po/: Commit new line numbers.

23 files changed, 8642 insertions, 10747 deletions

diff --git a/po/ca.po b/po/ca.po
index 0a1c8d59..c1aec42d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-25 15:41+0200\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/po/cs.po b/po/cs.po
index 5588b1d2..24e02310 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-25 20:25+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/po/da.po b/po/da.po
index 0a9dddbb..409b2248 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2013-03-11 07:50+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -24,6 +24,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: checkalias.c:174
@@ -384,7 +385,7 @@ msgstr "vælger eller prøver igen indbakken\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
@@ -679,81 +680,81 @@ msgstr "ADVARSEL: Kørsel som administrator (root) frarådes.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "kunne ikke få det nuværende arbejdskatalog\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Tilvalget nodetach er aktiveret, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Kører ikke i dæmontilstand, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "Logfil »%s« findes ikke, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Logfil »%s« er ikke skrivbar, afbryder.\n"
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 "syslog- og logfiltilvalg er begge angivet, ignorerer syslog, og logger til %s"
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - måske mangler %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail kører\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: fejl ved drab af %s fetchmail på %ld; jeg trækker mig.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail på %ld dræbt.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -761,7 +762,7 @@ msgstr ""
 "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært "
 "kører.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -770,204 +771,204 @@ msgstr ""
 "fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail "
 "kører på %ld.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail kører på %ld.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: kan ikke tage tilvalg mens en baggrundsfetchmail kører.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: baggrundsfetchmail på %ld vækket.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: ældre søskende på %ld døde på mystisk vis.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: kan ikke finde et kodeord for %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv adgangskode for %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Kan ikke frigøre til baggrunden. Afbryder.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starter fetchmail %s-dæmon\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "kunne ikke åbne %s for at tilføje logge til\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "tilstanden --check aktiveret, henter ikke post\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsfæste %s (fejl %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s ændret)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "forsøg på at genstarte kan mislykkes da kataloget ikke er genoprettet\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "forsøg på at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "prøve af %s droppet (mislykket godkendelse eller for mange tidsafbrud)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke nået, spørger ikke %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Spørgestatus=0 (succes)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Spørgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Spørgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Spørgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Spørgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Spørgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Spørgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Spørgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Spørgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Spørgestatus=9 (lås optaget)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Spørgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Spørgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Spørgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Spørgestatus=13 (afhentningsgrænse nået)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Spørgestatus=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sover %s for %d sekunder\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "vækket af %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "vækket af signal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "vækket %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsfæste kørselskontrolfilen\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Advarsel: flere forekomster af vært %s i konfigurationsfil\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Fejl: flere \"standardposter\" i konfigurationsfil.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-understøttelse.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "KERBEROS v4-understøttelse er konfigureret, men ikke kompileret ind.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "KERBEROS v5-understøttelse er konfigureret, men ikke kompileret ind.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-understøttelse er konfigureret, men ikke kompileret ind.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -975,16 +976,16 @@ msgstr ""
 "fetchmail: advarsel: ingen DNS er tilgængelig til at kontrollere "
 "afhentninger fra %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "advarsel: flerdrop for %s kræver kuverttilvalg!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "advarsel: Spørg ikke om hjælp hvis al post går til postmesteren!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -993,324 +994,324 @@ msgstr ""
 "fetchmail: konfiguration af %s er forkert, angiv positivt portnummer for "
 "tjeneste eller port\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: konfiguration af %s er forkert, RPOP kræver en privilegeret port\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "konfiguration af %s forkert, LMTP kan ikke bruge standard SMTP-port\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Brug af både fetchall og keep i dæmon- eller ledig tilstand er en fejl!\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s-forespørgsel til %s (protokol %s) begyndt %s\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-understøttelse.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-understøttelse.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-understøttelse.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-understøttelse.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-understøttelse.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-understøttet protokol valgt.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s-forespørgsel til %s (protokol %s) afsluttet %s\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Prøvemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forløbsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forløbsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail vil opfatte permanente fejl som permanent (drop beskeder).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail vil opfatte permanente fejl som midlertidig (bevar beskeder).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  Prøvning af denne server vil ske hvert %d. sekund.\n"
 msgstr[1] "  Prøvning af denne server vil ske hvert %d. sekund.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Denne vært vil ikke blive forespurgt når ingen vært er specificeret.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Denne vært vil blive forespurgt når ingen vært er specificeret.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = »%s«.\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = »%s«.\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = »%s«.\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilgængelige godkendelsesmetoder vil blive forsøgt.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er påkrævet.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  SSL-certifikatfil: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL-servers almennavn %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-nøgle-fingeraftryk (tjekket mod servernøglen): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter på svar fra server i højst %d sekunder"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle breve vil blive hentet (--all aktiveret).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Kun nye breve vil blive hentet (--all deaktiveret).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Hentede breve vil blive gemt på serveren (--keep aktiveret).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Hentede breve vil ikke blive gemt på serveren (--keep deaktiveret).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Gamle breve vil blive slettet før afhentning (--flush aktiveret).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Gamle breve vil ikke blive slettet før afhentning (--flush deaktiveret).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr ""
 "  For lange breve vil blive slettet før hentning (--limitflush aktiveret).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1318,349 +1319,349 @@ msgstr ""
 "  For lange breve vil blive slettet før hentning (--limitflush "
 "deaktiveret).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Omskrivning af serverlokale adresser er aktiveret (--norewrite "
 "deaktiveret).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Omskrivning af serverlokale adresser er deaktiveret (--norewrite "
 "aktiveret).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Fjernelse af vognreturtegn er aktiveret (stripcr aktiveret).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er deaktiveret (stripcr deaktiveret).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Indsættelse af vognreturtegn er aktiveret (forcecr aktiveret).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Indsættelse af vognreturtegn er deaktiveret (forcecr deaktiveret).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Fortolkning af Content-Transfer-Encoding er deaktiveret (pass8bit "
 "aktiveret).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Fortolkning af Content-Transfer-Encoding er aktiveret (pass8bit "
 "deaktiveret).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er aktiveret (mimedecode aktiveret).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-afkodning er deaktiveret (mimedecode deaktiveret).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter prøvning er aktiveret (idle aktiveret).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Tomgang efter prøvning er deaktiveret (idle deaktiveret).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive fjernet (dropstatus aktiveret)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive bevaret (dropstatus deaktiveret)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  \"Delivered-To\"-linjer vil blive fjernet (dropdelivered aktiveret)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  \"Delivered-To\"-linjer vil blive bevaret (dropdelivered deaktiveret)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Maksimal størrelse på breve er %d oktetter (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval for størrelsesadvarsler er %d sekunder (--warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Størrelsesadvarsler ved hver prøvning (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal størrelse på hentede breve (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Udfør binær søgning for UID'er under hver prøvning (--fastuidl 1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Udfør binær søgning for UID'er under %d ud for %d prøvninger (--fastuidl "
 "%d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Udfør lineær søgning for UID'er under hver prøvning (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgrænse er %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgrænse (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Sletninger udføres ved hver %d. brev (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domæner som der vil blive hentet post til:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilføjet %s som BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med »%s«.\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Værtsdelen af MAIL FROM-linjen vil blive %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adressen i RCPT TO-linjer til SMTP bliver %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er slået fra\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med »%s«.\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med »%s«.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne vært.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokalt navn genkendt\n"
 msgstr[1] "%d lokale navne genkendt\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er aktiveret.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er deaktiveret.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Serveraliasser vil blive sammenholdt med flermodtager-adresser efter IP-"
 "adresse.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Serveraliasser vil blive sammenholdt med flermodtager-adresser efter "
 "navn.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Adressering efter konvolutadressen er slået fra\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Konvolutadressen antages at være i %s-feltet i brevhovedet\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Antallet af konvolutadresse som vil blive sprunget over: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Præfiks %s vil blive slettet fra bruger-id\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Ingen præfikssletning\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderklærede postserveraliaser:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Lokale domæner:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem grænseflade %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen grænsefladekrav specificeret.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Prøveløkke vil overvåge %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overvågning af grænseflade specificeret.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serverforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugin "
 "%s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Modtagerforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugout "
 "%s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne vært.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Sporingsinformation vil ikke blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Beskeder med ugyldige brevhoveder vil blive afvist.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Beskeder med ugyldige brevhoveder vil blive videresendt.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: »%s«.\n"
@@ -1682,91 +1683,91 @@ msgstr ""
 "\n"
 "Fangede SIGINT... Jeg trækker mig.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "GSSAPI-fejl i gss_display_status kaldt fra <%s>\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "GSSAPI-fejl %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kunne ikke få servicenavn for [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Bruger servicenavn [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 "Ingen egnede GSSAPI-akkreditiver fundet. Springer GSSAPI-godkendelse over.\n"
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 "Hvis du ønsker at bruge GSSAPI, skal du først have akkreditiver, muligvis "
 "fra kinit.\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Modtaget forkert udformet udfordring til \"%s GSSAPI\"!\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Sender akkreditiver\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Fejl ved udveksling af akkreditiver\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Akkreditiver udvekslet\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server kræver integritet og/eller hemmeligholdelse\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksimal GSS-symbolstørrelse er %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Frigiver GSS-akkreditiver\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
@@ -1775,135 +1776,131 @@ msgstr "Fejl ved frigivelse af akkreditiver\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: tråd sover i %d sekunder.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "Modtaget BYE-svar fra IMAP-server: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "falsk brev-tal i »%s«!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "falsk EXPUNGE-tal i »%s«!"
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "går i tomgang efter prøvning\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opgradering til TLS lykkedes.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opgradering til TLS fejlede.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: opportunistisk opgradering til TLS fejlede, forsøger at fortsætte\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som påkrævet\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "postsletning fejlmatch (%d aktuel != %d forventer)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu er usete\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "genprøvning mislykkedes\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d brev venter efter genprøvning\n"
 msgstr[1] "%d breve venter efter genprøvning\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d brev venter efter første prøvning\n"
 msgstr[1] "%d breve venter efter første prøvning\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "sletning (EXPUNGE) mislykkedes\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d brev venter efter sletning\n"
 msgstr[1] "%d breve venter efter sletning\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Advarsel: Ignorering af bogus-data for beskedstørrelser returneret af "
 "serveren.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Ukorrekt FETCH-svar: %s.\n"
@@ -2099,138 +2096,138 @@ msgstr "Tilvalg --folder er ikke understøttet med ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Tilvalg --check er ikke understøttet med ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "fatal fejl ved læsning fra server\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Strengen '%s' er ikke en gyldig talstreng.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Værdien af strengen '%s' er %s end %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "mindre"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "større"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Ugyldig politik for ugyldig-hoved '%s' specificeret.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ugyldig protokol '%s' specificeret.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ugyldig godkendelse '%s' specificeret.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "brug: fetchmail [tilvalg] [server ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Mulige tilvalg er:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        vis denne hjælp\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     vis versionsinformation\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tjek om der er breve uden at hente dem\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      vær stille\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     vær larmende (diagnostisk uddata)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      kør som dæmon en gang pr. n sekunder\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    sæt ikke dæmonprocessen i baggrunden\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        dræb dæmonproces\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     angiv navn på logfil\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr "      --syslog      brug syslog(3) som dæmon til de fleste beskeder\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   skriv ikke Received-linjer & lav værtssløring\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specificer en alternativ kørselskontrolfil\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specificer en alternativ PID-fil (lås)\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specificer modtager som sidste udvej\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail sletter permanent beskeder der ikke kan "
 "leveres.\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2238,73 +2235,73 @@ msgstr ""
 "      --softbounce  bevar permanent beskeder der ikke kan leveres på "
 "serveren (standard).\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   specifikation af krævet grænseflade\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     overvåg grænseflade for aktivitet\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         brug ssl-kryptering\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      privat ssl-nøglefil\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   udfør streng kontrol af servercertifikat (anbefales)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr ""
 "      --sslcertck   udfør streng kontrol af servercertifikat (anbefales)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile sti til troværdigt-CA ssl-certifikatfil\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath sti til troværdig-CA ssl-certifikatmappe\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  forvent dette CommonName fra server (frarådes)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 "      --sslfingerprint fingeraftryk som skal matche serverens certifikat.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    brug bestemt ssl-protokol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hjælpeprogram til at åbne forbindelse\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     specificer hjælpeprogram til at åbne smtp-forbindelse\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
@@ -2313,155 +2310,155 @@ msgstr ""
 "                    specificer politik for håndtering af beskeder med "
 "ugyldige hoveder\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        TCP-port at forbinde til (forældet, brug --service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service      TCP-tjeneste at forbinde til (kan være numerisk TCP-"
 "port)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    præfiks som skal slettes fra lokale bruger-id'er\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  tilføj sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    specificer brugernavn på server\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  hent gamle og nye breve\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve på server\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  slet for lange breve\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       hent ikke breve over den anførte størrelse\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anfør vært til SMTP-levering\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anfør SMTP-afleveringsdomæne at bruge\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anfør fuldt SMTP-navn - brugernavn@domæne\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anfør antispam-svarværdier\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  anfør maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  anfør maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit angiv begrænsning for hentning af brev\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    udfør en binær søgning for UIDL'er\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     anfør maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anfør MDA til brug for levering\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anfør BSMTP-uddatafil\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
@@ -2473,99 +2470,99 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr ""
 "Advarsel: \"Maillennium POP3\" fundet, bruger RETR-kommando i stedet for "
 "TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "TLS er krævet for denne session, men server nægtede CAPA-kommando.\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "CAPA-kommandoen er dog nødvendig for TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: Opportunistisk opgradering til TLS mislykkedes, forsøger at fortsætte.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Vi er løbet tør for tilladte godkendelser og kan ikke fortsætte.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ugyldigt APOP-tidsstempel.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Kan ikke håndtere UIDL-svar fra opstrømsserver.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server svarede med UID for forkert besked.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) blev slettet, men er stadig til stede!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Breve indsat på serverens liste. Kan ikke håndtere dette.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (nem=%d) blev slettet, men er stadig til stede!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --folder er ikke understøttet med POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "tilvalg vedr. server efter brugertilvalgene"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS er ikke slået til."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2573,7 +2570,7 @@ msgstr ""
 "fetchmail: grænsefladetilvalg (interface) er kun understøttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2581,25 +2578,25 @@ msgstr ""
 "fetchmail: overvågningstilvalg (monitor) er kun understøttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL er ikke slået til"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "slut på inddata"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Filen %s skal være en regulær fil.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Filen %s må ikke have flere tilladelser end -rwx------ (0710).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Filen %s skal være ejet af dig.\n"
@@ -2828,104 +2825,108 @@ msgstr "SMTP: (tekst til afvisningsbrev)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "afvisning af brev fra %s sendt til %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Gemt fejlkode er stadig %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP-server kræver STARTTLS, bevarer besked.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Åbning af BSMTP-fil mislykkedes: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Skrivning af BSMTP-indledning mislykkedes: %s.\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan virkelig ikke lide modtageradresse '%s'\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Kan ikke skifte effektiv bruger-id til %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr "Kan ikke skifte effektiv bruger-id tilbage til oprindelig %ld: %s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "MDA-åbning mislykkedes\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kan ikke få kontakt til modtager, bruger i stedet %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fejl ved skrivning til MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2933,20 +2934,20 @@ msgstr ""
 "Underligt: MDA pclose returnede %d og fejlnr. %d/%s, kan ikke håndtere det i "
 "%s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -2982,80 +2983,80 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udfører %s (server %s service %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(»%s«,»%s«) fejl: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Forsøg med at tilføje tilvalget --service (se også OSS-punkt R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "ukendt (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Forsøger at forbinde til %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "navn %d: kan ikke oprette sokkelfamilie %d type %d: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "forbindelse mislykkedes.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "forbindelse til %s:%s [%s/%s] mislykkedes: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "navn %d: forbindelse til %s:%s [%s/%s] mislykkedes: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "forbundet.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3064,133 +3065,133 @@ msgstr ""
 "Forbindelsesfejl for denne prøvning:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL rapporteret: %s\n"
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Servercertifikat:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "Certifikatkæde, fra administrator til modpart, starter på dybde %d:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certifikat på dybde %d:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (måske afskåret).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (måske afskåret).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Emne almennavn: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dårligt certifikat: almennavn for langt!\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Dårligt certifikat: Emne almennavn indeholder NUL, afbryder!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Emne alternativt navn: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Dårligt certifikat: Emne almennavn indeholder NUL, afbryder!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anført, kunne ikke verificere certifikat!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s nøgle-fingeraftryk: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fejl vedrørende verificering af servercertifikat: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Ugyldig certifikatkæde ved: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3201,12 +3202,12 @@ msgstr ""
 "certifikater, hvilket fetchmail ikke kan gøre noget ved. For detaljer så se "
 "venligst dokumentet README.SSL-SERVER som følger med fetchmail.\n"
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Manglende betroet ankercertifikat: %s\n"
 
-#: socket.c:834
+#: socket.c:839
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
 "CA certificate location, or that c_rehash needs to be run on the certificate "
@@ -3218,96 +3219,96 @@ msgstr ""
 "certifikatmappen. For detaljer så se venligst dokumentationen for --"
 "sslcertpath og --sslcertfile i manualsiden.\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 #, fuzzy
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert værdi til SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget "
 "over!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
@@ -3315,11 +3316,11 @@ msgstr ""
 "Advarsel: Forbindelsen er usikker, fortsætter alligevel. (Brug hellere --"
 "sslcertck!)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Forsøger igen at læse cygwin-sokkel\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Forsøg på at læse cygwin-sokkel mislykkedes!\n"
 
@@ -3376,60 +3377,60 @@ msgstr ""
 msgid "line: %s"
 msgstr "linje: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Fortolker kuvert »%s« navne \"%-.*s\"\n"
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Fortolker modtagne navne \"%-.*s\"\n"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Ingen kuvertmodtager fundet, falder tilbage til brevhovedgæt.\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Gætter fra hoved \"%-.*s\".\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erklærede lokale navne"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "fejl ved skrivning af beskedtekst\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3467,35 +3468,35 @@ msgstr "ombytter ikke UID-lister, ingen UID'er set ved denne forespørgsel\n"
 msgid "discarding new UID list\n"
 msgstr "fjerner ny UID-liste\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Sletter fetchids-fil\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fejl ved sletning af %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Skriver fetchids-fil.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Skriver fejl til fetchids-fil %s: %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Fejl ved skrivning til fetchids-fil %s, gammel fil bevaret.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Kan ikke omdøbe fechids-fil %s til %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Kan ikke åbne fetchids-fil %s for skrivning: %s\n"
@@ -3508,6 +3509,12 @@ msgstr "malloc mislykkedes\n"
 msgid "realloc failed\n"
 msgstr "realloc mislykkedes\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Gemt fejlkode er stadig %d\n"
+
 #~ msgid "swapping UID lists\n"
 #~ msgstr "ombytter UID-lister\n"
 
diff --git a/po/de.po b/po/de.po
index 784638be..bc574285 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-25 19:13+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -2917,11 +2917,14 @@ msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
 #: sink.c:1167
 #, c-format
 msgid "MDA option contains single-quoted %%%c expansion.\n"
-msgstr "MDA-Option enthält einen %%%c-Platzhalter in einfachen Anführungszeichen.\n"
+msgstr ""
+"MDA-Option enthält einen %%%c-Platzhalter in einfachen Anführungszeichen.\n"
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr "Verweigere die Auslieferung. Bitte lesen Sie das Handbuch und reparieren Sie die mda-Option.\n"
+msgstr ""
+"Verweigere die Auslieferung. Bitte lesen Sie das Handbuch und reparieren Sie "
+"die mda-Option.\n"
 
 #: sink.c:1211
 #, c-format
diff --git a/po/el.po b/po/el.po
index b5a9542f..5a12b194 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,37 +5,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"POT-Creation-Date: 2003-03-01 00:18-0500\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
-"Language: el\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:174
+#: checkalias.c:171
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "������� ��� �� %s ����� �������� � ����� ������ �� ��� %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:175
 msgid "Yes, their IP addresses match\n"
 msgstr "���, �� IP ����������� ���� ����������\n"
 
-#: checkalias.c:182
+#: checkalias.c:179
 msgid "No, their IP addresses don't match\n"
 msgstr "���, �� IP ����������� ���� ��� ����������\n"
 
-#: checkalias.c:207
-#, fuzzy, c-format
-msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"� ��������� ��� `%s' ������� (������ ����������� ��������), ���� ���\n"
-"����������� �������������  ��� �� %s.\n"
-
-#: checkalias.c:230
+#: checkalias.c:199 checkalias.c:225
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -51,160 +43,140 @@ msgstr "�������� ���������������� ��� BASE64 ���������\n"
 msgid "decoded as %s\n"
 msgstr "����������������� ��� %s\n"
 
-#: driver.c:199
+#: driver.c:188
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "������ kerberos %s\n"
 
-#: driver.c:259 driver.c:265
-#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s']\n"
+#: driver.c:247 driver.c:252
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [� ������������ ���� '%*s'] \n"
 
-#: driver.c:345
-msgid "Fetchmail oversized-messages warning"
-msgstr ""
-
-#: driver.c:349
-#, fuzzy, c-format
-msgid "The following oversized messages were deleted on server %s account %s:"
+#: driver.c:333
+#, c-format
+msgid ""
+"Subject: Fetchmail oversized-messages warning.\n"
+"\n"
+"The following oversized messages remain on the mail server %s:"
 msgstr ""
-"�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
+"Subject: ������������� fetchmail ������������-���������.\n"
+"\n"
+"�� �������� ����������� �������� �������� ���������� ��� ����������� %s:"
 
-#: driver.c:353
-#, fuzzy, c-format
-msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
-
-#: driver.c:372
-#, fuzzy, c-format
-msgid "  %d message  %d octets long deleted by fetchmail."
-msgid_plural "  %d messages %d octets long deleted by fetchmail."
-msgstr[0] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
-msgstr[1] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
-
-#: driver.c:377
-#, fuzzy, c-format
-msgid "  %d message  %d octets long skipped by fetchmail."
-msgid_plural "  %d messages %d octets long skipped by fetchmail."
-msgstr[0] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
-msgstr[1] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
-
-#: driver.c:522
-#, fuzzy, c-format
-msgid "skipping message %s@%s:%d"
-msgstr "�������� ��������� %s@%s:%d (%d octets)"
+#: driver.c:351
+#, c-format
+msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+msgstr "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
 
-#: driver.c:577
+#: driver.c:444
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "�������� ��������� %s@%s:%d (%d octets)"
 
-#: driver.c:593
+#.
+#. * 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:460
 msgid " (length -1)"
 msgstr " (����� -1)"
 
-#: driver.c:596
+#: driver.c:463
 msgid " (oversized)"
 msgstr " (���������� �������)"
 
-#: driver.c:614
+#: driver.c:477
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "�������� ����� ������������, ������ %s@%s:%d (%d octets)\n"
 
-#: driver.c:632
+#: driver.c:494
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "�������� ��������� %s@%s:%d ��� %d"
 
-#: driver.c:637
-#, fuzzy, c-format
-msgid " (%d octets)"
-msgstr " (%d octets).\n"
+#: driver.c:499
+#, c-format
+msgid " (%d %soctets)"
+msgstr " (%d %soctets)"
 
-#: driver.c:638
-#, fuzzy, c-format
-msgid " (%d header octets)"
-msgstr " (%d octets �������) "
+#: driver.c:500
+msgid "header "
+msgstr "������������ "
 
-#: driver.c:708
-#, fuzzy, c-format
-msgid " (%d body octets)"
+#: driver.c:576
+#, c-format
+msgid " (%d body octets) "
 msgstr " (%d octets �������) "
 
-#: driver.c:770
+#: driver.c:644
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d "
-"�����������)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d �����������)\n"
 
-#: driver.c:802
+#: driver.c:674
 msgid " retained\n"
 msgstr "������������\n"
 
-#: driver.c:812
+#: driver.c:682
 msgid " flushed\n"
 msgstr "�����������\n"
 
-#: driver.c:824
+#: driver.c:699
 msgid " not flushed\n"
 msgstr "��� �����������\n"
 
-#: driver.c:842
-#, fuzzy, c-format
-msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] ""
-"�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
-msgstr[1] ""
-"�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
+#: driver.c:715
+#, c-format
+msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr "�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
+
+#: driver.c:775
+msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+msgstr "��� SIGPIPE ��������� ��� ��� MDA � ��� ������ stream socket\n"
 
-#: driver.c:899
+#: driver.c:782
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ������� ���� %s.\n"
 
-#: driver.c:903
+#: driver.c:786
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ��� ����������� %s.\n"
 
-#: driver.c:907
+#: driver.c:790
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� �� %s.\n"
 
-#: driver.c:912
+#: driver.c:795
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"���� ������ ���� ��� %d ������� �������� ��� ��� �������� ��� �������.\n"
+msgstr "���� ������ ���� ��� %d ������� �������� ��� ��� �������� ��� �������.\n"
 
-#: driver.c:915
+#: driver.c:798
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "���� ������ ���� ��� %d �������.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:810
+msgid "Subject: fetchmail sees repeated timeouts\n"
 msgstr "Subject: �� fetchmail ������ ����������������� ������ ����� ������\n"
 
-#: driver.c:930
+#: driver.c:812
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"�� fetchmail ���� ����������� ��� %d ������ ����� ������ ���� ��� ���������� "
-"��� �������� ������������� ��� �� %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "�� fetchmail ���� ����������� ��� %d ������ ����� ������ ���� ��� ���������� ��� �������� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:817
 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"
@@ -221,98 +193,106 @@ msgstr ""
 "�� fetchmail ��� �� ����������� ���� �� ��������������� ����� �� ��\n"
 "��������������.\n"
 
-#: driver.c:960
-#, fuzzy, c-format
-msgid "pre-connection command terminated with signal %d\n"
-msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
-
-#: driver.c:963
+#: driver.c:847
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:987
+#: driver.c:878
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "�������� ������� HESIOD ���. ������� ��� �� %s\n"
 
-#: driver.c:1008
+#: driver.c:900
 msgid "Lead server has no name.\n"
 msgstr "� ���������� ������������ ��� ���� �����.\n"
 
-#: driver.c:1035
-#, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s): %s\n"
+#: driver.c:923
+#, c-format
+msgid "couldn't find canonical DNS name of %s\n"
 msgstr "�������� ������� ��������� �������� DNS ��� %s\n"
 
-#: driver.c:1082
+#: driver.c:960
+msgid "internal inconsistency\n"
+msgstr "��������� ���������\n"
+
+#: driver.c:970
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s ������� ��� %s �������"
 
-#: driver.c:1111
+#: driver.c:976
+msgid "host is unknown."
+msgstr "�������� �����������."
+
+#: driver.c:979
+msgid "name is valid but has no IP address."
+msgstr "�� ����� ����� ������ ���� ��� ���� ��������� IP."
+
+#: driver.c:982
+msgid "unrecoverable name server error."
+msgstr "�� ���������� ������ ����������� ��������."
+
+#: driver.c:984
+msgid "temporary name server error."
+msgstr "��������� ������ ����������� ��������."
+
+#: driver.c:991
+#, c-format
+msgid "unknown DNS error %d."
+msgstr "������� ������ DNS %d."
+
+#: driver.c:1009
+#, c-format
+msgid ""
+"Subject: Fetchmail unreachable-server warning.\n"
+"\n"
+"Fetchmail could not reach the mail server %s:"
+msgstr ""
+"Subject: ������������� �������������-���������� ��� fetchmail.\n"
+"\n"
+"�� fetchmail �������� �� ����������� �� ���������� ������������� %s:"
+
+#: driver.c:1038 imap.c:384 pop3.c:292
 msgid "SSL connection failed.\n"
 msgstr "� ������� SSL �������.\n"
 
-#: driver.c:1166
+#: driver.c:1090
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "������ lock-busy ���� %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1094
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "������ busy ���������� ���� %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1099
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "�������� �������������� ���� %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1102
 msgid " (previously authorized)"
 msgstr " (������������ ���������������)"
 
-#: driver.c:1181
-msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1123
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s\n"
 msgstr "Subject: fetchmail �������� �������������� ��� %s@%s\n"
 
-#: driver.c:1206
+#: driver.c:1126
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "�������� ��� fetchmail ����� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:1210
-#, fuzzy
+#: driver.c:1130
 msgid ""
 "The attempt to get authorization failed.\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."
-msgstr ""
-"������� � ���������� ����� ��������������.\n"
-"���� ��� ���� �������� ������ ������������� ��� ���� �� �������, ����\n"
-"�������� ��� ��� ����� ��������� ��������� (���� ������������� �����������)\n"
-"��� �� fetchmail �������� �� ��������� ������ � ������������ ��� �������\n"
-"��� ������� ������ ���������.\n"
-"\n"
-"����, ��� ����� ������� ��� ������������ ��� ����������� ��� ��� ���� ���\n"
-"���������� �� ������� fetchmail, ������ �� ��� �����������, �� �������� ���\n"
-"��������� ��� fetchmail, ��� �� �� ��������������.\n"
-"\n"
-"� �������� fetchmail �� ��������� �� ������ ��� �� ��������� �� ��������\n"
-"�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
-"������������� � ��������."
-
-#: driver.c:1216
-#, fuzzy
-msgid ""
+"error message.\n"
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -336,7 +316,7 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
 "������������� � ��������."
 
-#: driver.c:1226
+#: driver.c:1145
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -356,184 +336,167 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� ��\n"
 "������������� � ��������."
 
-#: driver.c:1242
+#: driver.c:1160
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "����������� ������ ��� %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1165
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "������� ������ ������� � �������������� ��� %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1189
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "������������� ������ ���� %s@%s\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1195
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s\n"
 msgstr "Subject: ������������� ��� fetchmail ������ ��� %s@%s\n"
 
-#: driver.c:1281
+#: driver.c:1198
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "�������� ������� ��� fetchmail ��� %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1202
 msgid "Service has been restored.\n"
 msgstr "� �������� ��������������.\n"
 
-#: driver.c:1318
+#: driver.c:1233
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "������� � �����-����������� ������� %s\n"
 
-#: driver.c:1320
+#: driver.c:1235
 msgid "selecting or re-polling default folder\n"
 msgstr "������� � �����-����������� ��'������� �������\n"
 
-#: driver.c:1332
+#: driver.c:1251
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ���  %s (������� %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1259 rcfile_y.y:395
 #, c-format
 msgid "%s at %s"
 msgstr "%s ���  %s"
 
-#: driver.c:1340
+#. only used for ETRN
+#: driver.c:1264
 #, c-format
 msgid "Polling %s\n"
 msgstr "����������� ��� %s\n"
 
-#: driver.c:1344
-#, fuzzy, c-format
-msgid "%d message (%d %s) for %s"
-msgid_plural "%d messages (%d %s) for %s"
-msgstr[0] "%d %s (���� %d) ��� �� %s"
-msgstr[1] "%d %s (���� %d) ��� �� %s"
+#: driver.c:1268
+#, c-format
+msgid "%d %s (%d seen) for %s"
+msgstr "%d %s (���� %d) ��� �� %s"
+
+#: driver.c:1269 driver.c:1274
+msgid "messages"
+msgstr "��������"
 
-#: driver.c:1347
-msgid "seen"
-msgid_plural "seen"
-msgstr[0] ""
-msgstr[1] ""
+#: driver.c:1270 driver.c:1275
+msgid "message"
+msgstr "������"
 
-#: driver.c:1350
-#, fuzzy, c-format
-msgid "%d message for %s"
-msgid_plural "%d messages for %s"
-msgstr[0] "%d %s ��� �� %s"
-msgstr[1] "%d %s ��� �� %s"
+#: driver.c:1273
+#, c-format
+msgid "%d %s for %s"
+msgstr "%d %s ��� �� %s"
 
-#: driver.c:1357
+#: driver.c:1279
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1363
+#: driver.c:1285
 #, c-format
 msgid "No mail for %s\n"
 msgstr "��� ������� ������������ ��� �� %s\n"
 
-#: driver.c:1396
+#: driver.c:1348
 msgid "bogus message count!"
 msgstr "��������� ������� ���������!"
 
-#: driver.c:1448
-#, c-format
-msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-
-#: driver.c:1549
+#: driver.c:1462
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1552
+#: driver.c:1465
 msgid "missing or bad RFC822 header"
 msgstr "������ � ����� ����������� RFC822"
 
-#: driver.c:1555
+#: driver.c:1468
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1471
 msgid "client/server synchronization"
 msgstr "������������ ������/�����������"
 
-#: driver.c:1561
+#: driver.c:1474
 msgid "client/server protocol"
 msgstr "��������� ������/�����������"
 
-#: driver.c:1564
+#: driver.c:1477
 msgid "lock busy on server"
 msgstr "������������ �������� ��� �����������"
 
-#: driver.c:1567
+#: driver.c:1480
 msgid "SMTP transaction"
 msgstr "��������� SMTP"
 
-#: driver.c:1570
+#: driver.c:1483
 msgid "DNS lookup"
 msgstr "��������� DNS"
 
-#: driver.c:1573
-#, fuzzy
-msgid "undefined"
+#: driver.c:1486
+msgid "undefined error\n"
 msgstr "�� �������� ������\n"
 
-#: driver.c:1579
-#, fuzzy, c-format
-msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
+#: driver.c:1497
+#, c-format
+msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s ������ ���� ��� �������� ��� ���������� SMTP %s\n"
 
-#: driver.c:1581
-#, fuzzy
-msgid "unknown"
-msgstr "�������� �����������."
-
-#: driver.c:1583
-#, fuzzy, c-format
-msgid "%s error while fetching from %s@%s\n"
+#: driver.c:1499
+#, c-format
+msgid "%s error while fetching from %s\n"
 msgstr "%s ������ ���� ��� ���� ��� �� %s\n"
 
-#: driver.c:1595
-#, fuzzy, c-format
-msgid "post-connection command terminated with signal %d\n"
-msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
-
-#: driver.c:1597
+#: driver.c:1507
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:1616
+#: driver.c:1528
 msgid "Kerberos V4 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V4 ��� ���� ��������.\n"
 
-#: driver.c:1624
+#: driver.c:1536
 msgid "Kerberos V5 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V5 ��� ���� ��������.\n"
 
-#: driver.c:1635
+#: driver.c:1547
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "� ������� --flush ��� ������������� �� �� %s\n"
 
-#: driver.c:1641
+#: driver.c:1553
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "� ������� --all ��� ������������� �� �� %s\n"
 
-#: driver.c:1650
+#: driver.c:1561
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "� ������� --limit ��� ������������� �� �� %s\n"
 
-#: env.c:61
+#: env.c:60
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -548,13 +511,12 @@ msgstr ""
 "��������� \"env QMAILINJECT= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:73
+#: env.c:72
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -565,77 +527,69 @@ msgstr ""
 "��������� \"env NULLMAILER_FLAGS= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:85
+#: env.c:84
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: ��� ��������.  ������ ������.\n"
 
-#: env.c:149
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: �������� ������������� ��� ���������� ���!"
 
-#: env.c:172
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:161
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "� gethostbyname ������� ��� �� %s\n"
 
-#: env.c:174
-msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-
-#: env.c:178
-msgid ""
-"Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
-"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
-msgstr ""
-
-#: etrn.c:49 odmr.c:61
+#: etrn.c:47 odmr.c:59
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� ESMTP\n"
 
-#: etrn.c:55
+#: etrn.c:53
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� ETRN\n"
 
-#: etrn.c:79
+#: etrn.c:77
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "�������� ����������� ��� �� %s\n"
 
-#: etrn.c:84
+#: etrn.c:82
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "��� ���������� �������� ��� �� %s\n"
 
-#: etrn.c:90
+#: etrn.c:88
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "�������� ��� ��������� �� �������� ��� ��������� ��� �� %s\n"
 
-#: etrn.c:94
+#. Unable to queue messages for node <x>
+#: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "�������� ����������� �� ����� ��� ��������� ��� �� ����� %s\n"
 
-#: etrn.c:98
+#. Node <x> not allowed: <reason>
+#: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "� ������ %s ��� �����������: %s\n"
 
-#: etrn.c:102
+#. Syntax Error
+#: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "���������� ����� ETRN\n"
 
-#: etrn.c:106
+#. Syntax Error in Parameters
+#: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "���������� ����� ETRN ���� �����������\n"
 
-#: etrn.c:110
+#: etrn.c:108
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "������� ������ ETRN %d\n"
@@ -649,1057 +603,855 @@ msgid "Option --flush is not supported with ETRN\n"
 msgstr "� ������� --flush ��� ������������ �� �� ETRN\n"
 
 #: etrn.c:162
-#, fuzzy
-msgid "Option --folder is not supported with ETRN\n"
-msgstr "� ������� --flush ��� ������������ �� �� ETRN\n"
+msgid "Option --remote is not supported with ETRN\n"
+msgstr "� ������� --remote ��� ������������ �� �� ETRN\n"
 
 #: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "� ������� --check ��� ������������ �� �� ETRN\n"
 
-#: fetchmail.c:141
-msgid ""
-"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
-"                   Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2019 Matthias Andree\n"
-msgstr ""
-
-#: fetchmail.c:147
-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"
-"please see the file COPYING in the source or documentation directory.\n"
-msgstr ""
-
-#: fetchmail.c:187
-msgid "WARNING: Running as root is discouraged.\n"
-msgstr ""
-
-#: fetchmail.c:199
+#: fetchmail.c:156
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: ��������� ��"
 
-#: fetchmail.c:223
+#: fetchmail.c:180
 msgid "could not get current working directory\n"
 msgstr "�������� ����� ��� ��������� ������� �������� (cwd)\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:190
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "���� ����� �� fetchmail ������ %s"
 
-#: fetchmail.c:323
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:330
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:337
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:343
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:361
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:449
+#: fetchmail.c:331
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "���� ���������� ��� ��� ������ �������%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:332
 msgid " and "
 msgstr " ��� "
 
-#: fetchmail.c:455
+#: fetchmail.c:337
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
-msgstr ""
-"��� ����� ������� ������������ ������������� -- ���� �� %s �� ������;\n"
+msgstr "��� ����� ������� ������������ ������������� -- ���� �� %s �� ������;\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:358
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ��� ����� ������� ������������ �������������.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:367
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ��� ������ ���� fetchmail\n"
 
-#: fetchmail.c:494
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
+#: fetchmail.c:373
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: ������ ��� �������� ��� %s fetchmail ��� %d; �����������.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:374 fetchmail.c:380
 msgid "background"
 msgstr "��������"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:374 fetchmail.c:380
 msgid "foreground"
 msgstr "���������"
 
-#: fetchmail.c:503
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:379
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: �� %s fetchmail ��� %d ������������.\n"
 
-#: fetchmail.c:526
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: �������� ������� ������������� ���� ��� ���� fetchmail ��������� "
-"���� �������.\n"
+#: fetchmail.c:395
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: �������� ������� ������������� ���� ��� ���� fetchmail ��������� ���� �������.\n"
 
-#: fetchmail.c:532
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
+#: fetchmail.c:401
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 msgstr ""
 "fetchmail: �������� �������� ��� ��������� ����������� ��� ������ ����\n"
 "           fetchmail ��� %d.\n"
 
-#: fetchmail.c:539
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:408
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ������ ���� fetchmail ������ ��� ��������� ��� %d.\n"
 
-#: fetchmail.c:549
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: ������� �� ������ ���� ��� fetchmail ������ ��� ����������.\n"
+#: fetchmail.c:418
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: ������� �� ������ ���� ��� fetchmail ������ ��� ����������.\n"
 
-#: fetchmail.c:561
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:424
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: �������� ������������� fetchmail ��� %d.\n"
 
-#: fetchmail.c:573
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: ����������� ����������� ������� ������ ����������� ��� %d.\n"
+#: fetchmail.c:436
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
+msgstr "fetchmail: ����������� ����������� ������� ������ ����������� ��� %d.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:451
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: �������� ������ ����� ������ ��� �� %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:457
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "�������������� ��� ���� ������ ��� �� %s@%s: "
 
-#: fetchmail.c:634
-#, fuzzy
-msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: ��� ������ ���� fetchmail\n"
-
-#: fetchmail.c:638
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:488
+#, c-format
+msgid "starting fetchmail %s daemon \n"
 msgstr "�������� ������� fetchmail %s \n"
 
-#: fetchmail.c:654 fetchmail.c:656
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:503 fetchmail.c:505
+#, c-format
+msgid "could not open %s to append logs to \n"
 msgstr "�������� ���������� ��� %s ��� �������� ���������� �� ���� \n"
 
-#: fetchmail.c:675
-msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
-
-#: fetchmail.c:697
+#: fetchmail.c:543
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "�������� �������-���� %s (������ %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:548
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "������������ fetchmail (%s ������)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:553
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"� ���������� ��� ������� ���� �������� ���� � ������� ��� ���� "
-"�������������\n"
+msgstr "� ���������� ��� ������� ���� �������� ���� � ������� ��� ���� �������������\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:580
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "� �������� ��� ������������ ��� fetchmail �������\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:608
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"��������� �������� ��� %s (������� � ������������� � ������ ������ ������)\n"
+msgstr "��������� �������� ��� %s (������� � ������������� � ������ ������ ������)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:620
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "�� ��������� ��� ������, ��� ������ ������� %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:651
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "���������� ��������=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:653
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "���������� ��������=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:655
 msgid "Query status=2 (SOCKET)\n"
 msgstr "���������� ��������=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:657
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "���������� ��������=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:659
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "���������� ��������=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:661
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "���������� ��������=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:663
 msgid "Query status=6 (IOERR)\n"
 msgstr "���������� ��������=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:665
 msgid "Query status=7 (ERROR)\n"
 msgstr "���������� ��������=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:667
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "���������� ��������=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:669
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "���������� ��������=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:671
 msgid "Query status=10 (SMTP)\n"
 msgstr "���������� ��������=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:673
 msgid "Query status=11 (DNS)\n"
 msgstr "���������� ��������=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:675
 msgid "Query status=12 (BSMTP)\n"
 msgstr "���������� ��������=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:677
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "���������� ��������=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:679
 #, c-format
 msgid "Query status=%d\n"
 msgstr "���������� ��������=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:725
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "���� �� ��������� ����� ���������. �����������.\n"
 
-#: fetchmail.c:892
-#, fuzzy, c-format
-msgid "sleeping at %s for %d seconds\n"
+#: fetchmail.c:732
+#, c-format
+msgid "sleeping at %s\n"
 msgstr "������� ��� %s\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:756
 #, c-format
 msgid "awakened by %s\n"
 msgstr "����������� ��� �� %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:759
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "����������� ��� ���� %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:766
 #, c-format
 msgid "awakened at %s\n"
 msgstr "����������� ��� %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:772
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "������������ �����������, ��������� %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:921
 msgid "couldn't time-check the run-control file\n"
 msgstr "�������� �������-���� ��� ������ run-control\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:954
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
+msgstr "�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
 
-#: fetchmail.c:1166
-#, fuzzy
-msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr ""
-"�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
-
-#: fetchmail.c:1288
+#: fetchmail.c:1096
 msgid "SSL support is not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1295
-#, fuzzy
-msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
-
-#: fetchmail.c:1301
-#, fuzzy
-msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
-
-#: fetchmail.c:1307
-#, fuzzy
-msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
-
-#: fetchmail.c:1337
+#: fetchmail.c:1127
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: �������������: ������ ��������� DNS ��� ������ ������ ��� %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: �������������: ������ ��������� DNS ��� ������ ������ ��� %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1144
 #, c-format
-msgid "warning: multidrop for %s requires envelope option!\n"
-msgstr ""
+msgid "%s configuration invalid, port number cannot be negative\n"
+msgstr "�� ������� ��������� %s, � ������� ����� ��� ������ �� ����� ���������\n"
 
-#: fetchmail.c:1349
-msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-
-#: fetchmail.c:1366
-#, fuzzy, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"�� ������� ��������� %s, � ������� ����� ��� ������ �� ����� ���������\n"
-
-#: fetchmail.c:1373
-#, fuzzy, c-format
-msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1151
+#, c-format
+msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "�� ������� ��������� %s, �� RPOP ������� ����������� ����\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1167
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"�� ������� ��������� %s, �� LMTP ��� ����� ����� ��� �� ������� ����� SMTP\n"
+msgstr "�� ������� ��������� %s, �� LMTP ��� ����� ����� ��� �� ������� ����� SMTP\n"
 
-#: fetchmail.c:1405
-#, fuzzy
-msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
+#: fetchmail.c:1182
+msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "����� ����� �� fetchall ��� ���� �� �������� �� ��������� �������!\n"
 
-#: fetchmail.c:1415
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1439
+#: fetchmail.c:1232
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "����� �� ���� %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1317
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������ � �������\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1342
 msgid "POP2 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP2.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1354
 msgid "POP3 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP3.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1364
 msgid "IMAP support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� IMAP.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1370
 msgid "ETRN support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ETRN.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1376
+msgid "Cannot support ETRN without gethostbyname(2).\n"
+msgstr "�������� ����������� ETRN ����� gethostbyname(2).\n"
+
+#: fetchmail.c:1383
 msgid "ODMR support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ODMR.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1389
+msgid "Cannot support ODMR without gethostbyname(2).\n"
+msgstr "�������� ����������� ODMR ����� gethostbyname(2).\n"
+
+#: fetchmail.c:1395
 msgid "unsupported protocol selected.\n"
 msgstr "���������� �� �������������� ����������.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1405
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������������ � �������\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1422
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "��������� �������� ����� %d ������������\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1424
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "������ ����������� ����� �� %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1426
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "������ Id ����� �� %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1429
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�� �������� ������� �� ������������ ���� ��� syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1432
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "�� fetchmail �� ���������� ��� �� �� ������� Received\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1434
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "�� fetchmail �� ������� ������� ������� ��� ��� ������ ����������.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1436
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "�� fetchmail �� ������� multidrop �������� �� ���� ��������� ��� %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1440
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� postmaster.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1442
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� ���������.\n"
 
-#: fetchmail.c:1638
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "�� fetchmail �� ������� multidrop �������� �� ���� ��������� ��� %s.\n"
-
-#: fetchmail.c:1640
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "�� fetchmail �� ���������� ������������ ��������� ��� ���������.\n"
-
-#: fetchmail.c:1647
+#: fetchmail.c:1449
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "�������� ��� ���� ��� %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1453
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  � ������������ �� ������ ���� ��� %s\n"
 
-#: fetchmail.c:1654
-#, fuzzy, 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] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
-msgstr[1] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
+#: fetchmail.c:1456
+#, c-format
+msgid "  Poll of this server will occur every %d intervals.\n"
+msgstr "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1459
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  �� ������� ����� ��� ����������� ����� %s.\n"
 
-#: fetchmail.c:1661
-#, fuzzy
-msgid "  This host will not be queried when no host is specified.\n"
+#: fetchmail.c:1461
+#, c-format
+msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
 
-#: fetchmail.c:1662
-#, fuzzy
-msgid "  This host will be queried when no host is specified.\n"
-msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
+#: fetchmail.c:1462 fetchmail.c:1577 fetchmail.c:1580
+msgid "will not"
+msgstr "'��� ��"
+
+#: fetchmail.c:1462 fetchmail.c:1577 fetchmail.c:1580
+msgid "will"
+msgstr "��"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1466
 msgid "  Password will be prompted for.\n"
 msgstr "  � ���� ������ �� �������.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1470
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ������� APOP = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1473
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1476
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ���� ������ = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1489
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  �� ���������� ����� KPOP �� ������������� Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1492
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  �� ���������� ����� %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1495
 #, c-format
 msgid " (using service %s)"
 msgstr " (����� ��������� %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1497
+#, c-format
+msgid " (using network security options %s)"
+msgstr " (����� �������� ��������� ������� %s)"
+
+#: fetchmail.c:1500
+#, c-format
+msgid " (using port %d)"
+msgstr " (������������� ����� %d)"
+
+#: fetchmail.c:1503
 msgid " (using default port)"
 msgstr " (������������� ����� ��'�������)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1505
 msgid " (forcing UIDL use)"
 msgstr " (������������ ������ UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1511
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ���� �� ���������� ������� �������������� �� �����������.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1514
 msgid "  Password authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� �� ���� ������.\n"
 
-#: fetchmail.c:1706
-#, fuzzy
-msgid "  MSN authentication will be forced.\n"
-msgstr "  �� ������������ � ������������� NTLM.\n"
-
-#: fetchmail.c:1709
+#: fetchmail.c:1517
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1520
 msgid "  OTP authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� OTP.\n"
 
-#: fetchmail.c:1715
-#, fuzzy
-msgid "  CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1523
+msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� CRAM-Md5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1526
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1529
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1532
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1535
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ������������� ����-��-���� ���������.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1539
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ���������� ��������� ������������� �����: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1542
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ������������ ���������������� SSL ���������.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1544
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ���������� SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1546
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  ������������ ������� �������������� ����������� SSL.\n"
 
-#: fetchmail.c:1740
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  ������������ ������� �������������� ����������� SSL.\n"
-
-#: fetchmail.c:1743
-#, fuzzy, c-format
-msgid "  SSL trusted certificate file: %s\n"
-msgstr "  ������� ������������� �������������� SSL: %s\n"
-
-#: fetchmail.c:1745
+#: fetchmail.c:1548
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ������� ������������� �������������� SSL: %s\n"
 
-#: fetchmail.c:1747
-#, fuzzy, c-format
-msgid "  SSL server CommonName: %s\n"
-msgstr "���������� �����������: %s\n"
-
-#: fetchmail.c:1749
+#: fetchmail.c:1551
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ��������� �������� SSL (�� �������� �� �� ������ �����������): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1554
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ���� ������ ���-��������� ��� �� ����������� ����� %d ������������"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1556
 msgid " (default).\n"
 msgstr " (��'�������).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1563
 msgid "  Default mailbox selected.\n"
 msgstr "  �� ������� ��������������� ����������.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1568
 msgid "  Selected mailboxes are:"
 msgstr "  ���������� ��������������� �����:"
 
-#: fetchmail.c:1772
-#, fuzzy
-msgid "  All messages will be retrieved (--all on).\n"
+#: fetchmail.c:1573
+#, c-format
+msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s �������� �� ������� (--all %s).\n"
 
-#: fetchmail.c:1773
-#, fuzzy
-msgid "  Only new messages will be retrieved (--all off).\n"
-msgstr "  %s �������� �� ������� (--all %s).\n"
+#: fetchmail.c:1574
+msgid "All"
+msgstr "���"
 
-#: fetchmail.c:1775
-#, fuzzy
-msgid "  Fetched messages will be kept on the server (--keep on).\n"
-msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
+#: fetchmail.c:1574
+msgid "Only new"
+msgstr "���� �� ���"
 
-#: fetchmail.c:1776
-#, fuzzy
-msgid "  Fetched messages will not be kept on the server (--keep off).\n"
+#: fetchmail.c:1576
+#, c-format
+msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
 
-#: fetchmail.c:1778
-#, fuzzy
-msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
-
-#: fetchmail.c:1779
-#, fuzzy
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
-
-#: fetchmail.c:1781
-#, fuzzy
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
-
-#: fetchmail.c:1782
-#, fuzzy
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
+#: fetchmail.c:1579
+#, c-format
+msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+msgstr "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1784
-#, fuzzy
-msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
+#: fetchmail.c:1582
+#, c-format
+msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+msgstr "  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1785
-#, fuzzy
-msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
+#: fetchmail.c:1583 fetchmail.c:1586 fetchmail.c:1589 fetchmail.c:1592
+#: fetchmail.c:1595 fetchmail.c:1598 fetchmail.c:1731
+msgid "enabled"
+msgstr "�� ����������"
 
-#: fetchmail.c:1787
-#, fuzzy
-msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
+#: fetchmail.c:1583 fetchmail.c:1586 fetchmail.c:1589 fetchmail.c:1592
+#: fetchmail.c:1595 fetchmail.c:1598 fetchmail.c:1731
+msgid "disabled"
+msgstr "����� �����������"
 
-#: fetchmail.c:1788
-#, fuzzy
-msgid "  Carriage-return stripping is disabled (stripcr off).\n"
+#: fetchmail.c:1585
+#, c-format
+msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
 
-#: fetchmail.c:1790
-#, fuzzy
-msgid "  Carriage-return forcing is enabled (forcecr on).\n"
-msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
-
-#: fetchmail.c:1791
-#, fuzzy
-msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+#: fetchmail.c:1588
+#, c-format
+msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
 
-#: fetchmail.c:1793
-#, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
-
-#: fetchmail.c:1794
-#, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1591
+#, c-format
+msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1796
-#, fuzzy
-msgid "  MIME decoding is enabled (mimedecode on).\n"
-msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
-
-#: fetchmail.c:1797
-#, fuzzy
-msgid "  MIME decoding is disabled (mimedecode off).\n"
+#: fetchmail.c:1594
+#, c-format
+msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1799
-#, fuzzy
-msgid "  Idle after poll is enabled (idle on).\n"
-msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
-
-#: fetchmail.c:1800
-#, fuzzy
-msgid "  Idle after poll is disabled (idle off).\n"
+#: fetchmail.c:1597
+#, c-format
+msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
 
-#: fetchmail.c:1802
-#, fuzzy
-msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
+#: fetchmail.c:1600
+#, c-format
+msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1803
-#, fuzzy
-msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
+#: fetchmail.c:1601 fetchmail.c:1604
+msgid "discarded"
+msgstr "�����������"
 
-#: fetchmail.c:1805
-#, fuzzy
-msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
+#: fetchmail.c:1601 fetchmail.c:1604
+msgid "kept"
+msgstr "���������"
 
-#: fetchmail.c:1806
-#, fuzzy
-msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
+#: fetchmail.c:1603
+#, c-format
+msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1609
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  �� ���� �������� ��������� ����� %d octets (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1612
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1614
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  �������� �������������� �������� ��������� ����� %d ������� (--warnings "
-"%d).\n"
+msgstr "  �������� �������������� �������� ��������� ����� %d ������� (--warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1617
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ��������������� �������� �� ���� ������� (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1620
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1623
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  ������ ���� ����������-��������� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
-#, fuzzy, c-format
-msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
-
-#: fetchmail.c:1829
-#, fuzzy
-msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
-msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
-
-#: fetchmail.c:1833
-msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-
-#: fetchmail.c:1835
-#, c-format
-msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-
-#: fetchmail.c:1838
-msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-
-#: fetchmail.c:1840
+#: fetchmail.c:1625
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ���� ������ ��������� SMTP ����� %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1627
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  ������ ���� ������ ��������� SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1631
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  �������� ��������� ������ ���������� ������������� �� %d (--expunge %d).\n"
+msgstr "  �������� ��������� ������ ���������� ������������� �� %d (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1633
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ������ ������������� �������� (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1640
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �������� ��� ��� ������ ������������ �� ������ �����:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1645 fetchmail.c:1665
 msgid " (default)"
 msgstr " (��'�������)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1650
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �� �������� �� ���������� �� %s ��� BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1652
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �� �������� �� ����������� �� \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1659
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �� �������� �� ���������� %cMTP ��:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1670
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  �� ����� ���������� ��� ������� MAIL FROM �� ����� %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1673
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  ��������� ��� �� ����� ���� ������� RCPT TO ��� ������������� ����\n"
 "   SMTP �� ����� %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1682
 msgid "  Recognized listener spam block responses are:"
 msgstr "  �������������� ���������� �������������� spam ������� �����:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1688
 msgid "  Spam-blocking disabled\n"
 msgstr "  �������������� ��������������-spam\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1691
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������ �� \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1694
 msgid "  No pre-connection command.\n"
 msgstr "  ������ ������ ���-��������.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1696
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������������ �� \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1699
 msgid "  No post-connection command.\n"
 msgstr "  ������ ������ ����-��������.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1702
 msgid "  No localnames declared for this host.\n"
 msgstr "  ������ ������ ����� ��� �������� ��� ���� �� ����������.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1712
 msgid "  Multi-drop mode: "
 msgstr "  ��������� multi-drop: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1714
 msgid "  Single-drop mode: "
 msgstr "  ��������� single-drop: "
 
-#: fetchmail.c:1931
-#, fuzzy, c-format
-msgid "%d local name recognized.\n"
-msgid_plural "%d local names recognized.\n"
-msgstr[0] "%d ������ �����(��) ��������������.\n"
-msgstr[1] "%d ������ �����(��) ��������������.\n"
-
-#: fetchmail.c:1946
-#, fuzzy
-msgid "  DNS lookup for multidrop addresses is enabled.\n"
-msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
+#: fetchmail.c:1716
+#, c-format
+msgid "%d local name(s) recognized.\n"
+msgstr "%d ������ �����(��) ��������������.\n"
 
-#: fetchmail.c:1947
-#, fuzzy
-msgid "  DNS lookup for multidrop addresses is disabled.\n"
+#: fetchmail.c:1730
+#, c-format
+msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
 
-#: fetchmail.c:1951
-#, fuzzy
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1734
+msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
 
-#: fetchmail.c:1953
-#, fuzzy
-msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
+#: fetchmail.c:1736
+msgid "IP address.\n"
+msgstr "��������� IP.\n"
+
+#: fetchmail.c:1738
+msgid "name.\n"
+msgstr "�����.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1741
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ���������������� � ����������� �����������-�������\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1744
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "����������� ������� �������� �� �����: %s\n"
 
-#: fetchmail.c:1962
-#, fuzzy, c-format
-msgid "  Number of envelope headers to be skipped over: %d\n"
+#: fetchmail.c:1745
+msgid "Received"
+msgstr "�����������"
+
+#: fetchmail.c:1747
+#, c-format
+msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  ������� ������������ ������� ��� �� �������������: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1750
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  �� ������� %s �� ��������� ��� �� user id\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1753
 msgid "  No prefix stripping\n"
 msgstr "  ������ �������� ����������\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1760
 msgid "  Predeclared mailserver aliases:"
 msgstr "����������� ��������� �����������-�������������:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1769
 msgid "  Local domains:"
 msgstr "  ������� ��������:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1779
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  � ������� ������ �� ����� ���� ��� interface %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1781
 msgid "  No interface requirement specified.\n"
 msgstr "  ��� ��������� ���������� interface.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1783
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ������� �������� �� ������������ �� %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1785
 msgid "  No monitor interface specified.\n"
 msgstr "  ��� �������� interface ��������������.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1789
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ��������� ����������� �� ������ ���� ��� plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1791
 msgid "  No plugin command specified.\n"
 msgstr "  ��� �������� ������ plugin.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:1793
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  ��������� ������� �� ������ ���� ��� plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:1795
 msgid "  No plugout command specified.\n"
 msgstr "  ��� �������� ������ plugout.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:1800
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ��� ������������� UID ��� ���� �� ����������.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:1809
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID �������������.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1817
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  ����������� ���������� �������� �� ��������� ���� ����������� Received.\n"
+msgstr "  ����������� ���������� �������� �� ��������� ���� ����������� Received.\n"
 
-#: fetchmail.c:2025
-#, fuzzy
-msgid "  No poll trace information will be added to the Received header.\n"
+#: fetchmail.c:1819
+msgid ""
+"  No poll trace information will be added to the Received header.\n"
+".\n"
 msgstr ""
 "  ������ ���������� ���������� �������� �� �� ��������� ���� �����������\n"
 "Received.\n"
 
-#: fetchmail.c:2030
-msgid "  Messages with bad headers will be rejected.\n"
-msgstr ""
-
-#: fetchmail.c:2033
-msgid "  Messages with bad headers will be passed on.\n"
-msgstr ""
-
-#: fetchmail.c:2038
+#: fetchmail.c:1822
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ��������� Pass-through \"%s\".\n"
 
-#: getpass.c:71
+#.
+#. * This is a hack to help xgettext which cannot find strings in
+#. * macro definitions like the one for xalloca above.
+#.
+#: fetchmail.h:573 fetchmail.h:579
+msgid "alloca failed"
+msgstr "alloca �������"
+
+#: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "������: ������ ���������� ��� �� ������� getpassword()\n"
 
-#: getpass.c:193
+#: getpass.c:194
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1707,304 +1459,209 @@ msgstr ""
 "\n"
 "������� SIGINT... �����������.\n"
 
-#: gssapi.c:52
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:55
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "%cMTP ������: %s\n"
-
-#: gssapi.c:90
+#: gssapi.c:62
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "�������� ����� �������� ��������� ��� [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:68
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "����� �������� ��������� [%s]\n"
 
-#: gssapi.c:122
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:123
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:159
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:169
+#: gssapi.c:84
 msgid "Sending credentials\n"
 msgstr "�������� ���������������\n"
 
-#: gssapi.c:200
+#: gssapi.c:102
 msgid "Error exchanging credentials\n"
 msgstr "������ ���� ��������� ���������������\n"
 
-#: gssapi.c:242
+#: gssapi.c:144
 msgid "Couldn't unwrap security level data\n"
 msgstr "�������� ���������� ��������� �������� ���������\n"
 
-#: gssapi.c:247
+#: gssapi.c:149
 msgid "Credential exchange complete\n"
 msgstr "������������ � ��������� ���������������\n"
 
-#: gssapi.c:251
+#: gssapi.c:153
 msgid "Server requires integrity and/or privacy\n"
 msgstr "� ������������ ������� ����������� ���/� �����������\n"
 
-#: gssapi.c:260
+#: gssapi.c:162
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "�������������� ������� �������� ���������: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:166
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "������� ������� ��������� GSS ����� %ld\n"
 
-#: gssapi.c:273
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:282
+#: gssapi.c:179
 msgid "Error creating security level request\n"
 msgstr "������ ��� ���������� ������� �������� ���������\n"
 
-#: gssapi.c:286
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:297
+#: gssapi.c:190
 msgid "Releasing GSS credentials\n"
 msgstr "������������ ��������������� GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:193
 msgid "Error releasing credentials\n"
 msgstr "������ ���� ������������ ���������������\n"
 
-#: idle.c:61
+#: idle.c:62
 #, c-format
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ������� ��������� ��� %d ����.\n"
 
-#: imap.c:74
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:96
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "��������� ������� ���������!"
-
-#: imap.c:143
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:354
+#: imap.c:275
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "����������� ����������� ��� IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "����������� ����������� ��� IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:288
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "����������� ����������� ��� IMAP2 � IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:299
 msgid "will idle after poll\n"
 msgstr "�� �������� ���� ��� �������\n"
 
-#: imap.c:475 pop3.c:473
-#, c-format
-msgid "%s: upgrade to TLS succeeded.\n"
-msgstr ""
-
-#: imap.c:481 pop3.c:479
-#, c-format
-msgid "%s: upgrade to TLS failed.\n"
-msgstr ""
-
-#: imap.c:486
-#, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-
-#: imap.c:501
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:606
+#: imap.c:451
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "����������� ��������� OTP ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:473
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "����������� ��������� NTLM ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:635
+#: imap.c:482
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "����������� ��������� LOGIN ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:699
-#, fuzzy, c-format
-msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr ""
-"�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d "
-"�����������)\n"
-
-#: imap.c:826
-#, fuzzy, c-format
-msgid "%lu is unseen\n"
-msgstr "%u ��� ���� �������\n"
-
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
-#, c-format
-msgid "%u is unseen\n"
-msgstr "%u ��� ���� �������\n"
+#: imap.c:604 imap.c:670
+msgid "expunge failed\n"
+msgstr "�������� �������\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:626 imap.c:655
 msgid "re-poll failed\n"
 msgstr "����������� �������\n"
 
-#: imap.c:919 imap.c:975
-#, fuzzy, c-format
-msgid "%d message waiting after re-poll\n"
-msgid_plural "%d messages waiting after re-poll\n"
-msgstr[0] "%d �������� ��������� ���� ��� �����������\n"
-msgstr[1] "%d �������� ��������� ���� ��� �����������\n"
+#: imap.c:634
+#, c-format
+msgid "%d messages waiting after re-poll\n"
+msgstr "%d �������� ��������� ���� ��� �����������\n"
 
-#: imap.c:936
+#: imap.c:644
 msgid "mailbox selection failed\n"
 msgstr "� ������� ���������������� �������\n"
 
-#: imap.c:940
-#, fuzzy, c-format
-msgid "%d message waiting after first poll\n"
-msgid_plural "%d messages waiting after first poll\n"
-msgstr[0] "%d �������� ��������� ���� ��� ����� �������\n"
-msgstr[1] "%d �������� ��������� ���� ��� ����� �������\n"
-
-#: imap.c:954
-msgid "expunge failed\n"
-msgstr "�������� �������\n"
+#: imap.c:648
+#, c-format
+msgid "%d messages waiting after first poll\n"
+msgstr "%d �������� ��������� ���� ��� ����� �������\n"
 
-#: imap.c:958
-#, fuzzy, c-format
-msgid "%d message waiting after expunge\n"
-msgid_plural "%d messages waiting after expunge\n"
-msgstr[0] "%d �������� ��������� ���� ��� ��������\n"
-msgstr[1] "%d �������� ��������� ���� ��� ��������\n"
+#: imap.c:674
+#, c-format
+msgid "%d messages waiting after expunge\n"
+msgstr "%d �������� ��������� ���� ��� ��������\n"
 
-#: imap.c:997
+#: imap.c:696
 msgid "search for unseen messages failed\n"
 msgstr "��������� ��� �� ������� �������� �������\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:726
 #, c-format
-msgid "%u is first unseen\n"
-msgstr "%u ����� �� ����� �� �������\n"
-
-#: imap.c:1086
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
+msgid "%u is unseen\n"
+msgstr "%u ��� ���� �������\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:738
 #, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+msgid "%u is first unseen\n"
+msgstr "%u ����� �� ����� �� �������\n"
 
-#: interface.c:256
+#: interface.c:253
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "�������� ���������� ��� kvm interface. ����������� ��� �� fetchmail\n"
 "����� SGID kmem."
 
-#: interface.c:396
+#: interface.c:398
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "�������� ������������ ��� �������� interface ��� �� %s"
 
-#: interface.c:418
+#: interface.c:420
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist estimate) �������"
 
-#: interface.c:424
+#: interface.c:426
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc �������"
 
-#: interface.c:430
+#: interface.c:432
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) �������"
 
-#: interface.c:448
+#: interface.c:450
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "������ ��������� ������������ %d ��� ������� ���������."
 
-#: interface.c:480
+#. we did not find an interface with a matching name
+#: interface.c:482
 #, c-format
 msgid "No interface found with name %s"
 msgstr "�� ������� ������ interface �� ����� %s"
 
-#: interface.c:538
+#: interface.c:540
 #, c-format
 msgid "No IP address found for %s"
 msgstr "��� �������� ����������� IP ��� �� %s"
 
-#: interface.c:590
+#: interface.c:592
 msgid "missing IP interface address\n"
 msgstr "��� ������� ��������� IP interface\n"
 
-#: interface.c:606
+#: interface.c:608
 msgid "invalid IP interface address\n"
 msgstr "�� ������ ��������� IP interface\n"
 
-#: interface.c:612
+#: interface.c:614
 msgid "invalid IP interface mask\n"
 msgstr "�� ������ IP interface mask\n"
 
-#: interface.c:651
+#: interface.c:653
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "������������� ��� %s -����������- ��� %d\n"
 
-#: interface.c:666
+#: interface.c:668
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "��������� �������� ��� %s, �� %s ����� ����\n"
 
-#: interface.c:685
+#: interface.c:687
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "��������� �������� ��� %s, � ��������� IP %s ������������\n"
 
-#: interface.c:697
+#: interface.c:699
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "������������� ��� %s ��������� ��� %d\n"
 
-#: interface.c:723
+#: interface.c:725
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "��������� �������� ��� %s, %s ���������\n"
 
-#: interface.c:730
+#: interface.c:732
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "������������� ��� %s ���� %d, ����� %d\n"
@@ -2013,598 +1670,442 @@ msgstr "������������� ��� %s ���� %d, ����� %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "�������� ���������������� ������� ��������� BASE64\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "���������� %s ��� ��������� �� ��������� �� -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "� ��������� non-null (%s) ������ �� ���������� �������� �����������\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "�������� ���������������� ��������� ����������� BASE64\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "��� ��������� ���������\n"
 
-#: lock.c:87
-#, fuzzy, c-format
-msgid "fetchmail: error reading lockfile \"%s\": %s\n"
-msgstr "fetchmail: �������� ������ ������� �����������\n"
-
-#: lock.c:98
+#: lock.c:81
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: �������� ������ ������� �����������\n"
 
 #: lock.c:122
-#, fuzzy, c-format
-msgid "fetchmail: error opening lockfile \"%s\": %s\n"
-msgstr "fetchmail: �������� ������ ������� �����������\n"
-
-#: lock.c:169
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: �������� ����������� �����������.\n"
 
-#: netrc.c:220
+#: netrc.c:218
+#, c-format
+msgid "warning: found \"%s\" before any host names"
+msgstr "�������������: ������� �� \"%s\" ���� ���� ����� ����������"
+
+#: netrc.c:222
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: �������������: ������� �� \"%s\" ���� ���� ����� ����������\n"
 
-#: netrc.c:258
+#: netrc.c:261
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: �������������: ������� �������� \"%s\"\n"
 
-#: odmr.c:67
+#: odmr.c:65
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� �TRN\n"
 
-#: odmr.c:105
+#: odmr.c:103
 msgid "Turnaround now...\n"
 msgstr "��������� ����...\n"
 
-#: odmr.c:110
+#: odmr.c:108
 msgid "ATRN request refused.\n"
 msgstr "� ������ ATRN �����������.\n"
 
-#: odmr.c:114
+#. Unable to process ATRN request now
+#: odmr.c:112
 msgid "Unable to process ATRN request now\n"
 msgstr "�������� ������������ ������� ATRN ����\n"
 
-#: odmr.c:119
+#: odmr.c:117
 msgid "You have no mail.\n"
 msgstr "��� ����� ������������.\n"
 
-#: odmr.c:123
+#. Command not implemented
+#: odmr.c:121
 msgid "Command not implemented\n"
 msgstr "� ������ ��� ���� ����������\n"
 
-#: odmr.c:127
+#. Authentication required
+#: odmr.c:125
 msgid "Authentication required.\n"
 msgstr "��������� �������������.\n"
 
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:129
+#, c-format
+msgid "Unknown ODMR error %d\n"
 msgstr "������� ������ ODMR %d\n"
 
-#: odmr.c:192
-#, fuzzy
-msgid "receiving message data\n"
-msgstr "������� �������� ���������\n"
-
-#: odmr.c:245
+#: odmr.c:243
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "� ������� --keep ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:249
+#: odmr.c:247
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "� ������� --flush ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:253
-#, fuzzy
-msgid "Option --folder is not supported with ODMR\n"
-msgstr "� ������� --flush ��� ������������ �� �� ODMR\n"
+#: odmr.c:251
+msgid "Option --remote is not supported with ODMR\n"
+msgstr "� ������� --remote ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:257
+#: odmr.c:255
 msgid "Option --check is not supported with ODMR\n"
 msgstr "� ������� --check ��� ������������ �� �� ODMR\n"
 
-#: opie.c:42
+#: opie.c:37
 msgid "server recv fatal\n"
 msgstr "������������ ����� ��������\n"
 
-#: opie.c:56
+#: opie.c:51
 msgid "Could not decode OTP challenge\n"
 msgstr "�������� ���������������� ��������� OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:59 pop3.c:378
 msgid "Secret pass phrase: "
 msgstr "������� ����� ������: "
 
-#: options.c:178 options.c:222
+#: options.c:197 options.c:241
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "� ������������ '%s' ��� ����� ������ ������������ �������.\n"
 
-#: options.c:187
+#: options.c:206
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "���� ��� ������������� '%s' ����� %s ���� %d.\n"
 
-#: options.c:188
+#: options.c:207
 msgid "smaller"
 msgstr "���������"
 
-#: options.c:188
+#: options.c:207
 msgid "larger"
 msgstr "����������"
 
-#: options.c:336
-#, fuzzy, c-format
-msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr "�������� �� ������ ���������� `%s'.\n"
-
-#: options.c:377
+#: options.c:379
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "�������� �� ������ ���������� `%s'.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "�������� �� ������ ������������� `%s'.\n"
 
-#: options.c:640
+#: options.c:555
+msgid "fetchmail: network security support is disabled\n"
+msgstr "fetchmail: ���������������� � ���������� ��������� �������\n"
+
+#: options.c:648
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "�����: fetchmail [��������] [������������ ...]\n"
 
-#: options.c:641
+#: options.c:649
 msgid "  Options are as follows:\n"
 msgstr "  �� �������� ����� �� ���������:\n"
 
-#: options.c:642
+#: options.c:650
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        ���������� ����� ��� ��������� ��������\n"
 
-#: options.c:643
+#: options.c:651
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     ���������� ����������� ��������\n"
 
-#: options.c:645
+#: options.c:653
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       ������� ��� �������� ����� ��������\n"
 
-#: options.c:646
+#: options.c:654
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      ������� �������\n"
 
-#: options.c:647
+#: options.c:655
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     ��������� ������� (����������� ������)\n"
 
-#: options.c:648
+#: options.c:656
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      �������� ��� �������� ��� ���� ���� n �������\n"
 
-#: options.c:649
+#: options.c:657
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    ������� ��������� ���������� ��� �������\n"
 
-#: options.c:650
+#: options.c:658
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ����������� ���������� �������\n"
 
-#: options.c:651
+#: options.c:659
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ���������� �������� ������� ����������\n"
 
-#: options.c:652
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+#: options.c:660
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr ""
 "      --syslog      ������������� ��� syslog(3) ��� �� ����������� ��������\n"
 "                    ���� ��������� ��� ��������\n"
 
-#: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
-
-#: options.c:654
+#: options.c:661
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   �� ������� Received & ���������� ��� ��������� "
-"����������\n"
+msgstr "      --invisible   �� ������� Received & ���������� ��� ��������� ����������\n"
 
-#: options.c:655
+#: options.c:662
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ������� ������������ ������� �����������\n"
 
-#: options.c:656
+#: options.c:663
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
 
-#: options.c:657
-#, fuzzy
-msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
-
-#: options.c:658
+#: options.c:664
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ������� ��������� ��� ��������� ����\n"
 
-#: options.c:659
+#: options.c:665
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    �������������� ��� ����������� ��� ������ �� "
-"postmaster.\n"
+msgstr "      --nobounce    �������������� ��� ����������� ��� ������ �� postmaster.\n"
 
-#: options.c:660
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-
-#: options.c:661
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-
-#: options.c:663
+#: options.c:667
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   ������������ ������� interface\n"
 
-#: options.c:664
+#: options.c:668
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ������������� interface ��� �������������\n"
 
-#: options.c:667
+#: options.c:671
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ������������ ssl ���������������� ���������\n"
 
-#: options.c:668
+#: options.c:672
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ��������� ������ �������� ssl\n"
 
-#: options.c:669
-msgid "      --sslcert     ssl client certificate\n"
-msgstr "      --sslcert     ������������� ������ ssl\n"
-
-#: options.c:670
-#, fuzzy
-msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcert     ������������� ������ ssl\n"
-
-#: options.c:671
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcert     ������������� ������ ssl\n"
-
-#: options.c:672
-#, fuzzy
-msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr "      --sslcert     ������������� ������ ssl\n"
-
 #: options.c:673
-#, fuzzy
-msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
+msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
 #: options.c:674
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-
-#: options.c:675
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-
-#: options.c:676
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
+msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    ������������ ����������� ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:676
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      ���������� ���������� ������� ��� ������� ��������\n"
+msgstr "      --plugin      ���������� ���������� ������� ��� ������� ��������\n"
 
-#: options.c:679
+#: options.c:677
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     ���������� ���������� ������� ��� ������� smtp ��������\n"
+msgstr "      --plugout     ���������� ���������� ������� ��� ������� smtp ��������\n"
 
-#: options.c:680
-msgid ""
-"      --bad-header {reject|accept}\n"
-"                    specify policy for handling messages with bad headers\n"
-msgstr ""
-
-#: options.c:683
-#, fuzzy
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --protocol    ���������� ����������� ��������� (����� ������ man)\n"
+#: options.c:679
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
+msgstr "  -p, --protocol    ���������� ����������� ��������� (����� ������ man)\n"
 
-#: options.c:684
+#: options.c:680
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        ������������ ������ ��� UIDL (pop3 ����)\n"
 
-#: options.c:685
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:686
-#, fuzzy
-msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
-
-#: options.c:687
-#, fuzzy
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:681
+msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
 
-#: options.c:688
+#: options.c:682
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ����� �������������� (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:683
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ������ ����� ��-��������� ����������\n"
 
-#: options.c:690
+#: options.c:684
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ������� ������������ ����������\n"
 
-#: options.c:691
+#: options.c:685
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    ������� ��� �������� ��� �� ������ user id\n"
 
-#: options.c:692
+#: options.c:686
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ���������� ��������� �������������\n"
 
-#: options.c:693
+#: options.c:687
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  �������� ����������� ����������-�������� ��� Received\n"
+msgstr "      --tracepolls  �������� ����������� ����������-�������� ��� Received\n"
 
-#: options.c:695
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:689
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ������� ��� user login ��� �����������\n"
 
-#: options.c:696
-#, fuzzy
-msgid "  -a, --[fetch]all  retrieve old and new messages\n"
+#: options.c:690
+msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ���� ������ ��� ���� ���������\n"
 
-#: options.c:697
+#: options.c:691
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      �������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:698
+#: options.c:692
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ���������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:699
+#: options.c:693
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
 
-#: options.c:700
-#, fuzzy
-msgid "      --limitflush  delete oversized messages\n"
-msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
-
-#: options.c:701
+#: options.c:694
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ��� ����������� ��� ������������ �����������\n"
 
-#: options.c:702
+#: options.c:695
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       ��� ���� ��������� ���� ��� �� ������� �������\n"
 
-#: options.c:703
+#: options.c:696
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr ""
-"  -w, --warnings    �������� ������ ������������� ��������� ��������������\n"
+msgstr "  -w, --warnings    �������� ������ ������������� ��������� ��������������\n"
 
-#: options.c:705
+#: options.c:699
+msgid "  -T, --netsec      set IP security request\n"
+msgstr "  -T, --netsec      ������� ������� ��������� IP\n"
+
+#: options.c:701
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ������� ���������� SMTP ��� ��������\n"
 
-#: options.c:706
+#: options.c:702
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
 
-#: options.c:707
+#: options.c:703
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress ������� �������� ��������� SMTP ��� �����\n"
 
-#: options.c:708
+#: options.c:704
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ������� ����� ��������SMTP username@domain\n"
 
-#: options.c:709
+#: options.c:705
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   ������� ����� ���������� ����-spam\n"
 
-#: options.c:710
+#: options.c:706
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  ������� ����� ������ ��� ��� ��������� SMTP\n"
 
-#: options.c:711
+#: options.c:707
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  ������� ����� ����� ��� ��� ��������� �����������\n"
-
-#: options.c:712
-#, fuzzy
-msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
-
-#: options.c:713
-msgid "      --fastuidl    do a binary search for UIDLs\n"
-msgstr ""
+msgstr "  -B, --fetchlimit  ������� ����� ����� ��� ��� ��������� �����������\n"
 
-#: options.c:714
+#: options.c:708
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ������� �������� ��������� ������ ����������\n"
 
-#: options.c:715
+#: options.c:709
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ������� MDA ��� ����� �� ��������\n"
 
-#: options.c:716
+#: options.c:710
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ������� ������� ������ BSMTP\n"
 
-#: options.c:717
+#: options.c:711
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ������� LMTP (RFC2033) ��� ��������\n"
 
-#: options.c:718
+#: options.c:712
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      ���������� �������� �������������� �������\n"
 
-#: options.c:719
+#: options.c:713
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    �������� ������� ������� ��� ��� ������ ����������\n"
-
-#: pop3.c:329
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-
-#: pop3.c:413
-msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
+msgstr "      --showdots    �������� ������� ������� ��� ��� ������ ����������\n"
 
-#: pop3.c:414
-msgid "The CAPA command is however necessary for TLS.\n"
-msgstr ""
-
-#: pop3.c:491
-#, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-
-#: pop3.c:497
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:622
-msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-
-#: pop3.c:636
+#: pop3.c:416
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "�� ������� � ����������� ����������� ��� ����������\n"
 
-#: pop3.c:645
+#: pop3.c:425
 msgid "Timestamp syntax error in greeting\n"
 msgstr "���������� ������ ������������ ��� ����������\n"
 
-#: pop3.c:661
-msgid "Invalid APOP timestamp.\n"
-msgstr ""
-
-#: pop3.c:685
+#: pop3.c:447
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�� �������� ������ ����������� ��� POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:455
 msgid "lock busy!  Is another session active?\n"
 msgstr "������������ ��������!  ����� ������ ������ ���� ��������;\n"
 
-#: pop3.c:785
-msgid "Cannot handle UIDL response from upstream server.\n"
-msgstr ""
-
-#: pop3.c:808
-msgid "Server responded with UID for wrong message.\n"
-msgstr ""
-
-#: pop3.c:837
-#, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
-msgstr ""
-
-#: pop3.c:949
+#: pop3.c:563
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"�� �������� ����������� �� ����� ��� �����������. �������� ��������� �����.\n"
+msgstr "�� �������� ����������� �� ����� ��� �����������. �������� ��������� �����.\n"
 
-#: pop3.c:1047
+#: pop3.c:634
 msgid "protocol error\n"
 msgstr "������ �����������\n"
 
-#: pop3.c:1063
+#: pop3.c:647
 msgid "protocol error while fetching UIDLs\n"
 msgstr "������ ����������� ���� �� ���� UIDL\n"
 
-#: pop3.c:1094
-#, c-format
-msgid "id=%s (num=%d) was deleted, but is still present!\n"
-msgstr ""
-
-#: pop3.c:1445
-#, fuzzy
-msgid "Option --folder is not supported with POP3\n"
+#: pop3.c:930
+msgid "Option --remote is not supported with POP3\n"
 msgstr "� ������� --remote ��� ������������� �� �� POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "������� ����������� ���� ��� �������� ������"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:170
 msgid "SDPS not enabled."
 msgstr "�� SDPS ��� ���� �������������."
 
 #: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: � ������� interface ������������� ���� ��� Linux (����� IPv6) ��� "
-"�� FreeBSD\n"
+msgid "invalid security request"
+msgstr "�� ������ ������ ���������"
 
-#: rcfile_y.y:226
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: � ������� monitor ������������� ���� ��� Linux (����� IPv6) ��� "
-"�� FreeBSD\n"
+#: rcfile_y.y:224
+msgid "network-security support disabled"
+msgstr "���������������� � ���������� ��������-�������"
+
+#: rcfile_y.y:231
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: � ������� interface ������������� ���� ��� Linux (����� IPv6) ��� �� FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:238
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: � ������� monitor ������������� ���� ��� Linux (����� IPv6) ��� �� FreeBSD\n"
+
+#: rcfile_y.y:350
 msgid "SSL is not enabled"
 msgstr "�� SSL ��� ���� �������������"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:396
 msgid "end of input"
 msgstr "����� �������"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:433
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "�� ������ %s ������ �� ����� �������� ������.\n"
 
 #: rcfile_y.y:440
-#, fuzzy, c-format
-msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+#, c-format
+msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "�� ������ %s �� ������ �� ���� ���� ��� -rwx--x--- (0710) ������.\n"
 
 #: rcfile_y.y:452
@@ -2612,127 +2113,131 @@ msgstr "�� ������ %s �� ������ �� ���� ���� ��� -rwx--x--- (0710) ������.\n"
 msgid "File %s must be owned by you.\n"
 msgstr "�� ������ %s ������ �� ������ �� ����.\n"
 
-#: report.c:67
+#: report.c:81
 msgid "Unknown system error"
 msgstr "������� ������ ����������"
 
-#: report.c:92
-#, fuzzy, c-format
-msgid "%s (log message incomplete)\n"
+#: report.c:108
+#, c-format
+msgid "%s (log message incomplete)"
 msgstr "%s (�������� ������ ����������)"
 
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: report.c:266 report.c:294 report.c:366 report.c:394
+msgid "partial error message buffer overflow"
+msgstr "������ ������ ���������� ��������� ������"
+
+#: rfc822.c:73
+#, c-format
+msgid "About to rewrite %s"
 msgstr "�������� �� ������������ %s"
 
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:209
+#, c-format
+msgid "Rewritten version is %s\n"
 msgstr "������������ ������ ����� %s\n"
 
-#: rpa.c:118
+#: rpa.c:116
 msgid "Success"
 msgstr "��������"
 
-#: rpa.c:119
+#: rpa.c:117
 msgid "Restricted user (something wrong with account)"
 msgstr "������������� ������� (���� ��������� �� �� ����������)"
 
-#: rpa.c:120
+#: rpa.c:118
 msgid "Invalid userid or passphrase"
 msgstr "�� ������ userid � ����� ������"
 
-#: rpa.c:121
+#: rpa.c:119
 msgid "Deity error"
 msgstr "������ ��������"
 
-#: rpa.c:174
+#: rpa.c:172
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA �������� 2: ������ ���������������� Base64\n"
 
-#: rpa.c:185
+#: rpa.c:183
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "� �������� ������� ������ RPA %d.%d\n"
 
-#: rpa.c:191
+#: rpa.c:189
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "�������� ��������� (l=%d):\n"
 
-#: rpa.c:200
+#: rpa.c:198
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "����������� ��������� %s\n"
 
-#: rpa.c:205
+#: rpa.c:203
 msgid "RPA token 2 length error\n"
 msgstr "������ ������ RPA ��������� 2\n"
 
-#: rpa.c:209
+#: rpa.c:207
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "����� ������������: %s\n"
 
-#: rpa.c:213
+#: rpa.c:211
 msgid "RPA error in service@realm string\n"
 msgstr "������ RPA ��� ������������ service@realm\n"
 
-#: rpa.c:250
+#: rpa.c:248
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA �������� 4: ������ ���������������� Base64\n"
 
-#: rpa.c:261
+#: rpa.c:259
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "������������� ������ (l=%d):\n"
 
-#: rpa.c:275
+#: rpa.c:273
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "��������� RPA: %02X\n"
 
-#: rpa.c:281
+#: rpa.c:279
 msgid "RPA token 4 length error\n"
 msgstr "������ ������ RPA �������� 4\n"
 
-#: rpa.c:288
+#: rpa.c:286
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "�� RPA ��� ����������: %s\n"
 
-#: rpa.c:290
+#: rpa.c:288
 msgid "RPA rejects you, reason unknown\n"
 msgstr "�� RPA ��� ����������, ������� �����\n"
 
-#: rpa.c:298
+#: rpa.c:294
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "������ ������ �������������� ������ RPA: %d\n"
 
-#: rpa.c:303
+#: rpa.c:299
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "������ ������ �������� RPA ���������: %d\n"
 
-#: rpa.c:309
+#: rpa.c:305
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth �������. �������� �����������;\n"
 
-#: rpa.c:314
+#: rpa.c:310
 msgid "Session key established:\n"
 msgstr "������������� ������ ���������:\n"
 
-#: rpa.c:345
+#: rpa.c:341
 msgid "RPA authorisation complete\n"
 msgstr "������������� RPA ������������\n"
 
-#: rpa.c:372
+#: rpa.c:370
 msgid "Get response\n"
 msgstr "���� ���������\n"
 
-#: rpa.c:402
+#: rpa.c:400
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "� ���� ��������� ��������� %d [%s]\n"
@@ -2754,890 +2259,471 @@ msgstr "�� ����� ��������� %d �������� �� �� rxlen %d\n"
 msgid "Mechanism field incorrect\n"
 msgstr "���������� ���������� ������\n"
 
-#: rpa.c:531
+#: rpa.c:532
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "������ dec64 ��� ��������� %d: %x\n"
 
-#: rpa.c:546
+#: rpa.c:547
 msgid "Inbound binary data:\n"
 msgstr "����������� ������� ��������:\n"
 
-#: rpa.c:582
+#: rpa.c:585
 msgid "Outbound data:\n"
 msgstr "���������� ��������:\n"
 
-#: rpa.c:645
+#: rpa.c:651
 msgid "RPA String too long\n"
 msgstr "������������ RPA ���������� ������\n"
 
-#: rpa.c:650
+#: rpa.c:656
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:709
+#: rpa.c:718
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "�� RPA ������� �� ������� �� /dev/urandom. ���� �� ������\n"
 
-#: rpa.c:710
+#: rpa.c:719
 msgid "    prevent you logging in, but means you\n"
 msgstr "    �� ��� ��������� �� ������, ���� �������� ���\n"
 
-#: rpa.c:711
+#: rpa.c:720
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    �� �������� �� ����� �������� ��� ������ ����\n"
 
-#: rpa.c:712
+#: rpa.c:721
 msgid "    service that you think you are (replay\n"
 msgstr "    �������� ��� �������� (��������� ����������\n"
 
-#: rpa.c:713
+#: rpa.c:722
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ��� ��� ����� �������� ����� �������.)\n"
 
-#: rpa.c:724
+#: rpa.c:733
 msgid "User challenge:\n"
 msgstr "�������� ������:\n"
 
-#: rpa.c:874
+#: rpa.c:891
 msgid "MD5 being applied to data block:\n"
 msgstr "�� MD5 ����������� ��� ����� ��������:\n"
 
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:904
+msgid "MD5 result is: \n"
 msgstr "���������� MD5: \n"
 
-#: servport.c:53
-#, c-format
-msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
-msgstr ""
-
-#: servport.c:80
-#, c-format
-msgid "Cannot resolve service %s to port number.\n"
-msgstr ""
-
-#: servport.c:81
-msgid "Please specify the service as decimal port number.\n"
-msgstr ""
-
-#: sink.c:231
+#: sink.c:212
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "���������� ��� %s\n"
 
-#: sink.c:319
+#: sink.c:314
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message ����)\n"
 
-#: sink.c:322
+#. this will usually go to sylog...
+#: sink.c:317
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "� ������������ ��� %s ��������� ��� %s\n"
 
-#: sink.c:457
+#: sink.c:422
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "�� ������������ ������ ����� ����� %d\n"
 
-#: sink.c:509 sink.c:608
+#: sink.c:477 sink.c:555
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP ������: %s\n"
 
-#: sink.c:553
-msgid "SMTP server requires STARTTLS, keeping message.\n"
-msgstr ""
-
-#: sink.c:736
-#, fuzzy, c-format
-msgid "BSMTP file open failed: %s\n"
-msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
-
-#: sink.c:782
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
+#: sink.c:704
+msgid "BSMTP file open or preamble write failed\n"
 msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
 
-#: sink.c:996
+#: sink.c:922
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "� �������� %cMTP ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:1003
+#: sink.c:929
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "� �������� %cMTP ���������� ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:1049
+#: sink.c:967
 msgid "no address matches; no postmaster set.\n"
 msgstr "������ ��������� ���������� ��� ���� ������� postmaster.\n"
 
-#: sink.c:1061
+#: sink.c:979
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "�������� ��������� ����� ��� ��� %s!\n"
 
-#: sink.c:1067
+#: sink.c:985
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "������ ��������� ���������� �������� ��� %s.\n"
 
-#: sink.c:1223
+#: sink.c:1138
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "�������� �� ����������� ��: %s\n"
 
-#: sink.c:1234
-#, c-format
-msgid "Cannot switch effective user id to %ld: %s\n"
-msgstr ""
-
-#: sink.c:1246
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
-#: sink.c:1253
+#: sink.c:1162
 msgid "MDA open failed\n"
 msgstr "������� MDA �������\n"
 
-#: sink.c:1292
+#: sink.c:1199
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "������� %cMTP ��� %s �������\n"
 
-#: sink.c:1316
+#: sink.c:1223
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "�������� �������� ������޷ ����� ��� %s"
 
-#: sink.c:1374
-#, fuzzy, c-format
-msgid "Message termination or close of BSMTP file failed: %s\n"
-msgstr "����������� ��������� � �������� ��� ������� BSMTP �������\n"
-
-#: sink.c:1399
-#, fuzzy, c-format
-msgid "Error writing to MDA: %s\n"
-msgstr "���������� ��� %s\n"
-
-#: sink.c:1402
+#: sink.c:1279
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "�� MDA �������� ��� ���� %d\n"
 
-#: sink.c:1405
+#: sink.c:1282
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "�� MDA ��������� ��-�������� ��������� %d\n"
 
-#: sink.c:1408
-#, fuzzy, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+#: sink.c:1285
+#, c-format
+msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "��������: �� MDA pclose ��������� %d, �������� ��������� ��� %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1306
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "����������� ��������� � �������� ��� ������� BSMTP �������\n"
+
+#: sink.c:1327
 msgid "SMTP listener refused delivery\n"
 msgstr "� �������� SMTP �������� �� �������\n"
 
-#: sink.c:1463
+#: sink.c:1357
 msgid "LMTP delivery error on EOM\n"
 msgstr "������ �������� LMTP ���  EOM\n"
 
-#: sink.c:1466
+#: sink.c:1360
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�� ����������� �������� ���-503 ��� LMTP EOM: %s\n"
 
-#: sink.c:1632
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1510
+msgid ""
+"--\n"
+"\t\t\t\tThe Fetchmail Daemon\n"
 msgstr ""
 "--\n"
 "\t\t\t\t� ��������  Fetchmail\n"
 
-#: smtp.c:81
+#: smtp.c:86
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "������������� ESMTP CRAM-MD5...\n"
 
-#: smtp.c:87 smtp.c:137
+#. Server rejects AUTH
+#: smtp.c:93 smtp.c:153
 msgid "Server rejected the AUTH command.\n"
 msgstr "� ������������ �������� ��� ������ AUTH.\n"
 
-#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
+#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
 msgid "Bad base64 reply from server.\n"
 msgstr "��������� �������� BASE64 ��� �� �����������.\n"
 
-#: smtp.c:99
+#: smtp.c:105
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "��������������� ���������: %s\n"
 
-#: smtp.c:116
+#: smtp.c:126
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "������������� ESMTP PLAIN...\n"
 
-#: smtp.c:131
+#: smtp.c:146
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "������������� ESMTP LOGIN...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:359 smtp.c:380
 msgid "smtp listener protocol error\n"
 msgstr "������ ����������� ������� smtp\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:107 socket.c:133
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: ������� �� malloc\n"
 
-#: socket.c:171
+#: socket.c:165
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair �������\n"
 
-#: socket.c:177
+#. error
+#: socket.c:171
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: ������� �� fork\n"
 
-#: socket.c:184
+#: socket.c:179
 msgid "dup2 failed\n"
 msgstr "dup2 �������\n"
 
-#: socket.c:190
+#: socket.c:185
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "��������� %s (����������� %s �������� %s)\n"
 
-#: socket.c:195
+#: socket.c:188
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) �������\n"
 
-#: socket.c:270
-#, c-format
-msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
-msgstr ""
-
-#: socket.c:273
-msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-
-#: socket.c:287 socket.c:290
-#, c-format
-msgid "unknown (%s)"
-msgstr ""
-
-#: socket.c:293
-#, c-format
-msgid "Trying to connect to %s/%s..."
-msgstr ""
-
-#: socket.c:302
-#, c-format
-msgid "cannot create socket: %s\n"
-msgstr ""
-
-#: socket.c:304
-#, c-format
-msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr ""
-
-#: socket.c:322
-#, fuzzy
-msgid "connection failed.\n"
-msgstr "� ������� SSL �������.\n"
-
-#: socket.c:324
-#, fuzzy, c-format
-msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%s ������� ��� %s �������"
-
-#: socket.c:325
-#, fuzzy, c-format
-msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%s ������� ��� %s �������"
-
-#: socket.c:331
-#, fuzzy
-msgid "connected.\n"
-msgstr "� ������� SSL �������.\n"
-
-#: socket.c:344
+#: socket.c:280
 #, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
+msgid "fetchmail: getaddrinfo(%s.%s)\n"
+msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:406
+#: socket.c:427
 #, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
+msgid "fetchmail: illegal address length received for host %s\n"
+msgstr "fetchmail: ���� ��������� ������ ���������� ��� �� ���������� %s\n"
 
-#: socket.c:641
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:647
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "��� ���� ������� ����� ���������� ��� �������������!\n"
-
-#: socket.c:652
-#, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-
-#: socket.c:655
-#, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
-
-#: socket.c:661
+#: socket.c:733
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:664
+#: socket.c:735
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
+msgstr "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:666
+#: socket.c:737
 msgid "Unknown Organization\n"
 msgstr "�������� ����������\n"
 
-#: socket.c:668
+#: socket.c:739
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:671
+#: socket.c:741
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
+msgstr "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:673
+#: socket.c:743
 msgid "Unknown Issuer CommonName\n"
 msgstr "������� ���������� ������\n"
 
-#: socket.c:679
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "���������� ������: %s\n"
-
-#: socket.c:685
-msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "���� �������������: Subject ���������� ���������� ������!\n"
-
-#: socket.c:691
-#, fuzzy
-msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "���� �������������: Subject ���������� ���������� ������!\n"
-
-#: socket.c:719
+#: socket.c:747
 #, c-format
-msgid "Subject Alternative Name: %s\n"
-msgstr ""
+msgid "Server CommonName: %s\n"
+msgstr "���������� �����������: %s\n"
 
-#: socket.c:725
-#, fuzzy
-msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+#. 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:751
+msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "���� �������������: Subject ���������� ���������� ������!\n"
 
-#: socket.c:742
+#: socket.c:767
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "�� ��������� �������������� ����������: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:773
 msgid "Server name not set, could not verify certificate!\n"
-msgstr ""
-"��� ���� ������� ����� �����������, �������� ����������� ��������������!\n"
+msgstr "��� ���� ������� ����� �����������, �������� ����������� ��������������!\n"
 
-#: socket.c:754
+#: socket.c:778
 msgid "Unknown Server CommonName\n"
 msgstr "������� ���������� ����������\n"
 
-#: socket.c:756
+#: socket.c:780
 msgid "Server name not specified in certificate!\n"
 msgstr "��� ���� ������� ����� ���������� ��� �������������!\n"
 
-#: socket.c:768
+#: socket.c:790
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() �������!\n"
 
-#: socket.c:772
+#: socket.c:794
 msgid "Out of memory!\n"
 msgstr "������ � �����!\n"
 
-#: socket.c:780
+#: socket.c:806
 msgid "Digest text buffer too small!\n"
 msgstr "� ��������� ����� �������� ��������� ����� ���������� �����!\n"
 
-#: socket.c:786
+#: socket.c:812
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ��������� ��������: %s\n"
 
-#: socket.c:790
+#: socket.c:816
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ����������� ����������.\n"
 
-#: socket.c:792
+#: socket.c:819
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ����������� ��� ����������!\n"
 
-#: socket.c:804
-#, fuzzy, c-format
-msgid "Server certificate verification error: %s\n"
-msgstr "�������������: ���������� �������������� ����������: %s\n"
-
-#: socket.c:819
-#, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr ""
-
-#: socket.c:821
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
-msgstr ""
-
-#: socket.c:831
+#: socket.c:827
 #, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
-
-#: socket.c:834
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page.\n"
-msgstr ""
-
-#: socket.c:907 socket.c:985
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:925 socket.c:1003
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:956 socket.c:1035
-#, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr "����������� ����� ���������� SSL '%s', ����� �� ������� (SSLv23).\n"
-
-#: socket.c:1070
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
+msgid "Warning: server certificate verification: %s\n"
+msgstr "�������������: ���������� �������������� ����������: %s\n"
 
-#: socket.c:1075
+#: socket.c:833
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "�������� ������� (������ %d ����������): %s\n"
 
-#: socket.c:1095
+#: socket.c:865
 msgid "File descriptor out of range for SSL"
 msgstr "� ����������� ������� ����� �������� ��� �� SSL"
 
-#: socket.c:1115
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1183
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1198
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1235
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1238
+#: socket.c:882
 #, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1238
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1258
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1261
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "����������� ����� ���������� SSL '%s', ����� �� ������� (SSLv23).\n"
 
-#: socket.c:1268
+#: socket.c:942
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "���������� ��������������/������������ ����� �����������!\n"
 
-#: socket.c:1285
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-
-#: socket.c:1327
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "��������������� ��������� �������� Cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������������� ��������� �������� Cygwin �������!\n"
 
-#: transact.c:79
-#, fuzzy, c-format
-msgid "mapped address %s to local %s\n"
-msgstr "������������ ��� %s ��� ������ %s\n"
-
-#: transact.c:101
+#: transact.c:69
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "������������ ��� %s ��� ������ %s\n"
 
-#: transact.c:168
+#: transact.c:133
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "������ ���� ��� %s ������������ �� %s\n"
 
-#: transact.c:240
+#: transact.c:202
 #, c-format
 msgid ""
 "analyzing Received line:\n"
 "%s"
 msgstr "������� ������� Received:%s"
 
-#: transact.c:279
+#: transact.c:241
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "����� ������, �� %s ����� ��������� ��� ����. �������������\n"
 
-#: transact.c:285
+#: transact.c:247
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "�� ����� ������, �� %s ��� ����� ��������� ��� ����. �������������\n"
 
-#: transact.c:359
+#: transact.c:321
 msgid "no Received address found\n"
 msgstr "��� �������� ����������� Received\n"
 
-#: transact.c:368
+#: transact.c:330
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "�������� ����������� Received `%s'\n"
 
-#: transact.c:613
-#, fuzzy
-msgid "incorrect header line found - see manpage for bad-header option\n"
+#: transact.c:521
+msgid "incorrect header line found while scanning headers\n"
 msgstr "������� ����� ������ ������������ ���� ��� ������ ������������\n"
 
-#: transact.c:615
-#, c-format
-msgid "line: %s"
-msgstr ""
-
-#: transact.c:1105 transact.c:1115
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1130
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr "������� ������� Received:%s"
-
-#: transact.c:1142
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1160
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1175
+#: transact.c:1005
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "��� �������� ������ �����, �������� ��� %s\n"
 
-#: transact.c:1190
+#: transact.c:1020
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "��������� ��������� ��� ��������� ���� ��������� ��� DNS\n"
 
-#: transact.c:1301
+#: transact.c:1156
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "������� RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1177
 msgid "no recipient addresses matched declared local names"
 msgstr "������ ��������� ��������� �� ��������� �� �� �������� ������ �������"
 
-#: transact.c:1327
+#: transact.c:1188
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "��������� ��������� %s ��� ��������� �� ������ ������ �����"
 
-#: transact.c:1336
+#: transact.c:1202
 msgid "message has embedded NULs"
 msgstr "�� ������ �������� ���������� NULs"
 
-#: transact.c:1344
+#: transact.c:1215
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "� �������� SMTP �������� ��� ����������� ������� ����������: "
 
-#: transact.c:1394
-#, fuzzy
-msgid "error writing message text\n"
+#: transact.c:1250
+msgid "message delimiter found while scanning headers\n"
+msgstr "������� ��������� ��������� ���� ��� ������ ������������\n"
+
+#: transact.c:1350
+msgid "writing message text\n"
 msgstr "������� �������� ���������\n"
 
-#: transact.c:1670
+#: uid.c:101
 #, c-format
-msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
+msgid "lstat: %s: %s\n"
+msgstr "lstat: %s: %s\n"
 
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:215
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "����� ����� UID ��� %s:"
 
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:220 uid.c:231 uid.c:472
 msgid " <empty>"
 msgstr " <�����>"
 
-#: uid.c:273
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:227
+msgid "Scratch list of UIDs:"
 msgstr "�������� ����� �� UID:"
 
-#: uid.c:357 uid.c:401
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
-msgstr "����� ����� UID ��� %s:"
-
-#: uid.c:360
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:468
+#, c-format
+msgid "New UID list from %s:"
 msgstr "��� ����� UID ��� %s:"
 
-#: uid.c:390
+#: uid.c:496
+msgid "swapping UID lists\n"
+msgstr "��������� ������ UID\n"
+
+#: uid.c:502
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "��� ��������� ������ UID, �� ������� ������ UID �� ���� ��� �������\n"
 
-#: uid.c:410
-#, fuzzy
-msgid "discarding new UID list\n"
-msgstr "��������� ������ UID\n"
-
-#: uid.c:466
+#: uid.c:526
 msgid "Deleting fetchids file.\n"
 msgstr "�������� ������� fetchids.\n"
 
-#: uid.c:469
-#, fuzzy, c-format
-msgid "Error deleting %s: %s\n"
-msgstr "������ ���� ������������ ���������������\n"
-
-#: uid.c:476
+#: uid.c:532
 msgid "Writing fetchids file.\n"
 msgstr "������� ������� fetchids\n"
 
-#: uid.c:490 uid.c:499
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "������� ������� fetchids\n"
-
-#: uid.c:511
-#, c-format
-msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-
-#: uid.c:515
-#, c-format
-msgid "Cannot rename fetchids file %s to %s: %s\n"
-msgstr ""
-
-#: uid.c:519
-#, c-format
-msgid "Cannot open fetchids file %s for writing: %s\n"
-msgstr ""
-
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "������� �� malloc\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "������� �� realloc\n"
-
-#~ msgid "swapping UID lists\n"
-#~ msgstr "��������� ������ UID\n"
-
-#~ msgid ""
-#~ "Subject: Fetchmail oversized-messages warning.\n"
-#~ "\n"
-#~ "The following oversized messages remain on the mail server %s:"
-#~ msgstr ""
-#~ "Subject: ������������� fetchmail ������������-���������.\n"
-#~ "\n"
-#~ "�� �������� ����������� �������� �������� ���������� ��� ����������� %s:"
-
-#~ msgid " (%d %soctets)"
-#~ msgstr " (%d %soctets)"
-
-#~ msgid "header "
-#~ msgstr "������������ "
-
-#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-#~ msgstr "��� SIGPIPE ��������� ��� ��� MDA � ��� ������ stream socket\n"
-
-#~ msgid "internal inconsistency\n"
-#~ msgstr "��������� ���������\n"
-
-#~ msgid "name is valid but has no IP address."
-#~ msgstr "�� ����� ����� ������ ���� ��� ���� ��������� IP."
-
-#~ msgid "unrecoverable name server error."
-#~ msgstr "�� ���������� ������ ����������� ��������."
-
-#~ msgid "temporary name server error."
-#~ msgstr "��������� ������ ����������� ��������."
-
-#~ msgid "unknown DNS error %d."
-#~ msgstr "������� ������ DNS %d."
-
-#~ msgid ""
-#~ "Subject: Fetchmail unreachable-server warning.\n"
-#~ "\n"
-#~ "Fetchmail could not reach the mail server %s:"
-#~ msgstr ""
-#~ "Subject: ������������� �������������-���������� ��� fetchmail.\n"
-#~ "\n"
-#~ "�� fetchmail �������� �� ����������� �� ���������� ������������� %s:"
-
-#~ msgid "messages"
-#~ msgstr "��������"
-
-#~ msgid "message"
-#~ msgstr "������"
-
-#~ msgid "Option --remote is not supported with ETRN\n"
-#~ msgstr "� ������� --remote ��� ������������ �� �� ETRN\n"
-
-#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
-#~ msgstr "�������� ����������� ETRN ����� gethostbyname(2).\n"
-
-#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
-#~ msgstr "�������� ����������� ODMR ����� gethostbyname(2).\n"
-
-#~ msgid "will not"
-#~ msgstr "'��� ��"
-
-#~ msgid "will"
-#~ msgstr "��"
-
-#~ msgid " (using network security options %s)"
-#~ msgstr " (����� �������� ��������� ������� %s)"
-
-#~ msgid " (using port %d)"
-#~ msgstr " (������������� ����� %d)"
-
-#~ msgid "All"
-#~ msgstr "���"
-
-#~ msgid "Only new"
-#~ msgstr "���� �� ���"
-
-#~ msgid "enabled"
-#~ msgstr "�� ����������"
-
-#~ msgid "disabled"
-#~ msgstr "����� �����������"
-
-#~ msgid "discarded"
-#~ msgstr "�����������"
-
-#~ msgid "kept"
-#~ msgstr "���������"
-
-#~ msgid "IP address.\n"
-#~ msgstr "��������� IP.\n"
-
-#~ msgid "name.\n"
-#~ msgstr "�����.\n"
-
-#~ msgid "Received"
-#~ msgstr "�����������"
-
-#~ msgid "alloca failed"
-#~ msgstr "alloca �������"
-
-#~ msgid "warning: found \"%s\" before any host names"
-#~ msgstr "�������������: ������� �� \"%s\" ���� ���� ����� ����������"
-
-#~ msgid "Option --remote is not supported with ODMR\n"
-#~ msgstr "� ������� --remote ��� ������������ �� �� ODMR\n"
-
-#~ msgid "fetchmail: network security support is disabled\n"
-#~ msgstr "fetchmail: ���������������� � ���������� ��������� �������\n"
-
-#~ msgid "  -T, --netsec      set IP security request\n"
-#~ msgstr "  -T, --netsec      ������� ������� ��������� IP\n"
-
-#~ msgid "invalid security request"
-#~ msgstr "�� ������ ������ ���������"
-
-#~ msgid "network-security support disabled"
-#~ msgstr "���������������� � ���������� ��������-�������"
-
-#~ msgid "partial error message buffer overflow"
-#~ msgstr "������ ������ ���������� ��������� ������"
-
-#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
-#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
-
-#~ msgid "fetchmail: illegal address length received for host %s\n"
-#~ msgstr "fetchmail: ���� ��������� ������ ���������� ��� �� ���������� %s\n"
-
-#~ msgid "unknown issuer (first %d characters): %s\n"
-#~ msgstr "�������� ������� (������ %d ����������): %s\n"
-
-#~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr "������� ��������� ��������� ���� ��� ������ ������������\n"
-
-#~ msgid "lstat: %s: %s\n"
-#~ msgstr "lstat: %s: %s\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index ea5b7d53..85db6db0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
-"Last-Translator: David Lodge\n"
+"Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: checkalias.c:174
@@ -376,7 +377,7 @@ msgstr "selecting or re-polling default folder\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s at %s (folder %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
@@ -644,11 +645,10 @@ msgid ""
 "Copyright (C) 2005 - 2012 Sunil Shetye\n"
 "Copyright (C) 2005 - 2019 Matthias Andree\n"
 msgstr ""
-"Copyright © 2002, 2003 Eric S. Raymond\n"
-"Copyright © 2004 Matthias Andree, Eric S. Raymond,\n"
-"                   Robert M. Funk, Graham Wilson\n"
-"Copyright © 2005 - 2012 Sunil Shetye\n"
-"Copyright © 2005 - 2017 Matthias Andree\n"
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
 #: fetchmail.c:147
 msgid ""
@@ -668,80 +668,80 @@ msgstr "WARNING: Running as root is discouraged.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invoked with"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "This is fetchmail release %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, 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:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -749,7 +749,7 @@ msgstr ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, fuzzy, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -757,222 +757,222 @@ msgid ""
 msgstr ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, 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:549
+#: fetchmail.c:547
 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:561
+#: fetchmail.c:559
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, 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:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, 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:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr ""
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 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:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, 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:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, 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:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, 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:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 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:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -981,315 +981,315 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, 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:1391
+#: fetchmail.c:1387
 #, 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:1405
+#: fetchmail.c:1401
 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:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, 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:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, 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:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 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:1662
+#: fetchmail.c:1659
 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:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, fuzzy, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Server CommonName: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, 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:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 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:1776
+#: fetchmail.c:1773
 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:1778
+#: fetchmail.c:1775
 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:1779
+#: fetchmail.c:1776
 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:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1297,7 +1297,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1305,334 +1305,334 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, 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:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 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:1835
+#: fetchmail.c:1832
 #, 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:1838
+#: fetchmail.c:1835
 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:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, 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:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, 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:1888
+#: fetchmail.c:1885
 #, 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:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, 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:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 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:1953
+#: fetchmail.c:1950
 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:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, 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:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, 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:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, 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:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 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:2025
+#: fetchmail.c:2022
 #, 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:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -1654,88 +1654,88 @@ msgstr ""
 "\n"
 "Caught SIGINT... bailing out.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr ""
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, fuzzy, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "%cMTP error: %s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Couldn't get service name for [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Using service name [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Sending credentials\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Error exchanging credentials\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Couldn't unwrap security level data\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Credential exchange complete\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server requires integrity and/or privacy\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Unwrapped security level flags: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximum GSS token size is %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Error creating security level request\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Releasing GSS credentials\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Error releasing credentials\n"
 
@@ -1744,133 +1744,129 @@ msgstr "Error releasing credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread sleeping for %d sec.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr ""
 
-#: imap.c:96
+#: imap.c:97
 #, fuzzy, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "bogus message count!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Required LOGIN capability not supported by server\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is unseen\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is unseen\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message waiting after re-poll\n"
 msgstr[1] "%d messages waiting after re-poll\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message waiting after first poll\n"
 msgstr[1] "%d messages waiting after first poll\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message waiting after expunge\n"
 msgstr[1] "%d messages waiting after expunge\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2065,96 +2061,96 @@ msgstr "Option --folder is not supported with ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Option --check is not supported with ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Could not decode OTP challenge\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is not a valid number string.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Value of string '%s' is %s than %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "smaller"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "larger"
 
-#: options.c:336
+#: options.c:337
 #, fuzzy, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Invalid protocol `%s' specified.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Invalid protocol `%s' specified.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Invalid authentication `%s' specified.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [options] [server ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Options are as follows:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        display this option help\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     display version info\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       check for messages without fetching\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      work silently\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     work noisily (diagnostic output)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      run as a daemon once per n seconds\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    don't detach daemon process\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        kill daemon process\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specify logfile name\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2162,90 +2158,90 @@ msgstr ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   don't write Received & enable host spoofing\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specify alternate run control file\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specify alternate UIDs file\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specify alternate PID (lock) file\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specify recipient of last resort\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirect bounces from user to postmaster.\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor interface for activity\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         enable ssl encrypted session\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl private key file\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl client certificate\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
 
-#: options.c:672
+#: options.c:673
 #, fuzzy
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertpath path to ssl certificates\n"
 
-#: options.c:673
+#: options.c:674
 #, fuzzy
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath path to ssl certificates\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2253,168 +2249,168 @@ msgstr ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specify external command to open connection\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     specify external command to open smtp connection\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specify retrieval protocol (see man page)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        TCP port to connect to (obsolete, use --service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server nonresponse timeout\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelope address header\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix to remove from local user id\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   mail service principal\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  add poll-tracing information to Received header\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    specify users's login on server\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  retrieve old and new messages\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      delete new messages after retrieval\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        save new messages after retrieval\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       delete old messages from server\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  delete oversized messages\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   don't rewrite header addresses\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       don't fetch messages over given size\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval between warning mail notification\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    set SMTP forwarding host\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains fetch mail for specified domains\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress set SMTP delivery domain to use\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    set SMTP full name username@domain\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   set antispam response values\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  set batch limit for SMTP connections\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  set fetch limit for server connections\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit set fetch message size limit\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    do a binary search for UIDLs\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         set MDA to use for forwarding\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       set output BSMTP file\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        use LMTP (RFC2033) for delivery\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specify remote folder name\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    show progress dots even in logfiles\n"
 
@@ -2426,7 +2422,7 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 #, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
@@ -2434,91 +2430,91 @@ msgstr ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:491
+#: pop3.c:492
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Required APOP timestamp not found in greeting\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Timestamp syntax error in greeting\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Undefined protocol request in POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy!  Is another session active?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Cannot handle UIDL response from upstream server.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server responded with UID for wrong message.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) was deleted, but is still present!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "protocol error\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocol error while fetching UIDLs\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) was deleted, but is still present!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "server option after user options"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS not enabled."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2526,7 +2522,7 @@ msgstr ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2534,25 +2530,25 @@ msgstr ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL is not enabled"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "end of input"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "File %s must be a regular file.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "File %s must be owned by you.\n"
@@ -2781,124 +2777,128 @@ msgstr "SMTP: (bounce-message body)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "mail from %s bounced to %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Saved error is still %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP error: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:736
+#: sink.c:714
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:782
+#: sink.c:760
 #, fuzzy, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, 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:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, fuzzy, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Cannot rename fetchids file %s to %s: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, fuzzy, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Message termination or close of BSMTP file failed\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, 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:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -2934,216 +2934,216 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp listener protocol error\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc failed\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair failed\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork failed\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 failed\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "running %s (host %s service %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) failed\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Try adding the --service option (see also FAQ item R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "unknown (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Trying to connect to %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "cannot create socket: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, fuzzy, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "cannot create socket: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "connection failed.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "connected.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 #, fuzzy
 msgid "Server certificate:\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Issuer Organisation: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Unknown Organisation\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Warning: Issuer CommonName too long (possibly truncated).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unknown Issuer CommonName\n"
 
-#: socket.c:679
+#: socket.c:684
 #, fuzzy, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:691
+#: socket.c:696
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:730
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server CommonName mismatch: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server name not set, could not verify certificate!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Unknown Server CommonName\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Server name not specified in certificate!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() failed!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Out of memory!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Digest text buffer too small!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s key fingerprint: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingerprints match.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingerprints do not match!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3151,12 +3151,12 @@ msgid ""
 "fetchmail.\n"
 msgstr ""
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
+#: socket.c:839
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
 "CA certificate location, or that c_rehash needs to be run on the certificate "
@@ -3164,100 +3164,100 @@ msgid ""
 "sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr ""
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr ""
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "File descriptor out of range for SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certificate/fingerprint verification was somehow skipped!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr ""
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin socket read retry\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin socket read retry failed!\n"
 
@@ -3314,62 +3314,62 @@ msgstr "incorrect header line found while scanning headers\n"
 msgid "line: %s"
 msgstr "line: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1112
 #, fuzzy, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 "analyzing Received line:\n"
 "%s"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no local matches, forwarding to %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "forwarding and deletion suppressed due to DNS errors\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "writing RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "no recipient addresses matched declared local names"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "recipient address %s didn't match any local name"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "message has embedded NULs"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP listener rejected local recipient addresses: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "error writing message text\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3406,35 +3406,35 @@ msgstr "not swapping UID lists, no UIDs seen this query\n"
 msgid "discarding new UID list\n"
 msgstr "discarding new UID list\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Deleting fetchids file.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error deleting %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Writing fetchids file.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, fuzzy, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Writing fetchids file.\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Error writing to fetchids file %s, old file left in place.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Cannot rename fetchids file %s to %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Cannot open fetchids file %s for writing: %s\n"
@@ -3447,9 +3447,6 @@ msgstr "malloc failed\n"
 msgid "realloc failed\n"
 msgstr "realloc failed\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "swapping UID lists\n"
-
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Subject: Fetchmail unreachable-server warning."
 
@@ -3461,8 +3458,17 @@ msgstr "realloc failed\n"
 #~ msgstr ""
 #~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Required LOGIN capability not supported by server\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Saved error is still %d\n"
+
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "unknown issuer (first %d characters): %s\n"
 
 #~ msgid "message delimiter found while scanning headers\n"
 #~ msgstr "message delimiter found while scanning headers\n"
+
+#~ msgid "swapping UID lists\n"
+#~ msgstr "swapping UID lists\n"
diff --git a/po/eo.po b/po/eo.po
index c74175d9..f0c87965 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-09-02 08:18-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/es.po b/po/es.po
index e8b5dca1..ebfd9be8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.12\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2009-10-06 19:04+0200\n"
 "Last-Translator: Francisco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: checkalias.c:174
@@ -403,7 +404,7 @@ msgstr "seleccionando o volviendo a consultar la carpeta predeterminada\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
@@ -698,80 +699,80 @@ msgstr "AVISO: se recomienda no ejecutar esta aplicación como root.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocado con"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "no fue posible obtener el directorio de trabajo actual\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Esta es la versión %s de fetchmail"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Tomando opciones de la línea de órdenes%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " y "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hay servidores de correo configurados -- ¿puede faltar %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no se han especificado servidores de correo.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ningún otro fetchmail se está ejecutando\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, fuzzy, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "primer plano"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminado.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -779,7 +780,7 @@ msgstr ""
 "fetchmail: no es posible verificar el correo mientras otro fetchmail está en "
 "ejecución hacia el mismo anfitrión\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, fuzzy, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -788,211 +789,211 @@ msgstr ""
 "fetchmail: no es posible consultar los anfitriones especificados con otro "
 "fetchmail (%d) en ejecución.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, fuzzy, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: otro fetchmail (%d) está en ejecución en primer plano.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: no es posible aceptar opciones mientras un fetchmail está en "
 "ejecución en segundo plano.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: el proceso hijo más antiguo (%d) murió misteriosamente.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no se puede encontrar una contraseña para %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduzca contraseña para %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: No se puede separar en segundo plano. Abortando.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, fuzzy, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "no fue posible abrir %s para anexarle mensajes de registro\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "--check mode activado, no recibir correo\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no se pudo temporizar %s (error %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s cambió)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "el intento de volver a ejectuar puede fallar dado que el directorio no se ha "
 "restaurado\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "el intento de volver a ejecutar fetchmail falló\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "la consulta %s se omitió (fallo en la autenticación o demasiados excesos de "
 "espera)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo no alcanzado, no se consultará %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado de la consulta=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas las conexiones están trabadas. Saliendo.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "durmiendo en %s por %d segundos\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertado por %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertado por la señal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertado en %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "no se pudo temporizar el archivo de control de ejecución\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Aviso: múltiples menciones del anfitrión %s en el archivo de configuración\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Error: múltiples registros «predeterminados» en el archivo de "
 "configuración.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no se compiló.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "El soporte de  KERBEROS v4 está configurado pero no compilado\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "El soporte de  KERBEROS v5 está configurado pero no compilado\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "El soporte de  GSSAPI está configurado pero no compilado\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -1000,18 +1001,18 @@ msgstr ""
 "fetchmail: aviso: no hay DNS disponible para verificar recepciones "
 "«multidrop» de %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "aviso: ¡«multidrop» para %s requiere la opción «envelope»!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "aviso: ¡no pida soporte técnico si todo el correo está dirigido al "
 "postmaster!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1020,330 +1021,330 @@ msgstr ""
 "fetchmail: la configuración %s no es válida, especifique un número de puerto "
 "positivo para el servicio el puerto\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: la configuración %s no es válida, RPOP requiere un puerto "
 "privilegiado\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuración de %s inválida, LMTP no puede usar el puerto SMTP "
 "predeterminado\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Ambos, «fetchall» y «keep on» en el demonio o en el modo de espera, es un "
 "error\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s consultando a %s (protocolo %s) en %s: pregunta iniciada\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "se seleccionó un protocolo no permitido.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogando %s (protocolo %s) en %s: consulta terminada\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso se registrarán vía syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará «Received»\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes «multidrop» mal direccionados a %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al «postmaster».\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail tratará los errores permanentes como permanentes (soltar "
 "mensajes).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail tratará los errores permanentes como temporales (mantener "
 "mensajes).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo se recibirá vía %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  La consulta de este servidor ocurrirá cada %d intervalo.\n"
 msgstr[1] "  La consulta de este servidor ocurrirá cada %d intervalos.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Este anfitrión no será consultado cuando no se especifica un anfitrión.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Este anfitrión será consultado cuando no se especifique ningún anfitrión.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Se pedirá la contraseña.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = «%s».\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identidad RPOP = «%s».\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contraseña = «%s».\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (usando puerto predeterminado)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con contraseña.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación MSN.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones cifradas con SSL activadas.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, fuzzy, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "«CommonName» del servidor SSL: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Huella digital de la clave SSL (comprobada con la clave del servidor): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (predeterminado).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla predeterminada está seleccionada.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes se recibirán (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Los mensajes recibidos permanecerán en el servidor (--keep on).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Los mensajes recibidos se eliminarán del servidor (--keep off).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush "
 "on).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  No se eliminarán los mensajes viejos antes de recibir nuevos (--flush "
 "off).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1351,7 +1352,7 @@ msgstr ""
 "  Los mensajes demasiado grandes se eliminarán antes de recibir nuevos (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1359,360 +1360,360 @@ msgstr ""
 "  Los mensajes demasiado garndes no se eliminarán antes de recibir nuevos (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro se eliminarán (stripcr on).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se eliminarán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se añadirán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se añadirán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Se ignorará el contenido de «Content-Transfer-Encoding» (pass8bits on).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Se respetará el contenido de «Content-Transfer-Encoding» (pass8bits off).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Las líneas «Status» que no estén vacías se descartarán (dropstatus on).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Las líneas «Status» que no estén vacías se conservarán (dropstatus off).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas «Delivered-To» se descartarán (dropdelivered on).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas «Delivered-To» se conservarán (dropdelivered off).\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  El tamaño de los mensajes está limitado a %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán cada %d segundos (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán en cada consulta (--"
 "warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  El límite de tamaño para los mensajes recibidos es de %d (--fetchsizelimit "
 "%d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UID durante cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UID durante %d de cada %d consultas (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Utilizar búsqueda lineal de UID durante cada consulta (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensajes por lote SMTP es %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  El intervalo de borrado entre eliminaciones está forzado a %d (--expunge "
 "%d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (predeterminado)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Los mensajes serán anexados a %s como BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes se entregarán con «%s».\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes se reenviarán con %cMTP a:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El nombre del anfitrión en la línea «MAIL FROM» será %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  La dirección a poner en las líneas RCPT TO enviadas al STMP será %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de basura son:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de  basura está desactivado\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La conexión al servidor se iniciará con «%s».\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  No hay orden de preconexión.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La conexión al servidor se terminará con «%s».\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  No hay orden de postconexión.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para este anfitrión.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Modo «multi-drop»: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Modo «single-drop»: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nombre local reconocido.\n"
 msgstr[1] "%d nombres locales reconocidos.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Se comparará la dirección IP de los alias del servidor contra las "
 "direcciones «multidrop».\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Se comparará el nombre de los alias del servidor contra las direcciones "
 "«multidrop».\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El enrutado por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Se asume que el encabezado de la envoltura es: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número del encabezado de la envoltura a omitir: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  El prefijo %s se eliminará del nombre de usuario\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  No se eliminará ningún prefijo\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La conexión debe ser a través de la interfaz %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificaron requerimientos de la interfaz.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta se monitorizará %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitorización.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Las conexiones al servidor se llevarán a cabo a través del complemento %s "
 "(--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó una orden para el complemento.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Las conexiones al cliente se llevarán a cabo a través del «plugout» %s (--"
 "plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó una orden para el «plugout».\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UID guardadas de este anfitrión.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID guardadas.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Se añadirá información de traceado sobre la consulta al encabezado "
 "«Received».\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 #, fuzzy
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  No se añadirá información de traceado sobre la consulta al encabezado "
 "«Received».\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso «%s».\n"
@@ -1734,88 +1735,88 @@ msgstr ""
 "\n"
 "SIGINT recibido... abortando.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr ""
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, fuzzy, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "No fue posible obtener el nombre de servicio para [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Usando nombre de servicio [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Enviando credenciales\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Error intercambiando credenciales\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "No fue posible desenvolver los datos del nivel de seguridad\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Intercambio de credenciales completo\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "El servidor requiere integridad o privacidad\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Opciones de nivel de seguridad desenvueltas: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "El máximo tamaño del componente GSS es %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Error creando petición de nivel de seguridad\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando las credenciales GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Error liberando las credenciales\n"
 
@@ -1824,134 +1825,130 @@ msgstr "Error liberando las credenciales\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: la tarea dormirá durante %d segundos\n"
 
-#: imap.c:74
+#: imap.c:75
 #, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr ""
 
-#: imap.c:96
+#: imap.c:97
 #, fuzzy, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "descansará después de consultar\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: actualización a TLS correcta.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: falló la actualización a TLS.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: falló la actualización oportunista a TLS, intentando continuar\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no se compiló en fetchmail\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no se compiló en fetchmail\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "la eliminación de correo no coincide (%d actual != %d esperado)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu no fue visto\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
 msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
 msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
 msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no vistos falló\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Aviso: ignorando datos de errores para los tamaños de mensaje devueltos por "
 "el servidor.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2149,99 +2146,99 @@ msgstr "La opción --folder no se permite con ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "La opción --check no se permite con ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "fatal recv del servidor\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La cadena «%s» no es un cadena de números válida.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "El valor de la cadena «%s» es %s que %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "mayor"
 
-#: options.c:336
+#: options.c:337
 #, fuzzy, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "El protocolo «%s» especificado no es válido.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocolo «%s» especificado no es válido.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Se especificó una autenticación «%s» inválida.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opciones] [servidor ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Las opciones son las siguientes:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        muestra esta ayuda\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     muestra información sobre la versión\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       verifica si hay mensajes sin recibir\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabajar silenciosamente\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabajar ruidosamente (información de diagnóstico)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      correr en segundo plano y activarse una vez cada n "
 "segundos\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    no lanzar un proceso en segundo plano\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        terminar el proceso en segundo plano\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especificar el nombre del archivo de registro\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2249,45 +2246,45 @@ msgstr ""
 "      --syslog      usar syslog(3) para la mayoría de los mensajes cuando se "
 "ejecuta en segundo plano\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   no escribir «Received» y activar falsificación del "
 "anfitrión\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especificar archivo de control de ejecución alterno\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      especificar archivo de UID alterno\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     especificar archivo PID alternativo (bloqueado)\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especificar el recipiente de último recurso\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirigir rebotes del usuario al postmaster.\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail borra permanentemente los mensajes que no se "
 "pueden entregar.\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2295,57 +2292,57 @@ msgstr ""
 "      --softbounce  mantiene permanentemente los mensajes que no se pueden "
 "entregar en el servidor (predeterminado).\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificación de interfaz requerida\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar interfaz por actividad\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesión cifrada con ssl\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      archivo de clave privada ssl\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl del cliente\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcert     comprobación estricta del certificado del servidor "
 "(recomendado)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr ""
 "      --sslcert     comprobación estricta del certificado del servidor "
 "(recomendado)\n"
 
-#: options.c:672
+#: options.c:673
 #, fuzzy
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertpath ubicación de los certificados ssl\n"
 
-#: options.c:673
+#: options.c:674
 #, fuzzy
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath ubicación de los certificados ssl\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  esperar este «CommonName» del servidor "
 "(desaconsejado)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2353,187 +2350,187 @@ msgstr ""
 "      --sslfingerprint huella digital que debe coincidir con la del "
 "certificado del servidor.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    forzar protocolo (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especificar la orden externa para abrir una conexión\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especificar la orden externa para abrir una conexión "
 "smtp\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especificar el protocolo de recepción (ver página man)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar el uso de UIDL (sólo pop3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        Puerto TCP a conectar (obsoleto, use --service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     Servicio TCP al que conectarse (puede ser un puerto TCP "
 "numérico)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr ""
 "      --auth        tipo de autenticación (contraseña/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tiempo de espera por respuesta del servidor\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envolver encabezados de dirección\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefijo a eliminar de la identificación local del "
 "usuario\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal del servicio de correo\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  añadir información sobre traceado de consultas al "
 "encabezado «Received»\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    especificar el acceso del usuario en el servidor\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  recuperar antiguos y nuevos mensajes\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borrar nuevos mensajes después de recibidos\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        guardar nuevos mensajes después de recibidos\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  borrar mensajes demasiado grandes\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescribir las direcciones del encabezado\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recibir mensajes más grandes de lo especificado\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre las notificaciones de correo\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configurar el anfitrión de reenvío de SMTP\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress configurar el dominio de entrega de SMTP a usar\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    usar nombreusuario@dominio como nombre completo para "
 "SMTP\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurar los valores de respuesta anti basura\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  configurar el límite de mensajes para las conexiones "
 "SMTP\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configurar el límite de mensajes para las conexiones al "
 "servidor\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit configurar el límite de tamaño de mensaje\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    utilizar búsqueda binaria para los UIDL\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     configurar la cantidad de mensajes borrados entre "
 "eliminaciones\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         configurar el MDA para que reenvíe\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configurar archivo de salida de BSMTP\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para entrega\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especificar nombre de la carpeta remota\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
@@ -2547,7 +2544,7 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 #, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
@@ -2555,93 +2552,93 @@ msgstr ""
 "Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en "
 "vez de TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "La orden CAPA, no obstante, es necesaria para TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: la actualización oportunista a TLS falló, intentando continuar.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Hemos agotado los autenticadores permitidos y no puede continuar.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "El sello de tiempo APOP requerido no se ha encontrada en el saludo\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en el sello de tiempo en el saludo\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Sello de tiempo APOP inválido.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petición de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDL\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está permitida con POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "opciones de servidor tras opciones de usuario"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS no activado."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2649,7 +2646,7 @@ msgstr ""
 "fetchmail: la opción «interface» solo está permitida bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2657,25 +2654,25 @@ msgstr ""
 "fetchmail: la opción «monitor» sólo está permitida bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL no está activado"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "fin de entrada"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El archivo %s debe ser de tipo normal.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "El archivo %s no debe tener más que los permisos -rwx------ (0700).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Usted debe ser el propietario del archivo %s.\n"
@@ -2904,125 +2901,129 @@ msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "El error guardado es aún %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "El servidor SMTP necesita STARTTLS, manteniendo mensaje.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Fallo en la apertura del archivo de BSMTP: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, fuzzy, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Fallo en la escritura del preámbulo\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Al servidor %cMTP no le gusta la dirección de recipiente «%s»\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "Al servidor %cMTP realmente no le gusta la dirección de recipiente «%s»\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, fuzzy, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "No se puede renombrar el archivo fetchids %s a %s: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, fuzzy, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error escribiendo a MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA murió por la señal %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA devolvió un estado %d distinto de cero\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "Extraño: MDA pclose devolvió %d y errno %d/%s, no se puede manejar en %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -3058,223 +3059,223 @@ msgstr "Autenticación ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "error de protocolo en el servidor smtp\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc falló\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: par de sockets falló\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: falló la bifurcación\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 falló\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "ejecutando %s (anfitrión %s servicio %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) falló\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(«%s»,«%s») error: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 "Intentando añadir la opción --service (vea también FAQ elemento R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "desconocido (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Intentando conectar a %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "no se puede crear el zócalo %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, fuzzy, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "no se puede crear el zócalo %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "Fallo en la conexión.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "conexión a %s:%s [%s/%s] fallida: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "conexión a %s:%s [%s/%s] fallida: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "conectado.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 #, fuzzy
 msgid "Server certificate:\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organización emisora: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Aviso: el nombre de la organización emisora es muy largo (posiblemente "
 "truncado).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Organización desconocida\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "«CommonName» del emisor: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Aviso: el «CommonName» del emisor es muy largo (posiblemente truncado).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "«CommonName» del emisor desconocido\n"
 
-#: socket.c:679
+#: socket.c:684
 #, fuzzy, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "«CommonName» del emisor: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificado incorrecto: el «CommonName» del asunto es muy largo.\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 "Certificado incorrecto: el «CommonName» del asunto contiene NUL, abortando.\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nombre alternativo del asunto: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 "Certificado incorrecto: El nombre alternativo del asunto contiene NUL, "
 "abortando.\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "«CommonName» del servidor no coincide: %s = %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nombre de servidor no fue configurado, ¡no fue posible verificar el "
 "certificado!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "«CommonName» del servidor desconocido\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "¡No se especifica el nombre del servidor en el certificado!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falló\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "¡No hay memoria!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "¡El espacio para el resumen de texto es muy pequeño!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Huella digital de la clave %s: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Las huellas digitales de %s coinciden.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "¡Las huellas digitales de %s no coinciden!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3282,12 +3283,12 @@ msgid ""
 "fetchmail.\n"
 msgstr ""
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
+#: socket.c:839
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
 "CA certificate location, or that c_rehash needs to be run on the certificate "
@@ -3295,103 +3296,103 @@ msgid ""
 "sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr ""
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr ""
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr ""
 "El protocolo SSL «%s» especificado es inválido, usando el predeterminado "
 "(SSLv23).\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "¡La verificación de certificado/huella digital fue de algún modo omitida!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr ""
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del zócalo cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del zócalo cygwin\n"
 
@@ -3449,63 +3450,63 @@ msgstr ""
 msgid "line: %s"
 msgstr "línea: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1112
 #, fuzzy, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 "analizando línea «Received»:\n"
 "%s"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no hay coincidencias locales, reenviado a %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribiendo encabezados RFC822\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "ninguna dirección de destino coincidió con los nombres locales declarados"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "la dirección de destino %s no coincide con ningún nombre local"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "el mensaje contiene NULs"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "error al escribir el texto del mensaje\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3544,37 +3545,37 @@ msgstr ""
 msgid "discarding new UID list\n"
 msgstr "descartando la nueva lista de UID\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Borrando el archivo fetchids.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error borrando %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Escribiendo el archivo fetchids.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, fuzzy, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Escribiendo el archivo fetchids.\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 "Error escribiendo al archivo fetchids %s. Se dejó el archivo original "
 "intacto.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "No se puede renombrar el archivo fetchids %s a %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "No se puede abrir el archivo fetchids %s para escritura: %s\n"
@@ -3587,9 +3588,6 @@ msgstr "malloc falló\n"
 msgid "realloc failed\n"
 msgstr "realloc falló\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "se intercambian listas de UID\n"
-
 #~ msgid "krb5_sendauth: %s [server says '%*s'] \n"
 #~ msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n"
 
@@ -3605,12 +3603,21 @@ msgstr "realloc falló\n"
 #~ "fetchmail: Aviso: syslog y logfile están establecidos. Compruebe ambos "
 #~ "registros\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "El error guardado es aún %d\n"
+
 #~ msgid "Server CommonName: %s\n"
 #~ msgstr "«CommonName» del servidor: %s\n"
 
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
+#~ msgid "swapping UID lists\n"
+#~ msgstr "se intercambian listas de UID\n"
+
 #~ msgid "message delimiter found while scanning headers\n"
 #~ msgstr ""
 #~ "delimitador de mensajes encontrado durante la exploración de encabezados\n"
diff --git a/po/fi.po b/po/fi.po
index d87fbb93..4f59b081 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,38 +6,38 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2013-03-08 17:50+0100\n"
 "PO-Revision-Date: 2015-08-05 19:26+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.3\n"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Tarkistetaan, onko %s todella sama kone kuin %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Kyllä, IP-osoitteet täsmäävät\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Ei, IP-osoitteet eivät täsmää\n"
 
-#: checkalias.c:207
+#: checkalias.c:212
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "nimipalveluvirhe etsittäessä nimeä ”%s” "
 
-#: checkalias.c:230
+#: checkalias.c:237
 #, fuzzy, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "nimipalveluvirhe etsittäessä nimeä ”%s” "
@@ -58,27 +58,23 @@ msgstr "kerberos-virhe %s\n"
 
 #: driver.c:259 driver.c:265
 #, fuzzy, c-format
+#| msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [palvelin sanoo ”%*s”] \n"
 
 #: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: Fetchmailin varoitus liian suuresta viestistä"
 
 #: driver.c:349
 #, fuzzy, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
-"%2$d viestiä\n"
+msgstr "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
 
 #: driver.c:353
 #, fuzzy, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
-"%2$d viestiä\n"
+msgstr "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
 
 #: driver.c:372
 #, c-format
@@ -99,119 +95,105 @@ msgstr[1] ""
 msgid "skipping message %s@%s:%d"
 msgstr "ohitetaan viesti %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:576
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ohitetaan viesti %s@%s:%d (%d oktettia)"
 
-#: driver.c:593
+#: driver.c:592
 msgid " (length -1)"
 msgstr " (pituus -1)"
 
-#: driver.c:596
+#: driver.c:595
 msgid " (oversized)"
 msgstr " (ylisuuri)"
 
-#: driver.c:614
+#: driver.c:613
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr ""
-"otsakkeiden noutaminen ei onnistunut viestille %s@%s:%d (%d oktettia)\n"
+msgstr "otsakkeiden noutaminen ei onnistunut viestille %s@%s:%d (%d oktettia)\n"
 
-#: driver.c:632
+#: driver.c:631
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "luetaan viesti %s@%s:%d / %d"
 
-#: driver.c:637
+#: driver.c:636
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktettia)"
 
-#: driver.c:638
+#: driver.c:637
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d otsakeoktettia) "
 
-#: driver.c:708
+#: driver.c:707
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d runko-oktettia) "
 
-#: driver.c:770
+#: driver.c:769
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
 
-#: driver.c:802
+#: driver.c:801
 msgid " retained\n"
 msgstr " säilytettiin\n"
 
-#: driver.c:812
+#: driver.c:811
 msgid " flushed\n"
 msgstr " poistettiin\n"
 
-#: driver.c:824
+#: driver.c:823
 msgid " not flushed\n"
 msgstr " ei poistettu\n"
 
-#: driver.c:842
+#: driver.c:841
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] ""
-"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
-"%2$d viesti\n"
-msgstr[1] ""
-"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
-"%2$d viestiä\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viesti\n"
+msgstr[1] "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
 
-#: driver.c:899
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"aikakatkaistu %d sekunnissa odotettaessa yhdistämistä palvelimelle %s.\n"
+msgstr "aikakatkaistu %d sekunnissa odotettaessa yhdistämistä palvelimelle %s.\n"
 
-#: driver.c:903
+#: driver.c:902
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa palvelinta %s.\n"
 
 # Odotettaessa mitä, häh?
-#: driver.c:907
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa %s.\n"
 
-#: driver.c:912
+#: driver.c:911
 #, fuzzy, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa kuuntelijan vastausta.\n"
 
-#: driver.c:915
+#: driver.c:914
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "aikakatkaistu %d sekunnissa.\n"
 
 # Subject: on todennäköisesti postin otsakekentän nimi, jota ei saa kääntää.
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:926
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail havaitsee toistuvia aikakatkaisuja"
 
-#: driver.c:930
+#: driver.c:929
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail havaitsi yli %d aikakatkaisua yrittäessään noutaa postia "
-"tunnukselta %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail havaitsi yli %d aikakatkaisua yrittäessään noutaa postia tunnukselta %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:933
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -221,73 +203,73 @@ msgid ""
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
 
-#: driver.c:960
+#: driver.c:959
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr ""
 
-#: driver.c:963
+#: driver.c:962
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:987
+#: driver.c:986
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr ""
 
-#: driver.c:1008
+#: driver.c:1007
 msgid "Lead server has no name.\n"
 msgstr ""
 
-#: driver.c:1035
+#: driver.c:1034
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr ""
 
-#: driver.c:1082
+#: driver.c:1081
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: driver.c:1111
+#: driver.c:1110
 msgid "SSL connection failed.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: driver.c:1166
+#: driver.c:1165
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1170
+#: driver.c:1169
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1175
+#: driver.c:1174
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr ""
 
-#: driver.c:1178
+#: driver.c:1177
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1181
+#: driver.c:1180
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 msgstr ""
 
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1201
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmailin todennus epäonnistui käyttäjälle %s@%s"
 
-#: driver.c:1206
+#: driver.c:1205
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ei pystynyt noutamaan postia paikasta %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1209
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -296,7 +278,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1216
+#: driver.c:1215
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -308,7 +290,7 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1226
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -320,60 +302,60 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1242
+#: driver.c:1241
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1247
+#: driver.c:1246
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1271
+#: driver.c:1270
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr ""
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1276
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmailin todennus onnistui käyttäjälle %s@%s"
 
-#: driver.c:1281
+#: driver.c:1280
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 
-#: driver.c:1285
+#: driver.c:1284
 msgid "Service has been restored.\n"
 msgstr "Palvelu on palautettu.\n"
 
-#: driver.c:1318
+#: driver.c:1317
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 
-#: driver.c:1320
+#: driver.c:1319
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 
-#: driver.c:1332
+#: driver.c:1331
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s palvelimella %s (kansio %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1334 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s palvelimella %s"
 
-#: driver.c:1340
+#: driver.c:1339
 #, c-format
 msgid "Polling %s\n"
 msgstr "Noudetaan koneelta %s\n"
 
-#: driver.c:1344
+#: driver.c:1343
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -381,117 +363,117 @@ msgstr[0] "%d viesti (%d %s) käyttäjälle %s"
 msgstr[1] "%d viestiä (%d %s) käyttäjälle %s"
 
 # Tämä on edellisen kohdan ensimmäinen %s.
-#: driver.c:1347
+#: driver.c:1346
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "nähty"
 msgstr[1] "nähtyä"
 
-#: driver.c:1350
+#: driver.c:1349
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d viesti käyttäjälle %s"
 msgstr[1] "%d viestiä käyttäjälle %s"
 
-#: driver.c:1357
+#: driver.c:1356
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktettia).\n"
 
-#: driver.c:1363
+#: driver.c:1362
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ei postia käyttäjälle %s\n"
 
-#: driver.c:1396
+#: driver.c:1395
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1448
+#: driver.c:1447
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
 msgstr ""
 
-#: driver.c:1549
+#: driver.c:1548
 msgid "socket"
 msgstr "pistoke"
 
-#: driver.c:1552
+#: driver.c:1551
 msgid "missing or bad RFC822 header"
 msgstr "puuttuva tai virheellinen RFC822-otsake"
 
-#: driver.c:1555
+#: driver.c:1554
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1557
 msgid "client/server synchronization"
 msgstr ""
 
-#: driver.c:1561
+#: driver.c:1560
 msgid "client/server protocol"
 msgstr ""
 
-#: driver.c:1564
+#: driver.c:1563
 msgid "lock busy on server"
 msgstr ""
 
-#: driver.c:1567
+#: driver.c:1566
 msgid "SMTP transaction"
 msgstr ""
 
-#: driver.c:1570
+#: driver.c:1569
 msgid "DNS lookup"
 msgstr ""
 
-#: driver.c:1573
+#: driver.c:1572
 msgid "undefined"
 msgstr "määrittelemätön"
 
-#: driver.c:1579
+#: driver.c:1578
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 
-#: driver.c:1581
+#: driver.c:1580
 msgid "unknown"
 msgstr "tuntematon"
 
-#: driver.c:1583
+#: driver.c:1582
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr ""
 
-#: driver.c:1595
+#: driver.c:1594
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr ""
 
-#: driver.c:1597
+#: driver.c:1596
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:1616
+#: driver.c:1615
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1624
+#: driver.c:1623
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1635
+#: driver.c:1634
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1641
+#: driver.c:1640
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1650
+#: driver.c:1649
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr ""
@@ -511,8 +493,7 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -528,8 +509,8 @@ msgid "%s: can't determine your host!"
 msgstr ""
 
 #: env.c:172
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname epäonnistui osoitteelle %s\n"
 
 #: env.c:174
@@ -539,8 +520,7 @@ msgstr ""
 #: env.c:178
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
@@ -608,991 +588,967 @@ msgstr ""
 msgid "Option --check is not supported with ETRN\n"
 msgstr ""
 
-#: fetchmail.c:141
+#: fetchmail.c:137
 #, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 "                   Robert M. Funk, Graham Wilson\n"
 "Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2019 Matthias Andree\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
 "Copyright © 2002, 2003 Eric S. Raymond\n"
-"Copyright © 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
-"Wilson\n"
+"Copyright © 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
 "Copyright © 2005-2006 Sunil Shetye\n"
 "Copyright © 2005-2007 Matthias Andree\n"
 
-#: fetchmail.c:147
+#: 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"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
 
-#: fetchmail.c:187
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "VAROITUS: Ajamista pääkäyttäjänä ei suositella.\n"
 
-#: fetchmail.c:199
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr ""
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "nykyisen työhakemiston selvittäminen ei onnistunut\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Tämä on fetchmail-julkaisu %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:313
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:320
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:327
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:333
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:351
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:439
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr ""
 
-#: fetchmail.c:450
+#: fetchmail.c:440
 msgid " and "
 msgstr " ja "
 
-#: fetchmail.c:455
+#: fetchmail.c:445
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 
-#: fetchmail.c:476
+#: fetchmail.c:466
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr ""
 
-#: fetchmail.c:488
+#: fetchmail.c:478
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr ""
 
-#: fetchmail.c:494
+#: fetchmail.c:484
 #, fuzzy, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: virhe tapettaessa tau"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:485 fetchmail.c:494
 msgid "background"
 msgstr "tausta"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:485 fetchmail.c:494
 msgid "foreground"
 msgstr "edusta"
 
-#: fetchmail.c:503
+#: fetchmail.c:493
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: virhe tapettaessa tau"
 
-#: fetchmail.c:526
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+#: fetchmail.c:516
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
 msgstr ""
 
-#: fetchmail.c:532
+#: fetchmail.c:522
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
 msgstr ""
 
-#: fetchmail.c:539
+#: fetchmail.c:529
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr ""
 
-#: fetchmail.c:549
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+#: fetchmail.c:539
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 
-#: fetchmail.c:561
+#: fetchmail.c:545
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: virhe tapettaessa tau"
 
-#: fetchmail.c:573
+#: fetchmail.c:557
 #, fuzzy, c-format
+#| msgid "fetchmail: thread sleeping for %d sec.\n"
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: säie nukkuu %d sekuntia.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:572
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr ""
 
-#: fetchmail.c:592
+#: fetchmail.c:576
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Syötä salasana tunnukselle %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:618
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr ""
 
-#: fetchmail.c:638
+#: fetchmail.c:622
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr ""
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:638 fetchmail.c:640
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr ""
 
-#: fetchmail.c:675
+#: fetchmail.c:659
 msgid "--check mode enabled, not fetching mail\n"
 msgstr ""
 
-#: fetchmail.c:697
+#: fetchmail.c:681
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr ""
 
-#: fetchmail.c:702
+#: fetchmail.c:686
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr ""
 
-#: fetchmail.c:707
+#: fetchmail.c:691
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:734
+#: fetchmail.c:718
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr ""
 
-#: fetchmail.c:764
+#: fetchmail.c:748
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 
-#: fetchmail.c:776
+#: fetchmail.c:760
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr ""
 
-#: fetchmail.c:814
+#: fetchmail.c:798
 msgid "Query status=0 (SUCCESS)\n"
 msgstr ""
 
-#: fetchmail.c:816
+#: fetchmail.c:800
 msgid "Query status=1 (NOMAIL)\n"
 msgstr ""
 
-#: fetchmail.c:818
+#: fetchmail.c:802
 msgid "Query status=2 (SOCKET)\n"
 msgstr ""
 
-#: fetchmail.c:820
+#: fetchmail.c:804
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr ""
 
-#: fetchmail.c:822
+#: fetchmail.c:806
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr ""
 
-#: fetchmail.c:824
+#: fetchmail.c:808
 msgid "Query status=5 (SYNTAX)\n"
 msgstr ""
 
-#: fetchmail.c:826
+#: fetchmail.c:810
 msgid "Query status=6 (IOERR)\n"
 msgstr ""
 
-#: fetchmail.c:828
+#: fetchmail.c:812
 msgid "Query status=7 (ERROR)\n"
 msgstr ""
 
-#: fetchmail.c:830
+#: fetchmail.c:814
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr ""
 
-#: fetchmail.c:832
+#: fetchmail.c:816
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr ""
 
-#: fetchmail.c:834
+#: fetchmail.c:818
 msgid "Query status=10 (SMTP)\n"
 msgstr ""
 
-#: fetchmail.c:836
+#: fetchmail.c:820
 msgid "Query status=11 (DNS)\n"
 msgstr ""
 
-#: fetchmail.c:838
+#: fetchmail.c:822
 msgid "Query status=12 (BSMTP)\n"
 msgstr ""
 
-#: fetchmail.c:840
+#: fetchmail.c:824
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr ""
 
-#: fetchmail.c:842
+#: fetchmail.c:826
 #, c-format
 msgid "Query status=%d\n"
 msgstr ""
 
-#: fetchmail.c:884
+#: fetchmail.c:868
 msgid "All connections are wedged.  Exiting.\n"
 msgstr ""
 
-#: fetchmail.c:892
+#: fetchmail.c:876
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "Noutoväli on %d sekuntia\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:900
 #, c-format
 msgid "awakened by %s\n"
 msgstr ""
 
-#: fetchmail.c:919
+#: fetchmail.c:903
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr ""
 
-#: fetchmail.c:927
+#: fetchmail.c:911
 #, c-format
 msgid "awakened at %s\n"
 msgstr ""
 
-#: fetchmail.c:932
+#: fetchmail.c:916
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr ""
 
-#: fetchmail.c:1093
+#: fetchmail.c:1075
 msgid "couldn't time-check the run-control file\n"
 msgstr ""
 
-#: fetchmail.c:1127
+#: fetchmail.c:1109
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1148
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1270
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1277
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1283
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1289
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 
-#: fetchmail.c:1348
+#: fetchmail.c:1330
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1349
+#: fetchmail.c:1331
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1366
+#: fetchmail.c:1348
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
 msgstr ""
 
-#: fetchmail.c:1373
+#: fetchmail.c:1355
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 
-#: fetchmail.c:1391
+#: fetchmail.c:1373
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 
-#: fetchmail.c:1405
+#: fetchmail.c:1387
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 
-#: fetchmail.c:1415
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1439
+#: fetchmail.c:1412
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr ""
 
-#: fetchmail.c:1512
+#: fetchmail.c:1485
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 
-#: fetchmail.c:1537
+#: fetchmail.c:1510
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1522
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1532
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1538
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1546
 msgid "ODMR support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1580
+#: fetchmail.c:1553
 msgid "unsupported protocol selected.\n"
 msgstr ""
 
-#: fetchmail.c:1590
+#: fetchmail.c:1563
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 
-#: fetchmail.c:1615
+#: fetchmail.c:1580
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Noutoväli on %d sekuntia\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1582
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Lokitiedosto on %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1584
 #, c-format
 msgid "Idfile is %s\n"
 msgstr ""
 
-#: fetchmail.c:1622
+#: fetchmail.c:1587
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Edistymisviestit tallennetaan lokiin syslogitse\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1590
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 
-#: fetchmail.c:1627
+#: fetchmail.c:1592
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1629
+#: fetchmail.c:1594
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 
-#: fetchmail.c:1633
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 
-#: fetchmail.c:1635
+#: fetchmail.c:1600
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1603
 #, fuzzy
+#| msgid "Fetchmail will direct error mail to the sender.\n"
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1605
 #, fuzzy
+#| msgid "Fetchmail will direct error mail to the sender.\n"
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1612
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr ""
 
-#: fetchmail.c:1651
+#: fetchmail.c:1616
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1619
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1658
+#: fetchmail.c:1623
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Palvelimen todellinen nimi on %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1626
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1627
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1631
 msgid "  Password will be prompted for.\n"
 msgstr "  Salasanaa kysytään.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1635
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1673
+#: fetchmail.c:1638
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1676
+#: fetchmail.c:1641
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1685
+#: fetchmail.c:1650
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr ""
 
-#: fetchmail.c:1688
+#: fetchmail.c:1653
 #, c-format
 msgid "  Protocol is %s"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1655
 #, c-format
 msgid " (using service %s)"
 msgstr " (käytetään palvelua %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1657
 msgid " (using default port)"
 msgstr " (käytetään oletusporttia)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1659
 msgid " (forcing UIDL use)"
 msgstr ""
 
-#: fetchmail.c:1700
+#: fetchmail.c:1665
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1703
+#: fetchmail.c:1668
 msgid "  Password authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1706
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Vaaditaan todennus.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1674
 msgid "  NTLM authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1712
+#: fetchmail.c:1677
 msgid "  OTP authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1715
+#: fetchmail.c:1680
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "Vaaditaan todennus.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1683
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1721
+#: fetchmail.c:1686
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1724
+#: fetchmail.c:1689
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1727
+#: fetchmail.c:1692
 msgid "  End-to-end encryption assumed.\n"
 msgstr ""
 
-#: fetchmail.c:1731
+#: fetchmail.c:1696
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1734
+#: fetchmail.c:1699
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1736
+#: fetchmail.c:1701
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokolla: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1703
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1740
-msgid "  SSL server certificate checking disabled.\n"
-msgstr ""
-
-#: fetchmail.c:1743
+#: fetchmail.c:1706
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr ""
 
-#: fetchmail.c:1745
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1747
+#: fetchmail.c:1710
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr ""
 
-#: fetchmail.c:1749
+#: fetchmail.c:1712
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1752
+#: fetchmail.c:1715
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1717
 msgid " (default).\n"
 msgstr " (oletus).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1724
 msgid "  Default mailbox selected.\n"
 msgstr "  Oletuspostilaatikko valittu.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1729
 msgid "  Selected mailboxes are:"
 msgstr "  Valitut postilaatikot ovat:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1735
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1736
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1738
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1739
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1741
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1742
 #, fuzzy
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1744
 #, fuzzy
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1782
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1745
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
 msgstr ""
 
-#: fetchmail.c:1784
+#: fetchmail.c:1747
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 
-#: fetchmail.c:1785
+#: fetchmail.c:1748
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 
-#: fetchmail.c:1787
+#: fetchmail.c:1750
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr ""
 
-#: fetchmail.c:1788
+#: fetchmail.c:1751
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 
-#: fetchmail.c:1790
+#: fetchmail.c:1753
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr ""
 
-#: fetchmail.c:1791
+#: fetchmail.c:1754
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 
-#: fetchmail.c:1793
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1756
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 
-#: fetchmail.c:1794
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1757
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 
-#: fetchmail.c:1796
+#: fetchmail.c:1759
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr ""
 
-#: fetchmail.c:1797
+#: fetchmail.c:1760
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr ""
 
-#: fetchmail.c:1799
+#: fetchmail.c:1762
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr ""
 
-#: fetchmail.c:1800
+#: fetchmail.c:1763
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr ""
 
-#: fetchmail.c:1802
+#: fetchmail.c:1765
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 
-#: fetchmail.c:1803
+#: fetchmail.c:1766
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 
-#: fetchmail.c:1805
+#: fetchmail.c:1768
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 
-#: fetchmail.c:1806
+#: fetchmail.c:1769
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 
-#: fetchmail.c:1810
+#: fetchmail.c:1773
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Viestin kokoraja on %d oktettia (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1776
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ei viestin kokorajaa (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1778
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 
-#: fetchmail.c:1818
+#: fetchmail.c:1781
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 
-#: fetchmail.c:1821
+#: fetchmail.c:1784
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1824
+#: fetchmail.c:1787
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1826
+#: fetchmail.c:1789
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1829
+#: fetchmail.c:1792
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1833
+#: fetchmail.c:1796
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1835
+#: fetchmail.c:1798
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1838
+#: fetchmail.c:1801
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1840
+#: fetchmail.c:1803
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr ""
 
-#: fetchmail.c:1842
+#: fetchmail.c:1805
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1846
+#: fetchmail.c:1809
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 
-#: fetchmail.c:1848
+#: fetchmail.c:1811
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr ""
 
-#: fetchmail.c:1855
+#: fetchmail.c:1818
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1823 fetchmail.c:1843
 msgid " (default)"
 msgstr " (oletus)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr ""
 
-#: fetchmail.c:1867
+#: fetchmail.c:1830
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1874
+#: fetchmail.c:1837
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr ""
 
-#: fetchmail.c:1885
+#: fetchmail.c:1848
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1888
+#: fetchmail.c:1851
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1897
+#: fetchmail.c:1860
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 
-#: fetchmail.c:1903
+#: fetchmail.c:1866
 msgid "  Spam-blocking disabled\n"
 msgstr ""
 
-#: fetchmail.c:1906
+#: fetchmail.c:1869
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1909
+#: fetchmail.c:1872
 msgid "  No pre-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1911
+#: fetchmail.c:1874
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1914
+#: fetchmail.c:1877
 msgid "  No post-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1917
+#: fetchmail.c:1880
 msgid "  No localnames declared for this host.\n"
 msgstr ""
 
-#: fetchmail.c:1927
+#: fetchmail.c:1890
 msgid "  Multi-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1929
+#: fetchmail.c:1892
 msgid "  Single-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1931
+#: fetchmail.c:1894
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d paikallista nimeä tunnistettu.\n"
 msgstr[1] "%d paikallista nimeä tunnistettu.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1909
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1947
+#: fetchmail.c:1910
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 
-#: fetchmail.c:1951
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1914
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 
-#: fetchmail.c:1953
+#: fetchmail.c:1916
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 
-#: fetchmail.c:1956
+#: fetchmail.c:1919
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1959
+#: fetchmail.c:1922
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr ""
 
-#: fetchmail.c:1962
+#: fetchmail.c:1925
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr ""
 
-#: fetchmail.c:1965
+#: fetchmail.c:1928
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr ""
 
-#: fetchmail.c:1968
+#: fetchmail.c:1931
 msgid "  No prefix stripping\n"
 msgstr ""
 
-#: fetchmail.c:1973
+#: fetchmail.c:1936
 msgid "  Predeclared mailserver aliases:"
 msgstr ""
 
-#: fetchmail.c:1981
+#: fetchmail.c:1944
 msgid "  Local domains:"
 msgstr ""
 
-#: fetchmail.c:1991
+#: fetchmail.c:1954
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr ""
 
-#: fetchmail.c:1993
+#: fetchmail.c:1956
 msgid "  No interface requirement specified.\n"
 msgstr ""
 
-#: fetchmail.c:1995
+#: fetchmail.c:1958
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr ""
 
-#: fetchmail.c:1997
+#: fetchmail.c:1960
 msgid "  No monitor interface specified.\n"
 msgstr ""
 
-#: fetchmail.c:2001
+#: fetchmail.c:1964
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 
-#: fetchmail.c:2003
+#: fetchmail.c:1966
 msgid "  No plugin command specified.\n"
 msgstr ""
 
-#: fetchmail.c:2005
+#: fetchmail.c:1968
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 
-#: fetchmail.c:2007
+#: fetchmail.c:1970
 msgid "  No plugout command specified.\n"
 msgstr ""
 
-#: fetchmail.c:2014
+#: fetchmail.c:1975
 msgid "  No UIDs saved from this host.\n"
 msgstr ""
 
-#: fetchmail.c:2017
+#: fetchmail.c:1984
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID:tä tallennettu.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1992
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:2025
+#: fetchmail.c:1994
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:2030
+#: fetchmail.c:1999
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2033
+#: fetchmail.c:2002
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2038
+#: fetchmail.c:2007
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr ""
@@ -1632,8 +1588,7 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
 #: gssapi.c:123
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
 #: gssapi.c:159
@@ -1671,24 +1626,15 @@ msgstr ""
 msgid "Maximum GSS token size is %ld\n"
 msgstr ""
 
-#: gssapi.c:273
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:282
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr ""
 
-#: gssapi.c:286
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:297
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr ""
 
-#: gssapi.c:301
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr ""
 
@@ -1699,130 +1645,124 @@ msgstr "fetchmail: säie nukkuu %d sekuntia.\n"
 
 #: imap.c:74
 #, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+msgid "Received BYE response from IMAP server: %s"
 msgstr ""
 
-#: imap.c:96
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr ""
 
-#: imap.c:143
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr ""
 
-#: imap.c:360
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr ""
 
-#: imap.c:367
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr ""
 
-#: imap.c:384
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:475 pop3.c:473
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:481 pop3.c:479
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:486
+#: imap.c:482
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:501
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:606
+#: imap.c:598
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:626 pop3.c:559
+#: imap.c:618 pop3.c:558
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:635
+#: imap.c:627
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "epätäsmäävyys viestin poistossa (%d todellinen ≠ %d odotettu)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr ""
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr ""
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr ""
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d viesti odottamassa uudelleennoudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa uudelleennoudon jälkeen\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "postilaatikon valinta epäonnistui\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d viesti odottamassa ensimmäisen noudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa ensimmäisen noudon jälkeen\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "poisto epäonnistui\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d viesti odottamassa poiston jälkeen\n"
 msgstr[1] "%d viestiä odottamassa poiston jälkeen\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr ""
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:865
 #, c-format
 msgid "%u is first unseen\n"
 msgstr ""
 
-#: imap.c:1086
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:1078
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -1909,21 +1849,21 @@ msgstr ""
 msgid "could not decode initial BASE64 challenge\n"
 msgstr ""
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr ""
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr ""
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr ""
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr ""
 
@@ -1986,6 +1926,7 @@ msgstr "Vaaditaan todennus.\n"
 
 #: odmr.c:132
 #, fuzzy, c-format
+#| msgid "Unknown ETRN error %d\n"
 msgid "Unknown ODMR error \"%s\"\n"
 msgstr "Tuntematon ETRN-virhe %d\n"
 
@@ -2018,423 +1959,395 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:586
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr ""
 
-#: options.c:178 options.c:222
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr ""
 
-#: options.c:187
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Merkkijonon \"%s\" arvo on %s kuin %d.\n"
 
-#: options.c:188
+#: options.c:186
 msgid "smaller"
 msgstr "pienempi"
 
-#: options.c:188
+#: options.c:186
 msgid "larger"
 msgstr "suurempi"
 
-#: options.c:336
+#: options.c:323
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr ""
 
-#: options.c:377
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr ""
 
-#: options.c:424
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr ""
 
-#: options.c:640
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "käyttö:  fetchmail [valitsimet] [palvelin ...]\n"
 
-#: options.c:641
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Valitsimet ovat seuraavat:\n"
 
-#: options.c:642
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        näytä tämä ohje\n"
 
-#: options.c:643
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     näytä versiotiedot\n"
 
-#: options.c:645
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tarkasta viestit hakematta niitä\n"
 
-#: options.c:646
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      toimi hiljaisesti\n"
 
-#: options.c:647
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     toimi äänekkäästi (tulostetaan lisätietoa)\n"
 
-#: options.c:648
+#: options.c:628
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      aja palvelimena kerran n sekunnissa\n"
 
-#: options.c:649
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        tapa palvelinprosessi\n"
 
-#: options.c:651
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:652
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-
-#: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
+#: options.c:632
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 
-#: options.c:655
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 
-#: options.c:656
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 
-#: options.c:657
+#: options.c:636
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:658
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:659
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:660
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+#: options.c:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:661
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:667
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ota käyttöön SSL-salattu istunto\n"
 
-#: options.c:668
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:670
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:671
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-
-#: options.c:672
+#: options.c:650
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr ""
 
-#: options.c:673
+#: options.c:651
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr ""
 
-#: options.c:674
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:675
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+#: options.c:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr ""
 
-#: options.c:676
+#: options.c:654
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:678
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:679
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:680
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
+#: options.c:661
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:684
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:685
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:686
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:687
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:664
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:665
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        todennustapa (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:666
 #, fuzzy
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     "
 
-#: options.c:690
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:691
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:692
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:693
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:695
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:672
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    määrittele käyttäjän tunnus palvelimella\n"
 
-#: options.c:696
+#: options.c:673
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         nouda sekä uudet että vanhat viestit\n"
 
-#: options.c:697
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      poista uudet viestit noudon jälkeen\n"
 
-#: options.c:698
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        säilytä uudet viestit noudon jälkeen\n"
 
-#: options.c:699
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:700
+#: options.c:677
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:701
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   älä uudelleenkirjoita otsakkeiden osoitteita\n"
 
-#: options.c:702
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       älä nouda annetun koon ylittäviä viestejä\n"
 
-#: options.c:703
+#: options.c:680
 #, fuzzy
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    "
 
-#: options.c:705
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:706
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:707
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:708
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:709
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:710
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:711
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:712
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:713
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:714
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:715
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:716
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:717
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:718
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:719
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:329
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+#: pop3.c:327
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr ""
 
-#: pop3.c:413
+#: pop3.c:411
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:414
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:491
+#: pop3.c:494
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:497
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:622
+#: pop3.c:621
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:636
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:645
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:685
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:706
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:785
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:808
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:837
+#: pop3.c:835
 #, fuzzy, c-format
+#| msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
 
-#: pop3.c:949
+#: pop3.c:941
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1047
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "yhteyskäytäntövirhe\n"
 
-#: pop3.c:1063
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1094
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
 
-#: pop3.c:1445
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr ""
 
@@ -2447,36 +2360,33 @@ msgid "SDPS not enabled."
 msgstr ""
 
 #: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:226
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL ei ole käytössä"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:391
 msgid "end of input"
 msgstr "syötteen loppu"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Tiedoston %s on oltava tavallinen tiedosto.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:439
 #, fuzzy, c-format
+#| msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Tiedostolla %s ei saa olla enempää kuin -rwx--x--- (0710) -oikeudet.\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:451
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2695,133 +2605,134 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:456
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Tallennettu virhe on edelleen %d\n"
 
-#: sink.c:509 sink.c:608
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr ""
 
-#: sink.c:553
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:736
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr ""
 
-#: sink.c:782
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr ""
 
-#: sink.c:996
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1003
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1049
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1061
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1067
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1223
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
-#: sink.c:1234
+#: sink.c:1233
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr ""
 
-#: sink.c:1246
+#: sink.c:1245
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1292
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1316
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1374
+#: sink.c:1373
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 
-#: sink.c:1399
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr ""
 
-#: sink.c:1402
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1405
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1433
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1463
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1466
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1632
-msgid "The Fetchmail Daemon"
+#: sink.c:1620
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 
 #: smtp.c:81
@@ -2849,337 +2760,252 @@ msgstr ""
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:110 socket.c:139
+#: socket.c:110 socket.c:137
 msgid "fetchmail: malloc failed\n"
 msgstr ""
 
-#: socket.c:171
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr ""
 
-#: socket.c:177
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: haarauttaminen epäonnistui\n"
 
-#: socket.c:184
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 epäonnistui\n"
 
-#: socket.c:190
+#: socket.c:188
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:195
+#: socket.c:193
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) epäonnistui\n"
 
-#: socket.c:270
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:273
+#: socket.c:271
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:287 socket.c:290
+#: socket.c:285 socket.c:288
 #, c-format
 msgid "unknown (%s)"
 msgstr ""
 
-#: socket.c:293
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:302
+#: socket.c:300
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr ""
 
-#: socket.c:304
+#: socket.c:302
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr ""
 
-#: socket.c:322
+#: socket.c:320
 msgid "connection failed.\n"
 msgstr "yhteys epäonnistui.\n"
 
-#: socket.c:324
+#: socket.c:322
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: socket.c:325
+#: socket.c:323
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: socket.c:331
+#: socket.c:329
 msgid "connected.\n"
 msgstr ""
 "yhdistetty.\n"
 "\n"
 
-#: socket.c:344
+#: socket.c:342
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
+#: socket.c:387
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL ilmoitti: %s\n"
 
-#: socket.c:641
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:647
+#: socket.c:622
 msgid "Server certificate:\n"
 msgstr ""
 
-#: socket.c:652
+#: socket.c:627
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:630
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:664
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:666
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:668
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:673
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:679
+#: socket.c:654
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr ""
 
-#: socket.c:685
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:691
+#: socket.c:666
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:719
+#: socket.c:694
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:700
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:742
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:754
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:756
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr "Palvelimen nimeä ei ole määritelty sertifikaatissa!\n"
 
-#: socket.c:768
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() epäonnistui!\n"
 
-#: socket.c:772
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "Muisti loppui kesken!\n"
 
-#: socket.c:780
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:790
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:804
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:819
+#: socket.c:794
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Katkennut sertifiointiketju kohdassa: %s\n"
 
-#: socket.c:821
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
+#: socket.c:796
+msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about.  For details, please see the README.SSL-SERVER document that ships with fetchmail.\n"
 msgstr ""
 
-#: socket.c:831
+#: socket.c:806
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page.\n"
-msgstr ""
-
-#: socket.c:907 socket.c:985
-#, fuzzy
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr "Käyttöjärjestelmä ei tue SSLv2:ta.\n"
-
-#: socket.c:925 socket.c:1003
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr "Käyttöjärjestelmä ei tue SSLv2:ta.\n"
-
-#: socket.c:936 socket.c:1014
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr "Käyttöjärjestelmä ei tue SSLv2:ta.\n"
-
-#: socket.c:947 socket.c:1025
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr "Käyttöjärjestelmä ei tue SSLv2:ta.\n"
-
-#: socket.c:956 socket.c:1035
-#, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-
-#: socket.c:1070
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1075
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+#: socket.c:809
+msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:902
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:1115
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1183
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1198
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1235
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1238
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1238
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1258
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
+#: socket.c:913
+msgid "Your operating system does not support SSLv2.\n"
+msgstr "Käyttöjärjestelmä ei tue SSLv2:ta.\n"
 
-#: socket.c:1261
+#: socket.c:923
 #, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1285
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
+#: socket.c:1039
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
 msgstr ""
 
-#: socket.c:1327
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1330
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3233,139 +3059,142 @@ msgstr ""
 msgid "line: %s"
 msgstr "rivi: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1132
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1142
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr ""
 
-#: transact.c:1190
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr ""
 
-#: transact.c:1301
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr ""
 
-#: transact.c:1320
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 
-#: transact.c:1327
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr ""
 
-#: transact.c:1336
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr ""
 
-#: transact.c:1344
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 
-#: transact.c:1394
+#: transact.c:1493
 msgid "error writing message text\n"
 msgstr "virhe kirjoitettaessa viestin tekstiä\n"
 
-#: transact.c:1670
+#: transact.c:1641
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
 
-#: uid.c:262
+#: uid.c:249
 #, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr ""
 
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <tyhjä>"
 
-#: uid.c:273
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr ""
 
-#: uid.c:357 uid.c:401
+#: uid.c:325 uid.c:374
 #, c-format
-msgid "Merged UID list from %s:\n"
+msgid "Merged UID list from %s:"
 msgstr ""
 
-#: uid.c:360
+#: uid.c:328
 #, c-format
-msgid "New UID list from %s:\n"
+msgid "New UID list from %s:"
+msgstr ""
+
+#: uid.c:355
+msgid "swapping UID lists\n"
 msgstr ""
 
-#: uid.c:390
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:410
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr ""
 
-#: uid.c:466
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Poistetaan fetchids-tiedosto.\n"
 
-#: uid.c:469
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr ""
 
-#: uid.c:476
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr ""
 
-#: uid.c:490 uid.c:499
+#: uid.c:439 uid.c:447
 #, fuzzy, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "fetchmail: poistetaan vanhentunut lukkotiedosto\n"
 
-#: uid.c:511
+#: uid.c:459
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:515
+#: uid.c:463
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:519
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc epäonnistui\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc epäonnistui\n"
 
 #~ msgid "Subject: Fetchmail unreachable-server warning."
-#~ msgstr ""
-#~ "Subject: Fetchmailin varoitus tavoittamattomissa olevasta palvelimesta."
+#~ msgstr "Subject: Fetchmailin varoitus tavoittamattomissa olevasta palvelimesta."
 
 #, fuzzy
 #~ msgid "Fetchmail could not reach the mail server %s:"
diff --git a/po/fr.po b/po/fr.po
index cbd4b589..a3330c9e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
-"PO-Revision-Date: 2019-08-28 00:27+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
+"PO-Revision-Date: 2019-08-27 19:10+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -2948,11 +2948,11 @@ msgstr "aucune correspondance dans les adresses ; réexpédition vers %s.\n"
 #: sink.c:1167
 #, c-format
 msgid "MDA option contains single-quoted %%%c expansion.\n"
-msgstr "L'option MDA contient une expansion %%%c entre guillemets simples.\n"
+msgstr ""
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr "Réfuse de délivrer. Consultez le manuel et corrigez votre option mda.\n"
+msgstr ""
 
 #: sink.c:1211
 #, c-format
@@ -3609,3 +3609,33 @@ msgstr "échec de malloc\n"
 #: xmalloc.c:42
 msgid "realloc failed\n"
 msgstr "échec de realloc\n"
+
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "L'erreur mémorisée est toujours %d\n"
+
+#~ msgid "swapping UID lists\n"
+#~ msgstr "échange des listes d'UID\n"
+
+#~ msgid "unknown issuer (first %d characters): %s\n"
+#~ msgstr "expéditeur inconnu (%d premiers caractères) : %s\n"
+
+#~ msgid ""
+#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr ""
+#~ "fetchmail: attention: syslog et logfile sont activés. Consultez les deux "
+#~ "pour les messages !\n"
+
+#~ msgid "setsockopt(%d, SOL_SOCKET) failed: %s\n"
+#~ msgstr "setsockopt(%d, SOL_SOCKET) a échoué: %s\n"
+
+#~ msgid "Subject: Fetchmail unreachable-server warning."
+#~ msgstr "Subject: avertissement de serveur non accessible par Fetchmail."
+
+#~ msgid "Fetchmail could not reach the mail server %s:"
+#~ msgstr "Fetchmail ne peut atteindre le serveur de courrier %s:"
+
+#~ msgid "(null)"
+#~ msgstr "(nul)"
diff --git a/po/id.po b/po/id.po
index 3383e40e..4f21e911 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2014-01-27 18:25+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -375,7 +375,7 @@ msgstr "memilih atau penjajakan ulang folder standar\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s di %s (folder %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s di %s"
@@ -666,34 +666,34 @@ msgstr "PERINGATAN: Menjalankan sebagai root tak disarankan.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: dijalankan dengan"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "tak dapat mendapatkan direktori kerja saat ini\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ini adalah fetchmail rilis %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Opsi nodetach sedang berjalan, mengabaikan opsi berkas catatan.\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Tidak berjalan di mode jurik, mengabaikan opsi berkas catatan.\n"
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "Berkas catatan \"%s\" tidak ada, mengabaikan opsi berkas catatan.\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Berkas catatan \"%s\" tidak dapat ditulis, membatalkan.\n"
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
@@ -701,47 +701,47 @@ msgstr ""
 "kedua opsi catatan sistem dan berkas catatan diatur, mengabaikan catatan "
 "sistem, dan mencatat ke %s"
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Mengambil opsi dari baris perintah%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " dan "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Tak ada server surat yang diatur -- mungkin %s hilang?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: tak ada server surat yang telah ditentukan.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: tak ada fetchmail lain yang berjalan\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: galat mematikan %s fetchmail di %ld; membebaskan diri.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "latar belakang"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "latar depan"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail di %ld dimatikan.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -749,7 +749,7 @@ msgstr ""
 "fetchmail: tak dapat memeriksa surat jika fetchmail lain ke host yang sama "
 "juga berjalan.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -758,208 +758,208 @@ msgstr ""
 "fetchmail: tak dapat menghitung host yang ditentukan dengan fetchmail lain "
 "yang berjalan di %ld.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: fetchmail latar depan lain berjalan di %ld.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: tak dapat menerima opsi ketika fetchmail latar belakang "
 "berjalan.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail latar belakang di %ld terbangun.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: saudara tua di %ld mati secara misterius.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: tak dapat menemukan sandi lewat untuk %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Masukkan sandi lewat untuk %s@%s:"
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Tak dapat melepaskan ke latar belakang. Membatalkan.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "memulai jurik fetchmail %s\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "tak dapat membuka %s untuk ditambahkan data\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "Mode --check diaktifkan, tidak mengambil surat\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "tak dapat memeriksa waktu %s (galat %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "memulai ulang fetchmail (%s diubah)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "percobaan untuk menjalankan ulang mungkin akan gagal karena direktori belum "
 "dikembalikan\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "percobaan untuk menjalankan ulang fetchmail gagal\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "jajak pendapat %s dilewati (gagal otentikasi atau terlalu banyak waktu "
 "habis)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval tak tercapai, tidak melemakan %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Status lema=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Status lema=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Status lema=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Status lema=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Status lema=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Status lema=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Status lema=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Status lema=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Status lema=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Status lema=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Status lema=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Status lema=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Status lema=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Status lema=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Status lema=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Semua koneksi tersekat. Keluar.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "tertidur di %s selama %d detik\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "terbangun oleh %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "terbangun oleh sinyal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "terbangun pada %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "penghentian normal, status %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "tak dapat memeriksa waktu di berkas kendali jalan\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Peringatan: banyak penyebutan host %s di berkas pengaturan\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Galat: banyak catatan \"standar\" di berkas pengaturan.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "dukungan SSL tidak dikompilasi.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v4 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v5 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "dukungan GSSAPI dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -967,17 +967,17 @@ msgstr ""
 "fetchmail: peringatan: tak ada DNS tersedia untuk memeriksa pengambilan "
 "multitaruh dari %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "peringatan: multitaruh untuk %s memerlukan opsi amplop!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "peringatan: Jangan tanyakan dukungan jika semua surat melewati tuan pos!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -986,316 +986,316 @@ msgstr ""
 "fetchmail: konfigurasi %s tidak sah, tentukan nomor pangkalan positif untuk "
 "layanan atau pangkalan\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: konfigurasi %s tidak sah, RPOP memerlukan hak akses pangkalan\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s konfigurasi tidak sah, LMTP tak dapat menggunakan pangkalan SMTP standar\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Baik fetchall dan tetap di jurik atau mode siaga adalah kesalahan!\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "dihentikan dengan sinyal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s kueri %s (protokol %s) di %s: jajak pendapat dimulai\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "Dukungan POP2 tidak diatur.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "Dukungan POP3 tidak diatur.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "Dukungan IMAP tidak diatur.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "Dukungan ETRN tidak diatur.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "Dukungan ODMR tidak diatur.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "protokol tak didukung terpilih.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s kueri %s (protokol %s) di %s: jajak pendapat selesai\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval jajak pendapat adalah %d detik\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Berkas catatan adalah %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile adalah %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Pesan proses akan dicatat via catatan sistem\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 "Fetchmail akan menyembunyikan diri dan tak akan menghasilkan Diterima\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail akan menampilkan titik proses bahkan di berkas catatan.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail akan meneruskan pesan multi taruh salah alamat ke %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke tuan pos.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke pengirim.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail akan memperlakukan galat permanen sebagai permanen (taruh pesan).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail akan memperlakukan galat permanen sebagai sementara (simpan "
 "pesan).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opsi untuk menerima dari %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Surat akan diterima via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  Jajak pendapat server ini akan terjadi tiap %d interval.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Nama sebenarnya server adalah %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Host ini tidak akan dikueri bila tak ada host yang ditentukan.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Host ini akan dikueri bila tak ada host yang ditentukan.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Sandi lewat akan diberitahu.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Rahasia APOP = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Sandi lewat = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol adalah KPOP dengan otentikasi %s Kerberos"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol adalah %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (menggunakan layanan %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (menggunakan pangkalan standar)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (memaksa penggunaan UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Semua metode otentikasi yang tersedia akan dicoba.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Otentikasi sandi lewat akan dipaksa.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Otentikasi MSN akan dipaksa.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Otentikasi NTLM akan dipaksa.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Otentikasi OTP akan dipaksa.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Otentikasi CRAM-MD5 akan dipaksa.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Otentikasi GSSAPI akan dipaksa.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V4 akan dipaksa.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V5 akan dipaksa.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Enkripsi akhir-ke-akhir diasumsikan.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinsip layanan surat adalah: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesi terenkripsi SSL diaktifkan.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Pemeriksaan sertifikat server SSL diaktifkan.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Pemeriksaan sertifikat server SSL diaktifkan.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Berkas sertifikat terpercaya SSL: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Direktori sertifikat terpercaya SSL: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  NamaUmum server SSL: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Sidik jari kunci SSL (diperiksa kontra kunci server): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Waktu server tidak merespon adalah %d detik"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (standar).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Kotak surat standar terpilih.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Kotak surat terpilih adalah:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Semua pesan akan diterima (--all hidup).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Hanya pesan baru yang akan diterima (--all mati).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Pesan diterima akan tetap disimpan di server (--keep hidup).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Pesan diterima tidak akan disimpan di server (--keep mati).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Pesan lama akan dihapus sebelum penerimaan pesan (--flush hidup).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Pesan lama tidak akan dihapus sebelum penerimaan pesan (--flush mati).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1303,7 +1303,7 @@ msgstr ""
 "  Pesan terlalu besar akan dihapus sebelum penerimaan pesan (--limitflush "
 "hidup).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1311,337 +1311,337 @@ msgstr ""
 "  Pesan terlalu besar tidak akan dihapus sebelum penerimaan pesan (--"
 "limitflush mati).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Penulisan ulang alamat server lokal diaktifkan (--norewrite padam).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Penulisan ulang alamat lokal dinonaktifkan (--norewrite hidup).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Penanggalan balasan-muatan diaktifkan (stripcr hidup).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Penanggalan balasan-muatan dinonaktifkan (stripcr mati).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Pemaksaan balasan-muatan diaktifkan (forcecr hidup).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Pemaksaan balasan-muatan dinonaktifkan (forcecr mati).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretasi Penyandian-Transfer-Isi dinonaktifkan (pass8bits hidup).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpretasi Penyandian-Transfer-Isi diaktifkan (pass8bits mati).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Pengawasandi MIME diaktifkan (mimedecode hidup).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Pengawasandi MIME dinonaktifkan (mimedecode mati).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Siaga setelah penjajakan diaktifkan (idle hidup).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Siaga setelah penjajakan dinonaktifkan (idle mati).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Baris Status Tidak Kosong akan diabaikan (dropstatus hidup)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Baris Status Tidak Kosong akan dijaga (dropstatus mati)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Baris Terkirim-Ke akan diabaikan (dropdelivered hidup)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Baris Terkirim-Ke akan dijaga (dropdelivered mati)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Batas ukuran pesan adalah %d oktet (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Tak ada batas ukuran pesan (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval peringatan ukuran pesan adalah %d detik (--warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Peringatan ukuran pada setiap penjajakan (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Batas Pesan-diterima adalah %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Batas pesan-diterima kosong (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Batas ukuran pesan yang diambil adalah %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Batas ukuran pesan yang tidak diambil (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Lakukan penelusuran biner UID setiap kali penjajakan (--fastuidl 1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Lakukan penelusuran biner UID selama %d dari %d penjajakan (--fastuidl "
 "%d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Lakukan penelusuran linear UID setiap kali penjajakan (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Batas antrean pesan SMTP adalah %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Tak ada batas antrean pesan SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval penghapusan di antara penghapusan dipaksa ke %d (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Tak ada penghapusan yang dipaksa (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Ranah tempat dimana surat akan diambil adalah:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (standar)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Pesan akan ditambahkan ke %s sebagai BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Pesan akan dikirim dengan \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Pesan akan diteruskan-%cMTP ke:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pangkalan bagian baris SURAT DARI akan menjadi %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Alamat yang akan ditaruh di baris SALN KE dikirim ke SMTP akan menjadi %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Balasan pendengar blok spam yang dikenal adalah:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blok-spam dinonaktifkan\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Koneksi server akan dinyalakan dengan \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Tak ada perintah pra-koneksi.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Koneksi server akan dimatikan dengan \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Tak ada perintah pasca-koneksi.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Tak ada nama lokal yang dideklarasikan untuk pangkalan ini.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-taruh:"
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Mode taruh-tunggal:"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nama lokal dikenal.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Pencarian DNS untuk alamat multitaruh diaktifkan.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Pencarian DNS untuk alamat multitaruh dinonaktifkan.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Alias server akan dibandingkan dengan alamat multitaruh oleh alamat IP.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Alias server akan dibandingkan dengan alamat multitaruh oleh nama.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Pengalihan alamat-amplop dinonaktifkan\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Tajuk amplop diasumsikan sebagai: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Jumlah tajuk amplop yang dilewatkan lebih dari: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Awalan %s akan dihapus dari id pengguna\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Tak ada penanggalan awalan\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias server surat pradeklarasi:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Ranah lokal:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Koneksi harus melalui antarmuka %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Tak ada antarmuka diperlukan yang ditentukan.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Putaran penjajakan akan mengawasi %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Tak ada antarmuka pengawasan yang ditentukan.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Koneksi server akan dibuat via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Tak ada perintah plugin yang ditentukan.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Pendengar koneksi akan dibuat via plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Tak ada perintah plugout yang ditentukan.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Tak ada UID tersimpan dari pangkalan ini.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID tersimpan.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Informasi jejak penjajakan akan ditambahkan ke tajuk Diterima.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Tak ada informasi jejak penjajakan yang akan ditambahkan ke tajuk "
 "Diterima.\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Pesan dengan tajuk rusak akan ditolak.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Pesan dengan tajuk rusak akan diteruskan.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Melewati properti \"%s\".\n"
@@ -1663,90 +1663,90 @@ msgstr ""
 "\n"
 "Menangkap SIGINT... membebaskan diri.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "Galat GSSAPI di gss_display_status dipanggil dari <%s>\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Galat GSSAPI %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Tak mendapatkan nama layanan untuk [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Menggunakan nama layanan [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "Tidak ada kredential GSSAPI. Melewati otentikasi GSSAPI.\n"
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 "jika anda ingin menggunakan GSSAPI, anda memerlukan kredential, kemungkinan "
 "dari kinit.\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Menerima tantangan salah bentuk untuk \"%s GSSAPI\"!\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Mengirim kredensial\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Galat menukar kredential\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Tak dapat membongkar level keamanan data\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Penukaran kredensial selesai\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server memerlukan integritas dan/atau privasi\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Bendera level keamanan terbongkar: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Ukuran token GSS maksmimum adalah %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Galat membuat permintaan level kemanan.\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Membebaskan kredensial GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Galat membebaskan kredensial\n"
 
@@ -1755,131 +1755,127 @@ msgstr "Galat membebaskan kredensial\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread tidur selama %d detik.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "Menerima respon BYE dari server IMAP: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "jumlah pesan palsu di \"%s\"!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "jumlah EXPUNGE palsu di \"%s\"!"
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol teridentifkasi sebagai IMAP rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol teridentifikasi sebagai IMAP rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol teridentifkasi sebagai IMAP2 atau IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "akan siaga setelah penjajakan\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: pemutakhiran ke TLS sukses.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: pemutakhiran ke TLS gagal.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Kemampuan OTP yang diperlukan tidak dikompilasi ke fetchmail\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Kemampuan NTLM yang diperlukan tidak dikompilasi ke fetchmail\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Kemampuan LOGIN yang diperlukan tidak dikompilasi oleh server\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "penghapusan surat tidak cocok (%d sebenarnya != %d diharapkan)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu tak terlihat\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u sekarang tak terlihat\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "penjajakan ulang gagal\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d pesan menunggu setelah penjajakan ulang\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "pemilihan kotak surat gagal\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d pesan menunggu setelah penjajakan pertama\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "penghapusan gagal\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d pesan menunggu setelah penghapusan\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "penelusuran pesan tak terlihat gagal\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u pertama kali tak terlihat\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Peringatan: mengabaikan data palsu untuk ukuran pesan yang dikembalikan oleh "
 "server.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Respon FETCH salah: %s.\n"
@@ -2075,96 +2071,96 @@ msgstr "Opsi --folder tidak didukung dengan ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Opsi --check tidak didukung dengan ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Tak dapat mengawasandi tantangan OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frasa sandi rahasia:"
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Benang '%s' bukan benang nomor yang sah.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Nilai benang '%s' lebih %s dari %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "kecil"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "besar"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Kebijakan tajuk rusak tidak sah `%s' ditentukan.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protokol `%s' tidak sah ditentukan.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Otentikasi `%s' tidak sah ditentukan.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "penggunaan: fetchmail [opsi] [server ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Opsi sebagai berikut:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        tampilkan opsi bantuan ini\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     tampilkan info versi\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       periksa pesan tanpa mengambilnya\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      bekerja diam\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     bekerja berisik (keluaran diagnostik)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      jalankan sebagai jurik sekali per n detik\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    jangan lepaskan proses jurik\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        matikan proses jurik\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     tentukan nama berkas catatan\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2172,43 +2168,43 @@ msgstr ""
 "      --syslog      gunakan syslog(3) untuk mayoritas pesan ketika berjalan "
 "sebagai jurik\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   jangan tulis Diterima & aktifkan tipuan pangkalan\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc tentukan berkas kendali jalan alternatif\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      tentukan berkas UID alternatif\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     tentukan berkas PID (kunci) alternatif\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  tentukan penerima usaha terakhir\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    alihkan pantulan dari pengguna ke tuan pos.\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail menghapus secara permanen pesan yang tak "
 "dapat dikirim.\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2216,72 +2212,72 @@ msgstr ""
 "      --softbounce  simpan secara permanen pesan yang tak dapat dikirim pada "
 "server (standar).\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   antarmuka memerlukan spesifikasi\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor antarmuka untuk aktivitas\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         aktifkan sesi terenkripsi ssl\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      berkas kunci privat ssl\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     sertifikat klien ssl\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   lakukan cek sertifikat server ketat (disarankan)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr "      --sslcertck   lakukan cek sertifikat server ketat (disarankan)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile alamat ke berkas sertifikat ssl terpercaya-CA\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath alamat ke direktori sertifikat ssl terpercaya-CA\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  harapkan NamaUmum ini dari server (tak disarankan)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 "      --sslfingerprint sidik jari harus cocok dengan sertifikat server.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    paksa protokol ssl (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      tentukan perintah eksternal untuk membuka koneksi\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     tentukan perintah eksternal untuk membuka koneksi smtp\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
@@ -2290,157 +2286,157 @@ msgstr ""
 "                    tentukan kebijakan untuk menangani pesan dengan tajuk "
 "rusak\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    tentukan penerimaan protokol (lihat halaman manual)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        paksa penggunaan UIDL (hanya pop3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        pangkalan TCP untuk menghubungkan diri (kadaluwarsa, "
 "gunakan --service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     layanan TCP untuk menghubungkn diri (dapat berupa "
 "pangkalan TCP numerik)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr "      --auth        tipe otentikasi (sandi/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     waktu server tidak merespon\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    tajuk alamat amplop\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    awalan untuk dihapus dari id pengguna lokal\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   prinsipan layanan surat\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  tambahkan informasi pelacakan penjajakan ke tajuk "
 "Diterima\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    tentukan log masuk pengguna di server\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  terima pesan lama dan baru\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      hapus pesan baru setelah penerimaan\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        simpan pesan baru setelah penerimaan\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       hapus pesan lama dari server\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  hapus pesan kelebihan ukuran\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   jangan tulis ulang alamat tajuk\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       jangan ambil pesan yang lebih besar dari yang "
 "ditentukan\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval antara notifikasi peringatan surat\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    atur host penerusan SMTP\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ambil surat dari ranah yang telah ditentukan\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress atur ranah pengiriman SMTP yang digunakan\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    atur nama lengkap SMTP namapengguna@ranah\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   atur nilai respon antispam\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  atur batas batch untuk koneksi SMTP\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  atur batas ambil untuk koneksi server\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit atur batas ukuran pesan yang diambil\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    lakukan penelusuran biner untuk UIDL\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     atur penghapusan maksimal di antara penghapusan\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         atur MDA yang digunakan untuk penerusan\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       atur keluaran berkas BSMTP\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        gunakan LMTP (RFC2033) untuk pengiriman\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      tentukan nama folder jarak jauh\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    tampilkan titik proses bahkan di berkas catatan\n"
 
@@ -2452,99 +2448,99 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr ""
 "Peringatan: \"Maillennium POP3\" ditemukan, gunakan perintah RETR ketimbang "
 "TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS merupakan keharusan untuk sesi ini, tapi server menolak perintah CAPA.\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Perintah CAPA diperlukan untuk TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Kami kehabisan otentikator yang diizinkan dan tak dapat melanjutkan.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Stempel waktu APOP yang diperlukan tak ditemukan dalam perkenalan\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Galat sintaks stempel waktu dalam perkenalan\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Stempel waktu APOP tidak sah.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Permintaan protokol tak didefinisikan di POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "kunci sibuk! Apakah sesi lain aktif?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Tak dapat menangani repson UIDL dari server upstream.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server menjawab dengan UID untuk pesan salah.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) dihapus, tapi masih ada!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Pesan dimasukkan dalam senarai pada server. Tak dapat menangani ini.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "galat protokol\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "galat protokol ketika mengambil UIDL\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) dihapus, tapi masih ada!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opsi --folder tidak didukung dengan POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "opsi server setelah opsi pengguna"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS tak diaktfikan."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2552,33 +2548,33 @@ msgstr ""
 "fetchmail: opsi antarmuka hanya didukung oleh Linux (tanpa IPv6) dan "
 "FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 "fetchmail: opsi monitor hanya didukung oleh Linux (tanpa IPv6) dan FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL tidak diaktifkan"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "akhir masukan"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Berkas %s harus berkas reguler.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 "Berkas %s harus memiliki hak akses tidak kurang dari -rwx------ (0700).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Berkas %s harus dimiliki oleh anda.\n"
@@ -2806,104 +2802,108 @@ msgstr "SMTP: (tubuh pesan-pantul)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "pesan dari %s dipantulkan ke %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Galat tersimpan masih %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Galat %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Server SMTP memerlukan STARTTLS, menyimpan pesan.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Buka berkas BSMTP gagal: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Penulisan preambul BSMTP gagal: %s.\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Pendengar %cMTP tidak menyukai alamat penerima `%s'\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Pendengar %cMTP sangat tidak menyukai alamat penerima `%s'\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "tak ada alamat yang cocok; tak ada tuan pos yang diatur.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "bahkan tak dapat mengirim ke %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "tak ada kecocokan alamat; meneruskan ke %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "akan mengantarkan dengan: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Tak dapat mengganti id pengguna efektif ke %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr "Tak dapat mengganti id pengguna efektif kembali ke %ld asli: %s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Buka MDA gagal\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Sambungan %cMTP ke %s gagal\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "tak dapat menaikkan pendengar; mengembalikan ke %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Penghapusan pesan atau penutupan berkas BSMTP gagal: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Galat menulis ke MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA mati karena sinyal %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA mengembalikan status tidak nol %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2911,21 +2911,21 @@ msgstr ""
 "Aneh: MDA pclose mengembalikan %d dan errno %d/%s, tak dapat menangani di %s:"
 "%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "Pendengar SMTP menolak kiriman.\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "Galat kiriman LMTP pada akhir pesan\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 "Balasan bukan-503 yang tidak diharapkan terhadap akhir pesan LMTP: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -2961,80 +2961,80 @@ msgstr "Otentikasi ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "galat protokol pendengar smtp\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc gagal\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair gagal\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork gagal\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 gagal\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "menjalankan %s (host %s layanan %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) gagal\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") galat: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Coba menambah opsi --service (lihat juga item PSD R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "tak diketahui (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Coba menyambung ke %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "tak dapat membuat soket: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "nama %d: tak dapat membuat keluarga soket %d tipe %d: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "koneksi gagal.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "koneksi ke %s:%s [%s/%s] gagal: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "nama %d: koneksi ke %s:%s [%s/%s] gagal: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "tersambung.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3043,136 +3043,136 @@ msgstr ""
 "Galat koneksi untuk polling ini:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL melaporkan: %s\n"
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Sertifikat server:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "Rantai sertifikat, dari root ke peer, mulai di kedalaman %d:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Sertifikat di kedalaman %d:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organisasi Penerbit: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Peringatan: Nama Organisasi Penerbit terlalu panjang (kemungkinan "
 "terpotong).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Organisasi Tak Diketahui\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "NamaUmum Penerbit: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Peringatan: NamaUmum Penerbit terlalu panjang (kemungkinan terpotong).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "NamaUmum Penerbit Tak Diketahui\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "NamaUmum Subjek: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Sertifikat buruk: NamaUmum Subjek terlalu panjang!\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Sertifikat buruk: NamaUmum Subjek berisi NUL, membatalkan!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nama Alternatif Subjek: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Sertifikat buruk: Nama Alternatif Subjek berisi NUL, membatalkan!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "NamaUmum Server tidak cocok: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Nama server tak diatur, tak dapat memverifikasi sertifikat!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "NamaUmum Server Tak Diketahui\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Nama server tak ditentukan di sertifikat!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() gagal!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Kehabisan memori!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Penyangga teks digest terlalu kecil!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s kunci sidik jari: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s sidik jari cocok.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s sidik jari tidak cocok!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Galat verifikasi sertifikat server: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Rantai sertifikasi rusak di: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3183,12 +3183,12 @@ msgstr ""
 "luar kuasa fetchmail. Untuk detail, silakan lihat dokumen README.SSL-SERVER "
 "yang disertakan dalam fetchmail.\n"
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Sertifikat jangkar terpercaya hilang: %s\n"
 
-#: socket.c:834
+#: socket.c:839
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
 "CA certificate location, or that c_rehash needs to be run on the certificate "
@@ -3200,95 +3200,95 @@ msgstr ""
 "direktori sertifikat. Untuk detail, silakan lihat dokumentasi --sslcertpath "
 "dan --sslcertfile di halaman manual.\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 #, fuzzy
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr ""
 "Protokol SSL tidak sah '%s' ditentukan, menggunakan standar (SSLv23).\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Penjelas berkas di luar jangkauan untuk SSL."
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikasi sertifikat/sidik jari entah bagaimana terlewatkan!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
@@ -3296,11 +3296,11 @@ msgstr ""
 "Peringatan: koneksi tidak aman, tetap melanjutkan (Lebih baik gunakan --"
 "sslcertck!)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Coba ulang baca soket Cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Coba ulang baca soket Cygwin gagal!\n"
 
@@ -3358,61 +3358,61 @@ msgstr ""
 msgid "line: %s"
 msgstr "baris: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Mengurai amplop \"%s\" nama \"%-.*s\"\n"
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Mengurai nama Diterima \"%-.*s\"\n"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Tidak ada penerima amplop ditemukan, mengalihkan ke menebak tajuk.\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Menebak dari tajuk \"%-.*s\".\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "tak ada lokal yang cocok, meneruskan ke %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "meneruskan dan menghapus ditekan karena galat DNS\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "menulis RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "alamat penerima %s tidak cocok dengan nama lokal apapun"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "pesan memiliki NUL tertanam"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Pendengar SMTP menolak alamat penerima lokal: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "galat menulis teks pesan\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr "Penyangga terlalu kecil. Ini adalah kutu di pemanggil %s:%lu.\n"
@@ -3449,36 +3449,36 @@ msgstr "tidak menukar senarai UID, tak ada UID yang terlihat di lema ini\n"
 msgid "discarding new UID list\n"
 msgstr "mengabaikan senarai UID baru\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Menghapus berkas fetchids.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Galat menghapus %s:%s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Menulis berkas fetchids.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Menulis galat di berkas fetchids %s: %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 "Galat menulis ke berkas fetchids %s, berkas lama tertinggal di tempat.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Tak dapat menamai ulang berkas fetchids %s ke %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Tak dapat membuka berkas fetchids %s untuk penulisan: %s\n"
@@ -3491,6 +3491,12 @@ msgstr "malloc gagal\n"
 msgid "realloc failed\n"
 msgstr "realloc gagal\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Kemampuan LOGIN yang diperlukan tidak dikompilasi oleh server\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Galat tersimpan masih %d\n"
+
 #~ msgid "swapping UID lists\n"
 #~ msgstr "menukar senarai UID\n"
 
diff --git a/po/it.po b/po/it.po
index 9337330e..a975d9a6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.19-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2010-12-06 20:51+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,6 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: checkalias.c:174
@@ -395,7 +396,7 @@ msgstr "selezione o reinterrogazione della cartella predefinita in corso\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s in %s (cartella %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s in %s"
@@ -697,84 +698,84 @@ msgstr "ATTENZIONE: l'esecuzione come root è fortemente sconsigliata.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocato con"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "impossibile ottenere la directory di lavoro attuale\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Questo è Fetchmail rilascio %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Ottenimento delle opzioni dalla riga di comando %s%s in corso\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " e "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Nessuna impostazione dei server di posta. Probabilmente questo è dovuto a %s "
 "mancante.\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nessun server di posta specificato.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nessun'altra istanza di Fetchmail in esecuzione\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr ""
 "fetchmail: errore in fase di arresto forzato di %s Fetchmail su %ld; uscita "
 "in corso.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "in secondo piano"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "in primo piano"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s Fetchmail su %ld arrestato forzatamente.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -782,7 +783,7 @@ msgstr ""
 "fetchmail: impossibile controllare la posta mentre un'altra istanza di "
 "Fetchmail è in esecuzione sul medesimo host.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -791,213 +792,213 @@ msgstr ""
 "fetchmail: impossibile interrogare gli host specificati mentre un'altra "
 "istanza di Fetchmail è in esecuzione su %ld.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr ""
 "fetchmail: un'altra istanza di Fetchmail è in esecuzione in primo piano su "
 "%ld.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: impossibile accettare opzioni mentre un'istanza di Fetchmail è in "
 "esecuzione in secondo piano.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: Fetchmail in secondo piano ridestato su %ld.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: il fratello maggiore su %ld è morto misteriosamente.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: impossibile trovare una password per %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Inserire la password per %s@%s:"
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr ""
 "fetchmail: impossibile portare in secondo piano. Annullamento in corso.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "avvio del demone di Fetchmail %s in corso \n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "impossibile aprire %s per aggiungervi messaggi di registro \n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "Modalità «--check» attivata, nessun recupero di posta in corso\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "impossibile temporizzare %s (errore %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "riavvio in corso (%s modificato)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "il tentativo di nuova esecuzione potrebbe fallire, poiché la directory non è "
 "stata ripristinata\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "tentativo di nuova esecuzione fallito\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "interrogazione di %s omessa (autenticazione fallita o troppe situazioni di "
 "tempo scaduto)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervallo non raggiunto, nessuna interrogazione di %s in corso\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stato dell'interrogazione = 0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stato dell'interrogazione = 1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stato dell'interrogazione = 2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stato dell'interrogazione = 3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stato dell'interrogazione = 4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stato dell'interrogazione = 5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stato dell'interrogazione = 6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stato dell'interrogazione = 7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stato dell'interrogazione = 8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stato dell'interrogazione = 9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stato dell'interrogazione = 10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Stato dell'interrogazione = 11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stato dell'interrogazione = 12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stato dell'interrogazione = 13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stato dell'interrogazione = %d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tutte le connessioni sono incastrate. Uscita in corso.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "pausa su %s per %d secondi\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "ridestato da %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "ridestato dal segnale %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "ridestato su %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "interruzione normale, stato %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "impossibile temporizzare il file di controllo di esecuzione\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Attenzione: l'host %s è menzionato più volte nel file di configurazione\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: errore: molteplici record «defaults» nel file di configurazione.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "Il supporto per SSL non è compilato.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Il supporto per KERBEROS V4 è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Il supporto per KERBEROS V5 è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Il supporto per GSSAPI è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -1005,17 +1006,17 @@ msgstr ""
 "fetchmail: avviso: nessun DNS disponibile per controllare recuperi "
 "«multidrop» da %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "avviso: «multidrop» per %s richiede l'opzione «envelope».\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "avviso: non richiedere supporto se tutte le mail vanno al postmaster.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1024,135 +1025,135 @@ msgstr ""
 "fetchmail: la configurazione %s non è valida, specificare un numero di porta "
 "positivo per il servizio o la porta\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: la configurazione %s non è valida, RPOP richiede una porta "
 "privilegiata\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "La configurazione %s non è valida, LMTP non può usare la porta SMTP "
 "predefinita\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "«fetchall» e «keep on» contemporaneamente nel demone o in modalità inattiva "
 "costituiscono un errore.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminato con segnale %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogazione di %s (protocollo %s) su %s: iniziata\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "Il supporto a POP2 non è configurato.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "Il supporto a POP3 non è configurato.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "Il supporto a IMAP non è configurato.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "Il supporto a ETRN non è configurato.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "Il supporto a ODMR non è configurato.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "selezionato un protocollo non supportato.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogazione di %s (protocollo %s) su %s: completata\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervallo d'interrogazione è %d secondi\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Il file di registro è %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Il file di identificazione è %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr ""
 "I messaggi di avanzamento saranno registrati tramite il registro di sistema\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail si maschererà e non genererà «Received»\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "I puntini di avanzamento saranno mostrati anche nei file di registro.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Tutti i messaggi «multidrop» male indirizzati saranno inoltrati a %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Le mail di errore saranno indirizzate al postmaster.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Le mail di errore saranno indirizzate al mittente.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail tratterà gli errori permanenti come permanenti (scarta messaggi).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail tratterà gli errori permanenti come temporanei (mantieni "
 "messaggi).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opzioni per il recupero da %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le mail saranno recuperate via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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"
@@ -1161,195 +1162,195 @@ msgstr[0] ""
 msgstr[1] ""
 "  L'interrogazione di questo server sarà effettuata ogni %d intervalli.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Il vero nome del server è %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Questo host non verrà interrogato quando nessuno host è specificato.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Questo host verrà interrogato quando nessuno host è specificato.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  La password verrà richiesta.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  segreto APOP = «%s».\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  identità RPOP = «%s».\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = «%s».\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Il protocollo è KPOP con autenticazione Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Il protocollo è %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (con uso del servizio %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (con uso della porta predefinita)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (forzando l'uso di UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Tutti i metodi di autenticazione disponibili saranno provati.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  L'autenticazione password sarà forzata.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  L'autenticazione MSN sarà forzata.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  L'autenticazione NTLM sarà forzata.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  L'autenticazione OTP sarà forzata.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  L'autenticazione CRAM-MD5 sarà forzata.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  L'autenticazione GSSAPI sarà forzata.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  L'autenticazione Kerberos V4 sarà forzata.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  L'autenticazione Kerberos V5 sarà forzata.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Cifratura fra le due estremità presunta.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Il principal del server di posta è: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessione cifrata SSL abilitata.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocollo SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Controllo del certificato del server SSL abilitato.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Controllo del certificato del server SSL abilitato.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  File del certificato SSL fidato: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directory dei certificati SSL fidati: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  NomeComune del server SSL: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Impronta digitale SSL (controllata con il server delle chiavi): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Il limite di tempo per mancata risposta del server è %d secondi"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (predefinito).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Selezionata la casella di posta predefinita.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Le caselle di posta selezionate sono:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tutti i messaggi verranno recuperati («--all» abilitato).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Verranno scaricati solo i nuovi messaggi («--all» disabilitato).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr ""
 "  I messaggi recuperati verranno mantenuti sul server («--keep» abilitato).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  I messaggi recuperati non verranno mantenuti sul server («--keep» "
 "disabilitato).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  I vecchi messaggi verranno cancellati prima dello scaricamento dei "
 "messaggi («--flush» abilitato).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  I vecchi messaggi non verranno cancellati prima dello scaricamento dei "
 "messaggi («--flush» disabilitato).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1357,7 +1358,7 @@ msgstr ""
 "  I messaggi sovradimensionati verranno cancellati prima dello scaricamento "
 "dei messaggi («--limitflush» abilitato).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1365,377 +1366,377 @@ msgstr ""
 "  I messaggi sovradimensionati non verranno cancellati prima dello "
 "scaricamento dei messaggi («--limitflush» disabilitato).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La riscrittura degli indirizzi del server locale è abilitata («--"
 "norewrite» disabilitato).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La riscrittura degli indirizzi del server locale è disabilitata («--"
 "norewrite» abilitato).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La rimozione dei ritorni a capo è abilitata («stripcr» abilitato).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 "  La rimozione dei ritorni a capo è disabilitata («stripcr» disabilitato).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  La forzatura dei ritorni a capo è abilitata («forcecr» abilitato).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 "  La forzatura dei ritorni a capo è disabilitata («forcecr» disabilitato).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interpretazione di «Content-Transfer-Econding» è disabilitata "
 "(«pass8bits» abilitato).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interpretazione di «Content-Transfer-Encoding» è abilitata («pass8bits» "
 "disabilitato).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodifica MIME è abilitata («mimedecode» abilitato).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodifica MIME è disabilitata («mimedecode» disabilitato).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr ""
 "  La modalità inattiva dopo lo scaricamento è abilitata («idle» abilitato).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr ""
 "  La modalità inattiva dopo lo scaricamento è disabilitata («idle» "
 "disabilitato).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Le righe di stato non vuote verranno scartate («dropstatus» abilitato)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Le righe di stato non vuote verranno mantenute («dropstatus» "
 "disabilitato)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  Le righe «Delivered-To» verranno scartate («dropdelivered» abilitato)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  Le righe «Delivered-To» verranno mantenute («dropdelivered» disabilitato)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr ""
 "  Il limite della dimensione dei messaggi è %d ottetti («--limit %d»).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nessun limite della dimensione dei messaggi («--limit 0»).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  L'intervallo fra avvisi relativi alla dimensione dei messaggi è %d secondi "
 "(«--warnings %d»).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Gli avvisi relativi alla dimensione dei messaggi verranno mostrati ad ogni "
 "interrogazione («--warnings 0»).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Il limite dei messaggi ricevuti è %d («--fetchlimit %d»).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nessun limite dei messaggi ricevuti («--fetchlimit 0»).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Il limite della dimensione dei messaggi da scaricare è %d («--"
 "fetchsizelimit %d»).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 "  Nessun limite della dimensione dei messaggi da scaricare («--"
 "fetchsizelimit 0»).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Effettuare una ricerca binaria degli UID durante ogni interrogazione («--"
 "fastuidl 1»).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Effettuare una ricerca binaria degli UID durante %d di %d interrogazioni "
 "(«--fastuidl %d»).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Effettuare una ricerca binaria degli UID durante ogni interrogazione («--"
 "fastuidl 0»).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Il limite della serie di messaggi SMTP è %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nessun limite della serie di messaggi SMTP («--batchlimit 0»).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  L'intervallo di cancellazione fra ripuliture è forzato a %d («--expunge "
 "%d»).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nessuna ripulitura forzata («--expunge 0»).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  I domini per i quali le mail vengono scaricate sono:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (predefinito)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  I messaggi verranno aggiunti a %s come BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  I messaggi verranno consegnati con «%s».\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  I messaggi verranno inoltrati tramite %cMTP a:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  La parte host della riga «MAIL FROM» sarà %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  L'indirizzo da inserire nelle righe «RCPT TO» inviate a SMTP sarà %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 "  Gli ascoltatori delle risposte di blocco della posta indesiderata "
 "riconosciuti sono:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blocco della posta indesiderata disabilitato\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connessione al server verrà aperta con «%s».\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Nessun comando pre-connessione.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connessione al server verrà chiusa con «%s».\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Nessun comando post-connessione.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nessun nome locale dichiarato per questo host.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Modalità multi-drop: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Modalità single-drop: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome locale riconosciuto.\n"
 msgstr[1] "%d nomi locali riconosciuti.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La ricerca DNS per indirizzi multidrop è abilitata.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La ricerca DNS per indirizzi multidrop è disabilitata.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Gli alias del server verranno confrontati per indirizzo IP con gli "
 "indirizzi multidrop.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Gli alias del server verranno confrontati per nome con gli indirizzi "
 "multidrop.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'instradamento «envelope-address» è disabilitato\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'intestazione della busta è presunta essere: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numero di intestazioni delle buste da tralasciare: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Il prefisso %s sarà rimosso dall'ID utente\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Nessuna rimozione di prefissi\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predichiarati del server di posta:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Domini locali:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connessione deve avvenire attraverso l'interfaccia %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Nessun requisito specificato per l'interfaccia.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Il ciclo di interrogazione monitorerà %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Nessuna interfaccia di monitoraggio specificata.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Le connessioni al server verranno effettuate tramite il plugin %s («--"
 "plugin %s»).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Nessun comando di plugin specificato.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Le connessioni all'ascoltatore verranno effettuate tramite il plugout %s "
 "(«--plugout %s»).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Nessun comando di plugout specificato.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nessun UID salvato da questo host.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID salvati.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Le informazioni di tracciamento dell'interrogazione verranno aggiunte "
 "all'intestazione «Received».\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Nessuna informazione di tracciamento dell'interrogazione verrà aggiunta "
 "all'intestazione «Received».\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  I messaggi con un'intestazione non valida verranno respinti.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  I messaggi con un'intestazione non valida verranno passati.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Proprietà pass-through «%s».\n"
@@ -1757,92 +1758,92 @@ msgstr ""
 "\n"
 "Intercettato SIGINT, uscita in corso.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "Errore GSSAPI in gss_display_status chiamato da «%s»\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Errore GSSAPI %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Impossibile trovare il nome del servizio per [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Con uso del nome del servizio [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 "Non è stata trovata alcuna credenziale GSSAPI adatta. L'autenticazione "
 "GSSAPI viene omessa.\n"
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 "Se di desidera utilizzare le GSSAPI è necessario possedere anzitutto le "
 "credenziali, se possibile da kinit.\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Ricevuta prova malformata a «%s GSSAPI».\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Invio delle credenziali in corso\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Errore in fase di scambio delle credenziali\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Impossibile aprire i dati del livello di sicurezza\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Scambio di credenziali completato\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Il server richiede l'integrità, la riservatezza o entrambe\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Contrassegni del livello di sicurezza aperti: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "La dimensione massima del gettone GSS è %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Errore durante la creazione della richiesta del livello di sicurezza\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Rilascio delle credenziali GSS in corso\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Errore in fase di rilascio delle credenziali\n"
 
@@ -1851,137 +1852,133 @@ msgstr "Errore in fase di rilascio delle credenziali\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: processo in pausa per %d secondi.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "Ricevuta risposta BYE dal server IMAP: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "conteggio di messaggi errato in %s."
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "conteggio di EXPUNGE errato in %s."
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocollo identificato come IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocollo identificato come IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocollo identificato come IMAP2 o IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "Entrata in inattività dopo l'interrogazione\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: aggiornamento a TLS effettuato con successo.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: aggiornamento a TLS fallito.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
 "corso\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacità OTP richiesta non è compilata nel programma\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacità NTLM richiesta non è compilata nel programma\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "La capacità LOGIN richiesta non è supportata dal server\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu non è stato visto\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u non è stato visto\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "re-interrogazione fallita\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d messaggio in attesa dopo la re-interrogazione\n"
 msgstr[1] "%d messaggi in attesa dopo la re-interrogazione\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "selezione della casella di posta fallita\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d messaggio in attesa dopo la prima interrogazione\n"
 msgstr[1] "%d messaggi in attesa dopo la prima interrogazione\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "ripulitura fallita\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d messaggio in attesa dopo la ripulitura\n"
 msgstr[1] "%d messaggi in attesa dopo la ripulitura\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "ricerca di messaggi non visti fallita\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u è il primo non visto\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Avviso: i dati fasulli per le dimensioni dei messaggi restituiti dal server "
 "vengono ignorati.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Risposta FETCH non corretta: %s.\n"
@@ -2179,96 +2176,96 @@ msgstr "L'opzione «--folder» non è supportata con ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "L'opzione «--check» non è supportata con ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "server recv fatale\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossibile decodificare la prova OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Passphrase segreta: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La stringa «%s» non è una stringa numerica valida.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Il valore della stringa «%s» è %s piuttosto che %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "più piccolo"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "più grande"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Specificata politica «%s» relativa alle intestazioni non valide.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocollo specificato «%s» non valido.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Autenticazione specificata «%s» non valida.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Uso: fetchmail [opzioni] [server...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Le opzioni sono come segue:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help       mostra questa opzione di aiuto\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version    mostra le informazioni sulla versione\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check      controlla nuovi messaggi senza scaricarli\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent     lavora in modalità silenziosa\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose    lavora in modalità prolissa (output diagnostico)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon     esegui come demone una volta ogni n secondi\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach   non staccare il processo demone\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit       termina forzatamente il processo demone\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile    specifica il nome del file di registro\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2276,49 +2273,49 @@ msgstr ""
 "      --syslog          usa syslog(3) per la maggior parte dei messaggi "
 "durante l'esecuzione come demone\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible       non scrivere «Received» e abilita lo spoofing "
 "dell'host\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc     specifica un file di controllo dell'esecuzione "
 "alternativo\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile          specifica un file UID alternativo\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile         specifica un file PID (blocco) alternativo\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 "      --postmaster      specifica il ricevente che funge da ultima istanza\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce        reindirizza le mail rifiutate dall'utente al "
 "postmaster.\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail elimina i messaggi non recapitabili in modo "
 "permanente.\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2326,58 +2323,58 @@ msgstr ""
 "      --softbounce  mantiene sul server in modo permanente i messaggi non "
 "recapitabili (predefinito).\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface     specifica richiesta d'interfaccia\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor       monitora l'interfaccia per attività\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl             abilita le sessioni cifrate SSL\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey          file di chiave privata SSL\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert         certificato client SSL\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck       effettua un rigoroso controllo del certificato del "
 "server (raccomandato)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr ""
 "      --sslcertck       effettua un rigoroso controllo del certificato del "
 "server (raccomandato)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr ""
 "      --sslcertfile     percorso del file del certificato CA SSL fidato\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr ""
 "      --sslcertpath     percorso della directory del certificato CA SSL "
 "fidato\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname   si aspetta questo nome comune dal server "
 "(assolutamente sconsigliato)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2385,24 +2382,24 @@ msgstr ""
 "      --sslfingerprint  impronta digitale che deve coincidere con quella del "
 "certificato del server.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto        forza il protocollo SSL (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin          specifica il comando esterno per aprire la "
 "connessione\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout         specifica il comando esterno per aprire la "
 "connessione SMTP\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
@@ -2411,167 +2408,167 @@ msgstr ""
 "                    specificare la politica per il trattamento di messaggi "
 "con intestazione non valida\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    specifica il protocollo di scaricamento (vedere pagina "
 "man)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forza l'uso di UIDL (solo per POP3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port            porta TCP alla quale collegarsi (obsoleto, usare «--"
 "service» in sostituzione)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     servizio TCP al quale collegarsi (può essere una porta "
 "TCP numerica)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr ""
 "      --auth            tipo di autenticazione (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tempo massimo per mancata risposta del server\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    intestazione dell'indirizzo nella busta\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefisso da rimuovere dall'ID dell'utente locale\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal       principal del server di posta\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls      aggiunge le informazioni di tracciamento "
 "dell'interrogazione all'intestazione «Received»\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    specifica il login dell'utente sul server\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  scarica sia i vecchi che i nuovi messaggi\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      elimina i nuovi messaggi dopo lo scaricamento\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        conserva i nuovi messaggi dopo lo scaricamento\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       elimina i vecchi messaggi dal server\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush      elimina i messaggi sovradimensionati\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   non riscrivere gli indirizzi dell'intestazione\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       non scaricare i messaggi al di sopra della dimensione "
 "data\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    intervallo fra le notifiche degli avvisi di posta\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    imposta l'host di inoltro SMTP\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains    scarica la posta per i domini specificati\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress imposta il dominio di consegna SMTP da usare\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname        imposta il nome completo SMTP nomeutente@dominio\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    imposta i valori della risposta antispam\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  imposta il limite batch per connessioni SMTP\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  imposta il limite di scaricamento per connessioni a "
 "server\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchsizelimit  imposta il limite delle dimensioni dei messaggi da "
 "scaricare\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl        effettua una ricerca binaria degli UIDL\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     imposta il numero massimo di cancellazioni fra "
 "ripuliture\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         imposta l'MDA da usare per l'inoltro\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp           imposta il file di output BSMTP\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp            usa LMTP (RFC2033) per la consegna\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specifica il nome della cartella remota\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots        mostra i puntini di avanziamento anche nei file di "
@@ -2585,7 +2582,7 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 #, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
@@ -2593,100 +2590,100 @@ msgstr ""
 "Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, "
 "anziché di TOP, in corso.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS è obbligatorio per questa sessione, ma il server rifiuta il comando "
 "CAPA.\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Il comando CAPA è comunque necessario per TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
 "corso.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 "Data e ora APOP sono richieste, ma non sono state trovate nel messaggio di "
 "benvenuto\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Errore di sintassi di data e ora nel messaggio di benvenuto\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Data e ora APOP non valide.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Richiesto un protocollo non definito in POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Il blocco è occupato. Controllare se un'altra sessione è attiva.\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Impossibile gestire la risposta UIDL dal server upstream.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Il server ha risposto con UID per messaggio errato.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) è stato eliminato, ma è sempre presente.\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Messaggi inseriti nell'elenco sul server. Impossibile gestire questa "
 "situazione.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "errore di protocollo\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "errore di protocollo durante lo scaricamento degli UIDL\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) è stato eliminato, ma è sempre presente.\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opzione «--folder» non è supportata con POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "opzione del server dopo le opzioni dell'utente"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS non abilitato."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2694,7 +2691,7 @@ msgstr ""
 "fetchmail: l'opzione di interfaccia è supportata solo in Linux (senza IPv6) "
 "e FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2702,25 +2699,25 @@ msgstr ""
 "fetchmail: l'opzione di monitoraggio è supportata solo in Linux (senza IPv6) "
 "e FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL non è abilitato"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "fine dell'input"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Il file «%s» deve essere un file normale.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Il file «%s» deve avere non più dei permessi «-rwx------ (0700)».\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Il proprietario del file «%s» deve essere l'utente attuale.\n"
@@ -2949,108 +2946,112 @@ msgstr "SMTP: (corpo del messaggio respinto)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "posta da %s respinta a %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "L'errore salvato è ancora %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Errore %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Il server SMTP richiede STARTTLS, il messaggio viene mantenuto.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Apertura del file BSMTP fallita: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Scrittura del preambolo BSMTP fallita: %s.\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "L'ascoltatore %cMTP non gradisce l'indirizzo di destinatario «%s»\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "L'ascoltatore %cMTP non gradisce assolutamente l'indirizzo di destinatario "
 "«%s»\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 "nessun indirizzo corrispondente; nessun postmaster è stato impostato.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "impossibile anche inviare a %s.\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "nessun indirizzo corrispondente, inoltro a %s in corso.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "in procinto di consegnare con: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Impossibile modificare l'id dell'utente effettivo in %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 "Impossibile riportare l'id dell'utente effettivo all'originale %ld: %s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Apertura di MDA fallita\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Connessione di %cMTP a %s fallita\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "impossibile raggiungere l'ascoltatore, ritorno su %s in corso"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Terminazione del messaggio o chiusura del file BSTMP fallita: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Errore durante la scrittura su MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA terminato da segnale %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ha ritornato uno stato %d diverso da zero\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -3058,20 +3059,20 @@ msgstr ""
 "Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile "
 "trattare a %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "L'ascoltatore SMTP ha rifiutato la consegna\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "Errore di consegna LMTP su EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Risposta differente da 503 inattesa a LTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -3107,82 +3108,82 @@ msgstr "Autenticazione ESMTP LOGIN in corso\n"
 msgid "smtp listener protocol error\n"
 msgstr "errore di protocollo dell'ascoltatore SMTP\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc fallita\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair fallita\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork fallita\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 fallita\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "esecuzione di %s (host %s servizio %s) in corso\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) fallita\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") errore: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 "Provare ad aggiungere l'opzione «--service» (vedere anche le FAQ, paragrafo "
 "R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "sconosciuto (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Tentativo di connessione a %s/%s in corso"
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "nome %d: impossibile creare la famiglia di socket %d di tipo %d: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "connessione fallita.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connessione a %s:%s [%s/%s] fallita: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "nome %d: connessione a %s:%s [%s/%s] fallita: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "connesso.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3191,142 +3192,142 @@ msgstr ""
 "Errori di connessione per questa interrogazione:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Certificato del server:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 "Catena del certificato, dalla radice al nodo, che inizia in profondità %d:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certificato in profondità %d:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizzazione emittente: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Attenzione: nome dell'organizzazione emittente troppo lungo (possibile "
 "troncatura).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Organizzazione sconosciuta\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nome comune dell'emittente: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Attenzione: nome comune dell'emittente troppo lungo (possibile troncatura).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nome comune dell'emittente sconosciuto\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Nome comune dell'oggetto: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificato non valido: il nome comune del «Subject» è troppo lungo.\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 "Certificato non valido: il nome comune del «Subject» contiene NUL, "
 "interruzione in corso.\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nome alternativo del «Subject»: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 "Certificato non valido: il nome alternativo del «Subject» contiene NUL, "
 "interruzione in corso.\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Errore di corrispondenza del nome comune del server: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "Nome del server non impostato, impossibile verificare il certificato.\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Nome comune del server sconosciuto\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Nome del server non specificato nel certificato.\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() fallito.\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Memoria esaurita.\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Buffer del testo digest troppo piccolo.\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Chiave %s impronta digitale: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Impronte digitali %s corrispondenti.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Impronte digitali %s non corrispondenti.\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Errore di verifica del certificato del server: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Errore di verifica del certificato del server: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 #, fuzzy
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
@@ -3339,12 +3340,12 @@ msgstr ""
 "maggiori dettagli leggere il documento «README.SSL-SERVER» che è fornito con "
 "fetchmail.\n"
 
-#: socket.c:831
+#: socket.c:836
 #, fuzzy, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "  File del certificato SSL fidato: %s\n"
 
-#: socket.c:834
+#: socket.c:839
 #, fuzzy
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
@@ -3357,92 +3358,92 @@ msgstr ""
 "eseguito sulla directory del certificato. Per maggiori dettagli consultare "
 "le pagine man a proposito di --sslcertpath e di --sslcertfile.\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr ""
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr ""
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr ""
 "Specificato un protocollo SSL «%s» non valido, utilizzo di quello "
 "predefinito (SSLv23) in corso.\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Descrittore del file fuori tolleranza per SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifica del certificato o dell'impronta digitale ignorata.\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
@@ -3450,11 +3451,11 @@ msgstr ""
 "Attenzione: si continua malgrado la connessione non sia sicura (si "
 "raccomanda l'utilizzo di --sslcertck)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Nuovo tentativo di lettura del socket Cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Lettura del socket Cygwin fallita.\n"
 
@@ -3512,61 +3513,61 @@ msgstr ""
 msgid "line: %s"
 msgstr "riga: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Analisi della busta «%s» nomi «%- *s» in corso\n"
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Analisi dei nomi di Received «%- *s» in corso\n"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 "Non è stato trovato alcun destinatario, ritorno all'intestazione in corso.\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Tentativo in corso di indovinare dall'intestazione «%- *s».\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "nessuna corrispondenza locale, inoltro a %s in corso\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "inoltro e cancellazione soppressi a causa di errori DNS\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "scrittura di intestazioni msgblk RFC822 in corso\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "nessun indirizzo di destinatario corrisponde ai nomi locali dichiarati"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'indirizzo del destinatario %s non corrisponde ad alcun nome locale"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "il messaggio incorpora dei NUL"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "L'ascoltatore SMTP ha rifiutato gli indirizzi dei destinatari locali: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "errore durante la scrittura del testo del messaggio\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3605,37 +3606,37 @@ msgstr ""
 msgid "discarding new UID list\n"
 msgstr "il nuovo elenco degli UID viene scartato\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Eliminazione del file fetchids in corso.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Errore durante l'eliminazione di %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Scrittura del file fetchids in corso.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Errore durante la scrittura nel file fetchids: %s %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 "Errore durante la scrittura del file fetchids %s, lasciato il vecchio file "
 "al suo posto.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Impossibile rinominare il file fetchids %s in %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Impossibile aprire il file fetchids %s per la scrittura: %s\n"
@@ -3648,9 +3649,6 @@ msgstr "malloc fallita\n"
 msgid "realloc failed\n"
 msgstr "realloc fallita\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "scambio di elenchi degli UID in corso\n"
-
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Oggetto: avviso di server irraggiungibile"
 
@@ -3663,9 +3661,18 @@ msgstr "realloc fallita\n"
 #~ "fetchmail: attenzione: sono impostati sia il registro di sistema che il "
 #~ "file di registro. Controllarli entrambi.\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "La capacità LOGIN richiesta non è supportata dal server\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "L'errore salvato è ancora %d\n"
+
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "emittente sconosciuto (primi %d caratteri): %s\n"
 
+#~ msgid "swapping UID lists\n"
+#~ msgstr "scambio di elenchi degli UID in corso\n"
+
 #~ msgid "(null)"
 #~ msgstr "(null)"
 
diff --git a/po/ja.po b/po/ja.po
index a5672e7a..a145a121 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-24 23:49+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
diff --git a/po/nl.po b/po/nl.po
index 5d3ab8a5..365e1802 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.20-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2011-05-31 07:47+0200\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: checkalias.c:174
@@ -379,7 +380,7 @@ msgstr "standaardmap wordt geselecteerd of opnieuw opgehaald\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s op %s (map %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s op %s"
@@ -673,80 +674,80 @@ msgstr "WAARSCHUWING: Als root draaien wordt ontraden.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: opgestart met"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "kan huidige werkmap niet bepalen\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dit is fetchmail versie %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Deze opties van opdrachtregel gehaald%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " en "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Geen mailservers ingesteld -- misschien ontbreekt %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: geen mailservers opgegeven.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: er draait geen andere fetchmail\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: kan %s fetchmail op %ld niet elimineren -- gestopt\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "achtergrond"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "voorgrond"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail op %ld geëlimineerd.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -754,7 +755,7 @@ msgstr ""
 "fetchmail: kan mail niet controleren terwijl er een andere fetchmail\n"
 "naar dezelfde host actief is.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -763,226 +764,226 @@ msgstr ""
 "fetchmail: kan opgegeven hosts niet contacteren terwijl een andere fetchmail "
 "draait op %ld.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: een andere fetchmail draait op de voorgrond op %ld.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: kan geen opties accepteren terwijl er een fetchmail op de "
 "achtergrond draait.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail-service in de achtergrond op %ld wakkergeschud.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr ""
 "fetchmail: ouder zusterproces op %ld is om onbekende redenen afgebroken.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: kan geen wachtwoord vinden voor %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Geef wachtwoord voor %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: kan niet naar de achtergrond gaan. Gestopt.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starten van fetchmail %s-service\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "kan %s niet openen voor het toevoegen van loginformatie\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "--controlemodus ingeschakeld, geen e-mailontvangst\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kan geen tijdcontrole op %s uitvoeren (fout %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail wordt herstart (%s is gewijzigd)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "poging tot herstarten kan mislukken omdat de map niet is hersteld\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "poging tot herstarten van fetchmail is mislukt\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "mail ophalen van %s wordt overgeslagen (aanmelden is mislukt of duurt te "
 "lang)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval niet bereikt, %s wordt niet gecontroleerd\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Resultaatcode = 0 (GELUKT)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Resultaatcode=1 (GEEN MAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Resultaatcode=2 (SOCKETFOUT)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Resultaatcode=3 (AANMELDEN MISLUKT)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Resultaatcode=4 (PROTOCOLFOUT)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Resultaatcode=5 (SYNTAXFOUT)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Resultaatcode=6 (I/O-fout)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Resultaatcode=7 (ALGEMENE FOUT)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Resultaatcode=8 (UITGESLOTEN)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Resultaatcode=9 (VERGRENDELING ACTIEF)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Resultaatcode=10 (SMTP-fout)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Resultaatcode=11 (DNS-fout)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Resultaatcode=12 (BSMTP-fout)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Resultaatcode=13 (OPHAALLIMIET BEREIKT)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Resultaatcode=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle verbindingen zijn vastgelopen.  Gestopt.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "slapen om %s gedurende %d seconden\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "gewekt door %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "gewekt door signaal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "gewekt op %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normale afsluiting, afsluitwaarde %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "kan geen tijdcontrole uitvoeren op het run-control-bestand\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Waarschuwing: host %s is meerdere malen vermeld in configuratiebestand\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Fout: meerder \"defaults\"-secties in configuratiebestand.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-ondersteuning is niet ingebouwd.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Kerberos V4-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Kerberos V5-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: Waarschuwing: geen DNS beschikbaar voor multidrop van %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "waarschuwing: multidrop van %s vereist envelopoptie!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "waarschuwing: vraag niet om ondersteuning als alle e-mail naar postmaster "
 "gaat!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -991,325 +992,325 @@ msgstr ""
 "fetchmail: configuratie van %s is ongeldig -- poortnummer kan niet negatief "
 "zijn\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: configuratie voor %s is ongeldig -- RPOP vereist een speciale "
 "poort\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuratie voor %s is ongeldig -- LMTP kan niet de standaard SMTP-poort "
 "gebruiken\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Zowel 'fetchall' als 'keep on' in service-stand is een vergissing!\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beëindigd door signaal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ondervraagt %s (protocol %s) op %s: ophaalsessie gestart\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "een niet-ondersteund protocol is geselecteerd.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ondervraagt %s (protocol %s) op %s: ophaalsessie voltooid\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Polslinterval is %d seconden\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logbestand is %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-bestand is %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Voortgangsberichten worden via syslog opgeslagen\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail verstopt zich en maakt geen 'Received'-kopregels aan\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail toont voortgangspuntjes ook in logbestanden.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail zal onjuist geadresseerde multidrop-berichten doorsturen naar %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail zal foutmeldingen naar de postmaster sturen.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail zal foutmeldingen naar de afzender sturen.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail zal permanente foutmeldingen als permanent afhandelen (berichten "
 "verwijderen).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail zal permanente foutmeldingen als tijdelijk afhandelen (berichten "
 "behouden).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opties voor het ophalen van %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail wordt opgehaald via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  Polsen van deze server vindt elk interval plaats.\n"
 msgstr[1] "  Polsen van deze server vindt elke %d intervallen plaats.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Werkelijke naam van server is %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Deze host wordt niet bevraagd als er geen host is opgegeven.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Deze host wordt bevraagd als er geen host is opgegeven.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Wachtwoord wordt aan gebruiker gevraagd.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-geheim = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-ID = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Wachtwoord = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP met Kerberos %s-authenticatie"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (gebruikmakend van service %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (gebruikmakend van de standaard poort)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (gebruik van UIDL wordt afgedwongen)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle beschikbare authenticatiemethoden worden geprobeerd.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Wachtwoordauthenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Versleuteling van-eindpunt-tot-eindpunt wordt aangenomen.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Belangrijkste mailservice is: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-versleutelde sessies zijn ingeschakeld.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protocol: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Certificaat-controle voor SSL-server is ingeschakeld.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Certificaat-controle voor SSL-server is ingeschakeld.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Vertrouwd-SSL-certificaatbestand: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Map voor vertrouwde SSL-certificaten: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  CommonName SLL-server: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-sleutelafdruk (geverifieerd tegenover serversleutel): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server-timeout voor geen respons is %d seconden"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (standaard).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Standaard mailbox geselecteerd.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Geselecteerde mailboxen zijn:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle berichten zullen worden opgehaald ('--all on').\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Alleen nieuwe berichten zullen worden opgehaald ('--all off').\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr ""
 "  Van opgehaalde berichten worden kopieën op de server bewaard ('--keep "
 "on').\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Opgehaalde berichten worden van de server verwijderd ('--keep off').\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Oude berichten worden niet verwijderd voor het ophalen begint ('--flush "
 "off').\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1317,7 +1318,7 @@ msgstr ""
 "  Te grote berichten worden verwijderd voor het ophalen begint ('--"
 "limitflush on').\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1325,351 +1326,351 @@ msgstr ""
 "  Te grote berichten worden niet verwijderd voor het ophalen begint ('--"
 "limitflush off').\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Herschrijven van lokale serveradressen is ingeschakeld ('--norewrite "
 "off').\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Herschrijven van lokale serveradressen is uitgeschakeld ('--norewrite "
 "on').\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Verwijderen van CR-tekens is ingeschakeld ('stripcr on').\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Verwijderen van CR-tekens is uitgeschakeld ('stripcr off').\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Afdwingen van CR-tekens is ingeschakeld ('forcecr on').\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Afdwingen van CR-tekens is uitgeschakeld ('forcecr off').\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits "
 "on').\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits "
 "off').\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoderen is ingeschakeld ('mimedecode on').\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoderen is uitgeschakeld ('mimedecode off').\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nietsdoen na ophalen is ingeschakeld ('idle on').\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nietsdoen na ophalen is uitgeschakeld ('idle off').\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niet-lege Status-regels worden weggegooid ('dropstatus on')\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niet-lege Status-regels worden behouden ('dropstatus off')\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-regels worden weggegooid ('dropdelivered on')\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-regels worden behouden ('dropdelivered off')\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Berichtgrootte-limiet is %d tekens ('--limit %d').\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Berichtgrootte is onbegrensd ('--limit 0').\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Waarschuwingsinterval voor berichtgrootte is %d seconden ('--warnings "
 "%d').\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Waarschuwingen voor grootte tijdens elke ophaalronde ('--warnings 0').\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Aantal berichten per keer is beperkt tot %d ('--fetchlimit %d').\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  Het aantal per keer opgehaalde berichten is onbeperkt ('--fetchlimit 0').\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maximale berichtgrootte is %d ('--fetchsizelimit %d').\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Geen beperking op berichtgrootte ('--fetchsizelimit 0').\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Er wordt binair naar UID's gezocht tijdens het ophalen ('--fastuidl 1').\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Er wordt binair naar UID's gezocht tijdens %d van de %d ophaalacties ('--"
 "fastuidl %d').\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Er wordt lineair naar UID's gezocht tijdens elke ophaalactie ('--fastuidl "
 "0').\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limiet SMTP-berichtenbatch is %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Er is geen limiet voor SMTP-berichtenbatch (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Verwijderinterval tussen expunge-operaties geforceerd op %d (--expunge "
 "%d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Geen geforceerde expunges (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Er wordt mail opgehaald voor de volgende domeinen:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (standaard)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Berichten worden toegevoegd aan %s als BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Berichten worden bezorgd met \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Berichten worden %cMTP-geforward naar:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host-gedeelte van de MAIL FROM regel zal %szijn\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Het adres in de RCPT TO regels naar SMTP zal %s zijn\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Herkende foutcodes van spam-blokkades zijn:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blokkades uitgeschakeld\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serververbinding wordt tot stand gebracht met \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Geen voor-verbindingscommando.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serververbinding wordt verbroken met \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Geen na-verbindingscommando.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Geen lokale namen gedeclareerd voor deze host.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop modus: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Single-drop modus: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokale naam herkend.\n"
 msgstr[1] "%d lokale namen herkend.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is ingeschakeld.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is uitgeschakeld.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Server-aliassen worden vergeleken met multidrop-adressen via het IP-"
 "adres.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Server-aliassen worden vergeleken met multidrop-adressen via de naam.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelopadres-routering is uitgeschakeld\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelopkoppen is aangenomen als zijnde: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Aantal over te slaan envelopkoppen: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s zal van de user-ID worden verwijderd\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Geen prefix-verwijdering\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Voorgedefinieerde mailserver-aliassen:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Lokale domeinen:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connectie moet door interface %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Geen interface-eisen opgegeven.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polslus monitort %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Geen monitor-interface opgegeven.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Serverconnecties worden gelegd via plugin %s ('--plugin %s').\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Geen plugin-commando opgegeven.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Luisterende connecties worden gelegd via plugout %s ('--plugout %s').\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Geen plugout-commando opgegeven.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Geen UID's opgeslagen voor deze host.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID's opgeslagen.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Pols-trace-informatie wordt toegevoegd aan de Received-header.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Er wordt geen pols-trace-informatie aan de Received-header toegevoegd.\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Berichten met ongeldige kopregels worden afgewezen.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Berichten met een ongeldige kopregels worden doorgegeven.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Doorvoereigenschappen \"%s\".\n"
@@ -1691,92 +1692,92 @@ msgstr ""
 "\n"
 "SIGINT ontvangen -- gestopt\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "GSSAPI-fout in gss_display_status aangeroepen door <%s>\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "GSSAPI-fout %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kan geen servicenaam vinden voor [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Servicenaam [%s] wordt gebruikt\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 "Geen geschikte authenticatiegegevens van GSSAPI gevonden, SGGAPI-"
 "authenticatie overslaan.\n"
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 "Voor het gebruik van GSSAPI heeft u authenticatiegegevens nodig, mogelijk "
 "van kinit.\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Misvormde 'challenge' gestuurd aan \"%s GSSAPI\" ontvangen!\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Versturen van logingegevens\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Fout bij uitwisselen van login-gegevens\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kan beveiligingstunnel niet uitvouwen\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Login-gegevens succesvol uitgewisseld\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server vereist integriteit en/of privacy\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Eigenschappen van uitgevouwen beveiligingstunnel: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximale grootte van GSS-token is %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Fout bij het doen van beveiligingsverzoek\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "GSS-login-gegevens worden afgegeven\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Fout bij het afgeven van gegevens\n"
 
@@ -1785,132 +1786,128 @@ msgstr "Fout bij het afgeven van gegevens\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread slaapt gedurende %d seconden.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "BYE-reactie ontvangen van IMAP-server: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "onjuist berichtenaantal in \"%s\"!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "onjuist EXPUNGE-aantal in \"%s\"!"
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol herkend als IMAP4 revisie 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol herkend als IMAP4 revisie 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol herkend als IMAP2 of IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "zal nietsdoen na verzoek\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opwaardering naar TLS is geslaagd.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opwaardering naar TLS is mislukt.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benodigde OTP-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benodigde NTLM-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "bericht-expunge komt niet overeen (is %d, waar %d verwacht)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is ongelezen\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is ongelezen\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "opnieuw polsen is mislukt\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d bericht in wachtrij na nieuwe aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na nieuwe aanvraag\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "mailbox-selectie is mislukt\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d bericht in wachtrij na eerste aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na eerste aanvraag\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "expunge is mislukt\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d bericht in wachtrij na expunge\n"
 msgstr[1] "%d berichten in wachtrij na expunge\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "zoeken naar ongelezen berichten is mislukt\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is als eerste nog niet gelezen\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Waarschuwing: server geeft onzinnige berichtgrootten terug.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Onjuist FETCH-antwoord: %s.\n"
@@ -2106,99 +2103,99 @@ msgstr "Optie '--folder' is niet mogelijk met ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Optie '--check' is niet mogelijk met ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "server recv is mislukt\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Kan 'OTP-challenge' niet decoderen\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Geheime wachtwoordzin: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is geen geldige numerieke tekenreeks.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Waarde van string '%s' is %s dan %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "kleiner"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "groter"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Ongeldig protocol voor slechte-kopregel `%s' opgegeven.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ongeldig protocol `%s' opgegeven.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ongeldige authenticatie `%s' opgegeven.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Gebruik:  fetchmail [opties] [server ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Mogelijke opties zijn:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        deze hulptekst tonen\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     programmaversie tonen\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       op berichten controleren, maar deze niet ophalen\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      in stilte functioneren\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     gedetailleerde uitvoer produceren (diagnostische "
 "gegevens)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      als systeemservice elke N seconden draaien\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 "  -N, --nodetach    wel systeemservice, maar terminal niet teruggeven\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        systeemserviceproces elimineren\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     te gebruiken logbestand\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2206,44 +2203,44 @@ msgstr ""
 "      --syslog      syslog(3) gebruiken voor berichtgeving als "
 "systeemservice\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   onzichtbaar; geen Received-headers aanmaken\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc   te gebruiken run-control-bestand \n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      te gebruiken bestand met UID's\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     te gebruiken PID-/vergrendelingsbestand\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  mail-ontvanger indien alles faalt\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    geen bounces naar gebruikers sturen, alles naar "
 "postmaster\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail verwijdert permanent niet-bestelbare "
 "berichten.\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2251,52 +2248,52 @@ msgstr ""
 "      --softbounce  permanent onbestelbare berichten op de server behouden "
 "(standaard).\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   vereiste interface\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     deze interface op activiteit monitoren\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         SSL-beveiligde sessies inschakelen\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      bestand met SSL-privésleutels\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL-cliëntcertificaat\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr ""
 "      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile   pad naar vertrouwd SSL-certificaatbestand\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath pad naar vertrouwd-CA SSL-certificaatmap\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  verwacht deze CommonName van server (afgeraden)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2304,20 +2301,20 @@ msgstr ""
 "      --sslfingerprint fingerprint dat overeen moet komen met het "
 "servercertificaat.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    SSL-protocol afdwingen (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      extern commando om verbinding te openen\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     extern commando om SMTP-verbinding te openen\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
@@ -2326,153 +2323,153 @@ msgstr ""
 "                    protocol instellen voor afhandeling berichten met "
 "onjuiste kopregels\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    ophaal-protocol (zie man-pagina)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        gebruik van UIDL's afdwingen (alleen POP3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        met deze TCP-poort verbinden (verouderd; gebruik --"
 "service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --service     met deze TCP-poort verbinden (mag numeriek zijn)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr "      --auth        authenticatietype (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server-timeout voor geen respons\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelopadreskop\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix te verwijderen van lokaal user-ID\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal voor mail service\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  poll-tracing information toevoegen aan de Received-"
 "header\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    loginnaam voor gebruiker op server\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  zowel oude als nieuwe berichten ophalen\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      nieuwe berichten verwijderen na het ophalen\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 "  -k, --keep        kopie van nieuwe berichten achterlaten op de server\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       oude berichten van de server verwijderen\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  te grote berichten verwijderen\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   header-adressen niet herschrijven\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       berichten boven de genoemde grootte niet ophalen\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval tussen waarschuwingsmails\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    SMTP forwarding host\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains   mail voor deze domeinen ophalen\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress   te gebruiken SMTP-afleverdomein\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    SMTP volledige naam gebruikersnaam@domein\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam-responswaarden\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  stapel-limiet voor SMTP-connecties instellen\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  maximum aantal berichten per ophaalsessie\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit maximumgrootte van op te halen berichten\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL's binair zoeken\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     maximaal aantal verwijderingen tussen expunges\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         MDA voor forwarding\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP-uitvoerbestand\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) gebruiken voor bezorging\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      te gebruiken map op server\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    voortgangspuntjes ook in logbestanden tonen\n"
 
@@ -2484,7 +2481,7 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 #, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
@@ -2492,95 +2489,95 @@ msgstr ""
 "Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-"
 "commando in plaats van TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "De CAPA-opdracht is echter nodig voor TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Het maximum aantal toegestane authenticators is bereikt, kan niet verder "
 "gaan.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Vereiste APOP tijdstempel niet aangetroffen in begroeting\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tijdstempel syntaxfout in begroeting\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ongeldig APOP-tijdsstempel.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ongedefinieerd protocol-verzoek in POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Vergrendeling actief!  Draait er nog een sessie?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "UIDL-respons van upstreamserver kan niet worden verwerkt.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server reageerde met UID voor verkeerd bericht.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) is al verwijderd, maar bestaat nog steeds!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "protocolfout\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocolfout tijdens het ophalen van UIDLs\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) is al verwijderd, maar bestaat nog steeds!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Optie '--folder' is niet mogelijk met POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "serveroptie na gebruikersopties"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SPDS niet ingeschakeld."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2589,7 +2586,7 @@ msgstr ""
 "IPv6) \n"
 "en FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2598,27 +2595,27 @@ msgstr ""
 "IPv6) \n"
 "en FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL is niet ingeschakeld"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "einde invoer"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Bestand %s moet een regulier bestand zijn.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 "Bestandspermissies op %s mogen niet minder stringent zijn dan -rwx------ "
 "(0700).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Je moet de eigenaar zijn van bestand %s.\n"
@@ -2846,106 +2843,110 @@ msgstr "SMTP: (bounce-message-body)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "mail van %s gebounced naar %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Opgeslagen fout is nog steeds %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fout: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP-server vereist STARTTLS, bericht behouden.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Openen van BSMTP-bestand is mislukt: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Schrijven van BSMTP-voorwoord is mislukt: %s.\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-programma wijst ontvangeradres '%s' af\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-programma vindt ontvangeradres '%s' maar zozo\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "geen adres komt overeen, geen postmaster ingesteld.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan niet eens naar %s zenden!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "geen adres komt overeen; doorsturen naar %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "Staat op het punt te bezorgen met: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Kan geldig gebruikersid niet veranderen in %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 "Kan geldig gebruikersid niet terug veranderen naar het oorspronkelijke %ld: "
 "%s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Openen van MDA mislukt\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-verbinding met %s is mislukt\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kan geen contact krijgen met luisterend programma; valt terug naar %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Afbreken bericht of sluiten van BSMTP-bestand is mislukt: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fout bij schrijven naar MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA is geëlimineerd door signaal %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "afsluitwaarde van MDA is niet nul: %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2953,20 +2954,20 @@ msgstr ""
 "Vreemd: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
 "kan dit niet verwerken, op %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-programma weigert te bezorgen\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-bezorgfout op EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Onverwachte respons (niet 503) op LMTP-EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -3002,80 +3003,80 @@ msgstr "ESMTP-LOGIN-authenticatie...\n"
 msgid "smtp listener protocol error\n"
 msgstr "SMTP-programma geeft protocolfout aan\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: onvoldoende geheugen beschikbaar\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair() is mislukt\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: kan geen nieuw proces starten\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "fetchmail: dup2() is mislukt\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "draait %s (host %s service %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) is mislukt\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "Fout in getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Probeer de optie '--service' toe te voegen (zie ook FAQ-item R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "onbekend (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Verbinding maken met %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kan geen socket aanmaken: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "naam %d: kan geen socket-familie %d type %d aanmaken: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "verbinding is mislukt.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "verbinding met %s:%s [%s/%s] is mislukt: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "naam %d: verbinding met %s:%s [%s/%s] is mislukt: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "verbonden.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3084,135 +3085,135 @@ msgstr ""
 "Verbindingsfouten voor deze polsing:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Servercertificaat:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "Certificatieketen, van 'root' naar 'peer', beginnend op diepte %d:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certificeren op diepte %d:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Uitgevende organisatie: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Waarschuwing: naam van uitgevende organisatie is te lang (mogelijk "
 "afgebroken).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Onbekende organisatie\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Gewone uitgeversnaam: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Waarschuwing: gewone uitgeversnaam is te lang (mogelijk afgebroken).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Onbekende gewone uitgeversnaam\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Onderwerp gewone-naam: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Ongeldig certificaat: Subject CN is te lang!\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Ongeldig certificaat: Subject CommonName bevat NUL, afbreken!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Subject Alternative Name: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Ongeldig certificaat: Subject Alternative Name bevat NUL, afbreken!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Gewone naam (CN) van server klopt niet: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernaam is niet ingesteld; kan certificaat niet verifiëren!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Onbekende gewone naam (CN) van server\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernaam is niet opgegeven in certificaat!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() is mislukt!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Onvoldoende geheugen beschikbaar!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Tekstbuffer voor controlegetal is te klein!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s-sleutel-vingerafdruk: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s-vingerafdrukken komen overeen.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s-vingerafdrukken komen niet overeen!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fout bij verificatie van servercertificaat: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Fout bij verificatie van servercertificaat: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 #, fuzzy
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
@@ -3224,12 +3225,12 @@ msgstr ""
 "levert; iets waar fetchmail niets aan kan doen.  Meer informatie is te "
 "vinden in het document README.SSL-SERVER dat bij fetchmail zit.\n"
 
-#: socket.c:831
+#: socket.c:836
 #, fuzzy, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "  Vertrouwd-SSL-certificaatbestand: %s\n"
 
-#: socket.c:834
+#: socket.c:839
 #, fuzzy
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
@@ -3242,93 +3243,93 @@ msgstr ""
 "certificatiemap uitgevoerd moet worden. Meer informatie is te vinden bij de "
 "documentatie van --sslcertpath en --sslcertfile in de manpagina.\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr ""
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr ""
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr ""
 "Ongeldig SSL-protocol '%s' opgegeven; standaard (SSLv23) wordt gebruikt.\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Bestandsdescriptor valt buiten bereik voor SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Verificatie van certificaat/vingerafdruk is op een of andere manier "
 "overslagen!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
@@ -3336,11 +3337,11 @@ msgstr ""
 "Waarschuwing: de verbinding is niet beveiligd, er wordt wel verder gegaan. "
 "(Gebruik bijvoorkeur --sslcertck!)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen is mislukt!\n"
 
@@ -3397,61 +3398,61 @@ msgstr ""
 msgid "line: %s"
 msgstr "regel: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Ontleden van envelop \"%s\"-namen \"%-.*s\"\n"
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Received-namen \"%-.*s\" ontleden\n"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Geen envelopontvanger gevonden, terugvallen naar gissing van de kop.\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Gissing vanuit kop \"%-.*s\".\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "geen lokale overeenkomsten; doorsturen naar %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "doorsturen en verwijderen is onderdrukt vanwege DNS-fouten\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "schrijven van RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "ontvangeradres %s komt niet overeen met een lokale naam"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "bericht bevat NUL-tekens"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-programma heeft de volgende lokale ontvangers geweigerd: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "fout bij schrijven van berichttekst\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3489,36 +3490,36 @@ msgstr "UID-lijsten worden niet gewisseld; geen UID's in deze aanvraag\n"
 msgid "discarding new UID list\n"
 msgstr "nieuwe UID-lijst wordt weggegooid\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Verwijderen van fetchids-bestand.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fout bij verwijderen van %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Schrijven van fetchids-bestand.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Schrijven van fetchids-bestand %s is mislukt: %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 "Fout bij schrijven van fetchids-bestand %s; oude bestand is blijven staan.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Kan fetchids-bestand %s niet naar %s hernoemen: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Kan fetchids-bestand %s niet openen om naar te schrijven: %s\n"
@@ -3531,18 +3532,24 @@ msgstr "malloc() is mislukt\n"
 msgid "realloc failed\n"
 msgstr "realloc() is mislukt\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "omwisselen van UID-lijsten\n"
-
 #~ msgid ""
 #~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 #~ msgstr ""
 #~ "fetchmail: waarschuwing: syslog en logfile zijn ingesteld; controleer "
 #~ "beide op loginformatie!\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Opgeslagen fout is nog steeds %d\n"
+
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "onbekende uitgever (eerste %d tekens): %s\n"
 
+#~ msgid "swapping UID lists\n"
+#~ msgstr "omwisselen van UID-lijsten\n"
+
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Subject: fetchmail-waarschuwing -- onbereikbare server."
 
diff --git a/po/pl.po b/po/pl.po
index 3435a228..0aa9e4a0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-25 19:33+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1c796aa2..badd5980 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,44 +11,41 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2013-03-08 17:50+0100\n"
 "PO-Revision-Date: 2013-07-09 12:01-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
 "Language: pt_BR\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Verificando se %s é realmente o mesmo nó que %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Sim, os endereços IP coincidem\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Não, os endereços IP não coincidem\n"
 
-#: checkalias.c:207
+#: checkalias.c:212
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"falha na resolução do nome de servidor '%s' durante a consulta de %s: %s\n"
+msgstr "falha na resolução do nome de servidor '%s' durante a consulta de %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:237
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"falha na resolução do nome de servidor '%s' durante a consulta de %s.\n"
+msgstr "falha na resolução do nome de servidor '%s' durante a consulta de %s.\n"
 
 #: cram.c:95
 msgid "could not decode BASE64 challenge\n"
@@ -70,23 +67,18 @@ msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [servidor informa '%s']\n"
 
 #: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Assunto: Alerta do Fetchmail mensagens muito grandes"
 
 #: driver.c:349
 #, fuzzy, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
-"servidor\n"
+msgstr "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no servidor\n"
 
 #: driver.c:353
 #, fuzzy, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
-"servidor\n"
+msgstr "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no servidor\n"
 
 #: driver.c:372
 #, fuzzy, c-format
@@ -107,117 +99,106 @@ msgstr[1] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 msgid "skipping message %s@%s:%d"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:577
+#: driver.c:576
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:593
+#: driver.c:592
 msgid " (length -1)"
 msgstr " (comprimento -1)"
 
-#: driver.c:596
+#: driver.c:595
 msgid " (oversized)"
 msgstr " (muito grande)"
 
-#: driver.c:614
+#: driver.c:613
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:632
+#: driver.c:631
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensagem %d de %d"
 
-#: driver.c:637
+#: driver.c:636
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octetos)"
 
-#: driver.c:638
+#: driver.c:637
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos no cabeçalho da mensagem)"
 
-#: driver.c:708
+#: driver.c:707
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos no corpo da mensagem)"
 
-#: driver.c:770
+#: driver.c:769
 #, fuzzy, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "mensagem %d não possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: driver.c:802
+#: driver.c:801
 msgid " retained\n"
 msgstr " retida\n"
 
-#: driver.c:812
+#: driver.c:811
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:824
+#: driver.c:823
 msgid " not flushed\n"
 msgstr " não eliminada\n"
 
-#: driver.c:842
+#: driver.c:841
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] ""
-"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
-"servidor\n"
-msgstr[1] ""
-"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
-"servidor\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no servidor\n"
+msgstr[1] "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no servidor\n"
 
-#: driver.c:899
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"tempo esgotado após %d segundos esperando para conectar ao servidor %s.\n"
+msgstr "tempo esgotado após %d segundos esperando para conectar ao servidor %s.\n"
 
-#: driver.c:903
+#: driver.c:902
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado após %d segundos esperando pelo servidor %s.\n"
 
-#: driver.c:907
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado após %d segundos esperando por %s.\n"
 
-#: driver.c:912
+#: driver.c:911
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tempo esgotado após %d segundos esperando pelo receptor responder.\n"
 
-#: driver.c:915
+#: driver.c:914
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado após %d segundos.\n"
 
-#: driver.c:927
+#: driver.c:926
 #, fuzzy
-msgid "fetchmail sees repeated timeouts"
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Assunto: o fetchmail tem notado repetidos vencimentos de temporização\n"
 "\n"
 
-#: driver.c:930
+#: driver.c:929
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail notou mais que %d vencimentos de temporização enquanto tentava "
-"baixar mensagens de %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail notou mais que %d vencimentos de temporização enquanto tentava baixar mensagens de %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:933
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -233,74 +214,73 @@ msgstr ""
 "\n"
 "Fetchmail não vai consultar mais esta caixa postal até que seja reiniciado.\n"
 
-#: driver.c:960
+#: driver.c:959
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "comando de pré-conexão falhou com status %d\n"
 
-#: driver.c:963
+#: driver.c:962
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "comando de pré-conexão falhou com status %d\n"
 
-#: driver.c:987
+#: driver.c:986
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "não foi possível encontrar caixa postal HESIOD para %s\n"
 
-#: driver.c:1008
+#: driver.c:1007
 msgid "Lead server has no name.\n"
 msgstr "Servidor líder não possui nome.\n"
 
-#: driver.c:1035
+#: driver.c:1034
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "não foi possível encontrar o nome de DNS canônico para %s\n"
 
-#: driver.c:1082
+#: driver.c:1081
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: driver.c:1111
+#: driver.c:1110
 msgid "SSL connection failed.\n"
 msgstr "Conexão SSL falhou.\n"
 
-#: driver.c:1166
+#: driver.c:1165
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1169
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de servidor ocupado em %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1174
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Falha de autorização em %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1177
 msgid " (previously authorized)"
 msgstr " (autorizado anteriormente)"
 
-#: driver.c:1181
+#: driver.c:1180
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Para ajuda, consulte http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "Para ajuda, consulte http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1201
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Assunto: falha de autenticação do fetchmail em %s@%s"
 
-#: driver.c:1206
+#: driver.c:1205
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "O fetchmail não pôde receber o correio eletrônico de %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1209
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -309,7 +289,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1216
+#: driver.c:1215
 #, fuzzy
 msgid ""
 "\n"
@@ -326,7 +306,7 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail não consegue distinguir desta\n"
 "pois eles não enviam mensagens de erro úteis durante a falha no login.\n"
 
-#: driver.c:1226
+#: driver.c:1225
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -343,180 +323,180 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail não consegue distinguir desta\n"
 "pois eles não enviam mensagens de erro úteis durante a falha no login.\n"
 
-#: driver.c:1242
+#: driver.c:1241
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1247
+#: driver.c:1246
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desconhecido de login ou autenticação em %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1270
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Falha de autorização para %s@%s\n"
 
-#: driver.c:1277
+#: driver.c:1276
 #, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr ""
 "Assunto: falha de autenticação do fetchmail\n"
 "\n"
 
-#: driver.c:1281
+#: driver.c:1280
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "O fetchmail não pôde receber o correio eletrônico de %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1284
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "Serviço escolheu a versão %d.%d do RPA\n"
 
-#: driver.c:1318
+#: driver.c:1317
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta %s\n"
 
-#: driver.c:1320
+#: driver.c:1319
 msgid "selecting or re-polling default folder\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta padrão\n"
 
-#: driver.c:1332
+#: driver.c:1331
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s em %s (pasta %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1334 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
-#: driver.c:1340
+#: driver.c:1339
 #, c-format
 msgid "Polling %s\n"
 msgstr "Baixando %s\n"
 
-#: driver.c:1344
+#: driver.c:1343
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mensagem (%d %s) para %s"
 msgstr[1] "%d mensagens (%d %s) para %s"
 
-#: driver.c:1347
+#: driver.c:1346
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1350
+#: driver.c:1349
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mensagem para %s"
 msgstr[1] "%d mensagens para %s"
 
-#: driver.c:1357
+#: driver.c:1356
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1363
+#: driver.c:1362
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nenhuma mensagem para %s\n"
 
-#: driver.c:1396
+#: driver.c:1395
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1448
+#: driver.c:1447
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
 msgstr ""
 
-#: driver.c:1549
+#: driver.c:1548
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1552
+#: driver.c:1551
 msgid "missing or bad RFC822 header"
 msgstr "cabeçalho RFC822 ruim ou faltando"
 
-#: driver.c:1555
+#: driver.c:1554
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1557
 msgid "client/server synchronization"
 msgstr "sincronização cliente/servidor"
 
-#: driver.c:1561
+#: driver.c:1560
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1564
+#: driver.c:1563
 msgid "lock busy on server"
 msgstr "arquivo de lock existente no servidor"
 
-#: driver.c:1567
+#: driver.c:1566
 msgid "SMTP transaction"
 msgstr "Transação SMTP"
 
-#: driver.c:1570
+#: driver.c:1569
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1573
+#: driver.c:1572
 msgid "undefined"
 msgstr "não definido"
 
-#: driver.c:1579
+#: driver.c:1578
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1581
+#: driver.c:1580
 msgid "unknown"
 msgstr "desconhecido"
 
-#: driver.c:1583
+#: driver.c:1582
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1595
+#: driver.c:1594
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "comando de pós-conexão falhou com status %d\n"
 
-#: driver.c:1597
+#: driver.c:1596
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "comando de pós-conexão falhou com status %d\n"
 
-#: driver.c:1616
+#: driver.c:1615
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Suporte a Kerberos v4 não incluído (vinculado).\n"
 
-#: driver.c:1624
+#: driver.c:1623
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Suporte a Kerberos v5 não incluído (vinculado).\n"
 
-#: driver.c:1635
+#: driver.c:1634
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opção --flush não é suportada com %s\n"
 
-#: driver.c:1641
+#: driver.c:1640
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opção --all não é suportada com %s\n"
 
-#: driver.c:1650
+#: driver.c:1649
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opção --limit não é suportada com %s\n"
@@ -536,8 +516,7 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -553,8 +532,8 @@ msgid "%s: can't determine your host!"
 msgstr "%s: não foi possível determinar sua máquina!"
 
 #: env.c:172
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falhou para %s\n"
 
 #: env.c:174
@@ -564,8 +543,7 @@ msgstr ""
 #: env.c:178
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
@@ -633,14 +611,13 @@ msgstr "Opção --folder não é compatível com ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Opção --check não é compatível com ETRN\n"
 
-#: fetchmail.c:141
-#, fuzzy
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 "                   Robert M. Funk, Graham Wilson\n"
 "Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2019 Matthias Andree\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -648,1029 +625,986 @@ msgstr ""
 "Copyright (C) 2005 - 2012 Sunil Shetye\n"
 "Copyright (C) 2005 - 2013 Matthias Andree\n"
 
-#: fetchmail.c:147
+#: 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"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
 
-#: fetchmail.c:187
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:199
+#: fetchmail.c:193
 #, fuzzy
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: fork falhou\n"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:298
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Este é o fetchmail versão %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:313
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:320
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:327
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:333
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:351
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:439
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Utilizando opções da linha de comando%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:440
 msgid " and "
 msgstr " e "
 
-#: fetchmail.c:455
+#: fetchmail.c:445
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
-msgstr ""
-"Nenhum servidor de correio eletrônico configurado -- talvez %s esteja "
-"faltando?\n"
+msgstr "Nenhum servidor de correio eletrônico configurado -- talvez %s esteja faltando?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:466
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nenhum servidor de correio eletrônico foi especificado.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:478
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nenhum outro fetchmail está rodando\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:484
 #, fuzzy, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: erro eliminando %s fetchmail em %d; desistindo.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:485 fetchmail.c:494
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:485 fetchmail.c:494
 msgid "foreground"
 msgstr "primeiro plano"
 
-#: fetchmail.c:503
+#: fetchmail.c:493
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail em %d terminado.\n"
 
-#: fetchmail.c:526
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: não é possível checar por mensagens enquanto outro fetchmail está "
-"rodando para a mesma máquina.\n"
+#: fetchmail.c:516
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: não é possível checar por mensagens enquanto outro fetchmail está rodando para a mesma máquina.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:522
 #, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
 msgstr ""
 "fetchmail: não é possível receber mensagens das máquinas especificadas\n"
 "enquanto houver outro fetchmail rodando em %d.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:529
 #, fuzzy, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: outro fetchmail está rodando em primeiro plano em %d.\n"
 
-#: fetchmail.c:549
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+#: fetchmail.c:539
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: não é possível aceitar opções com outro fetchmail rodando em \n"
 "segundo plano.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:545
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail rodando em segundo plano em %d despertado.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:557
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: processo mais antigo rodando em %d morreu misteriosamente.\n"
+msgstr "fetchmail: processo mais antigo rodando em %d morreu misteriosamente.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:572
 #, fuzzy, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: não é possível encontrar uma senha para %s@s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:576
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Digite a senha para %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:618
 #, fuzzy
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nenhum outro fetchmail está rodando\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:622
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:638 fetchmail.c:640
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr ""
 
-#: fetchmail.c:675
+#: fetchmail.c:659
 msgid "--check mode enabled, not fetching mail\n"
 msgstr ""
 
-#: fetchmail.c:697
+#: fetchmail.c:681
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "não foi possível fazer checagem de horário de %s (erro %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:686
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s mudou) \n"
 
-#: fetchmail.c:707
+#: fetchmail.c:691
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:734
+#: fetchmail.c:718
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "tentativa de re-executar fetchmail falhou.\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:748
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"consulta de %s pulada (falha de autenticação ou muitos vencimentos de "
-"temporização)\n"
+msgstr "consulta de %s pulada (falha de autenticação ou muitos vencimentos de temporização)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:760
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo não atingido, não consultando %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:798
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Situação da consulta=0 (SUCCESSO)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:800
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Situação da consulta=1 (SEM-MENSAG)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:802
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Situação da consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:804
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Situação da consulta=3 (FALHA-AUTENT)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:806
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Situação da consulta=4 (PROTOCOLO)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:808
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Situação da consulta=5 (SINTAXE)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:810
 msgid "Query status=6 (IOERR)\n"
 msgstr "Situação da consulta=6 (ERRO-ENTRADA-SAÍDA)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:812
 msgid "Query status=7 (ERROR)\n"
 msgstr "Situação da consulta=7 (ERRO)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:814
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Situação da consulta=8 (EXCLUSÃO)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:816
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Situação da consulta=9 (TRAVA-OCUPADO)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:818
 msgid "Query status=10 (SMTP)\n"
 msgstr "Situação da consulta=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:820
 msgid "Query status=11 (DNS)\n"
 msgstr "Situação da consulta=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:822
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Situação da consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:824
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Situação da consulta=13 (OBTENÇÃO-MAX)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:826
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:868
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas as conexões estão travadas. Encerrando.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:876
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "dormindo em %s por %d segundos\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:900
 #, c-format
 msgid "awakened by %s\n"
 msgstr "acordado por %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:903
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:911
 #, c-format
 msgid "awakened at %s\n"
 msgstr "acordado em %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:916
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "encerramento normal, status %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1075
 msgid "couldn't time-check the run-control file\n"
 msgstr "não foi possível checar o horário do arquivo de controle de execução\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1109
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
+msgstr "Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1148
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr ""
-"Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
+msgstr "Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1270
 msgid "SSL support is not compiled in.\n"
 msgstr "O suporte a SSL não foi compilado.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1277
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "O suporte a KERBEROS v4 está configurado, mas não foi compilado.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1283
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "O suporte a KERBEROS v5 está configurado, mas não foi compilado.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1289
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "O suporte a GSSAPI está configurado, mas não foi compilado.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: warning: nenhum DNS disponível para checar buscas com múltiplas\n"
 "entregas de %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1330
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1349
+#: fetchmail.c:1331
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1366
+#: fetchmail.c:1348
 #, fuzzy, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
 msgstr "configuração de %s inválida, número da porta não pode ser negativo\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1355
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuração de %s inválida, o RPOP exige uma porta privilegiada\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1373
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "configuração de %s inválida, LMTP não pode usar a porta SMTP padrão\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1387
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "fetchall e modo daemon juntos está errado!\n"
 
-#: fetchmail.c:1415
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1439
+#: fetchmail.c:1412
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "encerrado com o sinal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1485
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1510
 msgid "POP2 support is not configured.\n"
 msgstr "O suporte a POP2 não está configurado.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1522
 msgid "POP3 support is not configured.\n"
 msgstr "O suporte a POP3 não está configurado.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1532
 msgid "IMAP support is not configured.\n"
 msgstr "O suporte a IMAP não está configurado.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1538
 msgid "ETRN support is not configured.\n"
 msgstr "O suporte a ETRN não está configurado.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1546
 msgid "ODMR support is not configured.\n"
 msgstr "O suporte a ODMR não está configurado.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1553
 msgid "unsupported protocol selected.\n"
 msgstr "protocolo não suportado escolhido.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1563
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1580
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervalo de consulta é %d segundos\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1582
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Arquivo de registro é %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1584
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Arquivo de identificação é %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1587
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mensagens de progresso serão gravadas pelo syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1590
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail fará mascaramento e não gerará `Received'\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1592
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1629
+#: fetchmail.c:1594
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensagens multidrop mal endereçadas para %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail irá enviar mensagens de correio de erro para o postmaster.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1600
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail irá enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1603
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail reenviará mensagens multidrop mal endereçadas para %s.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1605
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail irá enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1612
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opções para consulta de %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1616
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mensagens serão recuperadas via %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1619
 #, fuzzy, 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] "  Consulta deste servidor irá ocorrer a cada %d intervalos.\n"
 msgstr[1] "  Consulta deste servidor irá ocorrer a cada %d intervalos.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1623
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O verdadeiro nome do servidor é %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1626
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Esta máquina não será consultada quando nenhuma máquina for especificada.\n"
+msgstr "  Esta máquina não será consultada quando nenhuma máquina for especificada.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1627
 msgid "  This host will be queried when no host is specified.\n"
-msgstr ""
-"  Esta máquina será consultada quando nenhuma máquina for especificada.\n"
+msgstr "  Esta máquina será consultada quando nenhuma máquina for especificada.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1631
 msgid "  Password will be prompted for.\n"
 msgstr "  A senha será solicitada.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1635
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1638
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificação RPOP = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1641
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "   Senha = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1650
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocolo é KPOP com autenticação Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1653
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocolo é %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1655
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando serviço %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1657
 msgid " (using default port)"
 msgstr " (usando porta padrão)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1659
 msgid " (forcing UIDL use)"
 msgstr " (forçando o uso de UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1665
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Todos os métodos de autenticação disponíveis serão tentados.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1668
 msgid "  Password authentication will be forced.\n"
 msgstr "  Será forçada autenticação de senha.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1671
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Será forçada autenticação do MSN.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1674
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Será forçada autenticação do NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1677
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Será forçada autenticação do OTP.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1680
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Será forçada autenticação do CRAM-MD5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1683
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Será forçada autenticação do GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1686
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Será forçada autenticação do Kerberos v4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1689
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Será forçada autenticação do Kerberos v5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1692
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Criptografia end-to-end assumida.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1696
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1734
+#: fetchmail.c:1699
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1736
+#: fetchmail.c:1701
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1703
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1740
-msgid "  SSL server certificate checking disabled.\n"
-msgstr ""
-
-#: fetchmail.c:1743
+#: fetchmail.c:1706
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr ""
 
-#: fetchmail.c:1745
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1747
+#: fetchmail.c:1710
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Nome comum de servidor SSL: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1712
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1752
+#: fetchmail.c:1715
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
-msgstr ""
-"  O tempo máximo para não obtenção de resposta do servidor é %d segundos"
+msgstr "  O tempo máximo para não obtenção de resposta do servidor é %d segundos"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1717
 msgid " (default).\n"
 msgstr " (padrão).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1724
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correio padrão selecionada.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1729
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correio selecionadas são:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1735
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todas as mensagens serão recuperadas (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1736
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Apenas novas mensagens serão recuperadas (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1738
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  As Mensagens baixadas %s serão mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1739
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As Mensagens baixadas %s serão mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1741
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1742
 #, fuzzy
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1744
 #, fuzzy
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
 msgstr ""
 "  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1745
 #, fuzzy
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
 msgstr ""
 "  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1747
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
+msgstr "  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1748
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
+msgstr "  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  A eliminação do retorno de carro (CR) está %s (stripcr %s).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1751
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  A eliminação do retorno de carro (CR) está %s (stripcr %s).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1753
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Forçar retorno de carro (CR) está %s (forcecr %s).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1754
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Forçar retorno de carro (CR) está %s (forcecr %s).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1756
 #, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1757
 #, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1759
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  A decodificação MIME está %s (mimedecode %s).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1760
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  A decodificação MIME está %s (mimedecode %s).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1762
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inatividade após consulta é %s (inatividade %s).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1763
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Inatividade após consulta é %s (inatividade %s).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1765
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1766
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1768
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1769
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1773
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O tamanho limite por mensagem é %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1776
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1778
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de aviso de tamanho de mensagem é de %d segundos (--warnings \n"
 "%d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1781
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tamanho a cada recebimento (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1784
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O limite de mensagem recebida é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1787
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nenhum limite para mensagem recebida (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1789
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O limite de mensagem recebida é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1792
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1796
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1835
+#: fetchmail.c:1798
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1838
+#: fetchmail.c:1801
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1840
+#: fetchmail.c:1803
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O limite de lote de mensagens SMTP é %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1805
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nenhum limite de lote de mensagens SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1809
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  O intervalo de deleção entre eliminações é %d (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1811
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nenhuma eliminação (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1818
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1823 fetchmail.c:1843
 msgid " (default)"
 msgstr " (padrão)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensagens serão anexadas a %s como BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1830
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensagens serão entregues com \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1837
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensagens serão re-enviadas via %cMTP para:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1848
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da máquina na linha MAIL FROM será %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1851
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1897
+#: fetchmail.c:1860
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas reconhecidas de blocos spam são:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1866
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueio de spam desabilitado\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1869
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conexão do servidor será efetuada com \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1872
 msgid "  No pre-connection command.\n"
 msgstr "  Nenhum comando de pré-conexão.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1874
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conexão com o servidor será derrubada com \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1877
 msgid "  No post-connection command.\n"
 msgstr "  Nenhum comando de pós-conexão.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1880
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nenhum nome local declarado para esta máquina.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1890
 msgid "  Multi-drop mode: "
 msgstr "  Modo de múltipla entrega (multi-drop): "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1892
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simples (single-drop): "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1894
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome(s) local(is) reconhecido(s).\n"
 msgstr[1] "%d nome(s) local(is) reconhecido(s).\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1909
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  A busca no DNS por endereços de múltipla entrega está %s.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1910
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  A busca no DNS por endereços de múltipla entrega está %s.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1914
 #, fuzzy
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Os apelidos de servidores serão comparados com endereços de múltipla\n"
 "entrega por "
 
-#: fetchmail.c:1953
+#: fetchmail.c:1916
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Os apelidos de servidores serão comparados com endereços de múltipla\n"
 "entrega por "
 
-#: fetchmail.c:1956
+#: fetchmail.c:1919
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O roteamento de endereços de envelope está desabilitado\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1922
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Assume-se que o cabeçalho do envelope esteja: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1925
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número de cabeçalhos de envelope  a serem processados: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1928
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  O prefixo %s será removido da identificação do usuário\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1931
 msgid "  No prefix stripping\n"
 msgstr "  Nenhuma remoção de prefixo\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1936
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Apelidos pré-declarados do servidor de correio eletrônico:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1944
 msgid "  Local domains:"
 msgstr "  Domínios locais:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1954
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conexão precisa se dar pela interface %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1956
 msgid "  No interface requirement specified.\n"
 msgstr "  Não foi especificada nenhuma exigência de interface.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1958
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Ciclo de consultas monitorará %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1960
 msgid "  No monitor interface specified.\n"
 msgstr "  Nenhuma interface de monitoramento foi especificada.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1964
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conexões com o servidor se darão via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1966
 msgid "  No plugin command specified.\n"
 msgstr "  Nenhum comando \"plugin\" especificado.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:1968
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  As conexões com o cliente se darão via \"plugout\" %s (--plugout %s).\n"
+msgstr "  As conexões com o cliente se darão via \"plugout\" %s (--plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:1970
 msgid "  No plugout command specified.\n"
 msgstr "  Nenhum comando \"plugout\" especificado.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:1975
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nenhuma identificação de usuário gravada a partir desta máquina.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:1984
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d identificações de usuários gravadas.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1992
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:2025
+#: fetchmail.c:1994
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:2030
+#: fetchmail.c:1999
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2033
+#: fetchmail.c:2002
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2038
+#: fetchmail.c:2007
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriedades de passagem \"%s\".\n"
@@ -1712,8 +1646,7 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
 #: gssapi.c:123
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
 #: gssapi.c:159
@@ -1751,24 +1684,15 @@ msgstr "Desempacotadas marcas de nível de segurança: %s%s%s\n"
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Tamanho máximo do símbolo GSS é %ld\n"
 
-#: gssapi.c:273
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:282
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Erro criando solicitação de nível de segurança\n"
 
-#: gssapi.c:286
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:297
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando credenciais GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Erro na liberação de credenciais\n"
 
@@ -1781,142 +1705,134 @@ msgstr ""
 
 #: imap.c:74
 #, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+msgid "Received BYE response from IMAP server: %s"
 msgstr ""
 
-#: imap.c:96
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr ""
 
-#: imap.c:143
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:475 pop3.c:473
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:481 pop3.c:479
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:486
+#: imap.c:482
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:501
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:606
+#: imap.c:598
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:618 pop3.c:558
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:635
+#: imap.c:627
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:699
+#: imap.c:691
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mensagem %d não possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "nova tentativa de baixar mensagens falhou\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "seleção de caixa postal falhou\n"
 
-#: imap.c:940
+#: imap.c:932
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:954
+#: imap.c:946
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: imap.c:958
+#: imap.c:950
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "falha na busca por mensagens não vistas\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:865
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:1086
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:1078
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Não foi possível abrir a interface kvm. Certifique-se que fetchmail está "
-"SGID kmem."
+msgstr "Não foi possível abrir a interface kvm. Certifique-se que fetchmail está SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1997,21 +1913,21 @@ msgstr "atividade em %s foi %d, é %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "não foi possível decodificar o desafio BASE64 inicial\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "%s no bilhete não combina com -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "instância não nula (%s) pode causar comportamento estranho\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "não foi possível decodificar resposta \"pronto\" de BASE64\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "erro no desafio\n"
 
@@ -2111,459 +2027,414 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Não foi possível decodificar o desafio OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Frase-senha secreta: "
 
-#: options.c:178 options.c:222
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Cadeia '%s' não é uma cadeia de números válidos.\n"
 
-#: options.c:187
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Valor da cadeia '%s' é %s que %d.\n"
 
-#: options.c:188
+#: options.c:186
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:188
+#: options.c:186
 msgid "larger"
 msgstr "maior"
 
-#: options.c:336
+#: options.c:323
 #, fuzzy, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Protocolo `%s' inválido foi especificado.\n"
 
-#: options.c:377
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo `%s' inválido foi especificado.\n"
 
-#: options.c:424
+#: options.c:411
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Pré-autenticação `%s' inválida foi especificada.\n"
 
-#: options.c:640
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso: fetchmail [opções] [servidor ...]\n"
 
-#: options.c:641
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  As opções são:\n"
 
-#: options.c:642
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra esta tela de ajuda\n"
 
-#: options.c:643
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informações sobre a versão\n"
 
-#: options.c:645
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       checa por mensagens sem baixá-las\n"
 
-#: options.c:646
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabalha silenciosamente\n"
 
-#: options.c:647
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr ""
-"  -v, --verbose     trabalha barulhentamente (saídas para diagnóstico)\n"
+msgstr "  -v, --verbose     trabalha barulhentamente (saídas para diagnóstico)\n"
 
-#: options.c:648
+#: options.c:628
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      roda como um servidor uma vez a cada n segundos\n"
 
-#: options.c:649
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
-msgstr ""
-"  -N, --nodetach    não desconecta o processo servidor do seu terminal\n"
+msgstr "  -N, --nodetach    não desconecta o processo servidor do seu terminal\n"
 
-#: options.c:650
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        elimina processo servidor\n"
 
-#: options.c:651
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica o nome do arquivo de log\n"
 
-#: options.c:652
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+#: options.c:632
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr ""
 "      --syslog      usa o syslog(3) para a maioria das mensagens quando\n"
 "                    estiver rodando como servidor\n"
 
-#: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
-
-#: options.c:654
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   não escreve `Received' & ativa mascaramento da máquina\n"
+msgstr "      --invisible   não escreve `Received' & ativa mascaramento da máquina\n"
 
-#: options.c:655
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc especifica arquivo de controle de execução alternativo\n"
+msgstr "  -f, --fetchmailrc especifica arquivo de controle de execução alternativo\n"
 
-#: options.c:656
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usuários \n"
 "                    alternativo\n"
 
-#: options.c:657
+#: options.c:636
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usuários \n"
 "                    alternativo\n"
 
-#: options.c:658
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica o destinatário usado em último caso\n"
 
-#: options.c:659
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redireciona mensagens erradas para o postmaster.\n"
 
-#: options.c:660
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+#: options.c:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:661
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificação de interface exigida\n"
 
-#: options.c:664
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitora a atividade na interface\n"
 
-#: options.c:667
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         habilita sessão ssl criptografada\n"
 
-#: options.c:668
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      arquivo contendo a chave ssl privada\n"
 
-#: options.c:669
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:670
+#: options.c:649
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:671
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcert     certificado ssl do cliente\n"
-
-#: options.c:672
+#: options.c:650
 #, fuzzy
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:673
+#: options.c:651
 #, fuzzy
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:674
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:675
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+#: options.c:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr ""
 
-#: options.c:676
+#: options.c:654
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:678
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      especifica um comando externo para abrir uma conexão\n"
+msgstr "      --plugin      especifica um comando externo para abrir uma conexão\n"
 
-#: options.c:679
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     especifica um comando externo para abrir uma conexão "
-"smtp\n"
+msgstr "      --plugout     especifica um comando externo para abrir uma conexão smtp\n"
 
-#: options.c:680
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
-#, fuzzy
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
+#: options.c:661
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica o protocolo de retirada (ver página de \n"
 "                    manual)\n"
 
-#: options.c:684
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        força o uso de UIDLs (somente para pop3)\n"
 
-#: options.c:685
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:686
+#: options.c:663
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        Porta TCP para conexão\n"
 
-#: options.c:687
+#: options.c:664
 #, fuzzy
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        Porta TCP para conexão\n"
 
-#: options.c:688
+#: options.c:665
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --preauth     tipo de pré-autenticação (senha/kerberos/ssh)\n"
 
-#: options.c:689
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
-msgstr ""
-"  -t, --timeout     tempo limite para não obtenção de resposta do servidor\n"
+msgstr "  -t, --timeout     tempo limite para não obtenção de resposta do servidor\n"
 
-#: options.c:690
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabeçalho do endereço de envelope\n"
 
-#: options.c:691
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual    prefixo para remover da identificação de um usuário "
-"local\n"
+msgstr "  -Q, --qvirtual    prefixo para remover da identificação de um usuário local\n"
 
-#: options.c:692
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:693
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:695
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
-msgstr ""
-"  -u, --username    especifica a identificação do usuário no servidor\n"
+#: options.c:672
+msgid "  -u, --username    specify users's login on server\n"
+msgstr "  -u, --username    especifica a identificação do usuário no servidor\n"
 
-#: options.c:696
+#: options.c:673
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         recupera mensagens antigas e novas\n"
 
-#: options.c:697
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      apaga novas mensagens após a recuperação\n"
 
-#: options.c:698
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        não apaga novas mensagens após recuperação\n"
 
-#: options.c:699
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:700
+#: options.c:677
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:701
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   não reescreve os cabeçalhos das mensagens\n"
 
-#: options.c:702
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       não recupera mensagens acima de um dado tamanho\n"
 
-#: options.c:703
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre avisos de notificação de e-mail\n"
 
-#: options.c:705
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configura a máquina SMTP para reenvio\n"
 
-#: options.c:706
+#: options.c:683
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:707
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr ""
-"  -D, --smtpaddress configura o domínio de entrega do SMTP a ser usado\n"
+msgstr "  -D, --smtpaddress configura o domínio de entrega do SMTP a ser usado\n"
 
-#: options.c:708
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:709
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configura o valor das respostas anti-spam\n"
 
-#: options.c:710
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  configura o limite de lote para conexões SMTP\n"
 
-#: options.c:711
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:712
+#: options.c:689
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:713
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:714
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     configura o máximo de deleções entre eliminações\n"
 
-#: options.c:715
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "      --mda         configura o MDA a ser usado para reenvio\n"
 
-#: options.c:716
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configura o arquivo de saída BSMTP\n"
 
-#: options.c:717
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) para entrega\n"
 
-#: options.c:718
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especifica o nome da pasta remota\n"
 
-#: options.c:719
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:329
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Alerta: \"Maillennium POP3\" encontrado, usando o comando RETR ao invés de "
-"TOP.\n"
+#: pop3.c:327
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Alerta: \"Maillennium POP3\" encontrado, usando o comando RETR ao invés de TOP.\n"
 
-#: pop3.c:413
+#: pop3.c:411
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:414
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:491
+#: pop3.c:494
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:497
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:622
+#: pop3.c:621
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:636
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Data/horário APOP exigidos não encontrados na saudação\n"
 
-#: pop3.c:645
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na data/horário da saudação\n"
 
-#: pop3.c:661
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:685
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Solicitação de protocolo não definida em POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr "arquivo de travamento presente! Há outra sessão ativa?\n"
 
-#: pop3.c:785
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:808
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:837
+#: pop3.c:835
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) foi excluído, mas ainda está presente!\n"
 
-#: pop3.c:949
+#: pop3.c:941
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Mensagens inseridas numa lista no servidor. Não posso tratar isso.\n"
 
-#: pop3.c:1047
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:1063
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo durante a obtenção de UIDLs\n"
 
-#: pop3.c:1094
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) foi excluído, mas ainda está presente!\n"
 
-#: pop3.c:1445
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opção --remote não é compatível com POP3\n"
@@ -2577,36 +2448,32 @@ msgid "SDPS not enabled."
 msgstr ""
 
 #: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:226
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL não está habilitado"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:391
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:430
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:440
+#: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:452
+#: rcfile_y.y:451
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2792,8 +2659,7 @@ msgstr "    o serviço que você pensa estar (ataques\n"
 
 #: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
-msgstr ""
-"    de re-tentativa por parte de um serviço desonesto são possíveis.)\n"
+msgstr "    de re-tentativa por parte de um serviço desonesto são possíveis.)\n"
 
 #: rpa.c:724
 msgid "User challenge:\n"
@@ -2826,136 +2692,135 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "repassando para %s\n"
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:456
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:509 sink.c:608
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erro %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:736
+#: sink.c:735
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de preâmbulo falhou\n"
 
-#: sink.c:782
+#: sink.c:781
 #, fuzzy, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de preâmbulo falhou\n"
 
-#: sink.c:996
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Cliente %cMTP não gosta do endereço do destinatário `%s'\n"
 
-#: sink.c:1003
+#: sink.c:1002
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Cliente %cMTP não gosta do endereço do destinatário `%s'\n"
 
-#: sink.c:1049
+#: sink.c:1048
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1061
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "não é possível nem mandar para %s!\n"
 
-#: sink.c:1067
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1223
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "prestes a entregar para: %s\n"
 
-#: sink.c:1234
+#: sink.c:1233
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr ""
 
-#: sink.c:1246
+#: sink.c:1245
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "Abertura MDA falhou\n"
 
-#: sink.c:1292
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: sink.c:1316
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1374
+#: sink.c:1373
 #, fuzzy, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
 
-#: sink.c:1399
+#: sink.c:1398
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erro na liberação de credenciais\n"
 
-#: sink.c:1402
+#: sink.c:1401
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: sink.c:1405
+#: sink.c:1404
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
-msgstr ""
-"O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
+msgstr "O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1433
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "Cliente SMTP recusou a entrega\n"
 
-#: sink.c:1463
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1466
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta não-503 para o EOM LMTP: %s\n"
 
-#: sink.c:1632
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1620
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "O daemon do Fetchmail"
@@ -2986,337 +2851,254 @@ msgstr ""
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:110 socket.c:137
 #, fuzzy
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:171
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair falhou\n"
 
-#: socket.c:177
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:184
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 falhou\n"
 
-#: socket.c:190
+#: socket.c:188
 #, fuzzy, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "rodando %s %s %s\n"
 
-#: socket.c:195
+#: socket.c:193
 #, fuzzy, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: socket.c:270
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:273
+#: socket.c:271
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:287 socket.c:290
+#: socket.c:285 socket.c:288
 #, fuzzy, c-format
 msgid "unknown (%s)"
 msgstr "a máquina é desconhecida."
 
-#: socket.c:293
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:302
+#: socket.c:300
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "não é possível nem mandar para %s!\n"
 
-#: socket.c:304
+#: socket.c:302
 #, fuzzy, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "não é possível nem mandar para %s!\n"
 
-#: socket.c:322
+#: socket.c:320
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: socket.c:324
+#: socket.c:322
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: socket.c:325
+#: socket.c:323
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: socket.c:331
+#: socket.c:329
 #, fuzzy
 msgid "connected.\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: socket.c:344
+#: socket.c:342
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
+#: socket.c:387
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL informou: %s\n"
 
-#: socket.c:641
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:647
+#: socket.c:622
 msgid "Server certificate:\n"
 msgstr "Certificado do servidor:\n"
 
-#: socket.c:652
+#: socket.c:627
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:630
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:664
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:666
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:668
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:673
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:679
+#: socket.c:654
 #, fuzzy, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Data/horário do serviço %s\n"
 
-#: socket.c:685
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:691
+#: socket.c:666
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:719
+#: socket.c:694
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:700
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:742
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:754
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr "Nome comum de servidor desconhecido\n"
 
-#: socket.c:756
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:768
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falhou!\n"
 
-#: socket.c:772
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "Sem memória!\n"
 
-#: socket.c:780
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:790
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:804
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:819
+#: socket.c:794
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr ""
 
-#: socket.c:821
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
+#: socket.c:796
+msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about.  For details, please see the README.SSL-SERVER document that ships with fetchmail.\n"
 msgstr ""
 
-#: socket.c:831
+#: socket.c:806
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page.\n"
+#: socket.c:809
+msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:907 socket.c:985
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:925 socket.c:1003
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
+#: socket.c:902
+msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
+#: socket.c:913
+msgid "Your operating system does not support SSLv2.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:923
 #, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo `%s' inválido foi especificado.\n"
 
-#: socket.c:1070
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1075
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1095
-msgid "File descriptor out of range for SSL"
-msgstr ""
-
-#: socket.c:1115
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1183
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1198
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1235
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1238
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1238
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1258
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1261
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-
-#: socket.c:1268
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1285
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Aviso: a conexão é insegura, continuando mesmo assim. (Melhor usar --"
-"sslcertck!)\n"
+#: socket.c:1039
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Aviso: a conexão é insegura, continuando mesmo assim. (Melhor usar --sslcertck!)\n"
 
-#: socket.c:1327
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1330
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3366,150 +3148,148 @@ msgstr "encontrado endereço Received `%s'\n"
 #: transact.c:613
 #, fuzzy
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"encontrado o delimitador de mensagens durante varredura de cabeçalhos\n"
+msgstr "encontrado o delimitador de mensagens durante varredura de cabeçalhos\n"
 
 #: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "linha %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1132
 #, fuzzy, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 "analisando linha Received:\n"
 "%s"
 
-#: transact.c:1142
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: transact.c:1190
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvio e remoção suprimidos devido a erro de DNS\n"
 
-#: transact.c:1301
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrevendo cabeçalhos RFC822\n"
 
-#: transact.c:1320
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
 msgstr "nenhum endereço de destino combina com o valor local declarado"
 
-#: transact.c:1327
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "endereço do destinatário %s não combina com nenhum nome local"
 
-#: transact.c:1336
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr "a mensagem possui NULs inseridos"
 
-#: transact.c:1344
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Cliente SMTP rejeitou o endereço do destinatário: "
 
-#: transact.c:1394
+#: transact.c:1493
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "escrevendo o texto da mensagem\n"
 
-#: transact.c:1670
+#: transact.c:1641
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
 
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:249
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "Lista de UID antiga de %s:"
 
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <vazio>"
 
-#: uid.c:273
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr ""
 
-#: uid.c:357 uid.c:401
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
-msgstr "Lista de UID antiga de %s:"
+#: uid.c:325 uid.c:374
+#, c-format
+msgid "Merged UID list from %s:"
+msgstr ""
 
-#: uid.c:360
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
-msgstr "Lista de UID antiga de %s:"
+#: uid.c:328
+#, c-format
+msgid "New UID list from %s:"
+msgstr ""
 
-#: uid.c:390
+#: uid.c:355
+#, fuzzy
+msgid "swapping UID lists\n"
+msgstr "lista de UID gravada\n"
+
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:410
+#: uid.c:383
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "lista de UID gravada\n"
 
-#: uid.c:466
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Excluindo arquivo fetchids.\n"
 
-#: uid.c:469
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Erro ao excluir %s: %s\n"
 
-#: uid.c:476
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Escrevendo arquivo fetchids.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:439 uid.c:447
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Erro de escrita no arquivo fetchids %s: %s\n"
 
-#: uid.c:511
+#: uid.c:459
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Erro de escrita no arquivo fetchids %s, o arquivo antigo foi mantido no "
-"lugar.\n"
+msgstr "Erro de escrita no arquivo fetchids %s, o arquivo antigo foi mantido no lugar.\n"
 
-#: uid.c:515
+#: uid.c:463
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Não foi possível renomear o arquivo fetchids %s para %s: %s\n"
 
-#: uid.c:519
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Não foi possível abrir o arquivo fetchids %s para escrever: %s\n"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "A rotina malloc falhou\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "A rotina realloc falhou\n"
-
-#, fuzzy
-#~ msgid "swapping UID lists\n"
-#~ msgstr "lista de UID gravada\n"
diff --git a/po/ru.po b/po/ru.po
index a7e3fae0..4b67766b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2009-06-05 14:53+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: checkalias.c:174
@@ -391,7 +392,7 @@ msgstr "выбирается или повторяется опрос катал
 msgid "%s at %s (folder %s)"
 msgstr "%s на %s (каталог %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
@@ -687,81 +688,81 @@ msgstr "ПРЕДУПРЕЖДЕНИЕ. Запуск под root'ом не рек�
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: запущен с"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "невозможно было получить текущий рабочий каталог\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Это fetchmail версии %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Опции берутся из командной строки %s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " и "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Нет настроенных почтовых серверов -- может отсутствует %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: не были указаны почтовые серверы.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: другие запущенные fetchmail отсутствуют\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, fuzzy, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr ""
 "fetchmail: ошибка остановки %s fetchmail на %d; вынужденное завершение.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "фоновый режим"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "приоритетный режим"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail на %d остановлен.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -769,7 +770,7 @@ msgstr ""
 "fetchmail: невозможно проверить почту, пока на том же хосте запущен другой "
 "fetchmail.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, fuzzy, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -778,207 +779,207 @@ msgstr ""
 "fetchmail: невозможно опросить указанные хосты из-за другого fetchmail, "
 "запущенного на %d.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, fuzzy, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: на %d запущен другой приоритетный fetchmail.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: на %d из фонового режима вернулся  fetchmail.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr ""
 "fetchmail: на %d неожиданно завершился более старший процесс того же "
 "уровня.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: невозможно найти пароль для %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Введите пароль для %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "запускается демон fetchmail %s\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, fuzzy, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "невозможно было открыть %s для добавления записей\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "влючен режим --check, выборка почты не выполняется\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "невозможно было проверить время %s (ошибка %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail перезапускается (%s изменен)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "возможен сбой при перезапуске, т.к. каталог не был восстановлен\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "сбой перезапуска fetchmail\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "опрос %s пропущен (ошибка аутентификации или слишком много тайм-аутов)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "интервал не достигнут, %s не запрашивается\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Статус запроса=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Статус запроса=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Статус запроса=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Статус запроса=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Статус запроса=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Статус запроса=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Статус запроса=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Статус запроса=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Статус запроса=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Статус запроса=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Статус запроса=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Статус запроса=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Статус запроса=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Статус запроса=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Статус запроса=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Все соединения перегружены.  Завершение работы.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "в спящем режиме в %s на %d секунд\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "разбужен %s'ом\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "разбужен по сигналу %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "разбужен на %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "нормальное завершение, статус %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "невозможно было проверить время файла контроля запуска\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Предупреждение: многократные ссылки на хост %s в файле настройки\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "Поддержка SSL не была включена при компиляции.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v4 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v5 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Поддержка GSSAPI настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -986,18 +987,18 @@ msgstr ""
 "fetchmail: предупреждение: не доступен DNS для проверки многоканальной "
 "выборки из %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "предупреждение: multidrop для %s требует опцию envelope!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "предупреждение: Не просите технической поддержки, если все сообщения "
 "отправляются постмастеру!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1006,324 +1007,324 @@ msgstr ""
 "fetchmail: конфигурация %s не верна, укажите положительный номер порта для "
 "службы\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный "
 "порт\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Запускать fetchall, оставляя его при этом в режиме демона или простоя, "
 "нельзя!\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "завершен по сигналу %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос начат\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "Поддержка POP2 не настроена.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "Поддержка POP3 не настроена.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "Поддержка IMAP не настроена.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "Поддержка ETRN не настроена.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "Поддержка ODMR не настроена.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "выбран неподдерживаемый протокол.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос завершен\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал опроса - %d секунд\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Лог-файл - %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-файл - %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Обработка сообщений будет регистрироваться через syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail включит маскировку и не создаст поле Received\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail будет пересылать многоканальные сообщения без адреса на %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail направит ошибочное письмо постмастеру.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail направит ошибочное письмо отправителю.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail будет считать постоянные ошибки постоянными (удалит сообщения).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail будет считать постоянные ошибки временными (сохранит сообщения).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Параметры для получения из %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Почта будет получена через %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  Опрос этого сервера будет выполняться с интервалом %d.\n"
 msgstr[1] "  Опрос этого сервера будет выполняться с интервалами %d.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Настоящее имя севера - %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, этот хост не будет запрошен.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, будет запрошен этот хост.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Будет затребован пароль.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Секрет APOP = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Пароль = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол - KPOP с аутентификацией Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол - %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (используется служба %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (используется порт по умолчанию)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (принудительно используется UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Будут испробованы все доступные способы аутентификации.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация с паролем.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация MSN.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация OTP.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация CRAM-Md5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Допускается оперативное шифрование.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Принципал почтовой службы: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Включены сессии, зашифрованные SSL.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Протокол SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Включена проверка сертификата сервера SSL.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Включена проверка сертификата сервера SSL.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, fuzzy, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Каталог доверенных сертификатов SSL: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Каталог доверенных сертификатов SSL: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Общепринятое имя SSL-сервера: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Отпечаток ключа SSL (сверенный с ключом сервера): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Таймаут молчания сервера - %d секунд"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (по умолчанию).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Выбран почтовый ящик по умолчанию.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Выбранные почтовые ящики:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Будут получены все сообщения (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Будут получены только новые сообщения (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Выбранные сообщения будут оставлены на сервере (--keep on).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Выбранные сообщения будут удалены с сервера (--keep off).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Старые сообщения будут удалены перед получением сообщения (--flush on).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Старые сообщения не будут удалены перед получением сообщения (--flush "
 "off).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1331,7 +1332,7 @@ msgstr ""
 "  Сообщения завышенного размера будут удалены перед получением сообщения (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1339,346 +1340,346 @@ msgstr ""
 "  Сообщения завышенного размера не будут удалены перед получением сообщения "
 "(--limitflush  off).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Перезапись локальных адресов сервера включена (--norewrite off).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Перезапись локальных адресов сервера выключена (--norewrite on).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Удаление возврата каретки включено (stripcr on).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Удаление возврата каретки выключено (stripcr off).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Принудительный возврат каретки включен (forcecr on).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Принудительный возврат каретки выключен (forcecr off).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Интерпретация кодировки передаваемого контента включена (pass8bits off).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-декодирование включено (mimedecode on).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-декодирование выключено (mimedecode off).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Простой после опроса включен (idle on).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Простой после опроса выключен (idle off).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Непустые строки состояния будут удалены (dropstatus on)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Непустые строки состояния будут сохранены (dropstatus off)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Строки Delivered-To будут удалены (dropdelivered on)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Строки Delivered-To будут сохранены (dropdelivered off)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничение на размер сообщения - %d октетов (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Нет ограничения на размер сообщения (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Интервал между предупреждениями о размере сообщения - %d секунд (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Предупреждения о размере при каждом опросе (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничение на полученные сообщения - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Нет ограничения на полученные сообщения (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Нет ограничения на размер выборки сообщений (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl "
 "%d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничение на пакет SMTP-сообщений - %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Нет ограничения на пакет SMTP-сообщений (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Интервал между удалениями принудительно установлен в %d (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Нет принудительных удалений (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домены, для которых будет выполняться выборка почты:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (по умолчанию)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Сообщения будут прикреплены к %s как BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Сообщения будут доставлены с \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Сообщения будут переадресованы по %cMTP на:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Часть хоста из строки MAIL FROM будет %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Ответные действия на распознанные слушателем спам-блоки:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокировка спама отключена\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Подключение к серверу будет установлено с \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Нет команды, выполняемой до соединения.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Подключение к серверу будет разорвано с \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Нет команды, выполняемой после соединения.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Нет локальных имен, объявленных для этого хоста.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Многоканальный режим:"
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Одноканальный режим: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "распознано %d локальное имя.\n"
 msgstr[1] "распознано %d локальных имён.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов включен.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов выключен.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Алисы сервера будут сравнены с многоканальными адресами по имени.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Маршрутизация охватывающего адреса отключена\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Охватывающий заголовок должен быть: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Количество пропускаемых охватывающих заголовков: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префикс %s будет удален из id пользователя\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Нет разборки префикса\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Ранее объявленные алиасы почтового сервера:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Локальные домены:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Подключение должно быть через интерфейс %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Не указаны требования интерфейса.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Цикл опроса будет наблюдать за %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Не указан интерфейс монитора.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Подключения к серверу будут выполняться посредством плагина %s (--plugin "
 "%s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Не указана команда плагина.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Не указана команда plugout'а.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  С этого хоста нет сохраненных UID'ов.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Сохранено %d UID'ов.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Информация с трассировкой опроса будет добавлена в заголовок Received.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 #, fuzzy
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Информация с трассировкой опроса не будет добавлена в заголовок Received.\n"
 ".\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свойства ретрансляции \"%s\".\n"
@@ -1700,88 +1701,88 @@ msgstr ""
 "\n"
 "Получен SIGINT... завершение работы.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr ""
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, fuzzy, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Ошибка %cMTP: %s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Невозможно было получить имя службы для [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Используется имя службы [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Отправляются идентификационные данные\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Ошибка обмена идентификационными данными\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "Невозможно было развернуть данные уровня безопасности\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Обмен идентификационными данными завершен\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Серверу требуются целостность и/или конфиденциальность\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Флаги развернутого уровня безопасности: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Максимальный размер маркера GSS - %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Ошибка создания запроса уровня безопасности\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Создаются идентификационные данные GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Ошибка создания идентификационных данных\n"
 
@@ -1790,136 +1791,132 @@ msgstr "Ошибка создания идентификационных дан�
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: поток приостановлен в течение %d секунд.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr ""
 
-#: imap.c:96
+#: imap.c:97
 #, fuzzy, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "фиктивное количество сообщений!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизия 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизия 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Протокол идентифицирован как IMAP2 или IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "будет приостановлен после опроса\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: обновление до TLS выполнено успешно.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: сбой обновления до TLS.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
 "работу\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail скомпилирован без требуемой поддержки OTP\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail скомпилирован без требуемой поддержки NTLM\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Требуемая опция LOGIN не поддерживается сервером\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "разногласие при удалении писем (%d на самом деле != %d ожидалось)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu не просмотрено\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u не просмотрено\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "не удалось повторить опрос\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "ожидается %d сообщение после повторного опроса\n"
 msgstr[1] "ожидается %d сообщений после повторного опроса\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "не удалось выбрать почтовый ящик\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ожидается %d сообщение после первого опроса\n"
 msgstr[1] "ожидается %d сообщений после первого опроса\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "не удалось удалить\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "ожидается %d сообщение после удаления\n"
 msgstr[1] "ожидается %d сообщений после удаления\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "сбой поиска непросмотренных сообщений\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u первое не просмотренное\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Предупреждение: игнорируются некорректные данные о размерах сообщений, "
 "возвращённые сервером.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2116,97 +2113,97 @@ msgstr "Опция --folder не поддерживается с ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Опция --check не поддерживается с ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "сервер прекратил получение\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "Невозможно было декодировать запрос OTP\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Секретная идентификационная фраза:"
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Строка '%s' не является верной числовой строкой.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Значение строки '%s' - %s, чем %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "меньше"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "больше"
 
-#: options.c:336
+#: options.c:337
 #, fuzzy, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Указан неверный протокол `%s'.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Указан неверный протокол `%s'.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Указана неверная аутентификация `%s'.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "использование:  fetchmail [опции] [сервер ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Используемые опции:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        вывод этой справки\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     вывод информации о версии\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       проверка сообщений без выборки\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      работа без лишней информации\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     работа с подробным выводом диагностических данных\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      запуск в виде демона каждые n секунд\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    не отсоединять процесс демона\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        останов процесса демона\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     указание имени log-файла\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2214,42 +2211,42 @@ msgstr ""
 "      --syslog      использование syslog(3) для большинства сообщений, когда "
 "запущен как демон\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   не записывать Received и включить спуфинг хоста\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc указание другого файла контроля запуска\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      указание других UID'ов файла\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     указание другого файла с PID'ом\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  указать получателя на крайний случай\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    перенаправлять рикошеты пользователей постмастеру\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail удаляет постоянно недоставляемые сообщения\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2257,55 +2254,55 @@ msgstr ""
 "      --softbounce  сохранять на сервере постоянно недоставляемые сообщения "
 "(по умолчанию)\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   требуемая для интерфейса спецификация\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     наблюдение за активностью интерфейса\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         включение сессии, зашифрованной ssl\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      файл секретного ключа ssl\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     сертификат клиента ssl\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   строгая проверка сертификата севера (рекомендуется)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr ""
 "      --sslcertck   строгая проверка сертификата севера (рекомендуется)\n"
 
-#: options.c:672
+#: options.c:673
 #, fuzzy
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertpath путь к сертификатам ssl\n"
 
-#: options.c:673
+#: options.c:674
 #, fuzzy
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath путь к сертификатам ssl\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  ожидать это общепринятое имя от сервера (не "
 "рекомендуется)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2313,187 +2310,187 @@ msgstr ""
 "      --sslfingerprint отпечаток, который должен соответствовать сертификату "
 "сервера.\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr ""
 "      --sslproto    принудительное использование протокола ssl (SSL2/SSL3/"
 "TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      указание внешней команды для установки соединения\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     указание внешней команды для установки соединения smtp\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    указание протокола поиска (см. man page)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        принудительное использование UIDL'ов (только pop3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        TCP-порт для подключения (устарел, используйте --"
 "service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     служба TCP для подключения (может быть числовым TCP-"
 "портом)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr "      --auth        тип аутентификации (password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     таймаут молчания сервера\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    заголовок охватывающего адреса\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    префикс, удаляемый из id локального пользователя\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   принципал почтовой службы\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  добавление информации трассировки опроса в заголовок "
 "Received\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    указание логина пользователя на сервере\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  получение старых и новых сообщений\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      удаление новых сообщений после получения\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        сохранение новых сообщений после получения\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       удаление старых сообщений с сервера\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  удаление сообщений завышенного размера\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   не перезаписывать адреса заголовка\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       не делать выборку сообщений больше заданного размера\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    промежутки между предупреждающими почтовыми "
 "уведомлениями\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    установка хоста переадресации SMTP\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains выборка почты для указанных доменов\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress установка домена, используемого для доставки SMTP\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    установка полного (пользователь@домен) имени SMTP\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   установка значений антиспамерских ответных действий\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  установка ограничения на пакет для SMTP-соединений\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  установка ограничения на выборку для соединений сервера\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchsizelimit установка ограничения на размер выборки сообщений\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    выполнить двоичный поиск UIDL'ов\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     установка максимального количества удалений\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         установка MDA, используемого для переадресации\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       установка файла вывода BSMTP\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        использование для доставки LMTP (RFC2033)\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      указание имени удаленного каталога\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    отображение точечной строки прогресса даже в log-файлах\n"
@@ -2506,7 +2503,7 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 #, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
@@ -2514,95 +2511,95 @@ msgstr ""
 "Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP "
 "используется команда RETR.\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "Для этого сеанса требуется использовать TLS, однако сервер отклонил команду "
 "CAPA.\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Команда CAPA необходима для TLS.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
 "работу.\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Закончились допустимые аутентификаторы, продолжение невозможно.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В приветствии не найдена требуемая временная метка APOP\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "В приветствии ошибка синтаксиса временной метки\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Недопустимая временная метка APOP.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Неопределённый запрос протокола в POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "блокировка занятости!  Может активен другой сеанс?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Невозможно обработать UIDL-ответ upstream-сервера.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Сервер возвратил ответ с UID для неверного сообщения.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Сообщения добавлены в список на сервере. Обработка невозможна.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "ошибка протокола\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ошибка протокола при выборке UIDL'ов\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опция --folder не поддерживается с POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "опция сервера после опций пользователя"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS не включен."
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2610,32 +2607,32 @@ msgstr ""
 "fetchmail: опция interface поддерживается только в Linux (без IPv6) и "
 "FreeBSD\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 "fetchmail: опция monitor поддерживается только в Linux (без IPv6) и FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL не включен"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "конец ввода"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Файл %s должен быть обычным файлом.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Файл %s должен иметь прав доступа не более -rwx------ (0700).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Владельцем файла %s должны быть вы.\n"
@@ -2864,104 +2861,108 @@ msgstr "SMTP: (тело сообщения-рикошета)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "письмо от %s отправлено рикошетом на %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Сохраненная ошибка все еще %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Ошибка %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Для SMTP-сервера требуется STARTTLS; сообщение сохранено.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Не удалось открыть файл BSMTP: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, fuzzy, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Не удалось записать начальную часть BSMTP.\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Слушателю %cMTP не понравился адрес получателя `%s'\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Слушателю %cMTP в самом деле не понравился адрес получателя `%s'\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "нет сопоставленных адресов; постмастер не установлен.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "даже невозможно отправить на %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "нет сопоставленных адресов; переадресовывается на %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "будет отправлен с: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, fuzzy, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Не удалось открыть MDA\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Сбой %cMTP-подключения к %s\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "невозможно запустить слушателя; откат на %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, fuzzy, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Не удалось удалить сообщение или закрыть файл BSMTP\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Ошибка записи в MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA завершен по сигналу %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA возвратил ненулевой статус %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2969,20 +2970,20 @@ msgstr ""
 "Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно "
 "обработать в %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "Слушатель SMTP отказал в доставке\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ошибка доставки LMTP на EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Неожиданный не-503 ответ для LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -3018,219 +3019,219 @@ msgstr "Аутентификация ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "ошибка протокола слушателя smtp\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: сбой malloc\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: сбой socketpair\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: не удалось создать дочерний процесс\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "сбой dup2\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "запущен %s (хост %s служба %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "сбой execvp(%s)\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "ошибка getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Попробуйте добавить опцию --service (см. FAQ, пункт R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "неизв. (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Попытка подключения к %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "невозможно создать сокет: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, fuzzy, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "невозможно создать сокет: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "не удалось подключиться.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "соединение установлено.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 #, fuzzy
 msgid "Server certificate:\n"
 msgstr "Ошибка проверки сертификата сервера: %s\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Запрашивающая организация: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Предупреждение: имя запрашивающей организации слишком длинное (возможно "
 "укорочено).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Неизвестная организация\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Общепринятое имя: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Неизвестное общепринятое имя\n"
 
-#: socket.c:679
+#: socket.c:684
 #, fuzzy, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Общепринятое имя: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:691
+#: socket.c:696
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:730
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Несовпадение общепринятого имени сервера: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Имя сервера не установлено, невозможно проверить сертификат!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Неизвестное общепринятое имя сервера\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Имя сервера не указано в сертификате!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "сбой EVP_md5()!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Нехватка памяти!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Буфер текстового журнала слишком мал!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Отпечаток ключа %s: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Отпечатки %s совпадают.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Отпечатки %s не совпадают!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ошибка проверки сертификата сервера: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Ошибка проверки сертификата сервера: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3238,12 +3239,12 @@ msgid ""
 "fetchmail.\n"
 msgstr ""
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
+#: socket.c:839
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
 "CA certificate location, or that c_rehash needs to be run on the certificate "
@@ -3251,102 +3252,102 @@ msgid ""
 "sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr ""
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr ""
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr ""
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr ""
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr ""
 "Указан неверный протокол SSL '%s', используется протокол по умолчанию "
 "(SSLv23).\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Дескриптор файла вне диапазона SSL"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr ""
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Повторная попытка чтения сокета Cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Сбой повторного чтения сокета Cygwin!\n"
 
@@ -3403,62 +3404,62 @@ msgstr "при сканировании заголовков найдена не
 msgid "line: %s"
 msgstr "строка: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1112
 #, fuzzy, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 "анализируется строка Received:\n"
 "%s"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "нет локальных совпадений, переадресовывается на %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "переадресация и удаление приостановлены из-за ошибок DNS\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "записываются заголовки RFC822 msgblk\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "нет адресов получателей, соответствующих объявленным локальным именам"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "адрес получателя %s не соответствует ни одному локальному имени"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "сообщение содержит вложенные NUL"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Слушатель SMTP отверг адреса локальных получателей: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "ошибка записи текста сообщения\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3495,35 +3496,35 @@ msgstr "списки UID не обмениваются, в этом запрос
 msgid "discarding new UID list\n"
 msgstr "отбрасывается новый список UID\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Удаляется файл fetchids.\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Ошибка удаления %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Записывается файл fetchids.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, fuzzy, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Записывается файл fetchids.\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Ошибка записи в fetchids-файл %s, старый файл остался на месте.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Невозможно открыть fetchids-файл %s для записи: %s\n"
@@ -3536,9 +3537,6 @@ msgstr "сбой malloc\n"
 msgid "realloc failed\n"
 msgstr "сбой realloc\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "обмениваются списки UID\n"
-
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Тема: Предупреждение Fetchmail о недоступности сервера."
 
@@ -3551,6 +3549,12 @@ msgstr "сбой realloc\n"
 #~ "fetchmail: Предупреждение: настроено использование syslog и logfile. "
 #~ "Проверяйте оба журнала!\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Требуемая опция LOGIN не поддерживается сервером\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Сохраненная ошибка все еще %d\n"
+
 #~ msgid "Server CommonName: %s\n"
 #~ msgstr "Общепринятое имя сервера: %s\n"
 
@@ -3560,6 +3564,9 @@ msgstr "сбой realloc\n"
 #~ msgid "message delimiter found while scanning headers\n"
 #~ msgstr "при сканировании заголовков найден разделитель сообщения\n"
 
+#~ msgid "swapping UID lists\n"
+#~ msgstr "обмениваются списки UID\n"
+
 #~ msgid "TLS connection failed.\n"
 #~ msgstr "Сбой подключения через SSL.\n"
 
diff --git a/po/sk.po b/po/sk.po
index f1810845..41e95b54 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,36 +7,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.20-rc2\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2011-05-26 02:04+0200\n"
 "PO-Revision-Date: 2011-05-28 21:37+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Kontrola, či %s je naozaj ten istý uzol ako %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Áno, ich IP adresy súhlasia\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Nie, ich IP adresy nesúhlasia\n"
 
-#: checkalias.c:207
+#: checkalias.c:203
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "Nameserver-zlyhanie pri hľadaní `%s' počas komunikácie s %s.\n"
 
-#: checkalias.c:230
+#: checkalias.c:228
 #, fuzzy, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "Nameserver-zlyhanie pri hľadaní `%s' počas komunikácie s %s.\n"
@@ -61,7 +62,7 @@ msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server hovorí '%s']\n"
 
 #: driver.c:345
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
 #: driver.c:349
@@ -90,121 +91,108 @@ msgstr[0] "  %d správ s veľkosťou %d oktetov vynechaných fetchmailom."
 msgstr[1] "  %d správa s veľkosťou %d oktetov vynechaná fetchmailom."
 msgstr[2] "  %d správy s veľkosťou %d oktetov vynechané fetchmailom."
 
-#: driver.c:522
+#: driver.c:521
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "vynechávanie správy %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:575
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "vynechávanie správy %s@%s:%d (%d oktetov)"
 
-#: driver.c:593
+#: driver.c:591
 msgid " (length -1)"
 msgstr " (dĺžka -1)"
 
-#: driver.c:596
+#: driver.c:594
 msgid " (oversized)"
 msgstr " (nadrozmerné)"
 
-#: driver.c:614
+#: driver.c:612
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nepodarilo sa získať hlavičky, správa %s@%s:%d (%d oktetov)\n"
 
-#: driver.c:632
+#: driver.c:629
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "čítanie správy %s@%s:%d z %d"
 
-#: driver.c:637
+#: driver.c:634
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktetov)"
 
-#: driver.c:638
+#: driver.c:635
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetov hlavičky)"
 
-#: driver.c:708
+#: driver.c:702
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetov tela)"
 
-#: driver.c:770
+#: driver.c:761
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "správa %s@%s:%d nemala očakávanú dĺžku (%d aktuálne != %d očakávané)\n"
 
-#: driver.c:802
+#: driver.c:793
 msgid " retained\n"
 msgstr " ponechané\n"
 
-#: driver.c:812
+#: driver.c:803
 msgid " flushed\n"
 msgstr " vyprázdnené\n"
 
-#: driver.c:824
+#: driver.c:815
 msgid " not flushed\n"
 msgstr " nevyprázdnené\n"
 
-#: driver.c:842
+#: driver.c:833
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] ""
-"fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s účet %s\n"
-msgstr[1] ""
-"fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s účet %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s účet %s\n"
+msgstr[1] "fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s účet %s\n"
 
-#: driver.c:899
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"vypršanie časového limitu po %d sekundách pri čakaní na pripojenie na server "
-"%s.\n"
+msgstr "vypršanie časového limitu po %d sekundách pri čakaní na pripojenie na server %s.\n"
 
-#: driver.c:903
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "vypršanie časového limitu po %d sekundách pri čakaní na server %s.\n"
 
-#: driver.c:907
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "vypršanie časového limitu po %d sekundách pri čakaní na %s.\n"
 
-#: driver.c:912
+#: driver.c:903
 #, fuzzy, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"vypršanie časového limitu po %d sekundách pri čakaní na odpoveď z "
-"prijímača.\n"
+msgstr "vypršanie časového limitu po %d sekundách pri čakaní na odpoveď z prijímača.\n"
 
-#: driver.c:915
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "vypršanie časového limitu po %d sekundách.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:918
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Predmet: fetchmail zisťuje opakované vypršanie časových limitov"
 
-#: driver.c:930
+#: driver.c:921
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail zistil viac ako %d vypršaní časových limitov pri pokusoch získať "
-"poštu z %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail zistil viac ako %d vypršaní časových limitov pri pokusoch získať poštu z %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:925
 #, fuzzy
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
@@ -221,75 +209,75 @@ msgstr ""
 "\n"
 "Fetchmail nebude pracovať s týmto priečinkom, pokiaľ ho nespustíte znova.\n"
 
-#: driver.c:960
+#: driver.c:951
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "príkaz spúšťaný pred spojením nebol úspešný, návratový stav: %d\n"
 
-#: driver.c:963
+#: driver.c:954
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "príkaz spúšťaný pred spojením zlyhal so stavom: %d\n"
 
-#: driver.c:987
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nepodarilo sa nájsť poštovú schránku HESIOD pre %s\n"
 
-#: driver.c:1008
+#: driver.c:999
 #, fuzzy
 msgid "Lead server has no name.\n"
 msgstr "Vedúci server nemá meno.\n"
 
-#: driver.c:1035
+#: driver.c:1026
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nepodarilo sa nájsť kanonické DNS meno pre %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1073
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s spojenie s %s zlyhalo"
 
-#: driver.c:1111
+#: driver.c:1102
 msgid "SSL connection failed.\n"
 msgstr "SSL pripojenie zlyhalo.\n"
 
-#: driver.c:1166
+#: driver.c:1157
 #, fuzzy, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Zámok-chyba zaneprázdnenia pri %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1161
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba zaneprázdnenia servera na %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1166
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Zlyhanie overenia totožnosti na %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1169
 #, fuzzy
 msgid " (previously authorized)"
 msgstr " (predtým autorizovaný)"
 
-#: driver.c:1181
+#: driver.c:1172
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 msgstr ""
 
-#: driver.c:1202
+#: driver.c:1193
 #, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Predmet: autentifikácia fetchmailu neúspešná pri %s@%s\n"
 
-#: driver.c:1206
+#: driver.c:1197
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohol získať poštu z %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1201
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -312,7 +300,7 @@ msgstr ""
 "o spojenie. Ďalšie upozornenia nebudú zasielané, pokiaľ služba\n"
 "nebude obnovená."
 
-#: driver.c:1216
+#: driver.c:1207
 #, fuzzy
 msgid ""
 "\n"
@@ -338,7 +326,7 @@ msgstr ""
 "o spojenie. Ďalšie upozornenia nebudú zasielané, pokiaľ služba\n"
 "nebude obnovená."
 
-#: driver.c:1226
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -359,61 +347,61 @@ msgstr ""
 "o spojenie. Ďalšie upozornenia nebudú zasielané, pokiaľ služba\n"
 "nebude obnovená."
 
-#: driver.c:1242
+#: driver.c:1233
 #, fuzzy, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okamžité stiahnutie z %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1238
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Neznáma chyba pri prihlásení alebo overení totožnosti na %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Overenie totožnosti na %s@%s v poriadku\n"
 
-#: driver.c:1277
+#: driver.c:1268
 #, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Predmet: fetchmail autentifikácia OK na %s@%s\n"
 
-#: driver.c:1281
+#: driver.c:1272
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail bol úspešný pri prihlásení na %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1276
 msgid "Service has been restored.\n"
 msgstr "Služba bola obnovená.\n"
 
-#: driver.c:1318
+#: driver.c:1308
 #, fuzzy, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "výber alebo stiahnutie priečinka %s\n"
 
-#: driver.c:1320
+#: driver.c:1310
 #, fuzzy
 msgid "selecting or re-polling default folder\n"
 msgstr "výber alebo stiahnutie štandardného priečinka\n"
 
-#: driver.c:1332
+#: driver.c:1322
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (priečinok %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1325 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1340
+#: driver.c:1330
 #, fuzzy, c-format
 msgid "Polling %s\n"
 msgstr "Obnovujem %s\n"
 
-#: driver.c:1344
+#: driver.c:1334
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -421,14 +409,14 @@ msgstr[0] "%d správ (%d %s) pre %s"
 msgstr[1] "%d správa (%d %s) pre %s"
 msgstr[2] "%d správy (%d %s) pre %s"
 
-#: driver.c:1347
+#: driver.c:1337
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "videných"
 msgstr[1] "videná"
 msgstr[2] "videné"
 
-#: driver.c:1350
+#: driver.c:1340
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -436,106 +424,101 @@ msgstr[0] "%d správ pre %s"
 msgstr[1] "%d správa pre %s"
 msgstr[2] "%d správy pre %s"
 
-#: driver.c:1357
+#: driver.c:1347
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetov).\n"
 
-#: driver.c:1363
+#: driver.c:1353
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Žiadna pošta pre %s\n"
 
-#: driver.c:1396
+#: driver.c:1386
 #, fuzzy
 msgid "bogus message count!"
 msgstr "neplatný počet správ!"
 
-#: driver.c:1448
-#, c-format
-msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-
-#: driver.c:1549
+#: driver.c:1529
 msgid "socket"
 msgstr ""
 
-#: driver.c:1552
+#: driver.c:1532
 msgid "missing or bad RFC822 header"
 msgstr "chýbajúca alebo zlá hlavička RFC822"
 
-#: driver.c:1555
+#: driver.c:1535
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1538
 msgid "client/server synchronization"
 msgstr "synchronizácia klient/server"
 
-#: driver.c:1561
+#: driver.c:1541
 msgid "client/server protocol"
 msgstr "protokol klient/server"
 
-#: driver.c:1564
+#: driver.c:1544
 msgid "lock busy on server"
 msgstr "zámok na serveri zaneprázdnený"
 
-#: driver.c:1567
+#: driver.c:1547
 msgid "SMTP transaction"
 msgstr "SMTP transakcia"
 
-#: driver.c:1570
+#: driver.c:1550
 #, fuzzy
 msgid "DNS lookup"
 msgstr "DNS vyhľadávanie"
 
-#: driver.c:1573
+#: driver.c:1553
 msgid "undefined"
 msgstr "nedefinované"
 
-#: driver.c:1579
+#: driver.c:1559
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-chyba pri doručovaní na SMTP server %s\n"
 
-#: driver.c:1581
+#: driver.c:1561
 msgid "unknown"
 msgstr "neznáme"
 
-#: driver.c:1583
+#: driver.c:1563
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s chyba pri výbere z %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1575
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "príkaz spúšťaný po spojení nebol úspešný, návratový stav: %d\n"
 
-#: driver.c:1597
+#: driver.c:1577
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "príkaz spúšťaný po spojení zlyhal so stavom %d\n"
 
-#: driver.c:1616
+#: driver.c:1596
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Podpora pre Kerberos V4 nebola pripojená.\n"
 
-#: driver.c:1624
+#: driver.c:1604
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Podpora pre Kerberos V5 nebola pripojená.\n"
 
-#: driver.c:1635
+#: driver.c:1615
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Voľba --flush nie je podporovaná s %s\n"
 
-#: driver.c:1641
+#: driver.c:1621
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Voľba --all nie je podporovaná s %s\n"
 
-#: driver.c:1650
+#: driver.c:1630
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Voľba --limit nie je podporovaná s %s\n"
@@ -560,15 +543,13 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s: NULLMAILER_FLAGS-premenná prostredia je nastavená.\n"
 "To je nebezpečné, pretože to umožňuje pomocou nullmailer-inject a pomocou\n"
-"nullmailer-sendmail wrappera sfalšovanie vašich Od:, Správa-ID: alebo "
-"Návratová-cesta: záhlaví. Skúste \"env NULLMAILER_FLAGS= %s PARAMETRE\"\n"
+"nullmailer-sendmail wrappera sfalšovanie vašich Od:, Správa-ID: alebo Návratová-cesta: záhlaví. Skúste \"env NULLMAILER_FLAGS= %s PARAMETRE\"\n"
 "%s: Ukončené.\n"
 
 #: env.c:85
@@ -582,8 +563,8 @@ msgid "%s: can't determine your host!"
 msgstr "%s: nepodarilo sa určiť vášho hostiteľa!"
 
 #: env.c:172
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zlyhalo pre %s\n"
 
 #: env.c:174
@@ -593,8 +574,7 @@ msgstr ""
 #: env.c:178
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
@@ -662,14 +642,13 @@ msgstr "Voľba --folder nie je podporovaná s ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Voľba --check nie je podporovaná s ETRN\n"
 
-#: fetchmail.c:141
-#, fuzzy
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 "                   Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2019 Matthias Andree\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,\n"
@@ -677,1040 +656,976 @@ msgstr ""
 "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
 "Copyright (C) 2005 - 2010 Matthias Andree\n"
 
-#: fetchmail.c:147
+#: 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"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
 
-#: fetchmail.c:187
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:199
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: vyvolaný s"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "nepodarilo sa získať aktuálny pracovný adresár\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Toto je fetchmail, vydanie %s"
 
-#: fetchmail.c:323
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:330
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:337
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:343
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:361
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:449
+#: fetchmail.c:408
 #, fuzzy, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Preberám voľby z príkazového riadku%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:409
 msgid " and "
 msgstr " a "
 
-#: fetchmail.c:455
+#: fetchmail.c:414
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nie sú nastavené poštové servery -- možno chýba %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:435
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: neboli špecifikované poštové servery.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:447
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nebeží žiaden ďalší fetchmail\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:453
 #, fuzzy, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: chyba pri stopovaní %s-fetchmailu pri %d; zastavené.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:454 fetchmail.c:463
 msgid "background"
 msgstr "pozadie"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:454 fetchmail.c:463
 msgid "foreground"
 msgstr "popredie"
 
-#: fetchmail.c:503
+#: fetchmail.c:462
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s-fetchmail pri %ld ukončený.\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:485
 #, fuzzy
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"nemôžem skontrolovať poštu pokiaľ je spustený iný fetchmail pre rovnakého "
-"hostiteľa.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "nemôžem skontrolovať poštu pokiaľ je spustený iný fetchmail pre rovnakého hostiteľa.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:491
 #, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: nemôžem ťahať z uvedených hostiteľov pokiaľ beží iný fetchmail na "
-"%d.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: nemôžem ťahať z uvedených hostiteľov pokiaľ beží iný fetchmail na %d.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:498
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: v popredí beží iný fetchmail na %ld.\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:508
 #, fuzzy
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: nemôžem akceptovať voľby pokiaľ beží iný fetchmail v pozadí.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: nemôžem akceptovať voľby pokiaľ beží iný fetchmail v pozadí.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:514
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail v pozadí na %d bol prebudený.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:526
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: starší súrodenec na %d záhadne zomrel.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:541
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nepodarilo sa nájsť heslo pre %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:545
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Zadajte heslo pre %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:587
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr ""
 
-#: fetchmail.c:638
+#: fetchmail.c:591
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "štartujem fetchmail %s démona\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:607 fetchmail.c:609
 #, fuzzy, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "nepodarilo sa otvoriť %s pre pripojenie logov k \n"
 
-#: fetchmail.c:675
+#: fetchmail.c:611
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: varovanie: nie je dostupný DNS pre kontrolu Multidrop-spracovaní z %s\n"
+
+#: fetchmail.c:630
 msgid "--check mode enabled, not fetching mail\n"
 msgstr ""
 
-#: fetchmail.c:697
+#: fetchmail.c:652
 #, fuzzy, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nemôžem vykonať časovú kontrolu %s (chyba %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:657
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reštartovanie programu fetchmail (%s zmenených)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:662
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus o nové spustenie môže zlyhať, pretože adresár nebol obnovený\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:689
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus o nové spustenie programu fetchmail zlyhal\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:719
 #, fuzzy, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"obnovenie %s vynechané (zlyhala autentifikácia alebo vypršal čas spojenia)\n"
+msgstr "obnovenie %s vynechané (zlyhala autentifikácia alebo vypršal čas spojenia)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:731
 #, fuzzy, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval nebol dosiahnutý, nebudem posielať dotaz na %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:769
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav dopytu=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:771
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav dopytu=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:773
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav dopytu=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:775
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav dopytu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:777
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav dopytu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:779
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav dopytu=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:781
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav dopytu=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:783
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav dopytu=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:785
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav dopytu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:787
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav dopytu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:789
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav dopytu=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:791
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav dopytu=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:793
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav dopytu=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:795
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav dopytu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:797
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav dopytu=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:839
 #, fuzzy
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Žiadne spojenie nefunguje. Končím.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:847
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "spím o %s\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:871
 #, c-format
 msgid "awakened by %s\n"
 msgstr "zobudený od %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:874
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "zobudený signálom %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:882
 #, c-format
 msgid "awakened at %s\n"
 msgstr "zobudený o %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:887
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normálne ukončenie, stav %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1046
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "nemôžem vykonať časovú kontrolu run-control súboru\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1080
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Upozornenie: viaceré zmienky o hostiteľovi %s v konfiguračnom súbore\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1119
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr ""
-"fetchmail: Chyba: viaceré zmienky o hostiteľovi %s v konfiguračnom súbore.\n"
+msgstr "fetchmail: Chyba: viaceré zmienky o hostiteľovi %s v konfiguračnom súbore.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1241
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL podpora nebola preložená.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1248
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola preložená.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1254
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola preložená.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1260
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola preložená.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1290
 #, fuzzy, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: upozornenie: nie je dostupný DNS pre kontrolu Multidrop-"
-"spracovaní z %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: upozornenie: nie je dostupný DNS pre kontrolu Multidrop-spracovaní z %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1301
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1349
+#: fetchmail.c:1302
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1366
+#: fetchmail.c:1319
 #, fuzzy, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
 msgstr "nesprávna konfigurácia %s, číslo portu nemôže byť záporné\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1326
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "nesprávna konfigurácia %s, RPOP vyžaduje privilegovaný port\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1344
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "nesprávna konfigurácia %s, LMTP nemôže použiť štandardný SMTP port\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1358
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Použitie fetchall ako aj keep on v režime démona je chybné!\n"
 
-#: fetchmail.c:1415
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1439
+#: fetchmail.c:1383
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukončené signálom %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1456
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: ťahanie spustené\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1481
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 podpora nie je nakonfigurovaná.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1493
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 podpora nie je nakonfigurovaná.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1503
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP podpora nie je nakonfigurovaná.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1509
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN podpora nie je nakonfigurovaná.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1517
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR podpora nie je nakonfigurovaná.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1524
 msgid "unsupported protocol selected.\n"
 msgstr "vybraný protokol nie je podporovaný.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1534
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: ťahanie dokončené\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1551
 #, fuzzy, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Dotazovací interval je %d sekúnd\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1553
 #, fuzzy, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-súbor je %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1555
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile je %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1558
 #, fuzzy
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Protokol o správach bude zaznamenaný syslog-om\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1561
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail sa bude maskovať a nebude generovať Received\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude ukazovať priebeh pomocou bodiek aj v log-súbore.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1565
 #, fuzzy, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail bude nesprávne adresované správy posielať ďalej na %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1569
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude smerovať chybové správy správcovi pošty.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1571
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude smerovať chybové správy odosielateľovi.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1574
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail bude nesprávne adresované správy posielať ďalej na %s.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1576
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail bude smerovať chybové správy odosielateľovi.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1583
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Voľby pre získavanie z %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1587
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude získaná cez %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1590
 #, fuzzy, 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] "  Dotazovanie tohoto servera bude vykonané každé %d intervaly.\n"
 msgstr[1] "  Dotazovanie tohoto servera bude vykonané každé %d intervaly.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1594
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skutočný názov servera je %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1597
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tento hostiteľ %s dotazovaný, keď nebude špecifikovaný žiadny iný.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1598
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tento hostiteľ %s dotazovaný, keď nebude špecifikovaný žiadny iný.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1602
 msgid "  Password will be prompted for.\n"
 msgstr "  Heslo bude požadované.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1606
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP tajomstvo = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1609
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP identifikátor = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1612
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1621
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol je KPOP s overením totožnosti Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1624
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol je %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1626
 #, c-format
 msgid " (using service %s)"
 msgstr " (s použitím služby %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1628
 msgid " (using default port)"
 msgstr " (s použitím štandardného portu)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1630
 #, fuzzy
 msgid " (forcing UIDL use)"
 msgstr " (povinné použitie UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1636
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budú skúsené všetky dostupné metódy overenia totožnosti.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1639
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti heslom.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1642
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti MSN.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1645
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1648
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti OTP.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1651
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti CRAM-Md5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1654
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1657
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti Kerberos V4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1660
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti Kerberos V5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1663
 #, fuzzy
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Predpokladané šifrovanie na úrovni koncového zariadenia.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1667
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Vedúci poštovej služby je: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1670
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Povolené relácie šifrované SSL.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1672
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokol: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1674
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola SSL certifikátu servera povolená.\n"
 
-#: fetchmail.c:1740
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Kontrola SSL certifikátu servera povolená.\n"
-
-#: fetchmail.c:1743
+#: fetchmail.c:1677
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Súbor na dôveryhodné certifikáty SSL: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1679
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresár na dôveryhodné certifikáty SSL: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1681
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr ""
 
-#: fetchmail.c:1749
+#: fetchmail.c:1683
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odtlačok SSL kľúča (kontrolovaný oproti kľúču servera): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1686
 #, fuzzy, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Časový limit pre ne-odpovedanie servera je %d sekúnd"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1688
 #, fuzzy
 msgid " (default).\n"
 msgstr " (implicitná hodnota).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1695
 #, fuzzy
 msgid "  Default mailbox selected.\n"
 msgstr "  Vybraný štandardný poštový priečinok.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1700
 msgid "  Selected mailboxes are:"
 msgstr "  Vybrané poštové priečinky sú:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1706
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Všetky správy budu získané (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1707
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Len nové správy budu izískané (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1709
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stiahnuté správy budú ponechané na serveri (--keep on).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1710
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stiahnuté správy nebudú ponechané na serveri (--keep off).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1712
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Staré správy budú zmazané pred získavaním správ (--flush on).\n"
 
-#: fetchmail.c:1779
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1713
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  Staré správy nebudú zmazané pred získavaním správ (--flush off).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1715
 #, fuzzy
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Staré správy %s budú zmazané pred príjmom nových správ (--flush %s).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Staré správy %s budú zmazané pred príjmom nových správ (--flush %s).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1716
 #, fuzzy
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Staré správy %s budú zmazané pred príjmom nových správ (--flush %s).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Staré správy %s budú zmazané pred príjmom nových správ (--flush %s).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Prepis lokálnej adresy servera je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1719
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Prepis lokálnej adresy servera je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Vynechanie znaku \"návrat vozíka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1722
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Vynechanie znaku \"návrat vozíka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynútenie znaku \"návrat vozíka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1725
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynútenie znaku \"návrat vozíka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1727
 #, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpretácia šifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1728
 #, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpretácia šifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1730
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódovanie MIME je povolené (mimedecode on).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1731
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódovanie MIME je zakázané (mimedecode off).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1733
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nečinnosť po stiahnutí je %s (idle %s).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1734
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nečinnosť po stiahnutí je %s (idle %s).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1736
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdne stavové riadky budú %s (dropstatus %s)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdne stavové riadky budú %s (dropstatus %s)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1739
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Riadky Delivered-To budú zahodené (dropdelivered on)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1740
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Riadky Delivered-To budú ponechané (dropdelivered off)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1744
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit pre veľkosť správy je %d oktetov (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1747
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Správy nemajú limitovanú veľkosť (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1749
 #, fuzzy, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Interval pre upozornenie ohľadom veľkosti správy je %d sekúnd (--warnings "
-"%d).\n"
+msgstr "  Interval pre upozornenie ohľadom veľkosti správy je %d sekúnd (--warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1752
 #, fuzzy
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varovanie o veľkosti správ pri každom sťahovaní (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1755
 #, fuzzy, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit pre prijaté správy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1758
 #, fuzzy
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Príjem správ nie je limitovaný (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1760
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit pre prijaté správy je %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1763
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Správy nemajú limitovanú veľkosť (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1767
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1835
+#: fetchmail.c:1769
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1838
+#: fetchmail.c:1772
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1840
+#: fetchmail.c:1774
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky SMTP správ je %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1776
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Dávka SMTP správ nie je limitovaná (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1780
 #, fuzzy, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Interval medzi vymazaniami nastavený na %d (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1782
 #, fuzzy
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nevynútené vymazania (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1789
 #, fuzzy
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény pre ktoré bude doručená pošta sú:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1794 fetchmail.c:1814
 #, fuzzy
 msgid " (default)"
 msgstr " (implicitná hodnota)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1799
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Správy budú pridané k %s ako BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1801
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Správy budú doručené s \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1808
 #, fuzzy, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Správy budú %cMTP-dopravené na:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1819
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Hostiteľ v riadku MAIL FROM bude %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1822
 #, fuzzy, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  Adresa, ktorá sa použije v riadkoch RCPT TO a bude doručená v SMTP bude "
-"%s\n"
+msgstr "  Adresa, ktorá sa použije v riadkoch RCPT TO a bude doručená v SMTP bude %s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1831
 #, fuzzy
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznané SPAM-blokované odpovede prijímača sú:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1837
 #, fuzzy
 msgid "  Spam-blocking disabled\n"
 msgstr "  SPAM-blokovanie vypnuté\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1840
 #, fuzzy, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Spojenie so serverom bude aktivované s \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1843
 msgid "  No pre-connection command.\n"
 msgstr "  Príkaz spúšťaný pred pripojením neexistuje.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1845
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Prippojenie k serveru bude ukončené s \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1848
 msgid "  No post-connection command.\n"
 msgstr "  Príkaz spúšťaný po pripojení neexistuje.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1851
 #, fuzzy
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nie sú definované žiadne lokálne názvy pre tohto hostiteľa.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1861
 #, fuzzy
 msgid "  Multi-drop mode: "
 msgstr "  Režim Multi-drop: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1863
 #, fuzzy
 msgid "  Single-drop mode: "
 msgstr "  Režim Single-drop: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1865
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d rozpoznaných lokálnych názvov.\n"
 msgstr[1] "%d rozpoznaných lokálnych názvov.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1880
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS vyhľadávanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1881
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS vyhľadávanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1885
 #, fuzzy
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Prezývky servera budú porovnávané s multi-drop adresami pomocou "
 
-#: fetchmail.c:1953
+#: fetchmail.c:1887
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Prezývky servera budú porovnávané s multi-drop adresami pomocou "
 
-#: fetchmail.c:1956
+#: fetchmail.c:1890
 #, fuzzy
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Smerovanie adries obálok nie je aktivované\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1893
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Predpokladá sa, že hlavička obálky je: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1896
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Počet záhlaví obálok na analýzu: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1899
 #, fuzzy, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s bude odstránený z používateľovho id\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1902
 #, fuzzy
 msgid "  No prefix stripping\n"
 msgstr "  Žiadne odstránenie prefixu\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1907
 #, fuzzy
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Preddeklarované prezývky poštového servera:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1915
 #, fuzzy
 msgid "  Local domains:"
 msgstr "  Lokálne domény:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1925
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Pripojenie musí byť cez rozhranie %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1927
 #, fuzzy
 msgid "  No interface requirement specified.\n"
 msgstr "  Neboli špecifikované žiadne požiadavky na rozhranie.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1929
 #, fuzzy, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Dotazovací cyklus s monitorom %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1931
 msgid "  No monitor interface specified.\n"
 msgstr "  Nebolo špecifikované žiadne monitorovacie rozhranie.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1935
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Pripojenie k serveru bude realizované pomocou zásuvného modulu %s (--"
-"plugin %s).\n"
+msgstr "  Pripojenie k serveru bude realizované pomocou zásuvného modulu %s (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1937
 msgid "  No plugin command specified.\n"
 msgstr "  Nebol zadaný žiaden príkaz zásuvného modulu.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:1939
 #, fuzzy, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Spojenia s prijímačom budú realizované pomocou plugout-u %s (--plugout "
-"%s).\n"
+msgstr "  Spojenia s prijímačom budú realizované pomocou plugout-u %s (--plugout %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:1941
 #, fuzzy
 msgid "  No plugout command specified.\n"
 msgstr "  Nebol špecifikovaný žiadny príkaz pre plugout.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:1946
 #, fuzzy
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Neboli uložené žiadne UID-y z tohoto hostiteľa.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:1955
 #, fuzzy, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID-ov uložených.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1963
 #, fuzzy
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Informácia o trase dotazu bude pridaná do záhlavia Received.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1965
 #, fuzzy
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Do záhlavia Received nebude pridaná žiadna informácia o trase sťahovania.\n"
 ".\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:1970
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Správy so zlými hlavičkami budú odmietnuté.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:1973
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Správy so zlými hlavičkami budú pustené ďalej.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:1978
 #, fuzzy, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Vlastnosti prechodu \"%s\".\n"
@@ -1753,8 +1668,7 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr ""
 
 #: gssapi.c:123
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr ""
 
 #: gssapi.c:159
@@ -1796,25 +1710,16 @@ msgstr "Rozbalené príznaky bezpečnostnej úrovne: %s%s%s\n"
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximálna veľkosť GSS symbolu je %ld\n"
 
-#: gssapi.c:273
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:282
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Chyba pri vytváraní žiadosti bezpečnostnej úrovne\n"
 
-#: gssapi.c:286
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:297
+#: gssapi.c:288
 #, fuzzy
 msgid "Releasing GSS credentials\n"
 msgstr "Uvoľňujem osobné údaje GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:292
 #, fuzzy
 msgid "Error releasing credentials\n"
 msgstr "Chyba pri uvoľňovaní osobných údajov\n"
@@ -1825,146 +1730,139 @@ msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: vlákno uspaté na %d sekúnd.\n"
 
 #: imap.c:74
-#, fuzzy, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
 msgstr "Prijatá odpoveď BYE z IMAP servera: %s"
 
-#: imap.c:96
+#: imap.c:92
 #, fuzzy, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "neplatný počet správ!"
 
-#: imap.c:143
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:354
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identifikovaný ako IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identifikovaný ako IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identifikovaný ako IMAP2 alebo IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:378
 #, fuzzy
 msgid "will idle after poll\n"
 msgstr "bude nečinný po stiahnutí\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:481 pop3.c:479
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:486
+#: imap.c:482
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:501
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:606
+#: imap.c:598
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Požadovaná funkcia OTP nebola preložená do fetchmail-u\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:618 pop3.c:558
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Požadovaná funkcia NTLM nebola preložená do fetchmail-u\n"
 
-#: imap.c:635
+#: imap.c:627
 #, fuzzy
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Požadovaná funkcia LOGIN nie je podporovaná serverom\n"
 
-#: imap.c:699
+#: imap.c:691
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "správa %s@%s:%d nemala očakávanú dĺžku (%d aktuálne != %d očakávané)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u je neprečítaných\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, fuzzy, c-format
 msgid "%u is unseen\n"
 msgstr "%u je neprečítaných\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 #, fuzzy
 msgid "re-poll failed\n"
 msgstr "stiahnutie zlyhalo\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d správ čaká po stiahnutí\n"
 msgstr[1] "%d správ čaká po stiahnutí\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "výber poštového priečinka zlyhal\n"
 
-#: imap.c:940
+#: imap.c:932
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d správ čaká po prvom stiahnutí\n"
 msgstr[1] "%d správ čaká po prvom stiahnutí\n"
 
-#: imap.c:954
+#: imap.c:946
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "vymazanie zlyhalo\n"
 
-#: imap.c:958
+#: imap.c:950
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d správ čaká po prvom vymazaní\n"
 msgstr[1] "%d správ čaká po prvom vymazaní\n"
 
-#: imap.c:997
+#: imap.c:989
 #, fuzzy
 msgid "search for unseen messages failed\n"
 msgstr "vyhľadávanie neprečítaných správ zlyhalo\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:865
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je prvá neprečítaná\n"
 
-#: imap.c:1086
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:1078
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1176 imap.c:1183
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Nepodarilo sa otvoriť rozhranie kvm. Uistite sa, že fetchmail je SGID kmem."
+msgstr "Nepodarilo sa otvoriť rozhranie kvm. Uistite sa, že fetchmail je SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2044,22 +1942,22 @@ msgstr "aktivita na %s bola %d, je %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "nepodarilo sa dekódovať počiatočnú BASE64 výzvu\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, fuzzy, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "principál %s v tikete sa nezhoduje s -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "nenulová inštancia (%s) môže spôsobiť zvláštne správanie\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 #, fuzzy
 msgid "could not decode BASE64 ready response\n"
 msgstr "nemôžem dekódovať BASE64 odpoveď o pripravenosti\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 #, fuzzy
 msgid "challenge mismatch\n"
 msgstr "nezhoda výzvy\n"
@@ -2157,427 +2055,396 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Nepodarilo sa dekódovať OTP výzvu\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
-#: options.c:178 options.c:222
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Reťazec '%s' nie je platný číselny reťazec.\n"
 
-#: options.c:187
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota reťazca '%s' je %s ako %d.\n"
 
-#: options.c:188
+#: options.c:186
 msgid "smaller"
 msgstr "menšia"
 
-#: options.c:188
+#: options.c:186
 msgid "larger"
 msgstr "väčšia"
 
-#: options.c:336
+#: options.c:323
 #, fuzzy, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Špecifikovaný neplatný protokol `%s'.\n"
 
-#: options.c:377
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Zadaný neplatný protokol `%s'.\n"
 
-#: options.c:424
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Zadané neplatné overenie totožnosti `%s'.\n"
 
-#: options.c:640
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "použitie:  fetchmail [prepínače] [server ...]\n"
 
-#: options.c:641
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Prepínače sú nasledovné:\n"
 
-#: options.c:642
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobraziť tohoto pomocníka pre voľby\n"
 
-#: options.c:643
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobraziť informáciu o verzii\n"
 
-#: options.c:645
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       skontrolovať správy bez stiahnutia\n"
 
-#: options.c:646
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracovať potichu\n"
 
-#: options.c:647
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracovať hlučne (diagnostický výstup)\n"
 
-#: options.c:648
+#: options.c:628
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spustiť ako démona raz za n sekúnd\n"
 
-#: options.c:649
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodpájať proces démona\n"
 
-#: options.c:650
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabiť proces démona\n"
 
-#: options.c:651
+#: options.c:631
 #, fuzzy
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     špecifikuj názov log-súboru\n"
 
-#: options.c:652
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      použiť syslog(3) pre väčšinu správ pri behu ako démon\n"
-
-#: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:632
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      použiť syslog(3) pre väčšinu správ pri behu ako démon\n"
 
-#: options.c:654
+#: options.c:633
 #, fuzzy
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   nezapisovať Received & povoliť podvrhnutie hostiteľa\n"
+msgstr "      --invisible   nezapisovať Received & povoliť podvrhnutie hostiteľa\n"
 
-#: options.c:655
+#: options.c:634
 #, fuzzy
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc špecifikuj náhradný spúšťací riadiaci súbor\n"
 
-#: options.c:656
+#: options.c:635
 #, fuzzy
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      špecifikuj náhradný súbor UID-ov\n"
 
-#: options.c:657
+#: options.c:636
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     špecifikuj náhradný súbor UID-ov\n"
 
-#: options.c:658
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:659
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:660
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+#: options.c:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:661
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     sledovať aktivitu rozhrania\n"
 
-#: options.c:667
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr ""
 
-#: options.c:668
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl certifikát klienta\n"
 
-#: options.c:670
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:671
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcertpath cesta k ssl certifikátom\n"
-
-#: options.c:672
+#: options.c:650
 #, fuzzy
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile cesta k ssl certifikátom\n"
 
-#: options.c:673
+#: options.c:651
 #, fuzzy
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath cesta k ssl certifikátom\n"
 
-#: options.c:674
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:675
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+#: options.c:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr ""
 
-#: options.c:676
+#: options.c:654
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    vynútiť ssl protokol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:679
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:680
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 
-#: options.c:683
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
+#: options.c:661
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:684
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:685
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:686
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:687
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:664
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:665
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        typ overenia totožnosti (heslo/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 
-#: options.c:690
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:691
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:692
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:693
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:695
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:672
+msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 
-#: options.c:696
+#: options.c:673
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  získať staré a nové správy\n"
 
-#: options.c:697
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 
-#: options.c:698
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 
-#: options.c:699
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       vymazať staré správy zo servera\n"
 
-#: options.c:700
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  vymazať nadrozmerné správy\n"
 
-#: options.c:701
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr ""
 
-#: options.c:702
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 
-#: options.c:703
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 
-#: options.c:705
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:706
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:707
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:708
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:709
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:710
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:711
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:712
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:713
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:714
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:715
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:716
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:717
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:718
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:719
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:329
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+#: pop3.c:327
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
 msgstr ""
 
-#: pop3.c:413
+#: pop3.c:411
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:414
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:491
+#: pop3.c:494
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:497
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:622
+#: pop3.c:621
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:636
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:645
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:685
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:706
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:785
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:808
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:837
+#: pop3.c:835
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:949
+#: pop3.c:941
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1047
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:1063
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1094
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1445
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Voľba --folder nie je podporovaná s POP3\n"
 
@@ -2590,36 +2457,32 @@ msgid "SDPS not enabled."
 msgstr "SDPS nie je povolené."
 
 #: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:226
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL nie je povolené"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:391
 msgid "end of input"
 msgstr "koniec vstupu"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Súbor %s musí byť obyčajný súbor.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:452
+#: rcfile_y.y:451
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Súbor %s musí byť vlastnený vami.\n"
@@ -2838,135 +2701,135 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:456
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:509 sink.c:608
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Chyba %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:736
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Otvorenie súboru BSMTP zlyhalo: %s\n"
 
-#: sink.c:782
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr ""
 
-#: sink.c:996
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1003
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1049
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1061
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1067
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1223
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
-#: sink.c:1234
+#: sink.c:1233
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr ""
 
-#: sink.c:1246
+#: sink.c:1245
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1253
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1292
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1316
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1374
+#: sink.c:1373
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 
-#: sink.c:1399
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Chyba zápisu do MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1405
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1433
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1463
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1466
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1632
-#, fuzzy
-msgid "The Fetchmail Daemon"
-msgstr "štartujem fetchmail %s démona\n"
+#: sink.c:1620
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
+msgstr ""
 
 #: smtp.c:81
 msgid "ESMTP CRAM-MD5 Authentication...\n"
@@ -2993,334 +2856,240 @@ msgstr "Overovanie totožnosti ESMTP PLAIN...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Overovanie totožnosti ESMTP LOGIN...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:110 socket.c:139
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc zlyhal\n"
 
-#: socket.c:171
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair zlyhal\n"
 
-#: socket.c:177
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr ""
 
-#: socket.c:184
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr ""
 
-#: socket.c:190
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) zlyhal\n"
 
-#: socket.c:270
+#: socket.c:265
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:273
+#: socket.c:268
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:287 socket.c:290
+#: socket.c:282 socket.c:285
 #, c-format
 msgid "unknown (%s)"
 msgstr "neznáme (%s)"
 
-#: socket.c:293
+#: socket.c:288
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:302
+#: socket.c:297
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr ""
 
-#: socket.c:304
+#: socket.c:299
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr ""
 
-#: socket.c:322
+#: socket.c:317
 msgid "connection failed.\n"
 msgstr "pripojenie zlyhalo.\n"
 
-#: socket.c:324
+#: socket.c:319
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s spojení s %s bolo neúspešných"
 
-#: socket.c:325
+#: socket.c:320
 #, fuzzy, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s spojení s %s bolo neúspešných"
 
-#: socket.c:331
+#: socket.c:326
 #, fuzzy
 msgid "connected.\n"
 msgstr "SSL spojenie neúspešné.\n"
 
-#: socket.c:344
+#: socket.c:339
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
 "%s"
 msgstr ""
 
-#: socket.c:406
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:641
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:647
+#: socket.c:605
 #, fuzzy
 msgid "Server certificate:\n"
 msgstr "Chyba overenia certifikátu servera: %s\n"
 
-#: socket.c:652
+#: socket.c:610
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr ""
 
-#: socket.c:655
+#: socket.c:613
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr ""
 
-#: socket.c:661
+#: socket.c:619
 #, fuzzy, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizácia vydavateľa: %s\n"
 
-#: socket.c:664
+#: socket.c:622
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:666
+#: socket.c:624
 #, fuzzy
 msgid "Unknown Organization\n"
 msgstr "Neznáma organizácia\n"
 
-#: socket.c:668
+#: socket.c:626
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:629
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:673
+#: socket.c:631
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:679
+#: socket.c:637
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr ""
 
-#: socket.c:685
+#: socket.c:643
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:691
+#: socket.c:649
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:719
+#: socket.c:677
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:683
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:742
+#: socket.c:700
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:707
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:754
+#: socket.c:712
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:756
+#: socket.c:714
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:768
+#: socket.c:726
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:772
+#: socket.c:730
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:780
+#: socket.c:738
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:744
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:790
+#: socket.c:748
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:750
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:804
+#: socket.c:760
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Chyba overenia certifikátu servera: %s\n"
 
-#: socket.c:819
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Chyba overenia certifikátu servera: %s\n"
-
-#: socket.c:821
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
-msgstr ""
-
-#: socket.c:831
-#, fuzzy, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr "  Súbor na dôveryhodné certifikáty SSL: %s\n"
-
-#: socket.c:834
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page.\n"
-msgstr ""
-
-#: socket.c:907 socket.c:985
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:925 socket.c:1003
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:956 socket.c:1035
-#, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr "Zadaný neplatný protokol `%s'.\n"
-
-#: socket.c:1070
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1075
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1095
-msgid "File descriptor out of range for SSL"
-msgstr ""
-
-#: socket.c:1115
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1183
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1198
+#: socket.c:767
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "neznámy vydavateľ (prvých %d znakov): %s\n"
 
-#: socket.c:1235
-msgid "Server shut down connection prematurely during SSL_connect().\n"
+#: socket.c:768
+msgid "This error usually happens when the server provides an incomplete certificate chain, which is nothing fetchmail could do anything about.  For details, please see the README.SSL-SERVER document that comes with fetchmail.\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:777
 #, c-format
-msgid "System error during SSL_connect(): %s\n"
+msgid "This means that the root signing certificate (issued for %s) is not in the trusted CA certificate locations, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:1238
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1258
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
+#: socket.c:869
+msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:885
 #, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:978
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1285
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
+#: socket.c:995
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
 msgstr ""
 
-#: socket.c:1327
+#: socket.c:1037
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1330
+#: socket.c:1040
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3377,164 +3146,155 @@ msgstr "nesprávny riadok hlavičky nájdený pri prezeraní hlavičiek\n"
 msgid "line: %s"
 msgstr "riadok: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1132
 #, fuzzy, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 "analýza riadka Received:\n"
 "%s"
 
-#: transact.c:1142
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr ""
 
-#: transact.c:1160
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr ""
 
-#: transact.c:1175
+#: transact.c:1177
 #, fuzzy, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "žiadne lokálne zhody, posielam na %s\n"
 
-#: transact.c:1190
+#: transact.c:1192
 #, fuzzy
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "odoslanie a zmazanie odložené kvôli DNS chybám\n"
 
-#: transact.c:1301
+#: transact.c:1303
 #, fuzzy
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "zápis msgblk.hlavičiek RFC822\n"
 
-#: transact.c:1320
+#: transact.c:1322
 #, fuzzy
 msgid "no recipient addresses matched declared local names"
 msgstr "žiadna adresa príjemcu nezodpovedá zadaným lokálnym menám"
 
-#: transact.c:1327
+#: transact.c:1329
 #, fuzzy, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa príjemcu %s nezodpovedá žiadnemu lokálnemu menu"
 
-#: transact.c:1336
+#: transact.c:1338
 #, fuzzy
 msgid "message has embedded NULs"
 msgstr "správa obsahuje NUL-y"
 
-#: transact.c:1344
+#: transact.c:1346
 #, fuzzy
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP prijímač zamietol lokálne adresy príjemcu: "
 
-#: transact.c:1394
+#: transact.c:1485
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "zápis textu správy\n"
 
-#: transact.c:1670
+#: transact.c:1633
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
 
-#: uid.c:262
+#: uid.c:249
 #, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr "Starý zoznam UID z %s:"
 
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <prázdne>"
 
-#: uid.c:273
+#: uid.c:262
 #, fuzzy
-msgid "Scratch list of UIDs:\n"
+msgid "Scratch list of UIDs:"
 msgstr "Dočasný zoznam UID-ov:"
 
-#: uid.c:357 uid.c:401
+#: uid.c:325 uid.c:374
 #, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+msgid "Merged UID list from %s:"
 msgstr "Starý zoznam UID z %s:"
 
-#: uid.c:360
+#: uid.c:328
 #, fuzzy, c-format
-msgid "New UID list from %s:\n"
+msgid "New UID list from %s:"
 msgstr "Nový zoznam UID z %s:"
 
-#: uid.c:390
+#: uid.c:355
+#, fuzzy
+msgid "swapping UID lists\n"
+msgstr "vymieňam zoznamy UID\n"
+
+#: uid.c:363
 #, fuzzy
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "nevymieňam zoznamy UID, žiadne UID-y nevideli túto požiadavku\n"
 
-#: uid.c:410
+#: uid.c:383
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "vymieňam zoznamy UID\n"
 
-#: uid.c:466
+#: uid.c:419
 #, fuzzy
 msgid "Deleting fetchids file.\n"
 msgstr "Mažem súbor fetchids.\n"
 
-#: uid.c:469
+#: uid.c:422
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Chyba pri uvoľňovaní osobných údajov\n"
 
-#: uid.c:476
+#: uid.c:428
 #, fuzzy
 msgid "Writing fetchids file.\n"
 msgstr "Zapisujem súbor fetchids.\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:439 uid.c:447
 #, fuzzy, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Zapisujem súbor fetchids.\n"
 
-#: uid.c:511
+#: uid.c:459
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:515
+#: uid.c:463
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:519
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc zlyhal\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc zlyhal\n"
 
 #, fuzzy
-#~ msgid "swapping UID lists\n"
-#~ msgstr "vymieňam zoznamy UID\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: varovanie: nie je dostupný DNS pre kontrolu Multidrop-"
-#~ "spracovaní z %s\n"
-
-#~ msgid "unknown issuer (first %d characters): %s\n"
-#~ msgstr "neznámy vydavateľ (prvých %d znakov): %s\n"
-
-#, fuzzy
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr ""
 #~ "Predmet: Fetchmail varovanie - nedosiahnuteľný server.\n"
diff --git a/po/sq.po b/po/sq.po
index 1fce56d2..2d48de60 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-22 22:26+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -33,14 +33,15 @@ msgstr "Jo, adresat e tyre IP s’përputhen\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "dështim emri shërbyesi teksa kërkohej për '%s' gjatë vjeljes së %s: %s\n"
+msgstr ""
+"dështim emri shërbyesi teksa kërkohej për '%s' gjatë vjeljes së %s: %s\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "dështim emri shërbyesi teksa kërkohej për `%s' gjatë vjeljes së %s.\n"
 
-#: cram.c:95
+#: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
 msgstr ""
 
@@ -61,19 +62,21 @@ msgstr "krb5_sendauth: %s [shërbyesi thotë '%s']\n"
 
 #: driver.c:345
 #, fuzzy
-#| msgid "Subject: Fetchmail oversized-messages warning"
 msgid "Fetchmail oversized-messages warning"
 msgstr "Subjekt: Sinjalizim nga Fetchmail rreth mesazhesh të stërmëdhenj"
 
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Mesazhet vijues të stërmëdhenj mase u fshinë prej shërbyesit të postës %s llogaria %s:"
+msgstr ""
+"Mesazhet vijues të stërmëdhenj mase u fshinë prej shërbyesit të postës %s "
+"llogaria %s:"
 
 #: driver.c:353
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr "Mesazhet vijues të stërmëdhenj mbesin në shërbyesin e postës %s llogaria %s:"
+msgstr ""
+"Mesazhet vijues të stërmëdhenj mbesin në shërbyesin e postës %s llogaria %s:"
 
 #: driver.c:372
 #, c-format
@@ -134,8 +137,11 @@ msgstr " (%d tetëshe lënde)"
 
 #: driver.c:770
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "mesazhi %s@%s:%d nuk pati gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"mesazhi %s@%s:%d nuk pati gjatësinë e pritur (%d aktualja != %d e "
+"pritshmja)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -152,14 +158,18 @@ msgstr " i pazbrazur\n"
 #: driver.c:842
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "U mbërrit në kufi prurjesh %d; %d mesazh lënë te shërbyesi %s llogaria %s\n"
-msgstr[1] "U mbërrit në kufi prurjesh %d; %d mesazhe lënë te shërbyesi %s llogaria %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"U mbërrit në kufi prurjesh %d; %d mesazh lënë te shërbyesi %s llogaria %s\n"
+msgstr[1] ""
+"U mbërrit në kufi prurjesh %d; %d mesazhe lënë te shërbyesi %s llogaria %s\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr "mbarim kohe pas %d sekondash në pritje për t’u lidhur me shërbyesin %s.\n"
+msgstr ""
+"mbarim kohe pas %d sekondash në pritje për t’u lidhur me shërbyesin %s.\n"
 
 #: driver.c:903
 #, c-format
@@ -183,14 +193,17 @@ msgstr "mbarim kohe pas %d sekondash.\n"
 
 #: driver.c:927
 #, fuzzy
-#| msgid "Subject: fetchmail sees repeated timeouts"
 msgid "fetchmail sees repeated timeouts"
 msgstr "Subjekt: fetchmail-i sheh mbarime të përsëritur kohe"
 
 #: driver.c:930
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail-i pa më tepër se %d mbarime kohe teksa përpiqej të merrte postë prej %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
+"%s.\n"
+msgstr ""
+"Fetchmail-i pa më tepër se %d mbarime kohe teksa përpiqej të merrte postë "
+"prej %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -201,7 +214,8 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Kjo mund të dëshmonte se shërbyesi juaj i postës ka ngecur, ose që shërbyesi juaj SMTP\n"
+"Kjo mund të dëshmonte se shërbyesi juaj i postës ka ngecur, ose që shërbyesi "
+"juaj SMTP\n"
 "ka ngecur, ose që kartela e kutisë suaj postare te shërbyesi është\n"
 "dëmtuar nga një gabim shërbyesi.  Mund të jepni `fetchmail -v -v' për të\n"
 "diagnostikuar problemin.\n"
@@ -262,11 +276,11 @@ msgstr " (autorizuar dikur)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr "Për ndihmë, shihni te http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr ""
+"Për ndihmë, shihni te http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
 #: driver.c:1202
 #, fuzzy, c-format
-#| msgid "Subject: fetchmail authentication failed on %s@%s"
 msgid "fetchmail authentication failed on %s@%s"
 msgstr "Subjekt: mirëfilltësimi fetchmail dështoi te %s@%s"
 
@@ -286,7 +300,8 @@ msgstr ""
 "Orvatja për të marrë autorizim dështoi.\n"
 "Ngaqë kemi patur tashmë sukses në marrje autorizimi për këtë\n"
 "lidhje, ka gjasa që kjo të jetë një tjetër mënyrë dështimi\n"
-"(fjala vjen, shërbyes i zënë) të cilën fetchmail-i s’e dallon dot nga të tjerat,\n"
+"(fjala vjen, shërbyes i zënë) të cilën fetchmail-i s’e dallon dot nga të "
+"tjerat,\n"
 "ngaqë shërbyesi s’dërgoi mesazh të dobishëm gabimi."
 
 #: driver.c:1216
@@ -347,7 +362,6 @@ msgstr "OK autorizimi te %s@%s\n"
 
 #: driver.c:1277
 #, fuzzy, c-format
-#| msgid "Subject: fetchmail authentication OK on %s@%s"
 msgid "fetchmail authentication OK on %s@%s"
 msgstr "Subjekt: OK mirëfilltësimi fetchmail-i te %s@%s"
 
@@ -374,7 +388,7 @@ msgstr "po përzgjedh ose vjel prej dosjes parazgjedhje\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s te %s (dosja %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s te %s"
@@ -421,7 +435,8 @@ msgstr "numërim mesazhesh me gabime!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr "U anashkaluan shumë mesazhe (%d > %d) për shkak gabimesh kalimtare për %s\n"
+msgstr ""
+"U anashkaluan shumë mesazhe (%d > %d) për shkak gabimesh kalimtare për %s\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -462,7 +477,8 @@ msgstr "e papërcaktuar"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr "Gabim %s gjatë prurjes prej %s@%s-së dhe shpërndarjes te streha SMTP %s\n"
+msgstr ""
+"Gabim %s gjatë prurjes prej %s@%s-së dhe shpërndarjes te streha SMTP %s\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -516,7 +532,8 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Ndryshorja e mjedisit QMAILINJECT u rregullua.\n"
-"Kjo është e rrezikshme, ngaqë mund të bëjë që qmail-inject ose mbështjellësi\n"
+"Kjo është e rrezikshme, ngaqë mund të bëjë që qmail-inject ose "
+"mbështjellësi\n"
 " sendmail i qmail-it të përzihet me kryet Prej: ose ID Mesazhi:.\n"
 "Provoni \"env QMAILINJECT= %s ARGUMENTE TUAJT KËTU\"\n"
 "%s: Ndërprerje.\n"
@@ -526,13 +543,16 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s: Ndryshorja e mjedisit NULLMAILER_FLAGS u rregullua.\n"
-"Kjo është e rrezikshme, ngaqë mund të bëjë që nullmailerl-inject ose mbështjellësi\n"
-" sendmail i nullmailer-it të përzihet me kryet tuaja Prej:, ID Mesazhi:, ose Shteg-Kthimi.\n"
+"Kjo është e rrezikshme, ngaqë mund të bëjë që nullmailerl-inject ose "
+"mbështjellësi\n"
+" sendmail i nullmailer-it të përzihet me kryet tuaja Prej:, ID Mesazhi:, ose "
+"Shteg-Kthimi.\n"
 "Provoni \"env NULLMAILER_FLAGS= %s ARGUMENTE TUAJT KËTU\"\n"
 "%s: Ndërprerje.\n"
 
@@ -548,22 +568,24 @@ msgstr "%s: nuk përcakton dot strehën tuaj!"
 
 #: env.c:172
 #, fuzzy, c-format
-#| msgid "gethostbyname failed for %s\n"
 msgid "getaddrinfo failed for %s\n"
 msgstr "gethostbyname dështoi për %s\n"
 
 #: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Nuk gjendet dot streha time te bazë të dhënash strehësh për ta shquar!\n"
+msgstr ""
+"Nuk gjendet dot streha time te bazë të dhënash strehësh për ta shquar!\n"
 
 #: env.c:178
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Po provohet të vazhdojë me strehëemër të pashquar.\n"
-"MOS raportoni krye të dëmtuar Të Marrë: , rreshta HELO/EHLO apo probleme të ngjashëm!\n"
+"MOS raportoni krye të dëmtuar Të Marrë: , rreshta HELO/EHLO apo probleme të "
+"ngjashëm!\n"
 "Rregulloni më mirë /etc/hosts, DNS, NIS apo LDAP tuajt.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -632,12 +654,6 @@ msgstr "Mundësia --check nuk mbulohet me ETRN\n"
 
 #: fetchmail.c:141
 #, fuzzy
-#| msgid ""
-#| "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-#| "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
-#| "                   Robert M. Funk, Graham Wilson\n"
-#| "Copyright (C) 2005 - 2012 Sunil Shetye\n"
-#| "Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -669,932 +685,1021 @@ msgstr "KUJDES: Xhirimi si rrënjë nuk është i këshillueshëm.\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: thirrur me"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "nuk mori dot drejtorinë e tanishme të punës\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ky është versioni %s i fetchmail-it"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr "Mundësia nodetach është në funksionim, po shpërfillet mundësia mbi kartelë regjistrimi.\n"
+msgstr ""
+"Mundësia nodetach është në funksionim, po shpërfillet mundësia mbi kartelë "
+"regjistrimi.\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr "Nuk po xhiron nën mënyrën demon, po shpërfillet mundësia mbi kartelë regjistrimi.\n"
+msgstr ""
+"Nuk po xhiron nën mënyrën demon, po shpërfillet mundësia mbi kartelë "
+"regjistrimi.\n"
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr "Kartela regjistër \"%s\" nuk ekziston, po shpërfillet mundësia mbi kartelë regjistrimi.\n"
+msgstr ""
+"Kartela regjistër \"%s\" nuk ekziston, po shpërfillet mundësia mbi kartelë "
+"regjistrimi.\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr "Kartela e regjistrimit \"%s\" nuk është e shkruajtshme, po ndërpritet.\n"
+msgstr ""
+"Kartela e regjistrimit \"%s\" nuk është e shkruajtshme, po ndërpritet.\n"
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
-msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr "Është rregulluar dhe mundësia syslog, dhe ajo logfile, po shëprfillet syslog, dhe po regjistrohet te %s"
+msgid ""
+"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr ""
+"Është rregulluar dhe mundësia syslog, dhe ajo logfile, po shëprfillet "
+"syslog, dhe po regjistrohet te %s"
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Po merret mundësi prej rresht urdhrash%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr " dhe "
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nuk ka shërbyes poste të rregulluar -- ndoshta mungon %s?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nuk janë treguar shërbyes poste.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nuk po xhiron tjetër fetchmail\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr ""
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "prapaskenë"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "paraskenë"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail te %ld u asgjësua.\n"
 
-#: fetchmail.c:526
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: s’kontrollon dot për postë, kur një tjetër fetchmail xhiron te e njëjta strehë.\n"
+#: fetchmail.c:524
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: s’kontrollon dot për postë, kur një tjetër fetchmail xhiron te e "
+"njëjta strehë.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
-msgstr "fetchmail: s’mund të vilet nga strehët e treguara, me një tjetër fetchmail që xhiron te %ld.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at "
+"%ld.\n"
+msgstr ""
+"fetchmail: s’mund të vilet nga strehët e treguara, me një tjetër fetchmail "
+"që xhiron te %ld.\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: një tjetër fetchmail në paraskenë po xhiron te %ld.\n"
 
-#: fetchmail.c:549
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: s’pranohen dot mundësi kur një fetchmail xhiron në prapaskenë.\n"
+#: fetchmail.c:547
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: s’pranohen dot mundësi kur një fetchmail xhiron në prapaskenë.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: një fetchmail në prapaskenë te %ld u zgjua.\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: një vëlla më i moshuar te %ld vdiq në mënyrë misterioze.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nuk gjen dot një fjalëkalim për %s@%s.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Jepni fjalëkalim për %s@%s: "
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nuk mund të shqitet në prapaskenë. Po ndërpritet.\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "po niset demoni fetchmail %s\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "nuk u hap dot %s për të vargëzuar regjistrime në të\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "Mënyra --check është aktive, nuk po vilet postë\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "s’kontrolloi dot kohën e %s (gabim %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "po riniset fetchmail (%s ndryshoi)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "përpjekja për rinisje mund të dështojë, ngaqë drejtoria nuk është rikthyer\n"
+msgstr ""
+"përpjekja për rinisje mund të dështojë, ngaqë drejtoria nuk është rikthyer\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "përpjekja për rinisje të fetchmail-it dështoi\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n"
+msgstr ""
+"vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval që nuk kapet, nuk po kërkohet %s\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Gjendje kërkimi=0 (SUKSES)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Gjendje kërkimi=1 (PAPOSTË)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Gjendje kërkimi=2 (\"SOCKET\")\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Gjendje kërkimi=3 (DËSHTMIR)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Gjendje kërkimi=4 (PROTOKOLL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Gjendje kërkimi=5 (SYNTAKSË)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Gjendje kërkimi=6 (GABIO)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Gjendje kërkimi=7 (GABIM)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Gjendje kërkimi=8 (PËRJASHTO)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Gjendje kërkimi=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Gjendje kërkimi=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Gjendje kërkimi=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Gjendje kërkimi=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Gjendje kërkimi=13 (MAKSJELL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Gjendje kërkimi=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Janë bllokuar krejt lidhjet.  Po dilet.\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "në gjumë te %s për %d sekonda\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "përmendur prej %s\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "përmendur prej sinjali %d\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "përmendur më %s\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "mbarim normal, gjendje %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "s’kontrolloi dot kohën për kartelën run-control\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr "Sinjalizim: përmendje e shumëfishtë e strehës %s në kartelën formësim\n"
+msgstr ""
+"Sinjalizim: përmendje e shumëfishtë e strehës %s në kartelën formësim\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: Gabim: zëra të shumëfishtë për \"parazgjedhje\" te kartela formësim.\n"
+msgstr ""
+"fetchmail: Gabim: zëra të shumëfishtë për \"parazgjedhje\" te kartela "
+"formësim.\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Mbulimi për KERBEROS v4 është formësuar, por nuk është përpiluar.\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Mbulimi për KERBEROS v5 është formësuar, por nuk është përpiluar.\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Mbulimi për GSSAPI-n është formësuar, por jo përpiluar.\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: sinjalizim: pa DNS gati, te i cili të kontrollohen prurje shpërndarjesh të shumëfishta %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: sinjalizim: pa DNS gati, te i cili të kontrollohen prurje "
+"shpërndarjesh të shumëfishta %s\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "kujdes: shpërndarja e shumëfishtë për %s lyp mundësinë zarf!\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "sinjalizim: Mos kërkoni ndihmë, nëse krejt posta i shkon ustait të postës!\n"
+msgstr ""
+"sinjalizim: Mos kërkoni ndihmë, nëse krejt posta i shkon ustait të postës!\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për shërbimin ose portën\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për "
+"shërbimin ose portën\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: formësimi i %s i pavlefshëm, RPOP lyp një portë të privilegjuar\n"
+msgstr ""
+"fetchmail: formësimi i %s i pavlefshëm, RPOP lyp një portë të privilegjuar\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "Formësimi i %s i pavlefshëm, LMTP s’mund të përdorë portën SMTP parazgjedhje\n"
+msgstr ""
+"Formësimi i %s i pavlefshëm, LMTP s’mund të përdorë portën SMTP "
+"parazgjedhje\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Prania e fetchall-it njëkohësisht me \"keep on\" në një demon, ose në një gjendje plogështie, përbën gabim!\n"
+msgstr ""
+"Prania e fetchall-it njëkohësisht me \"keep on\" në një demon, ose në një "
+"gjendje plogështie, përbën gabim!\n"
 
-#: fetchmail.c:1415
-msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+#: fetchmail.c:1411
+msgid ""
+"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "përfunduar me sinjal %d\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja filloi\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP2.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP3.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për IMAP.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ETRN.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ODMR.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "u përzgjodh protokoll i pambuluar.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja u plotësua\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervali i vjeljes është %d sekonda\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Jetëgjatësia e regjistrit është %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile është %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesazhet e ecurisë do të regjistrohen përmes syslog\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail do të kryejë maskim dhe nuk do të prodhojë Të Marrë\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail-i do të tregojë pika ecurie edhe në kartela regjistrimesh.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të shumëfishtë te %s.\n"
+msgstr ""
+"Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të "
+"shumëfishtë te %s.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste drejt ustait të postës.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "Fetchmail-i do t’i trajtojë gabimet e përhershme si të përhershme (do t’i hedhë tej mesazhet).\n"
+msgstr ""
+"Fetchmail-i do t’i trajtojë gabimet e përhershme si të përhershme (do t’i "
+"hedhë tej mesazhet).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "Fetchmail-i do t’i trajtojë gabimet e përhershme si të përkohshme (do t’i mbajë mesazhet).\n"
+msgstr ""
+"Fetchmail-i do t’i trajtojë gabimet e përhershme si të përkohshme (do t’i "
+"mbajë mesazhet).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Mundësi për marrje prej %s@%s:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do të merret përmes %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "  Vjelja e këtij shërbyesi do të ndodhë çdo %d interval.\n"
 msgstr[1] "  Vjelja e këtij shërbyesi do të ndodhë çdo %d intervale.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i vërtetë i shërbyesit është %s.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Kjo strehë nuk do pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Kjo strehë do të pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Do të kërkohet fjalëkalim.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  E fshehtë APOP= \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjalëkalim = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli është KPOP me mirëfilltësim Kerberos %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokolli është %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (po përdoret shërbim %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (po përdoret portë parazgjedhje)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (po detyrohet përdorimi i UIDL-së)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Do të provohen tërë metodat e mundshme për mirëfilltësim.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim me fjalëkalim.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim MSN.\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim NTLM.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-MD5.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim GSSAPI.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V4.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V5.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Nënkuptohet fshehtëzim skaj-më-skaj.\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Parësori i shërbimit postar është: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  U aktivizuan sesione SSL të fshehtëzuar.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  U aktivizua kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
-#| msgid "  SSL server certificate checking enabled.\n"
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  U aktivizua kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Kartelë dëshmie SSL të besuar: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Drejtori dëshmish SSL të besueshme: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Emër i Zakonshëm shërbyesi SSL: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Shenjë gishtash kyçi SSL (kontrolluar kundrejt kyçi shërbyesi): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mospërgjigjes së shërbyesit është %d sekonda"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e përzgjedhur.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Kutitë postare të përzgjedhura janë:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Do të merren tërë mesazhet (--all on).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Do të merren vetëm mesazhet e rinj (--all off).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesazhet e sjellë do të mbahen në shërbyes (--keep on).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesazhet e sjellë nuk do të mbahen në shërbyes (--keep off).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Mesazhet e vjetër do të zbrazen para marrjes së mesazheve (--flush on).\n"
+msgstr ""
+"  Mesazhet e vjetër do të zbrazen para marrjes së mesazheve (--flush on).\n"
 
-#: fetchmail.c:1779
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Mesazhet e vjetër nuk do të zbrazen para marrjes së mesazheve (--flush off).\n"
+#: fetchmail.c:1776
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Mesazhet e vjetër nuk do të zbrazen para marrjes së mesazheve (--flush "
+"off).\n"
 
-#: fetchmail.c:1781
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Mesazhet e stërmëdhenj do të zbrazen para marrjes së mesazheve (--limitflush on).\n"
+#: fetchmail.c:1778
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Mesazhet e stërmëdhenj do të zbrazen para marrjes së mesazheve (--"
+"limitflush on).\n"
 
-#: fetchmail.c:1782
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Mesazhet stërmëdhenj nuk do të zbrazen para marrjes së mesazheve (--limitflush off).\n"
+#: fetchmail.c:1779
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Mesazhet stërmëdhenj nuk do të zbrazen para marrjes së mesazheve (--"
+"limitflush off).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Rishkrimi i adresave vendore të shërbyesit është i aktivizuar (--norewrite off).\n"
+msgstr ""
+"  Rishkrimi i adresave vendore të shërbyesit është i aktivizuar (--norewrite "
+"off).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Rishkrimi i adresave vendore të shërbyesit është i çaktivizuar (--norewrite on).\n"
+msgstr ""
+"  Rishkrimi i adresave vendore të shërbyesit është i çaktivizuar (--"
+"norewrite on).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Heqja e carriage-return-it është e aktivizuar (stripcr on).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e carriage-return-it është e çaktivizuar (stripcr off).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Detyrimi i carriage-return-it është i aktivizuar (forcecr on).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Detyrimi i carriage-return-it është i çaktivizuar (forcecr off).\n"
 
-#: fetchmail.c:1793
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretimi i Kodimit të Shpërnguljes së Lëndës është i çaktivizuar (pass8bits on).\n"
+#: fetchmail.c:1790
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Interpretimi i Kodimit të Shpërnguljes së Lëndës është i çaktivizuar "
+"(pass8bits on).\n"
 
-#: fetchmail.c:1794
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretimi i Kodimit të Shpërnguljes së Lëndës është i aktivizuar (pass8bits off).\n"
+#: fetchmail.c:1791
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretimi i Kodimit të Shpërnguljes së Lëndës është i aktivizuar "
+"(pass8bits off).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Çkodimi MIME është i aktivizuar (mimedecode on).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Çkodimi MIME është i çaktivizuar (mimedecode off).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Plogështia pas vjeljes është e aktivizuar (idle on).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Plogështia pas vjeljes është e çaktivizuar (idle off).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Rreshta Gjendjeje Jo e Zbrazët do të hidhen tej (dropstatus on)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Rreshta Gjendjeje Jo e Zbrazët do të ruhen (dropstatus off)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Rreshtat Nisur Për do të hidhen tej (dropdelivered on)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur Për do të ruhen (dropdelivered off)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Caku i madhësisë së mesazheve është %d tetëshe (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa cak madhësie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--warnings %d).\n"
+msgstr ""
+"  Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--"
+"warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madhësie në çdo vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Caku për mesazhe të marrë është %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa cak për mesazhe të marrë (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Caku madhësie mesazhesh që sillen është %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa cak madhësie mesazhesh që sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n"
+msgstr ""
+"  Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Kryej kërkim linear të UID-ve gjatë çdo vjeljeje (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Caku për tufë mesazhesh SMTP është %d.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa cak për tufë mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Intervali i fshirjesh ndërmjet shuarjesh është vënë me detyrim %d (--expunge %d).\n"
+msgstr ""
+"  Intervali i fshirjesh ndërmjet shuarjesh është vënë me detyrim %d (--"
+"expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje të detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Përkatësitë për të cilat do të sillet postë janë:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesazhet do të vargëzohen te %s si BSMTP\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do të shpërndahen me \"%s\".\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do të përcillen si %cMTP te:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Adresa që do vendoset tek rreshtat RCPT TO e dërguar te SMTP do të jetë %s\n"
+msgstr ""
+"  Adresa që do vendoset tek rreshtat RCPT TO e dërguar te SMTP do të jetë "
+"%s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
-msgstr "  Përgjigje të pranuara blloqesh mesazhesh të padëshiruar dëgjuesi janë:"
+msgstr ""
+"  Përgjigje të pranuara blloqesh mesazhesh të padëshiruar dëgjuesi janë:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokimi i mesazheve të padëshiruar është i çaktivizuar\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të sillet me \"%s\".\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdhër para-lidhjeje.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të mbyllet me \"%s\".\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdhër pas-lidhjeje.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendorë të deklaruar për këtë strehë.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Mënyrë shpërndarje e shumëfishtë: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Mënyrë shpërndarje njëshe: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
-msgstr "  Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i aktivizuar.\n"
+msgstr ""
+"  Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i aktivizuar.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
-msgstr "  Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i çaktivizuar.\n"
+msgstr ""
+"  Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i çaktivizuar.\n"
 
-#: fetchmail.c:1951
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta sipas adresash IP.\n"
+#: fetchmail.c:1948
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta "
+"sipas adresash IP.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta sipas emrash.\n"
+msgstr ""
+"  Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta "
+"sipas emrash.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Kryet e zarfit nënkuptohet të jenë: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr ""
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Parashtesa %s do të hiqet prej id-je përdoruesi\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash shërbyesi të paradeklaruar:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Përkatësi vendore:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet të jetë përmes ndërfaqes %s.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht të përcaktuar rreth ndërfaqes.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do të mbikëqyrë %s.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa ndërfaqe mbikëqyrjeje të përcaktuar.\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n"
+msgstr ""
+"  Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Lidhjet me dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n"
+msgstr ""
+"  Lidhjet me dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout "
+"%s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdhër shtojce daljeje të përcaktuar.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID të ruajtur prej kësaj strehe.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID të ruajtur.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Të dhëna gjurmimi vjeljeje do të shtohen te kryet Të Marrë.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Mesazhet me krye të këqija do të hidhen tej.\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Mesazhet me krye të këqija do të kalohen.\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-nëpër \"%s\".\n"
 
+#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
+#, c-format
+msgid "Cannot modify signal mask: %s"
+msgstr ""
+
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "GABIM: pa mbulim për rutinën getpassword()\n"
@@ -1607,87 +1712,92 @@ msgstr ""
 "\n"
 "U kap SIGINT... po qërohem që këtej.\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "Gabim GSSAPI te gss_display_status, thirrur prej <%s>\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Gabim GSSAPI %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "S’arriti të ketë emër shërbimi për [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Po përdoret emër shërbimi [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr "Nuk u gjetën kredenciale GSSAPI të përshtatshme. Mirëfilltësimi GSSAPI po anashkalohet.\n"
+msgstr ""
+"Nuk u gjetën kredenciale GSSAPI të përshtatshme. Mirëfilltësimi GSSAPI po "
+"anashkalohet.\n"
 
-#: gssapi.c:123
-msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr "Nëse dëshironi të përdorni GSSAPI-n, ju duhen kredenciale, së pari, ka mundësi prej kinit-it.\n"
+#: gssapi.c:124
+msgid ""
+"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr ""
+"Nëse dëshironi të përdorni GSSAPI-n, ju duhen kredenciale, së pari, ka "
+"mundësi prej kinit-it.\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "Po dërgohen kredenciale\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "Gabim gjatë shkëmbimit të kredencialeve\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "S’hapi dot të dhëna niveli sigurie\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "Shkëmbim kredencialesh i plotësuar\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Shërbyesi lyp integritet dhe/ose privatësi\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "U çmbështollën shenja niveli sigurie: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Madhësia më e madhe për \"token\" GSS është %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "Gabim në krijim kërkese niveli sigurie\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "Po jepen kredenciale GSS\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "Gabim dhënieje kredencialesh\n"
 
@@ -1696,139 +1806,138 @@ msgstr "Gabim dhënieje kredencialesh\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: rrjedhë e përgjumur për %d sek.\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
-#| msgid "Received BYE response from IMAP server: %s"
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "Prej shërbyesit IMAP u mor përgjigje BYE: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "numërim i rremë mesazhesh te \"%s\"!"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "numërim i rremë EXPUNGE te \"%s\"!"
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "do të rrijë në plogështi pas vjeljeje\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: përmirësimi me TLS pati sukses.\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: përmirësimi me TLS dështoi.\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: përmirësimi oportunist me TLS dështoi, po provohet vazhdimi\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Aftësi e domosdoshme OTP e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Aftësi e domosdoshme NTML e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "Aftësi e domosdoshme LOGIN e pambuluar prej shërbyesit\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "ngatërrëse në fshirje poste (%d faktiku != %d çka pritej)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr ""
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "rivjelja dështoi\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d mesazh në pritje pas rivjeljes\n"
 msgstr[1] "%d mesazhe në pritje pas rivjeljes\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "përzgjedhja e kutisë postare dështoi\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d mesazh në pritje pas vjeljes së parë\n"
 msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "shuarja dështoi\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d mesazh në pritje pas shuarjes\n"
 msgstr[1] "%d mesazhe në pritje pas shuarjes\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\n"
 
-#: imap.c:1086
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Sinjalizim: po shpërfillen të dhëna të rreme për madhësi mesazhesh, të dërguara nga shërbyesi.\n"
+#: imap.c:1078
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Sinjalizim: po shpërfillen të dhëna të rreme për madhësi mesazhesh, të "
+"dërguara nga shërbyesi.\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Përgjigje FETCH e pasaktë: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "I pazoti të hapë ndërfaqen kvm. Sigurohuni se fetchmail-i është SGID kmem."
+msgstr ""
+"I pazoti të hapë ndërfaqen kvm. Sigurohuni se fetchmail-i është SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1954,6 +2063,14 @@ msgstr "%s:%d: kujdes: para cilitdo emër strehe u gjet \"%s\"\n"
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: sinjalizim: \"token\" \"%s\" i panjohur\n"
 
+#: ntlmsubr.c:35
+msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
+msgstr ""
+
+#: ntlmsubr.c:84
+msgid "NTLM challenge contains invalid data.\n"
+msgstr ""
+
 #: odmr.c:67
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
@@ -2008,460 +2125,516 @@ msgstr "Mundësia --folder nuk mbulohet me ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Mundësia --check nuk mbulohet me ODMR\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr ""
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frazëkalim i fshehtë: "
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Vargu '%s' nuk është varg numerik i vlefshëm.\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Vlera e vargut '%s' është %s se %d.\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "më e vogël"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "më e madhe"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Është dhënë rregull i pavlefshëm `%s' për krye të këqia.\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "U dha protokoll i pavlefshëm `%s'.\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "U dha mirëfilltësim i pavlefshëm `%s'.\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "përdorimi:  fetchmail [mundësi] [shërbyes ...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "  Mundësitë janë si vijon:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        shfaq ndihmën për këtë mundësi\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     shfaq të dhëna versioni\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       kontrollo për mesazhe por pa sjellë\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      puno në heshtje\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     puno me zhurmë (diagnostiko ecurinë)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      xhiro si demon njëherë në n sekonda\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    mos shkëput proces demoni\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        asgjëso proces demoni\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     përcakto emër kartele regjistrimi\n"
 
-#: options.c:652
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      përdor syslog(3) për shumicën e mesazheve kur xhiron si demon\n"
-
 #: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
+"      --syslog      përdor syslog(3) për shumicën e mesazheve kur xhiron si "
+"demon\n"
 
 #: options.c:654
-msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   mos shkruaj Të Marrë & dhe aktivizo \"host spoofing\"\n"
+msgid "      --nosyslog    turns off use of syslog(3)\n"
+msgstr ""
 
 #: options.c:655
+msgid "      --invisible   don't write Received & enable host spoofing\n"
+msgstr ""
+"      --invisible   mos shkruaj Të Marrë & dhe aktivizo \"host spoofing\"\n"
+
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc përcakto kartelë \"run control\" alternative\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      përcakto tjetër kartelë UID-rash\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     përcaktoni kartelë (lock) PID alternative\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  përcaktoni marrës për provën e fundit\n"
 
-#: options.c:659
-msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
-
 #: options.c:660
-msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr "      --nosoftbounce fetchmail fshin përgjithmonë mesazhe të padërgueshëm.\n"
+msgid "      --nobounce    redirect bounces from user to postmaster.\n"
+msgstr ""
+"      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
 
 #: options.c:661
-msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
-msgstr "      --softbounce  i mban përgjithmonë në shërbyes mesazhet e padërgueshëm (parazgjedhje).\n"
+msgid ""
+"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr ""
+"      --nosoftbounce fetchmail fshin përgjithmonë mesazhe të padërgueshëm.\n"
 
-#: options.c:663
+#: options.c:662
+msgid ""
+"      --softbounce  keep permanently undeliverable messages on server "
+"(default).\n"
+msgstr ""
+"      --softbounce  i mban përgjithmonë në shërbyes mesazhet e padërgueshëm "
+"(parazgjedhje).\n"
+
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   përcaktim i ndërfaqes së nevojshme\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     mbikëqyr ndërfaqen për veprimtari\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         aktivizo sesion të fshehtëzuar me ssl\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      kartelë kyçi ssl privat\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     dëshmi ssl klienti\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   kryej kontroll strikt të dëshmive të shërbyesve (e këshillueshme)\n"
+msgstr ""
+"      --sslcertck   kryej kontroll strikt të dëshmive të shërbyesve (e "
+"këshillueshme)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
-#| msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcertck   kryej kontroll strikt të dëshmive të shërbyesve (e këshillueshme)\n"
+msgstr ""
+"      --sslcertck   kryej kontroll strikt të dëshmive të shërbyesve (e "
+"këshillueshme)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile shteg për te kartelë dëshmie ssl trusted-CA\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath shteg për te drejtori dëshmish ssl trusted-CA\n"
 
-#: options.c:674
-msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr "      --sslcommonname  prit prej shërbyesi këtë Emër të Zakonshëm (e pakëshillueshme)\n"
-
 #: options.c:675
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint shenjë gishtash që duhet të përputhet me atë të dëshmisë së shërbyesit.\n"
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+"      --sslcommonname  prit prej shërbyesi këtë Emër të Zakonshëm (e "
+"pakëshillueshme)\n"
 
 #: options.c:676
-msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint shenjë gishtash që duhet të përputhet me atë të "
+"dëshmisë së shërbyesit.\n"
+
+#: options.c:677
+#, fuzzy
+msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr "      --sslproto    detyro përdorim protokolli ssl (SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      përcakto urdhër të jashtëm për hapje lidhjesh\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     përcakto urdhër të jashtëm për hapje lidhjesh smtp\n"
+msgstr ""
+"      --plugout     përcakto urdhër të jashtëm për hapje lidhjesh smtp\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    përcakto rregull për trajtim mesazhesh me krye të këqija\n"
+"                    përcakto rregull për trajtim mesazhesh me krye të "
+"këqija\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
-#| msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    përcakto protokoll marrjeje (shihni faqen man)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        detyro përdorimin e UIDL-rave (vetëm pop3)\n"
 
-#: options.c:685
-msgid "      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
 #: options.c:686
-msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        portë TCP për lidhje (e vjetruar, përdorni --service)\n"
+msgid ""
+"      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr ""
 
 #: options.c:687
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     shërbim TCP për lidhje (mund të jetë portë numerike TCP)\n"
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr ""
+"      --port        portë TCP për lidhje (e vjetruar, përdorni --service)\n"
 
 #: options.c:688
-msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
-msgstr "      --auth        lloj mirëfilltësimi (fjalëkalim/kerberos/ssh/otp)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     shërbim TCP për lidhje (mund të jetë portë numerike "
+"TCP)\n"
 
 #: options.c:689
+#, fuzzy
+msgid "      --auth        authentication type (see manual)\n"
+msgstr ""
+"      --auth        lloj mirëfilltësimi (fjalëkalim/kerberos/ssh/otp)\n"
+
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     afat mospërgjigjeje shërbyesi\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    krye adrese zarfi\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr "  -Q, --qvirtual    parashtesë për t’u hequr pre id-je përdoruesi vendor\n"
+msgstr ""
+"  -Q, --qvirtual    parashtesë për t’u hequr pre id-je përdoruesi vendor\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   parësori i shërbimit postar\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  shton të dhëna gjurmimi vjeljeje te kryet Të marrë\n"
+msgstr ""
+"      --tracepolls  shton të dhëna gjurmimi vjeljeje te kryet Të marrë\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
-#| msgid "  -u, --username    specify users's login on server\n"
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr "  -u, --username    përcakto futjen e përdoruesit te shërbyesi\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
-msgstr "  -a, --[fetch]all  merr edhe mesazhe të reja, edhe mesazhe të vjetra\n"
+msgstr ""
+"  -a, --[fetch]all  merr edhe mesazhe të reja, edhe mesazhe të vjetra\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      fshi mesazhe të rinj pas marrjeje\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ruaj mesazhe të rinj pas marrjeje\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       fshi mesazhe të vjetër prej shërbyesit\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  fshi mesazhe të stërmëdhenj\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   mos rishkruaj adresa kryesh\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       mos sill mesazhe tej madhësisë së dhënë\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval midis njoftimesh sinjalizimi poste\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    cakto strehë SMTP përcjelljesh\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains sill postë për përkatësitë e caktuara\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress cakto përkatësi SMTP shpërndarje për t’u përdorur\n"
+msgstr ""
+"  -D, --smtpaddress cakto përkatësi SMTP shpërndarje për t’u përdorur\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr "      --smtpname    cakto emër të plotë SMTP emërpërdoruesi@përkatësi\n"
+msgstr ""
+"      --smtpname    cakto emër të plotë SMTP emërpërdoruesi@përkatësi\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   cakto vlera përgjigjesh antispam\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  cakto kufi tufe për lidhje SMTP\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  cakto kufi prurjeje për lidhje shërbyesish\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit cakto kufi madhësie mesazhesh që sillen\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    kryej një kërkim dyor për UIDL-ra\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     cakto maksimum fshirjesh ndërmjet shuarjesh\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         cakto MDA për t’u përdorur për përcjellje\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       cakto kartelë përfundimesh BSMTP\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        përdor LMTP (RFC2033) për shpërndarje\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      cakto emër dosjeje të largët\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika ecurie edhe në kartela regjistrimi\n"
 
-#: pop3.c:329
-msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr "Kujdes: U gjet \"Maillennium POP3\", po përdoret urdhri RETR në vend të TOP.\n"
+#: pop2.c:67
+msgid "POP2 does not support STLS. Giving up.\n"
+msgstr ""
 
-#: pop3.c:413
-msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr "TLS-ja është e detyrueshme për këtë sesion, por shërbyesi nuk e pranoi urdhrin CAPA.\n"
+#: pop2.c:73
+msgid "POP2 only supports password authentication. Giving up.\n"
+msgstr ""
+
+#: pop3.c:330
+msgid ""
+"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr ""
+"Kujdes: U gjet \"Maillennium POP3\", po përdoret urdhri RETR në vend të "
+"TOP.\n"
 
 #: pop3.c:414
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+"TLS-ja është e detyrueshme për këtë sesion, por shërbyesi nuk e pranoi "
+"urdhrin CAPA.\n"
+
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Urdhri CAPA megjithatë është i nevojshëm për TLS-në.\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: përmirësimi oportunist me TLS dështoi, po provohet vazhdimi\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Na u mbaruan mirëfilltësuesit e lejuar dhe nuk mund të vazhdojmë.\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore në përshëndetje\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Vulë kohore APOP e pavlefshme.\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock i zënë!  Ka ndonjë sesion tjetër aktiv?\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Nuk trajton dot përgjigje UIDL nga shërbyesi i sipërm.\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Mesazhe të futur në një listë te shërbyesi. S’e trajton dot këtë.\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mundësia --folder nuk mbulohet me POP3\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "mundësi shërbyesi pas mundësish përdoruesi"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS jo e aktivizuar."
 
-#: rcfile_y.y:218
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: mundësia e ndërfaqes mbulohet vetëm nën Linux (pa IPv6) dhe FreeBSD\n"
+#: rcfile_y.y:219
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: mundësia e ndërfaqes mbulohet vetëm nën Linux (pa IPv6) dhe "
+"FreeBSD\n"
 
-#: rcfile_y.y:226
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: mundësia e mbikëqyrjes mbulohet vetëm nën Linux (pa IPv6) dhe FreeBSD\n"
+#: rcfile_y.y:227
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: mundësia e mbikëqyrjes mbulohet vetëm nën Linux (pa IPv6) dhe "
+"FreeBSD\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL nuk është e aktivizuar"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "fund futjeje"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Kartela %s duhet të jetë një kartelë e rregullt.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Kartela %s s’duhet të ketë më tepër leje se -rwx------ (0700).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Kartela %s duhet të jetë pronë e juaja.\n"
@@ -2691,126 +2864,129 @@ msgstr "SMTP: (tekst mesazhi kërcimesh)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "postë nga %s kërceu për te %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "Gabimi i ruajtur është ende %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Gabim %cMTP: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Shërbyesi SMTP lyp STARTTLS, mesazhi po mbahet.\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Hapja e kartelës BSMTP dështoi: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr ""
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Dëgjuesi %cMTP s’e pëlqen adresën e marrësit `%s'\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Dëgjuesi %cMTP s’e ka dhe aq qejf adresën e marrësit `%s'\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "pa përputhje adresash; s’është caktuar usta poste.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "s'e dërgon dot as te %s!\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "pa përputhje adresash; po përcillet drejt %s.\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "gati për të shpërndarë me: %s\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Nuk kalohet dot id efektive përdoruesi në to %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr "Nuk rikthehet dot ID efektive përdoruesi te origjinali %ld: %s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Hapja e MDA-s dështoi\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Lidhja %cMTP me %s dështoi\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "s'ia del dot me dëgjuesin; po rikthehet te %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Dështoi përfundimi i mesazhit ose mbyllja e kartelës BSMTP: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gabim gjatë shkrimit në MDA: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA u përgjigj me gjendje jo zero %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Çudi: MDA pclose u përgjigj me %d dhe errno %d/%s, nuk trajton dot %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"Çudi: MDA pclose u përgjigj me %d dhe errno %d/%s, nuk trajton dot %s:%d\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "Gabim shpërndarjeje LMTP në EOM\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Përgjigje jo-503 e papritur për LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
-#| msgid ""
-#| "-- \n"
-#| "The Fetchmail Daemon"
 msgid "The Fetchmail Daemon"
 msgstr ""
 "-- \n"
@@ -2845,80 +3021,81 @@ msgstr "Mirëfilltësim ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "gabim protokolli dëgjuesi smtp\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: dështoi \"malloc\"\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair dështoi\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: degëzimi dështoi\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 dështoi\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "po xhirohet %s (streha %s shërbimi %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) dështoi\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "gabim getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr "Provoni të shtoni mundësinë --service (shihni po ashtu FAQ, zëri R12).\n"
+msgstr ""
+"Provoni të shtoni mundësinë --service (shihni po ashtu FAQ, zëri R12).\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "i panjohur (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Po përpiqet të lidhe me %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "s’krijohet dot socket: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "emër %d: s’krijohet dot familje socket-i %d lloji %d: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "lidhja dështoi.\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "lidhja me %s:%s [%s/%s] dështoi: %s.\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "emër %d: lidhja me %s:%s [%s/%s] dështoi: %s.\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "i lidhur.\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -2927,238 +3104,266 @@ msgstr ""
 "Gabime lidhjeje për këtë vjelje:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL-ja njoftoi: %s\n"
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Dëshmi shërbyesi:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr "Zinxhir dëshmish, nga rrënja te ana tjetër, që fillon me thellësinë %d:\n"
+msgstr ""
+"Zinxhir dëshmish, nga rrënja te ana tjetër, që fillon me thellësinë %d:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Dëshmi me thellësi %d:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizëm Lëshues: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Kujdes: Emër Organizmi Lëshues shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Organizëm i Panjohur\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Emër i Zakonshëm Lëshuesi: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "Sinjalizim: Emër i Zakonshëm Lëshuesi shumë i gjatë (mundet u cungua).\n"
+msgstr ""
+"Sinjalizim: Emër i Zakonshëm Lëshuesi shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Emër i Zakonshëm Lëshuesi i Panjohur\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Emër i Zakonshëm Subjekti: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dëshmi e keqe: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "Dëshmi e keqe: Emri i Zakonshëm i Subjektit përmban NUL, po ndërpritet!\n"
+msgstr ""
+"Dëshmi e keqe: Emri i Zakonshëm i Subjektit përmban NUL, po ndërpritet!\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Emër Alternativ Subjekti: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr "Dëshmi e keqe: Emri Alternativ i Subjektit përmban NUL, po ndërpritet!\n"
+msgstr ""
+"Dëshmi e keqe: Emri Alternativ i Subjektit përmban NUL, po ndërpritet!\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ngatërrim Emri të Zakonshëm Shërbyesi: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar, nuk u verifikua dot dëshmia!\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Emër i Zakonshëm Shërbyesi i Panjohur\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar në dëshmi!\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() dështoi!\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Kujtesë e pamjaftueshme!\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Shtytëz përmbledhjeje tekstesh shumë e vogël!\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Gjurmë gishtash kyçi %s: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s gjurmët e gishtave përputhen.\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s gjurmët e gishtave nuk përputhen!\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Gabim verifikim dëshmie shërbyesi: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Zinxhir i dëmtuar dëshmish te: %s\n"
 
-#: socket.c:821
-msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about.  For details, please see the README.SSL-SERVER document that ships with fetchmail.\n"
-msgstr "Kjo mund të nënkuptonte se shërbyesi nuk dha dëshmi të ndërmjetme AD-je, për çka fetchmail-i nuk mund të bëjë asgjë.  Për hollësi, ju lutem shihni dokumentin README.SSL-SERVER që shoqëron fetchmail-in.\n"
+#: socket.c:826
+msgid ""
+"This could mean that the server did not provide the intermediate CA's "
+"certificate(s), which is nothing fetchmail could do anything about.  For "
+"details, please see the README.SSL-SERVER document that ships with "
+"fetchmail.\n"
+msgstr ""
+"Kjo mund të nënkuptonte se shërbyesi nuk dha dëshmi të ndërmjetme AD-je, për "
+"çka fetchmail-i nuk mund të bëjë asgjë.  Për hollësi, ju lutem shihni "
+"dokumentin README.SSL-SERVER që shoqëron fetchmail-in.\n"
 
-#: socket.c:831
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
-#: socket.c:834
-msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page.\n"
-msgstr "Kjo mund të nënkuptonte që dëshmia e nënshkrimit të AD për rrënjën nuk gjendet te vendi i dëshmive të besuara për AD-të, ose se lypset që të xhirohet c_rehash te drejtoria e dëshmive. Për hollësi, ju lutemi shihni dokumentimin për --sslcertpath dhe --sslcertfile te faqja e doracakut.\n"
+#: socket.c:839
+msgid ""
+"This could mean that the root CA's signing certificate is not in the trusted "
+"CA certificate location, or that c_rehash needs to be run on the certificate "
+"directory. For details, please see the documentation of --sslcertpath and --"
+"sslcertfile in the manual page.\n"
+msgstr ""
+"Kjo mund të nënkuptonte që dëshmia e nënshkrimit të AD për rrënjën nuk "
+"gjendet te vendi i dëshmive të besuara për AD-të, ose se lypset që të "
+"xhirohet c_rehash te drejtoria e dëshmive. Për hollësi, ju lutemi shihni "
+"dokumentimin për --sslcertpath dhe --sslcertfile te faqja e doracakut.\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 #, fuzzy
-#| msgid "Your operating system does not support SSLv2.\n"
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "Sistemi juaj operativ nuk e mbulon SSLv2.\n"
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 #, fuzzy
-#| msgid "Your operating system does not support SSLv2.\n"
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "Sistemi juaj operativ nuk e mbulon SSLv2.\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 #, fuzzy
-#| msgid "Your operating system does not support SSLv2.\n"
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "Sistemi juaj operativ nuk e mbulon SSLv2.\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 #, fuzzy
-#| msgid "Your operating system does not support SSLv2.\n"
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "Sistemi juaj operativ nuk e mbulon SSLv2.\n"
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
-#| msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr "U dha protokoll SSL i pavlefshëm '%s', po përdoret i parazgjedhuri (SSLv23).\n"
+msgstr ""
+"U dha protokoll SSL i pavlefshëm '%s', po përdoret i parazgjedhuri "
+"(SSLv23).\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
-msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgid ""
+"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
-msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgid ""
+"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Përshkrues kartele jashtë intervali SSL-je"
 
-#: socket.c:1115
-msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+#: socket.c:1121
+msgid ""
+"Note that some distributions disable older protocol versions in weird non-"
+"standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
-msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgid ""
+"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
+"continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
-msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgid ""
+"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
+"to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikimi i dëshmisë/gjurmës së gishtave pak a shumë u anashkalua!\n"
 
-#: socket.c:1285
-msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
-msgstr "Kujdes: lidhja është e pasigurt, po vazhdohet sido qoftë. (Më mirë përdorni --sslcertck!)\n"
+#: socket.c:1291
+msgid ""
+"Warning: the connection is insecure, continuing anyways. (Better use --"
+"sslcertck!)\n"
+msgstr ""
+"Kujdes: lidhja është e pasigurt, po vazhdohet sido qoftë. (Më mirë përdorni "
+"--sslcertck!)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Riprovë për lexim prej një socket-i Cygwin\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Leximi dhe shkrimi prej një socket-i Cygwin dështuan!\n"
 
@@ -3207,74 +3412,75 @@ msgstr "u gjet adresë Të Marrë `%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr "u gjet rresht i pasaktë kryeje - shihni faqen e doracakut manpage mbi mundësinë bad-header\n"
+msgstr ""
+"u gjet rresht i pasaktë kryeje - shihni faqen e doracakut manpage mbi "
+"mundësinë bad-header\n"
 
 #: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "rreshti: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr ""
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Nuk u gjet marrës zarfi, po provohet me hamendësim kryesh.\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Po hamendësohet prej kryeje \"%-.*s\".\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "pa përputhje vendore, po përcillet te %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "përcjellja dhe fshirja u lanë përgjysmë, për shkak gabimesh DNS\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "po shkruhen RFC822 msgblk.headers\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "asnjë adresë marrësi nuk përputhet me emra vendorë të deklaruar"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa e marrësit %s s’u përputh me ndonjë emër vendor"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "mesazhi ka NULe të trupëzuar"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Dëgjuesi SMTP hodhi tej adresa vendore marrësish: "
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "gabim në shkrim teksti mesazhi\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr "Shtytëz shumë e vogël. Kjo është një e metë te thirrësi i %s:%lu.\n"
 
 #: uid.c:262
 #, fuzzy, c-format
-#| msgid "Old UID list from %s:"
 msgid "Old UID list from %s:\n"
 msgstr "Listë e vjetër UID prej %s:"
 
@@ -3284,19 +3490,16 @@ msgstr " <e zbrazët>"
 
 #: uid.c:273
 #, fuzzy
-#| msgid "Scratch list of UIDs:"
 msgid "Scratch list of UIDs:\n"
 msgstr "Listë e papastër UID-sh:"
 
 #: uid.c:357 uid.c:401
 #, fuzzy, c-format
-#| msgid "Merged UID list from %s:"
 msgid "Merged UID list from %s:\n"
 msgstr "Listë UID-sh e përzier prej %s:"
 
 #: uid.c:360
 #, fuzzy, c-format
-#| msgid "New UID list from %s:"
 msgid "New UID list from %s:\n"
 msgstr "Listë e re UID-sh prej %s:"
 
@@ -3308,35 +3511,36 @@ msgstr "nuk po shkëmbehen lista UID-sh, asnjë UID nuk e pa këtë kërkesë\n"
 msgid "discarding new UID list\n"
 msgstr "po hidhet tej listë e re UID-sh\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "Po fshihet kartelë \"fetchids\".\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Gabim në fshirjen e kartelës %s: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "Po shkruhet kartelë \"fetchids\".\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Gabim shkrimi në kartelën fetchids %s: %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Gabim gjatë shkrimit te kartela fetchids %s, u la në vend kartela e vjetër.\n"
+msgstr ""
+"Gabim gjatë shkrimit te kartela fetchids %s, u la në vend kartela e vjetër.\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "S’riemërton dot kartelën fetchids %s si %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "S'hap dot kartelën fetchids %s për shkrim në të: %s\n"
@@ -3349,5 +3553,11 @@ msgstr "dështoi malloc\n"
 msgid "realloc failed\n"
 msgstr "dështoi realloc\n"
 
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "Aftësi e domosdoshme LOGIN e pambuluar prej shërbyesit\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "Gabimi i ruajtur është ende %d\n"
+
 #~ msgid "swapping UID lists\n"
-#~ msgstr "po shkëmbehen lista UID-sh\n"
\ No newline at end of file
+#~ msgstr "po shkëmbehen lista UID-sh\n"
diff --git a/po/sv.po b/po/sv.po
index e67ad3f2..f3bb9c47 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-25 22:23+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/tr.po b/po/tr.po
index bb78246f..23e88929 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,40 +5,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-19 21:34+0200\n"
+"POT-Creation-Date: 2003-10-15 15:23-0400\n"
 "PO-Revision-Date: 2003-10-17 17:27+0200\n"
-"Last-Translator: Engin G�nd�z\n"
+"Last-Translator: Engin G�nd�z <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"Language: tr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:174
+#: checkalias.c:171
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "`%s' d���m�n�n ger�ekten `%s' ile ayn� olup olmad���na bak�l�yor\n"
 
-#: checkalias.c:178
+#: checkalias.c:175
 msgid "Yes, their IP addresses match\n"
 msgstr "Evet, IP adresleri birbirine uyuyor\n"
 
-#: checkalias.c:182
+#: checkalias.c:179
 msgid "No, their IP addresses don't match\n"
 msgstr "Hay�r, IP adresleri birbirine uymuyor\n"
 
-#: checkalias.c:207
-#, fuzzy, c-format
-msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
-
-#: checkalias.c:230
+#: checkalias.c:199 checkalias.c:225
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
+msgstr "%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
 
 #: cram.c:95
 msgid "could not decode BASE64 challenge\n"
@@ -49,160 +41,145 @@ msgstr "BASE64 challenge'�n�n kodunu ��zemedim\n"
 msgid "decoded as %s\n"
 msgstr "%s olarak kodu ��z�ld�\n"
 
-#: driver.c:199
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos hatas� %s\n"
 
-#: driver.c:259 driver.c:265
-#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s']\n"
+#: driver.c:250 driver.c:255
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
-#: driver.c:345
-msgid "Fetchmail oversized-messages warning"
-msgstr ""
-
-#: driver.c:349
-#, fuzzy, c-format
-msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
-
-#: driver.c:353
-#, fuzzy, c-format
-msgid "The following oversized messages remain on server %s account %s:"
+#: driver.c:336
+#, c-format
+msgid ""
+"Subject: Fetchmail oversized-messages warning.\n"
+"\n"
+"The following oversized messages remain on the mail server %s:"
 msgstr ""
-"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
-
-#: driver.c:372
-#, fuzzy, c-format
-msgid "  %d message  %d octets long deleted by fetchmail."
-msgid_plural "  %d messages %d octets long deleted by fetchmail."
-msgstr[0] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
-msgstr[1] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+"Subject: Fetchmail �ok b�y�k ileti uyar�s�.\n"
+"\n"
+"A�a��da yaz�l� �ok b�y�k iletiler sunucu %s �zerinde b�rak�ld�:"
 
-#: driver.c:377
-#, fuzzy, c-format
-msgid "  %d message  %d octets long skipped by fetchmail."
-msgid_plural "  %d messages %d octets long skipped by fetchmail."
-msgstr[0] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
-msgstr[1] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+#: driver.c:354
+#, c-format
+msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+msgstr "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
 
-#: driver.c:522
+#: driver.c:494
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlan�yor"
 
-#: driver.c:577
+#: driver.c:546
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ileti %s@%s:%d atlan�yor (%d sekizlik)"
 
-#: driver.c:593
+#.
+#. * 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:562
 msgid " (length -1)"
 msgstr " (b�y�kl�k -1)"
 
-#: driver.c:596
+#: driver.c:565
 msgid " (oversized)"
 msgstr " (�ok b�y�k)"
 
-#: driver.c:614
+#: driver.c:580
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "ba�l�klar getirilemedi, ileti %s@%s:%d (%d sekizlik)\n"
 
-#: driver.c:632
+#: driver.c:597
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:637
-#, fuzzy, c-format
-msgid " (%d octets)"
-msgstr " (%d sekizli).\n"
+#: driver.c:602
+#, c-format
+msgid " (%d %soctets)"
+msgstr " (%d %ssekizlik)"
 
-#: driver.c:638
-#, fuzzy, c-format
-msgid " (%d header octets)"
-msgstr " (ileti g�vdesi %d sekizlik) "
+#: driver.c:603
+msgid "header "
+msgstr "ba�l�k "
 
-#: driver.c:708
-#, fuzzy, c-format
-msgid " (%d body octets)"
+#: driver.c:675
+#, c-format
+msgid " (%d body octets) "
 msgstr " (ileti g�vdesi %d sekizlik) "
 
-#: driver.c:770
+#: driver.c:733
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen "
-"%d)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen %d)\n"
 
-#: driver.c:802
+#: driver.c:764
 msgid " retained\n"
 msgstr " b�rak�ld�\n"
 
-#: driver.c:812
+#: driver.c:773
 msgid " flushed\n"
 msgstr " bo�alt�ld�\n"
 
-#: driver.c:824
+#: driver.c:790
 msgid " not flushed\n"
 msgstr " bo�alt�lmad�\n"
 
-#: driver.c:842
-#, fuzzy, c-format
-msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] ""
-"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
-msgstr[1] ""
-"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
+#: driver.c:806
+#, c-format
+msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr "`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
+
+#: driver.c:866
+msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+msgstr "bir MDA'dan SIGPIPE f�rlat�ld� ya da stream soket hatas�\n"
 
-#: driver.c:899
+#: driver.c:873
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"%d saniye %s sunucusuna ba�lanmak beklendi ve zamana��m� s�resi doldu.\n"
+msgstr "%d saniye %s sunucusuna ba�lanmak beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:903
+#: driver.c:877
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "sunucu %2$s %1$d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:907
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%2$s %1$d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:912
+#: driver.c:886
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "dinleyici %d saniye beklendikten sonra zamana��m�na u�rand�.\n"
 
-#: driver.c:915
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:901
+msgid "Subject: fetchmail sees repeated timeouts\n"
 msgstr "Subject: fetchmail �ok say�da zamana��m� ile kar��la��yor\n"
 
-#: driver.c:930
+#: driver.c:903
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail %2$s@%3$s'den posta almaya �al���rken %1$d'den �ok zamana��m� ile "
-"kar��la�t�.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail %2$s@%3$s'den posta almaya �al���rken %1$d'den �ok zamana��m� ile kar��la�t�.\n"
 
-#: driver.c:934
+#: driver.c:908
 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"
@@ -219,99 +196,109 @@ msgstr ""
 "Fetchmail yeniden �al��t�r�lana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:960
-#, fuzzy, c-format
-msgid "pre-connection command terminated with signal %d\n"
-msgstr "ba�lant� sonras� komut ba�ar�s�z oldu, durum kodu %d\n"
-
-#: driver.c:963
+#: driver.c:937
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "ba�lant� sonras� komut ba�ar�s�z oldu, durum kodu %d\n"
 
-#: driver.c:987
+#: driver.c:968
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s i�in HESIOD pobox bulunamad�\n"
 
-#: driver.c:1008
+#: driver.c:990
 msgid "Lead server has no name.\n"
 msgstr "Lead sunucunun ad� yok.\n"
 
 # canonical'in T�rk�esi ne ola? kanonik hi� ho� de�il.
-#: driver.c:1035
-#, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s): %s\n"
+#: driver.c:1013
+#, c-format
+msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "%s (%s)'in kanonik DNS ad�n� bulamad�m\n"
 
-#: driver.c:1082
+#: driver.c:1050
+msgid "internal inconsistency\n"
+msgstr "i� tutars�zl�k\n"
+
+#: driver.c:1060
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
 
-#: driver.c:1111
+#: driver.c:1066
+msgid "host is unknown."
+msgstr "makina bilinmiyor."
+
+#: driver.c:1069
+msgid "name is valid but has no IP address."
+msgstr "ad ge�erli ama IP adresi yok."
+
+# unrecoverable = d�zeltilemez (Sankur'un s�zl��� 'kurtar�lamaz' diyor ama buraya pek
+# uymuyor bence...
+#: driver.c:1072
+msgid "unrecoverable name server error."
+msgstr "d�zeltilemeyen ad sunucusu hatas�."
+
+#: driver.c:1074
+msgid "temporary name server error."
+msgstr "ge�ici ad sunucusu hatas�."
+
+#: driver.c:1081
+#, c-format
+msgid "unknown DNS error %d."
+msgstr "bilinmeyen DNS hatas� %d."
+
+#: driver.c:1099
+#, c-format
+msgid ""
+"Subject: Fetchmail unreachable-server warning.\n"
+"\n"
+"Fetchmail could not reach the mail server %s:"
+msgstr ""
+"Subject: Fetcmail ula��lamayan sunucu uyar�s�.\n"
+"\n"
+"Fetchmail posta sunucusuna (%s) ula�amad�:"
+
+#: driver.c:1128 imap.c:366 pop3.c:410
 msgid "SSL connection failed.\n"
 msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: driver.c:1166
+#: driver.c:1181
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Me�gul kilit hatas� (%s@%s)\n"
 
-#: driver.c:1170
+#: driver.c:1185
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Sunucu me�gul hatas� (%s@%s)\n"
 
-#: driver.c:1175
+#: driver.c:1190
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s'te yetkilendirme hatas�\n"
 
-#: driver.c:1178
+#: driver.c:1193
 msgid " (previously authorized)"
 msgstr " (�nceden yetkilendirilmi�)"
 
-#: driver.c:1181
-msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1214
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s\n"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetlemesi ba�ar�s�z oldu\n"
 
-#: driver.c:1206
+#: driver.c:1217
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamad�.\n"
 
-#: driver.c:1210
-#, fuzzy
+#: driver.c:1221
 msgid ""
 "The attempt to get authorization failed.\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."
-msgstr ""
-"Yetki alma denemesi ba�ar�s�z oldu.\n"
-"Bu ba�lant� i�in daha �nce yetki alm�� oldu�umuza g�re, bu bir olas�l�kla\n"
-"ba�ka bir hata (�rne�in sunucunun me�gul olmas�) nedeniyle olabilir, fakat\n"
-"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu "
-"anlayamam��\n"
-"olabilir.\n"
-"\n"
-"Fakat e�er hesab�n�z�n bilgilerini fetchmail daemon'� ba�lat�ld���ndan\n"
-"beri de�i�tirilmi�se, �imdi daemon'� durdurup, fetchmail yap�land�rmas�n�\n"
-"de�i�tirip, daemon'� yeniden ba�latman�z gerekiyor.\n"
-"\n"
-"Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
-"�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
-
-#: driver.c:1216
-#, fuzzy
-msgid ""
+"error message.\n"
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -324,8 +311,7 @@ msgstr ""
 "Yetki alma denemesi ba�ar�s�z oldu.\n"
 "Bu ba�lant� i�in daha �nce yetki alm�� oldu�umuza g�re, bu bir olas�l�kla\n"
 "ba�ka bir hata (�rne�in sunucunun me�gul olmas�) nedeniyle olabilir, fakat\n"
-"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu "
-"anlayamam��\n"
+"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu anlayamam��\n"
 "olabilir.\n"
 "\n"
 "Fakat e�er hesab�n�z�n bilgilerini fetchmail daemon'� ba�lat�ld���ndan\n"
@@ -335,7 +321,7 @@ msgstr ""
 "Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
 "�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
 
-#: driver.c:1226
+#: driver.c:1236
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -354,191 +340,180 @@ msgstr ""
 "Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
 "�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
 
-#: driver.c:1242
+#: driver.c:1251
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1247
+#: driver.c:1256
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s'te bilinmeyen giri� ya da kimlik denetleme hatas�\n"
 
-#: driver.c:1271
+#: driver.c:1280
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1286
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s\n"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1281
+#: driver.c:1289
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi ba�ard�.\n"
 
-#: driver.c:1285
+#: driver.c:1293
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden sa�lan�yor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1318
+#: driver.c:1324
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "%s klas�r�n� se�iyor ya da yeniden kontrol ediyorum\n"
 
-#: driver.c:1320
+#: driver.c:1326
 msgid "selecting or re-polling default folder\n"
 msgstr "�ntan�ml� klas�r� se�iyor ya da yeniden kotrol ediyorum\n"
 
 # kaynak koduna bak�lacak
-#: driver.c:1332
+#: driver.c:1342
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klas�r %3$s)"
 
 # kaynak koduna bak�lacak
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1350 rcfile_y.y:397
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#: driver.c:1340
+#. only used for ETRN
+#: driver.c:1355
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklan�yor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1344
-#, fuzzy, c-format
-msgid "%d message (%d %s) for %s"
-msgid_plural "%d messages (%d %s) for %s"
-msgstr[0] "%5$s i�in (%3$d adedi %4$s) %1$d %2$s"
-msgstr[1] "%5$s i�in (%3$d adedi %4$s) %1$d %2$s"
-
-#: driver.c:1347
-#, fuzzy
+#: driver.c:1359
+#, c-format
+msgid "%d %s (%d %s) for %s"
+msgstr "%5$s i�in (%3$d adedi %4$s) %1$d %2$s"
+
+# bir �nceki ve bir sonraki iletilerle ilgili.
+# Bunun T�rk�ede tekil �erilmesi gerek, ��nk� hemen �n�nde bir say� olacak.
+#: driver.c:1360 driver.c:1367
+msgid "messages"
+msgstr "ileti"
+
+# �nceki iki ileti ile ilgili.
+#: driver.c:1361 driver.c:1368
+msgid "message"
+msgstr "ileti"
+
+#: driver.c:1363
 msgid "seen"
-msgid_plural "seen"
-msgstr[0] "g�r�lm��"
-msgstr[1] "g�r�lm��"
+msgstr "g�r�lm��"
 
 # �nceki iki ileti ile ilgili.
-#: driver.c:1350
-#, fuzzy, c-format
-msgid "%d message for %s"
-msgid_plural "%d messages for %s"
-msgstr[0] "%3$s i�in %1$d %2$s"
-msgstr[1] "%3$s i�in %1$d %2$s"
+#: driver.c:1366
+#, c-format
+msgid "%d %s for %s"
+msgstr "%3$s i�in %1$d %2$s"
 
-#: driver.c:1357
+#: driver.c:1372
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1363
+#: driver.c:1378
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s i�in mektup yok\n"
 
-#: driver.c:1396
+#: driver.c:1411
 msgid "bogus message count!"
 msgstr "sahte ileti say�s�!"
 
-#: driver.c:1448
-#, c-format
-msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-
-#: driver.c:1549
+#: driver.c:1512
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1552
+#: driver.c:1515
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ba�l��� ya hi� yok ya da format� k�t�"
 
-#: driver.c:1555
+#: driver.c:1518
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1521
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1561
+#: driver.c:1524
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokol�"
 
-#: driver.c:1564
+#: driver.c:1527
 msgid "lock busy on server"
 msgstr "sunucuda kilit me�gul"
 
 # transaction'� i�lem diye �evirdim. Do�ru mu?
-#: driver.c:1567
+#: driver.c:1530
 msgid "SMTP transaction"
 msgstr "SMTP i�lemi"
 
-#: driver.c:1570
+#: driver.c:1533
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1573
-#, fuzzy
-msgid "undefined"
+#: driver.c:1536
+msgid "undefined error\n"
 msgstr "tan�mlanmam�� hata\n"
 
-#: driver.c:1579
-#, fuzzy, c-format
-msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
+#: driver.c:1547
+#, c-format
+msgid "%s error while delivering to SMTP host %s\n"
 msgstr "SMTP makinas� %2$s'e da��t�l�rken %1$s hatas�\n"
 
-#: driver.c:1581
-#, fuzzy
-msgid "unknown"
-msgstr "makina bilinmiyor."
-
-#: driver.c:1583
-#, fuzzy, c-format
-msgid "%s error while fetching from %s@%s\n"
+#: driver.c:1549
+#, c-format
+msgid "%s error while fetching from %s\n"
 msgstr "%2$s'den getirilirken %1$s hatas�\n"
 
-#: driver.c:1595
-#, fuzzy, c-format
-msgid "post-connection command terminated with signal %d\n"
-msgstr "ba�lant� sonras� komut %d durum kodu ile ba�ar�s�z oldu\n"
-
-#: driver.c:1597
+#: driver.c:1557
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "ba�lant� sonras� komut %d durum kodu ile ba�ar�s�z oldu\n"
 
-#: driver.c:1616
+#: driver.c:1578
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 deste�i yok.\n"
 
-#: driver.c:1624
+#: driver.c:1586
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 deste�i yok.\n"
 
-#: driver.c:1635
+#: driver.c:1597
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1641
+#: driver.c:1603
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1650
+#: driver.c:1611
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit se�ene�i %s ile desteklenmiyor\n"
 
-#: env.c:61
+#: env.c:60
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -554,13 +529,12 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:73
+#: env.c:72
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -571,504 +545,394 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:85
+#: env.c:84
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Burada yoksunuz. Uzak durun.\n"
 
-#: env.c:149
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: makinan�z� belirleyemiyorum!"
 
-#: env.c:172
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:161
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "`gethostbyname' %s i�in ba�ar�s�z oldu\n"
 
-#: env.c:174
-msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-
-#: env.c:178
-msgid ""
-"Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
-"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
-msgstr ""
-
-#: etrn.c:49 odmr.c:61
+#: etrn.c:47 odmr.c:59
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "%s'nin SMTP dinleyicisi ESMTP'yi desteklemiyor\n"
 
-#: etrn.c:55
+#: etrn.c:53
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "%s'nin SMTP dinleyicisi ETRN'yi desteklemiyor\n"
 
-#: etrn.c:79
+#: etrn.c:77
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "%s i�in kuyru�a koyma ba�lad�\n"
 
-#: etrn.c:84
+#: etrn.c:82
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "%s i�in bekleyen ileti yok\n"
 
-#: etrn.c:90
+#: etrn.c:88
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "%s i�in bekleyen iletiler ba�lad�\n"
 
-#: etrn.c:94
+#. Unable to queue messages for node <x>
+#: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "%s d���m� i�in iletiler kuyru�a konam�yor\n"
 
-#: etrn.c:98
+#. Node <x> not allowed: <reason>
+#: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "D���m %s'in izni yok: %s\n"
 
-#: etrn.c:102
+#. Syntax Error
+#: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "ETRN s�zdizim hatas�\n"
 
-#: etrn.c:106
+#. Syntax Error in Parameters
+#: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "Parametrelerde ETRN s�zdizim hatas�\n"
 
-#: etrn.c:110
+#: etrn.c:108
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "Bilinmeyen ETRN hatas� %d\n"
 
-#: etrn.c:154
+#: etrn.c:155
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "--keep se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:158
+#: etrn.c:159
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "--flush se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:162
-#, fuzzy
-msgid "Option --folder is not supported with ETRN\n"
-msgstr "--flush se�ene�i ETRN ile desteklenmiyor\n"
+#: etrn.c:163
+msgid "Option --remote is not supported with ETRN\n"
+msgstr "--remote se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:166
+#: etrn.c:167
 msgid "Option --check is not supported with ETRN\n"
 msgstr "--check se�ene�i ETRN ile desteklenmiyor\n"
 
-#: fetchmail.c:141
-msgid ""
-"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
-"                   Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2019 Matthias Andree\n"
-msgstr ""
-
-#: fetchmail.c:147
-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"
-"please see the file COPYING in the source or documentation directory.\n"
-msgstr ""
-
-#: fetchmail.c:187
-msgid "WARNING: Running as root is discouraged.\n"
-msgstr ""
-
 # bu T�rk�e'nin s�zdizimine uymuyor??? Ne bi�im 'i18n'!! :((
-#: fetchmail.c:199
+#: fetchmail.c:156
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: bunlarla ba�lat�ld�"
 
-#: fetchmail.c:223
+#: fetchmail.c:180
 msgid "could not get current working directory\n"
 msgstr "�al��ma dizini bulunamad�\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:190
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail s�r�m %s"
 
-#: fetchmail.c:323
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:330
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:337
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:343
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:361
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:449
+#: fetchmail.c:331
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Se�enekler komut sat�r�ndan al�n�yor%s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:332
 msgid " and "
 msgstr " ve "
 
-#: fetchmail.c:455
+#: fetchmail.c:337
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Hi�bir posta sunucusu yok; belki %s eksik?\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:358
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: hi�bir posta sunucusu belirtilmedi.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:367 fetchmail.c:376
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ba�ka bir fetchmail �al��m�yor\n"
 
-#: fetchmail.c:494
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
-msgstr ""
-"fetchmail: %2$d'de %1$sda �al��an fetchmail'i �ld�r�rken hata; ��k�yorum.\n"
+#: fetchmail.c:382
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
+msgstr "fetchmail: %2$d'de %1$sda �al��an fetchmail'i �ld�r�rken hata; ��k�yorum.\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:383 fetchmail.c:389
 msgid "background"
 msgstr "arkaplan"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:383 fetchmail.c:389
 msgid "foreground"
 msgstr "�nplan"
 
-#: fetchmail.c:503
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:388
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %2$d'de %1$sde �al��an fetchmail �ld�r�ld�.\n"
 
-#: fetchmail.c:526
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: ayn� makinaya ba�ka bir fetchmail �al���rken iletilere bakamam.\n"
+#: fetchmail.c:404
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: ayn� makinaya ba�ka bir fetchmail �al���rken iletilere bakamam.\n"
 
-#: fetchmail.c:532
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: %d'de �al��an ba�ka bir fetchmail ile belirtilen makinalar� "
-"yoklayamam.\n"
+#: fetchmail.c:410
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: %d'de �al��an ba�ka bir fetchmail ile belirtilen makinalar� yoklayamam.\n"
 
-#: fetchmail.c:539
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:417
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: %d'de ba�ka bir fetchmail �nplanda �al���yor.\n"
 
-#: fetchmail.c:549
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: arkaplanda bir fetchmail �al���rken se�enekleri kabul edemem.\n"
+#: fetchmail.c:427
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: arkaplanda bir fetchmail �al���rken se�enekleri kabul edemem.\n"
 
-#: fetchmail.c:561
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:433
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: %d'de arkaplanda �al��an fetchmail uyand�r�ld�.\n"
 
-#: fetchmail.c:573
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
+#: fetchmail.c:445
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: %d b�y�k karde� s�re� gizemli bir bi�imde �ld�.\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s'in parolas�n� bulam�yorum.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:466
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s'in parolas�n� yaz�n�z: "
 
-#: fetchmail.c:634
-#, fuzzy
-msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: ba�ka bir fetchmail �al��m�yor\n"
-
-#: fetchmail.c:638
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:497
+#, c-format
+msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s daemon ba�lat�l�yor \n"
 
-#: fetchmail.c:654 fetchmail.c:656
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:512 fetchmail.c:514
+#, c-format
+msgid "could not open %s to append logs to \n"
 msgstr "kay�t eklemek i�in %s a��lamad� \n"
 
-#: fetchmail.c:675
-msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
-
-#: fetchmail.c:697
+#: fetchmail.c:552
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "dosya zaman� kontrol edilemedi %s (hata kodu %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:557
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail yeniden ba�lat�l�yor (%s de�i�ti)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:562
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"yeniden ba�latma denemesi, dizin eski haline d�nd�r�lmedi�inden ba�ar�s�z "
-"olabilir\n"
+msgstr "yeniden ba�latma denemesi, dizin eski haline d�nd�r�lmedi�inden ba�ar�s�z olabilir\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:589
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail'i yeniden ba�latma denemesi ba�ar�s�z oldu\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:617
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"%s'e bakmadan atl�yorum (ya kimlik denetlemesi ba�ar�s�z ya da �ok fazla "
-"zamama��m�)\n"
+msgstr "%s'e bakmadan atl�yorum (ya kimlik denetlemesi ba�ar�s�z ya da �ok fazla zamama��m�)\n"
 
 # interval ne? time interval mi?? kaynak koduna bak
-#: fetchmail.c:776
+#: fetchmail.c:629
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "aral�k ula��lmad�, %s'i sorgulam�yorum\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:667
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sorgulama durumu=0 (SUCCESS)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:669
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sorgulama durumu=1 (NOMAIL)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:671
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sorgulama durumu=2 (SOCKET)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:673
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sorgulama durumu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:675
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sorgulama durumu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:677
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sorgulama durumu=5 (SYNTAX)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:679
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sorgulama durumu=6 (IOERR)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:681
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sorgulama durumu=7 (ERROR)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:683
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sorgulama durumu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:685
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sorgulama durumu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:687
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sorgulama durumu=10 (SMTP)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:689
 msgid "Query status=11 (DNS)\n"
 msgstr "Sorgulama durumu=11 (DNS)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:691
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sorgulama durumu=12 (BSMTP)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:693
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sorgulama durumu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:695
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sorgulama durumu=%d\n"
 
 # wedge'yi s�k��mak diye �evirdim. Uygun mu?
-#: fetchmail.c:884
+#: fetchmail.c:741
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "T�m ba�lant�lar s�k��t�. ��k�yorum.\n"
 
-#: fetchmail.c:892
-#, fuzzy, c-format
-msgid "sleeping at %s for %d seconds\n"
+#: fetchmail.c:748
+#, c-format
+msgid "sleeping at %s\n"
 msgstr "fetchmail: %s'de uyuyorum\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:772
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s taraf�ndan uyand�r�ld�m\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:775
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d sinyali ile taraf�ndan uyand�r�ld�m\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:782
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s'de uyand�r�ld�m\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:788
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal biti�, durum kodu %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:941
 msgid "couldn't time-check the run-control file\n"
 msgstr "�al��ma denetimi (run-control) dosyas�n�n zaman� kontrol edilemedi\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:974
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
-
-#: fetchmail.c:1166
-#, fuzzy
-msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr ""
-"Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
+msgstr "Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1116
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
-#: fetchmail.c:1295
-#, fuzzy
-msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "SSL deste�i derlenirken eklenmemi�.\n"
-
-#: fetchmail.c:1301
-#, fuzzy
-msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "SSL deste�i derlenirken eklenmemi�.\n"
-
-#: fetchmail.c:1307
-#, fuzzy
-msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "SSL deste�i derlenirken eklenmemi�.\n"
-
 # multidrop'u �eviremedim.
-#: fetchmail.c:1337
+#: fetchmail.c:1149
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: uyar�: %s'den multidrop iletileri kontrol etmek i�in DNS yok\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: uyar�: %s'den multidrop iletileri kontrol etmek i�in DNS yok\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1166
 #, c-format
-msgid "warning: multidrop for %s requires envelope option!\n"
-msgstr ""
-
-#: fetchmail.c:1349
-msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-
-#: fetchmail.c:1366
-#, fuzzy, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "%s yap�land�rma ge�ersiz, port s�f�rdan k���k bir say� olamaz\n"
 
 # priviledged port = ayr�cal�kl� port???
-#: fetchmail.c:1373
-#, fuzzy, c-format
-msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1173
+#, c-format
+msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "%s yap�land�rma ge�ersiz, RPOP ayr�cal�kl� bir port gerektirir\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1189
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"%s yap�land�rma ge�ersiz, LMTP, SMTP'nin �ntan�ml� portunu kullanamaz\n"
+msgstr "%s yap�land�rma ge�ersiz, LMTP, SMTP'nin �ntan�ml� portunu kullanamaz\n"
 
-#: fetchmail.c:1405
-#, fuzzy
-msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
+#: fetchmail.c:1204
+msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "`fetchall' ve daemon kipinde �al��ma birlikte olmaz!\n"
 
-#: fetchmail.c:1415
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1439
+#: fetchmail.c:1254
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1339
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%4$s'de %1$s %2$s'i sorguluyor (protokol %3$s): yoklama ba�lat�ld�\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1364
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1376
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1386
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1392
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1398
+msgid "Cannot support ETRN without gethostbyname(2).\n"
+msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
+
+#: fetchmail.c:1405
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1411
+msgid "Cannot support ODMR without gethostbyname(2).\n"
+msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
+
+#: fetchmail.c:1417
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol se�ilmi�.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1590
+#: fetchmail.c:1427
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -1076,681 +940,607 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1615
+#: fetchmail.c:1444
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nab�z yoklama aral��� %d saniye\n"
 
 # logfile = kay�t dosyas� ?
-#: fetchmail.c:1617
+#: fetchmail.c:1446
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Kay�t  dosyas� = %s\n"
 
 # Idfile'i T�rk�e'ye �evirebilir miyim burada (kimlik dosyas�?) Kaynak koduna bak
-#: fetchmail.c:1619
+#: fetchmail.c:1448
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyas� %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1451
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�lerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1454
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail k�l�k de�i�tirecek ve Received sat�r� olu�turmayacak\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1456
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Fetchmail ilerleme durumunu g�steren noktalar� kay�t dosyalar�nda bile "
-"g�sterecek.\n"
+msgstr "Fetchmail ilerleme durumunu g�steren noktalar� kay�t dosyalar�nda bile g�sterecek.\n"
 
 # multidrop message ne demek?
-#: fetchmail.c:1629
+#: fetchmail.c:1458
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
+msgstr "Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
 
 # postmaster = postmaster ??
-#: fetchmail.c:1633
+#: fetchmail.c:1462
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1464
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini g�ndericiye iletecek.\n"
 
-# multidrop message ne demek?
-#: fetchmail.c:1638
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
-
-#: fetchmail.c:1640
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "Fetchmail hata iletisini g�ndericiye iletecek.\n"
-
-#: fetchmail.c:1647
+#: fetchmail.c:1471
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek i�in se�enekler:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1475
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1654
-#, fuzzy, 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] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
-msgstr[1] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
+#: fetchmail.c:1478
+#, c-format
+msgid "  Poll of this server will occur every %d intervals.\n"
+msgstr "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1481
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun ger�ek ad� %s.\n"
 
 # Bu �eviriyi kontrol et.
-#: fetchmail.c:1661
-#, fuzzy
-msgid "  This host will not be queried when no host is specified.\n"
+#: fetchmail.c:1483
+#, c-format
+msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
 
-# Bu �eviriyi kontrol et.
-#: fetchmail.c:1662
-#, fuzzy
-msgid "  This host will be queried when no host is specified.\n"
-msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
+# Harika. Nas�l �evrilecek bu?
+#: fetchmail.c:1484 fetchmail.c:1599 fetchmail.c:1602
+msgid "will not"
+msgstr ""
+
+# Harika! Nas�l �evrilecek �imdi bu?? :(
+#: fetchmail.c:1484 fetchmail.c:1599 fetchmail.c:1602
+msgid "will"
+msgstr ""
 
-#: fetchmail.c:1666
+#: fetchmail.c:1488
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1492
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1495
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullan�c� ad� = \"%s\".\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1498
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1511
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullan�l�yor"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1514
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1517
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullan�yorum)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1519
+#, c-format
+msgid " (using network security options %s)"
+msgstr " (�u a� g�venli�i se�eneklerini kullan�yorum: %s)"
+
+#: fetchmail.c:1522
+#, c-format
+msgid " (using port %d)"
+msgstr " (port %d kullan�l�yor)"
+
+#: fetchmail.c:1525
 msgid " (using default port)"
 msgstr " (�ntan�ml� port kullan�l�yor)"
 
 # 'to force' nas�l �evrilebilir?
-#: fetchmail.c:1694
+#: fetchmail.c:1527
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullan�m� istenecek)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1533
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  T�m kimlik denetleme y�ntemleri denenecek.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1536
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1706
-#, fuzzy
-msgid "  MSN authentication will be forced.\n"
-msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
-
-#: fetchmail.c:1709
+#: fetchmail.c:1539
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1542
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1715
-#, fuzzy
-msgid "  CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1545
+msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1548
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1551
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1554
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1557
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  U�tan uca �ifreleme varsay�l�yor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1731
+#: fetchmail.c:1561
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1564
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile �ifrelenmi� oturumlar etkinle�tirildi.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1566
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokol�: %s.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1568
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikas� kontrol� etkinle�tirildi.\n"
 
-#: fetchmail.c:1740
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  SSL sunucu sertifikas� kontrol� etkinle�tirildi.\n"
-
-#: fetchmail.c:1743
-#, fuzzy, c-format
-msgid "  SSL trusted certificate file: %s\n"
-msgstr "  SSL g�venilir sertifika dizini: %s\n"
-
-#: fetchmail.c:1745
+#: fetchmail.c:1570
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL g�venilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1747
-#, fuzzy, c-format
-msgid "  SSL server CommonName: %s\n"
-msgstr "Sunucu `CommonName'i: %s\n"
-
-#: fetchmail.c:1749
+#: fetchmail.c:1573
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL anahtar parmakizi (sunucu anahtar� ile denetlendi): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1576
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamana��m� %d saniye"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1578
 msgid " (default).\n"
 msgstr " (�ntan�ml�).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1585
 msgid "  Default mailbox selected.\n"
 msgstr "  �ntan�ml� posta kutusu se�ildi.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1590
 msgid "  Selected mailboxes are:"
 msgstr "  Se�ilen posta kutular�:"
 
 #  bu �eviriyi kontrol et
-#: fetchmail.c:1772
-#, fuzzy
-msgid "  All messages will be retrieved (--all on).\n"
+#: fetchmail.c:1595
+#, c-format
+msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#  bu �eviriyi kontrol et
-#: fetchmail.c:1773
-#, fuzzy
-msgid "  Only new messages will be retrieved (--all off).\n"
-msgstr "  %s ileti getirilecek (--all %s).\n"
+#: fetchmail.c:1596
+msgid "All"
+msgstr "Hepsi"
 
-#: fetchmail.c:1775
-#, fuzzy
-msgid "  Fetched messages will be kept on the server (--keep on).\n"
-msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
+#: fetchmail.c:1596
+msgid "Only new"
+msgstr "Yaln�zca yeniler"
 
-#: fetchmail.c:1776
-#, fuzzy
-msgid "  Fetched messages will not be kept on the server (--keep off).\n"
+#: fetchmail.c:1598
+#, c-format
+msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1778
-#, fuzzy
-msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
-
-#: fetchmail.c:1779
-#, fuzzy
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
-
-#: fetchmail.c:1781
-#, fuzzy
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
-
-#: fetchmail.c:1782
-#, fuzzy
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1601
+#, c-format
+msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1784
-#, fuzzy
-msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
+#: fetchmail.c:1604
+#, c-format
+msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1785
-#, fuzzy
-msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
+#: fetchmail.c:1605 fetchmail.c:1608 fetchmail.c:1611 fetchmail.c:1614
+#: fetchmail.c:1617 fetchmail.c:1620 fetchmail.c:1767
+msgid "enabled"
+msgstr "etkin"
 
-# carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1787
-#, fuzzy
-msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
+#: fetchmail.c:1605 fetchmail.c:1608 fetchmail.c:1611 fetchmail.c:1614
+#: fetchmail.c:1617 fetchmail.c:1620 fetchmail.c:1767
+msgid "disabled"
+msgstr "etkin de�il"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1788
-#, fuzzy
-msgid "  Carriage-return stripping is disabled (stripcr off).\n"
+#: fetchmail.c:1607
+#, c-format
+msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1790
-#, fuzzy
-msgid "  Carriage-return forcing is enabled (forcecr on).\n"
-msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
-
-# carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1791
-#, fuzzy
-msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+#: fetchmail.c:1610
+#, c-format
+msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
 
-#: fetchmail.c:1793
-#, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
-
-#: fetchmail.c:1794
-#, fuzzy
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1613
+#, c-format
+msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1796
-#, fuzzy
-msgid "  MIME decoding is enabled (mimedecode on).\n"
-msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
-
-#: fetchmail.c:1797
-#, fuzzy
-msgid "  MIME decoding is disabled (mimedecode off).\n"
+#: fetchmail.c:1616
+#, c-format
+msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
 
 # idle = ?? Ba�kalar�na sor
-#: fetchmail.c:1799
-#, fuzzy
-msgid "  Idle after poll is enabled (idle on).\n"
-msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
-
-# idle = ?? Ba�kalar�na sor
-#: fetchmail.c:1800
-#, fuzzy
-msgid "  Idle after poll is disabled (idle off).\n"
+#: fetchmail.c:1619
+#, c-format
+msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1802
-#, fuzzy
-msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
+#: fetchmail.c:1622
+#, c-format
+msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
 
-# Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
-# d���n�lmeliler.
-#: fetchmail.c:1803
-#, fuzzy
-msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
+# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
+# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropstatus ? "on" : "off");
+# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
+# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropdelivered ? "on" : "off");
+#
+# DIKKAT: 'discarded' ve 'kept'in durumlari �zel; at�lacak ve tutulacak
+# olarak �evrilmeleri gerekiyor.
+#: fetchmail.c:1623 fetchmail.c:1626
+msgid "discarded"
+msgstr "at�lacak"
 
-# Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
-# d���n�lmeliler.
-#: fetchmail.c:1805
-#, fuzzy
-msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
+#: fetchmail.c:1623 fetchmail.c:1626
+msgid "kept"
+msgstr "tutulacak"
 
 # Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1806
-#, fuzzy
-msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
+#: fetchmail.c:1625
+#, c-format
+msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1631
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  �leti boyut s�n�r� %d sekizlik (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1634
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �leti boyut s�n�r� yok (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1636
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  �leti boyut uyar�s� aral��� %d saniye (--warnings %d).\n"
 
 # poll = yoklama
-#: fetchmail.c:1818
+#: fetchmail.c:1639
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada b�y�kl�k uyar�s� (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1642
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Al�nan ileti s�n�r� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1645
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Al�nan ileti s�n�r� yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1647
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Getirilen ileti boyut s�n�r� %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1650
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Getirilen ileti boyut s�n�r� yok (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1654
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Her yoklama s�ras�nda UID'lerin 'binary' aramas�n� yap (--fastuidl %d).\n"
+msgstr "  Her yoklama s�ras�nda UID'lerin 'binary' aramas�n� yap (--fastuidl %d).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1656
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Her %2$d yoklaman�n %1$d tanesinde UID'lerin 'binary' aramas�n� yap (--"
-"fastuidl %3$d).\n"
+msgstr "  Her %2$d yoklaman�n %1$d tanesinde UID'lerin 'binary' aramas�n� yap (--fastuidl %3$d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1659
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Her yoklama s�ras�nda UID'ler i�in do�rusal arama yap (--fastuidl 0).\n"
+msgstr "   Her yoklama s�ras�nda UID'ler i�in do�rusal arama yap (--fastuidl 0).\n"
 
 # batch = ?
-#: fetchmail.c:1840
+#: fetchmail.c:1661
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1842
+#: fetchmail.c:1663
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1667
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Silmeler aras�ndaki zaman aral��� olarak %d kullan�lacak (--expunge %d).\n"
+msgstr "  Silmeler aras�ndaki zaman aral��� olarak %d kullan�lacak (--expunge %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1669
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Silmeler zorlanmayacak (--expunge 0).\n"
 
 # bu �eviriye bir bak. domain=alan deyince 'alanlar' sanki 'recipients' gibi anla��labilir??
-#: fetchmail.c:1855
+#: fetchmail.c:1676
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �u alanlar (domains) i�in posta getirilecek:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1681 fetchmail.c:1701
 msgid " (default)"
 msgstr " (�ntan�ml�)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1686
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �letiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1688
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �letiler \"%s\" ile ula�t�r�lacak.\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1695
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �letiler %cMTP ile a�a��dakilere iletilecek:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1706
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  MAIL FROM sat�r�n�n bilgisayar b�l�m� %s olacak\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1709
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  SMTP'ye g�nderilecek RCPT TO sat�rlar�na konacak adres %s olacak\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1718
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yan�tlar� ��yle:"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1724
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin de�il\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1727
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile a��lacak.\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1730
 msgid "  No pre-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1732
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile kopat�lacak.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1735
 msgid "  No post-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1738
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina i�in hi�bir yerel ad tan�mlanmam��.\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1748
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1750
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1931
-#, fuzzy, c-format
-msgid "%d local name recognized.\n"
-msgid_plural "%d local names recognized.\n"
-msgstr[0] "%d yerel ad tan�nd�.\n"
-msgstr[1] "%d yerel ad tan�nd�.\n"
-
-# buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1946
-#, fuzzy
-msgid "  DNS lookup for multidrop addresses is enabled.\n"
-msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
+#: fetchmail.c:1752
+#, c-format
+msgid "%d local name(s) recognized.\n"
+msgstr "%d yerel ad tan�nd�.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1947
-#, fuzzy
-msgid "  DNS lookup for multidrop addresses is disabled.\n"
+#: fetchmail.c:1766
+#, c-format
+msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
 
 # Bu string'den hemen sonra a�a��daki iki string geliyor ("IP address."
 # ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
 # bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye b�yle oldu�unu anlamak i�in.
-#: fetchmail.c:1951
-#, fuzzy
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1770
+msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  "
 
-# Bu string'den hemen sonra a�a��daki iki string geliyor ("IP address."
-# ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
-# bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
-# bakmak gerek niye b�yle oldu�unu anlamak i�in.
-#: fetchmail.c:1953
-#, fuzzy
-msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  "
+# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
+# bak�n�z.
+#: fetchmail.c:1772
+msgid "IP address.\n"
+msgstr "Sunucu takma adlar� IP adresleri kullan�larak kar��la�t�r�lacak.\n"
 
-#: fetchmail.c:1956
+# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
+# bak�n�z.
+#: fetchmail.c:1774
+msgid "name.\n"
+msgstr "Sunucu takma adlar�, adlar� kullan�larak kar��la�t�r�lacak.\n"
+
+#: fetchmail.c:1777
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin de�il\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1780
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope ba�l��� ��yle varsay�l�yor: %s\n"
 
-#: fetchmail.c:1962
-#, fuzzy, c-format
-msgid "  Number of envelope headers to be skipped over: %d\n"
+# Bu ileti yukar�daki "Envelope header is assumed to be: %" iletisine
+# ba�l�.
+#: fetchmail.c:1781
+msgid "Received"
+msgstr "Received"
+
+#: fetchmail.c:1783
+#, c-format
+msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Parse edilecek envelope ba�l��� say�s�: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1786
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s �neki kullan�c� kimli�inden silinecek\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1789
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1796
 msgid "  Predeclared mailserver aliases:"
 msgstr "  �nceden tan�mlanm�� posta sunucusu takma adlar�:"
 
-#: fetchmail.c:1981
+#: fetchmail.c:1805
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1815
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ba�lat� %s aray�z�nden olmal�.\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1817
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir aray�z�n kullan�lmas� zorunlu ko�ulmam��.\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1819
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama d�ng�s� %s'i g�zleyecek.\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1821
 msgid "  No monitor interface specified.\n"
 msgstr "  G�zleme aray�z� belirtilmemi�.\n"
 
 # plugin == ?
-#: fetchmail.c:2001
+#: fetchmail.c:1825
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Sunucu ba�lant�lar� %s plugin'i ile yap�lacak (--plugin %s).\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1827
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemi�.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:2005
+#: fetchmail.c:1829
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Dinleyici ba�lant�lar� %s plugout'u ile yap�lacak (--plugput %s).\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:1831
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemi�.\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:1836
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hi�bir UID saklanmad�.\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:1845
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID sakland�.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1853
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received ba�l���na yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:2025
-#, fuzzy
-msgid "  No poll trace information will be added to the Received header.\n"
+#: fetchmail.c:1855
+msgid ""
+"  No poll trace information will be added to the Received header.\n"
+".\n"
 msgstr ""
 "  Received ba�l���na yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:2030
-msgid "  Messages with bad headers will be rejected.\n"
-msgstr ""
-
-#: fetchmail.c:2033
-msgid "  Messages with bad headers will be passed on.\n"
-msgstr ""
-
-#: fetchmail.c:2038
+#: fetchmail.c:1858
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  �zellikler ge�iriliyor \"%s\".\n"
 
-#: getpass.c:71
+#.
+#. * This is a hack to help xgettext which cannot find strings in
+#. * macro definitions like the one for xalloca above.
+#.
+#: fetchmail.h:584 fetchmail.h:590
+msgid "alloca failed"
+msgstr "alloca ba�ar�s�z oldu"
+
+#: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "HATA: getpassword() desteklenmiyor\n"
 
-#: getpass.c:193
+#: getpass.c:194
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1758,302 +1548,207 @@ msgstr ""
 "\n"
 "SIGINT yakaland�... ��k�yorum.\n"
 
-#: gssapi.c:52
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:55
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "%cMTP hatas�: %s\n"
-
-#: gssapi.c:90
+#: gssapi.c:62
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "[%s] i�in hizmet ad� al�namad�\n"
 
-#: gssapi.c:95
+#: gssapi.c:68
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Hizmet ad� olarak [%s] kullan�l�yor\n"
 
-#: gssapi.c:122
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:123
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:159
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:169
+#: gssapi.c:84
 msgid "Sending credentials\n"
 msgstr "Credential'lar g�nderiliyor\n"
 
-#: gssapi.c:200
+#: gssapi.c:102
 msgid "Error exchanging credentials\n"
 msgstr "Credential takas�nda hata\n"
 
-#: gssapi.c:242
+#: gssapi.c:144
 msgid "Couldn't unwrap security level data\n"
 msgstr "G�venlik d�zeyi verisi elde edilemedi\n"
 
-#: gssapi.c:247
+#: gssapi.c:149
 msgid "Credential exchange complete\n"
 msgstr "Crendential takas� tamamland�\n"
 
-#: gssapi.c:251
+#: gssapi.c:153
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Sunucu i� tutarl�l�k ve/ya da mahremiyet gerektiriyor\n"
 
-#: gssapi.c:260
+#: gssapi.c:162
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "G�venlik d�zeyi bayraklar�: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:166
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "En b�y�k GSS token boyutu %ld\n"
 
-#: gssapi.c:273
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:282
+#: gssapi.c:179
 msgid "Error creating security level request\n"
 msgstr "G�venlik d�zeyi iste�ini olu�tururken hata\n"
 
-#: gssapi.c:286
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:297
+#: gssapi.c:190
 msgid "Releasing GSS credentials\n"
 msgstr "GSS credential'lar� b�rak�l�yor\n"
 
-#: gssapi.c:301
+#: gssapi.c:193
 msgid "Error releasing credentials\n"
 msgstr "Credential'lar b�rak�l�rken hata\n"
 
-#: idle.c:61
+#: idle.c:62
 #, c-format
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread %d saniye uyuyor.\n"
 
-#: imap.c:74
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:96
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "sahte ileti say�s�!"
-
-#: imap.c:143
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:354
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol IMAP4 rev 1 olarak belirlendi\n"
 
-#: imap.c:360
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol IMAP rev 0 olarak belirlendi.\n"
 
-#: imap.c:367
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
 
-#: imap.c:384
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "yoklamadan sonra idle kal�nacak\n"
 
-#: imap.c:475 pop3.c:473
-#, c-format
-msgid "%s: upgrade to TLS succeeded.\n"
-msgstr ""
-
-#: imap.c:481 pop3.c:479
-#, c-format
-msgid "%s: upgrade to TLS failed.\n"
-msgstr ""
-
-#: imap.c:486
-#, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-
-#: imap.c:501
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:606
+#: imap.c:460
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli OTP deste�i ile derlenmemi�\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:482
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli NTLM deste�i ile derlenmemi�\n"
 
-#: imap.c:635
+#: imap.c:491
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yetene�ini desteklemiyor\n"
 
-#: imap.c:699
-#, fuzzy, c-format
-msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr ""
-"%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen "
-"%d)\n"
-
-#: imap.c:826
-#, fuzzy, c-format
-msgid "%lu is unseen\n"
-msgstr "%u g�r�lmemi�\n"
-
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
-#, c-format
-msgid "%u is unseen\n"
-msgstr "%u g�r�lmemi�\n"
+#: imap.c:641 imap.c:707
+msgid "expunge failed\n"
+msgstr "silme ba�ar�s�z oldu\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:663 imap.c:692
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama ba�ar�s�z oldu\n"
 
-#: imap.c:919 imap.c:975
-#, fuzzy, c-format
-msgid "%d message waiting after re-poll\n"
-msgid_plural "%d messages waiting after re-poll\n"
-msgstr[0] "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
-msgstr[1] "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
+#: imap.c:671
+#, c-format
+msgid "%d messages waiting after re-poll\n"
+msgstr "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
 
-#: imap.c:936
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu se�imi ba�ar�s�z oldu\n"
 
-#: imap.c:940
-#, fuzzy, c-format
-msgid "%d message waiting after first poll\n"
-msgid_plural "%d messages waiting after first poll\n"
-msgstr[0] "ilk yoklamadan sonra %d ileti bekliyor\n"
-msgstr[1] "ilk yoklamadan sonra %d ileti bekliyor\n"
-
-#: imap.c:954
-msgid "expunge failed\n"
-msgstr "silme ba�ar�s�z oldu\n"
+#: imap.c:685
+#, c-format
+msgid "%d messages waiting after first poll\n"
+msgstr "ilk yoklamadan sonra %d ileti bekliyor\n"
 
-#: imap.c:958
-#, fuzzy, c-format
-msgid "%d message waiting after expunge\n"
-msgid_plural "%d messages waiting after expunge\n"
-msgstr[0] "silinmeden sonra %d ileti bekliyor\n"
-msgstr[1] "silinmeden sonra %d ileti bekliyor\n"
+#: imap.c:711
+#, c-format
+msgid "%d messages waiting after expunge\n"
+msgstr "silinmeden sonra %d ileti bekliyor\n"
 
-#: imap.c:997
+#: imap.c:734
 msgid "search for unseen messages failed\n"
 msgstr "g�r�lmemi� iletileri arama i�lemi ba�ar�s�z oldu\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:764 pop3.c:658 pop3.c:670 pop3.c:887 pop3.c:894
 #, c-format
-msgid "%u is first unseen\n"
-msgstr "%u ilk g�r�lmemi�\n"
-
-#: imap.c:1086
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
+msgid "%u is unseen\n"
+msgstr "%u g�r�lmemi�\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:776 pop3.c:679
 #, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+msgid "%u is first unseen\n"
+msgstr "%u ilk g�r�lmemi�\n"
 
-#: interface.c:256
+#: interface.c:253
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr "kvm aray�z� a��lamad�. fetchmail'in SGID kmem oldu�undan emin olunuz."
 
-#: interface.c:396
+#: interface.c:398
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "%s'den aray�z ad�n� ��karamad�m"
 
-#: interface.c:418
+#: interface.c:420
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist kestirme) ba�ar�s�z oldu"
 
-#: interface.c:424
+#: interface.c:426
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc ba�ar�s�z oldu"
 
-#: interface.c:430
+#: interface.c:432
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) ba�ar�s�z oldu"
 
-#: interface.c:448
+#: interface.c:450
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Routing iletisi s�r�m %d anla��lamad�."
 
-#: interface.c:480
+#. we did not find an interface with a matching name
+#: interface.c:482
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Ad� %s olan bir aray�z bulunamad�"
 
-#: interface.c:538
+#: interface.c:540
 #, c-format
 msgid "No IP address found for %s"
 msgstr "%s i�in bir IP adresi bulunamad�"
 
-#: interface.c:590
+#: interface.c:592
 msgid "missing IP interface address\n"
 msgstr "IP aray�z� adresi yok\n"
 
-#: interface.c:606
+#: interface.c:608
 msgid "invalid IP interface address\n"
 msgstr "ge�ersiz IP aray�z� adresi\n"
 
-#: interface.c:612
+#: interface.c:614
 msgid "invalid IP interface mask\n"
 msgstr "ge�ersiz IP aray�z� maskesi\n"
 
-#: interface.c:651
+#: interface.c:653
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:666
+#: interface.c:668
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "%s'in yoklanmas�n� atl�yorum, %s �al��m�yor\n"
 
-#: interface.c:685
+#: interface.c:687
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "%s'in yoklamas� atlan�yor, %s IP adresi d��ar�da tutuluyor\n"
 
-#: interface.c:697
+#: interface.c:699
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:723
+#: interface.c:725
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "%s'in yoklamas� atlan�yor, %s etkin de�il\n"
 
-#: interface.c:730
+#: interface.c:732
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s'de etkinlik %d idi, �imdi %d\n"
@@ -2062,730 +1757,591 @@ msgstr "%s'de etkinlik %d idi, �imdi %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "�lk BASE64 challenge'�n�n kodu ��z�lemedi\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "Ticket'teki %s principal'� -u %s'e uymuyor\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "null olmayan (%s) garip davran��a neden olabilir\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "BASE64 haz�r yan�t�n�n kodu ��z�lemedi\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "challenge'lar uymuyor\n"
 
-#: lock.c:87
-#, fuzzy, c-format
-msgid "fetchmail: error reading lockfile \"%s\": %s\n"
-msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
-
-#: lock.c:98
+#: lock.c:81
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
 
 #: lock.c:122
-#, fuzzy, c-format
-msgid "fetchmail: error opening lockfile \"%s\": %s\n"
-msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
-
-#: lock.c:169
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: kilit olu�turulamad�.\n"
 
-#: netrc.c:220
+#: netrc.c:218
+#, c-format
+msgid "warning: found \"%s\" before any host names"
+msgstr "uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu"
+
+#: netrc.c:222
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu\n"
 
-#: netrc.c:258
+#: netrc.c:261
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: uyar�: bilinmeyen token \"%s\"\n"
 
-#: odmr.c:67
+#: odmr.c:65
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "%s'in SMTP dinleyicisi ATRN'yi desteklemiyor\n"
 
-#: odmr.c:105
+#: odmr.c:103
 msgid "Turnaround now...\n"
 msgstr "Roller de�i�iliyor...\n"
 
-#: odmr.c:110
+#: odmr.c:108
 msgid "ATRN request refused.\n"
 msgstr "ATRN iste�i reddedildi.\n"
 
-#: odmr.c:114
+#. Unable to process ATRN request now
+#: odmr.c:112
 msgid "Unable to process ATRN request now\n"
 msgstr "ATRN iste�ini �imdi i�leyemiyorum\n"
 
-#: odmr.c:119
+#: odmr.c:117
 msgid "You have no mail.\n"
 msgstr "Mektubunuz yok.\n"
 
-#: odmr.c:123
+#. Command not implemented
+#: odmr.c:121
 msgid "Command not implemented\n"
 msgstr "Bu komut ger�eklenmemi�\n"
 
-#: odmr.c:127
+#. Authentication required
+#: odmr.c:125
 msgid "Authentication required.\n"
 msgstr "Kimlik kan�tlamas� gerekiyor.\n"
 
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:129
+#, c-format
+msgid "Unknown ODMR error %d\n"
 msgstr "Bilinmeyen ODMR hatas� %d\n"
 
-#: odmr.c:192
-#, fuzzy
-msgid "receiving message data\n"
-msgstr "ileti metni yaz�l�yor\n"
-
-#: odmr.c:245
+#: odmr.c:244
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "--keep se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:249
+#: odmr.c:248
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "--flush se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:253
-#, fuzzy
-msgid "Option --folder is not supported with ODMR\n"
-msgstr "--flush se�ene�i ODMR ile desteklenmiyor\n"
+#: odmr.c:252
+msgid "Option --remote is not supported with ODMR\n"
+msgstr "--remote se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:257
+#: odmr.c:256
 msgid "Option --check is not supported with ODMR\n"
 msgstr "--check se�ene�i ODMR ile desteklenmiyor\n"
 
-#: opie.c:42
+#: opie.c:37
 msgid "server recv fatal\n"
 msgstr "sunucu recv �l�mc�l\n"
 
-#: opie.c:56
+#: opie.c:51
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'�n�n kodu ��z�lemedi\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:59 pop3.c:495
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
-#: options.c:178 options.c:222
+#: options.c:201 options.c:245
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "'%s' katar� ge�erli bir say� katar� de�il.\n"
 
-#: options.c:187
+#: options.c:210
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "'%1$s'in de�eri %3$d'den %2$s.\n"
 
-#: options.c:188
+#: options.c:211
 msgid "smaller"
 msgstr "k���k"
 
-#: options.c:188
+#: options.c:211
 msgid "larger"
 msgstr "b�y�k"
 
-#: options.c:336
-#, fuzzy, c-format
-msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr "Ge�ersiz protokol `%s' belirtilmi�.\n"
-
-#: options.c:377
+#: options.c:383
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ge�ersiz protokol `%s' belirtilmi�.\n"
 
-#: options.c:424
+#: options.c:429
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ge�ersiz kimlik denetlemesi y�ntemi `%s' belirtilmi�.\n"
 
-#: options.c:640
+#: options.c:567
+msgid "fetchmail: network security support is disabled\n"
+msgstr "fetchmail: a� g�venli�i deste�i etkin de�il\n"
+
+#: options.c:660
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "kullan�m: fetchmail [se�enekler] [sunucu ...]\n"
 
-#: options.c:641
+#: options.c:661
 msgid "  Options are as follows:\n"
 msgstr "  A�a��daki se�enekler kullan�labilir:\n"
 
-#: options.c:642
+#: options.c:662
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        bu yard�m iletisini g�ster\n"
 
-#: options.c:643
+#: options.c:663
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     s�r�m bilgisini g�ster\n"
 
-#: options.c:645
+#: options.c:665
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       iletileri kontrol et ama getirme\n"
 
-#: options.c:646
+#: options.c:666
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      sessizce �al��\n"
 
-#: options.c:647
+#: options.c:667
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     �ok ayr�nt�l� bilgi ver (tan�lama ��kt�s�)\n"
 
-#: options.c:648
+#: options.c:668
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      n saniye i�in bir kez daemon olarak  �al��\n"
 
-#: options.c:649
+#: options.c:669
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    deamon s�recini 'detach' etme\n"
 
-#: options.c:650
+#: options.c:670
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        daemon s�recini �ld�r\n"
 
-#: options.c:651
+#: options.c:671
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     kay�t dosyas� ad�n� belirle\n"
 
-#: options.c:652
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      daemon olarak �al���rken �o�u ileti i�in syslog(3) "
-"kullan\n"
-
-#: options.c:653
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:672
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      daemon olarak �al���rken �o�u ileti i�in syslog(3) kullan\n"
 
-#: options.c:654
+#: options.c:673
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   'Received' sat�rlar�n� yazma ve 'spoof' etmeye izin ver\n"
+msgstr "      --invisible   'Received' sat�rlar�n� yazma ve 'spoof' etmeye izin ver\n"
 
-#: options.c:655
+#: options.c:674
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ba�ka bir yap�land�rma dosyas� kullan\n"
 
-#: options.c:656
+#: options.c:675
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
 
-#: options.c:657
-#, fuzzy
-msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
-
-#: options.c:658
+#: options.c:676
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ba�ka bir \"son �are\" al�c�s� belirle\n"
 
-#: options.c:659
+#: options.c:677
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    bounce eden iletileri kullan�c�dan postmaster'a g�nder.\n"
-
-#: options.c:660
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-
-#: options.c:661
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
+msgstr "      --nobounce    bounce eden iletileri kullan�c�dan postmaster'a g�nder.\n"
 
-#: options.c:663
+#: options.c:679
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:664
+#: options.c:680
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     aray�z�n etkinli�ini g�zle\n"
 
-#: options.c:667
+#: options.c:683
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ssl ile �ifrelenmi� oturumu etkinle�tir\n"
 
-#: options.c:668
+#: options.c:684
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl �zel anahtar dosyas�\n"
 
-#: options.c:669
+#: options.c:685
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl istemci sertifikas�\n"
 
-#: options.c:670
-#, fuzzy
-msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcert     ssl istemci sertifikas�\n"
-
-#: options.c:671
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcert     ssl istemci sertifikas�\n"
-
-#: options.c:672
-#, fuzzy
-msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr "      --sslcert     ssl istemci sertifikas�\n"
-
-#: options.c:673
-#, fuzzy
-msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr "      --sslcert     ssl istemci sertifikas�\n"
-
-#: options.c:674
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-
-#: options.c:675
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-
-#: options.c:676
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
+#: options.c:686
+msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    ssl protokol�n� se� (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:688
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      ba�lat�lar� a�mak i�in d��ar�dan bir program belirle\n"
+msgstr "      --plugin      ba�lat�lar� a�mak i�in d��ar�dan bir program belirle\n"
 
-#: options.c:679
+#: options.c:689
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     SMTP ba�lant�lar�n� yapmak i�in d��ar�dan bir program "
-"belirle\n"
-
-#: options.c:680
-msgid ""
-"      --bad-header {reject|accept}\n"
-"                    specify policy for handling messages with bad headers\n"
-msgstr ""
+msgstr "      --plugout     SMTP ba�lant�lar�n� yapmak i�in d��ar�dan bir program belirle\n"
 
-#: options.c:683
-#, fuzzy
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --protocol    belirtilen protokol� kullan (man sayfas�na bak�n�z)\n"
+#: options.c:691
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
+msgstr "  -p, --protocol    belirtilen protokol� kullan (man sayfas�na bak�n�z)\n"
 
-#: options.c:684
+#: options.c:692
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr ""
-"  -U, --uidl        UIDL kullan�m�n� zorunlu k�l (yaln�zca pop3 i�in)\n"
-
-#: options.c:685
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
+msgstr "  -U, --uidl        UIDL kullan�m�n� zorunlu k�l (yaln�zca pop3 i�in)\n"
 
-#: options.c:686
-#, fuzzy
-msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
-
-#: options.c:687
-#, fuzzy
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:693
+msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
 
-#: options.c:688
+#: options.c:694
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        kimlik kan�tama t�r� (parola/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:695
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     sunucu zamana��m� s�resi\n"
 
-#: options.c:690
+#: options.c:696
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope   envelope adresi ba�l���\n"
 
-#: options.c:691
+#: options.c:697
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    yerel kullan�c� kimli�inden silinecek �nek\n"
 
 # 'principal' ne demek?
-#: options.c:692
+#: options.c:698
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   posta hizmeti pricipal'�\n"
 
-#: options.c:693
+#: options.c:699
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received ba�l�klar�na yoklama bilgisi ekle\n"
 
-#: options.c:695
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:701
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    kullan�c�n�n sunucudak� kullan�c� ad�\n"
 
-#: options.c:696
-#, fuzzy
-msgid "  -a, --[fetch]all  retrieve old and new messages\n"
+#: options.c:702
+msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         eski ve yeni iletileri getir\n"
 
-#: options.c:697
+#: options.c:703
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      getirdikten sonra yeni iletileri sil\n"
 
-#: options.c:698
+#: options.c:704
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep       getirdikten sonra yeni iletileri sakla\n"
 
-#: options.c:699
+#: options.c:705
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:700
-#, fuzzy
-msgid "      --limitflush  delete oversized messages\n"
-msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
-
-#: options.c:701
+#: options.c:706
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ba�l�k adreslerini yeniden yazma\n"
 
-#: options.c:702
+#: options.c:707
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -w, --limit       belirtilenden daha b�y�k iletileri getirme\n"
 
-#: options.c:703
+#: options.c:708
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    posta bildirimleri aras�ndaki zaman aral���\n"
 
-#: options.c:705
+#: options.c:711
+msgid "  -T, --netsec      set IP security request\n"
+msgstr "  -T, --netsec      IP g�venli�i iste\n"
+
+#: options.c:713
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    bu SMTP sunucusunu kullan\n"
 
-#: options.c:706
+#: options.c:714
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr ""
-"      --fetchdomains belirtilen alan adlar� i�in gelen postalar� getir\n"
+msgstr "      --fetchdomains belirtilen alan adlar� i�in gelen postalar� getir\n"
 
-#: options.c:707
+#: options.c:715
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress kullan�lacak SMTP da��t�m alan� (domain) belirle\n"
 
-#: options.c:708
+#: options.c:716
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    bu SMTP kullan�c�@alanad� adresini kullan\n"
 
-#: options.c:709
+#: options.c:717
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam yan�t de�erlerini kullan\n"
 
-#: options.c:710
+#: options.c:718
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  SMTP ba�lant�lar� i�in batch limiti belirle\n"
 
-#: options.c:711
+#: options.c:719
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  sunucu ba�lant�lar� i�in getirme s�n�r�\n"
 
-#: options.c:712
+#: options.c:720
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit getirilen iletilerin boyut s�n�r�n� ayarla\n"
 
-#: options.c:713
+#: options.c:721
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL'ler i�in 'binary' arama yap\n"
 
-#: options.c:714
+#: options.c:722
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:715
+#: options.c:723
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         iletim i�in kullan�lacak MDA'y� belirle\n"
 
-#: options.c:716
+#: options.c:724
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP ��kt�s�n� bu dosyaya al\n"
 
-#: options.c:717
+#: options.c:725
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        da��t�m i�in LMTP (RFC2033) kullan\n"
 
-#: options.c:718
+#: options.c:726
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder    uzaktaki klas�r ad� olarak bunu kullan\n"
 
-#: options.c:719
+#: options.c:727
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    ilerlemeyi g�steren noktalar� kay�t dosyalar�nda bile "
-"g�ster\n"
-
-#: pop3.c:329
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-
-#: pop3.c:413
-msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-
-#: pop3.c:414
-msgid "The CAPA command is however necessary for TLS.\n"
-msgstr ""
-
-#: pop3.c:491
-#, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-
-#: pop3.c:497
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:622
-msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
+msgstr "      --showdots    ilerlemeyi g�steren noktalar� kay�t dosyalar�nda bile g�ster\n"
 
 # timestamp = zaman damgas� (zaman belirteci daha do�al olurdu bence ama b�yle kullan�lm��
 # ba�ka yerlerde)
-#: pop3.c:636
+#: pop3.c:533
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgas� selamlama i�erisinde bulunamad�\n"
 
-#: pop3.c:645
+#: pop3.c:542
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama i�indeki zaman damgas�nda s�zdizim yanl��� var\n"
 
-#: pop3.c:661
-msgid "Invalid APOP timestamp.\n"
-msgstr ""
-
-#: pop3.c:685
+#: pop3.c:564
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tan�mlanmam�� protokol iste�i\n"
 
-#: pop3.c:706
+#: pop3.c:572
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit me�gul!  Ba�ka bir oturum a��k olabilir\n"
 
-#: pop3.c:785
-msgid "Cannot handle UIDL response from upstream server.\n"
-msgstr ""
-
-#: pop3.c:808
-msgid "Server responded with UID for wrong message.\n"
-msgstr ""
-
-#: pop3.c:837
-#, fuzzy, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
+#: pop3.c:649 pop3.c:878
+#, c-format
+msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) silinmi�ti, fakat hala burada!\n"
 
-#: pop3.c:949
+#: pop3.c:751
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmu�. Bu durumu idare edemem.\n"
 
-#: pop3.c:1047
+#: pop3.c:837
 msgid "protocol error\n"
 msgstr "protokol hatas�\n"
 
-#: pop3.c:1063
+#: pop3.c:852
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatas�\n"
 
-#: pop3.c:1094
-#, c-format
-msgid "id=%s (num=%d) was deleted, but is still present!\n"
-msgstr "id=%s (num=%d) silinmi�ti, fakat hala burada!\n"
-
-#: pop3.c:1445
-#, fuzzy
-msgid "Option --folder is not supported with POP3\n"
+#: pop3.c:1210
+msgid "Option --remote is not supported with POP3\n"
 msgstr "--remote se�ene�i POP3 ile desteklenmiyor\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "kullan�c� se�eneklerinden sonra sunucu se�ene�i verilmi�"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:170
 msgid "SDPS not enabled."
 msgstr "SDPS etkin de�il."
 
 #: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: 'interface' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
-"destekleniyor\n"
+msgid "invalid security request"
+msgstr "ge�ersiz g�venlik iste�i"
 
-#: rcfile_y.y:226
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: 'monitor' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
-"destekleniyor\n"
+#: rcfile_y.y:224
+msgid "network-security support disabled"
+msgstr "a� g�venli�i deste�ini etkisizle�tirildi"
+
+#: rcfile_y.y:231
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: 'interface' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de destekleniyor\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:238
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: 'monitor' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de destekleniyor\n"
+
+#: rcfile_y.y:350
 msgid "SSL is not enabled"
 msgstr "SSL etkin de�il."
 
-#: rcfile_y.y:392
+#: rcfile_y.y:398
 msgid "end of input"
 msgstr "girdi sonu"
 
 # symbolic link?
-#: rcfile_y.y:430
+#: rcfile_y.y:435
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "%s dosyas� normal bir dosya olmal�.\n"
 
-#: rcfile_y.y:440
-#, fuzzy, c-format
-msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+#: rcfile_y.y:442
+#, c-format
+msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Dosyan�n (%s) izinleri -rwx--x--- (0710)'den �ok olmamal�.\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:454
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Dosyanin (%s) sahibi siz olmal�s�n�z.\n"
 
-#: report.c:67
+#: report.c:81
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatas�"
 
-#: report.c:92
-#, fuzzy, c-format
-msgid "%s (log message incomplete)\n"
+#: report.c:108
+#, c-format
+msgid "%s (log message incomplete)"
 msgstr "%s (kay�t iletisi tam de�il)"
 
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: report.c:266 report.c:294 report.c:366 report.c:394
+msgid "partial error message buffer overflow"
+msgstr "hata ileti tamponu ta�mas�"
+
+#: rfc822.c:74
+#, c-format
+msgid "About to rewrite %s"
 msgstr "%s'i yeniden yazmak �zereyim"
 
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:210
+#, c-format
+msgid "Rewritten version is %s\n"
 msgstr "Yeniden yaz�lan %s\n"
 
-#: rpa.c:118
+#: rpa.c:116
 msgid "Success"
 msgstr "Ba�ar�l�"
 
-#: rpa.c:119
+#: rpa.c:117
 msgid "Restricted user (something wrong with account)"
-msgstr ""
-"S�n�rl� kullan�c� (kullan�c� hesab� ile ilgili yanl�� bir�eyler olabilir)"
+msgstr "S�n�rl� kullan�c� (kullan�c� hesab� ile ilgili yanl�� bir�eyler olabilir)"
 
-#: rpa.c:120
+#: rpa.c:118
 msgid "Invalid userid or passphrase"
 msgstr "Kullan�c� ad� ya da parolas� ge�ersiz"
 
 # deity error???
-#: rpa.c:121
+#: rpa.c:119
 msgid "Deity error"
 msgstr "`Deity' hatas�"
 
-#: rpa.c:174
+#: rpa.c:172
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 kod ��zme hatas�\n"
 
-#: rpa.c:185
+#: rpa.c:183
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Hizmet RPA s�r�m %d.%d'i se�ti\n"
 
-#: rpa.c:191
+#: rpa.c:189
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Hizmet challenge'i (l=%d):\n"
 
-#: rpa.c:200
+#: rpa.c:198
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Hizmet zaman damgas� %s\n"
 
-#: rpa.c:205
+#: rpa.c:203
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2'de uzunluk hatas� var\n"
 
 # realm = alem
-#: rpa.c:209
+#: rpa.c:207
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Alem listesi: %s\n"
 
-#: rpa.c:213
+#: rpa.c:211
 msgid "RPA error in service@realm string\n"
 msgstr "hizmet@alem katar�nda RPA hatas�\n"
 
-#: rpa.c:250
+#: rpa.c:248
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 kod ��zme hatas�\n"
 
-#: rpa.c:261
+#: rpa.c:259
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Kullan�c� kimlik kan�tlama (l=%d):\n"
 
-#: rpa.c:275
+#: rpa.c:273
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA durumu: %02X\n"
 
-#: rpa.c:281
+#: rpa.c:279
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4: uzunluk hatas�\n"
 
-#: rpa.c:288
+#: rpa.c:286
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA sizi reddediyor: %s\n"
 
-#: rpa.c:290
+#: rpa.c:288
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA sizi reddediyor, nedeni bilinmiyor\n"
 
-#: rpa.c:298
+#: rpa.c:294
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA Kullan�c� Kimlik Kan�tlama uzunluk hatas�: %d\n"
 
-#: rpa.c:303
+#: rpa.c:299
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Oturumu anahtar uzunlu�u hatas�: %d\n"
 
-#: rpa.c:309
+#: rpa.c:305
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _hizmet_ kimlik kan�tlamas� ba�ar�s�z oldu.\n"
 
-#: rpa.c:314
+#: rpa.c:310
 msgid "Session key established:\n"
 msgstr "Oturum anahtar� kuruldu:\n"
 
-#: rpa.c:345
+#: rpa.c:341
 msgid "RPA authorisation complete\n"
 msgstr "RPA yetkilendirme tamamland�\n"
 
-#: rpa.c:372
+#: rpa.c:370
 msgid "Get response\n"
 msgstr "Yan�t al\n"
 
-#: rpa.c:402
+#: rpa.c:400
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Yan�t alma %d d�nd� [%s]\n"
@@ -2807,592 +2363,364 @@ msgstr "Token uzunlu�u %d rxlen (%d) ile uyu�muyor\n"
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanizma alan� do�ru de�il\n"
 
-#: rpa.c:531
+#: rpa.c:532
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "karakter %d'de dec64 hatas�: %x\n"
 
-#: rpa.c:546
+#: rpa.c:547
 msgid "Inbound binary data:\n"
 msgstr "Gelen ikilik veri:\n"
 
-#: rpa.c:582
+#: rpa.c:585
 msgid "Outbound data:\n"
 msgstr "Giden veri:\n"
 
-#: rpa.c:645
+#: rpa.c:651
 msgid "RPA String too long\n"
 msgstr "RPA katar� �ok uzun\n"
 
-#: rpa.c:650
+#: rpa.c:656
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:709
+#: rpa.c:718
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA /dev/urandom a��lamad�. Bu durum sisteme\n"
 
-#: rpa.c:710
+#: rpa.c:719
 msgid "    prevent you logging in, but means you\n"
 msgstr "    girmenize engel de�ildir, ancak konu�tu�unuzu\n"
 
-#: rpa.c:711
+#: rpa.c:720
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    d���nd���n�z sistem ile konu�muyor\n"
 
-#: rpa.c:712
+#: rpa.c:721
 msgid "    service that you think you are (replay\n"
 msgstr "    olabilirsiniz (k�t� niyetli sistemler\n"
 
-#: rpa.c:713
+#: rpa.c:722
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    `replay' sald�r�s� yapabilir).\n"
 
-#: rpa.c:724
+#: rpa.c:733
 msgid "User challenge:\n"
 msgstr "Kullan�c� challenge'�:\n"
 
-#: rpa.c:874
+#: rpa.c:891
 msgid "MD5 being applied to data block:\n"
 msgstr "Veri blo�una MD5 uygulan�yor:\n"
 
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:904
+msgid "MD5 result is: \n"
 msgstr "MD5 sonucu:\n"
 
-#: servport.c:53
-#, c-format
-msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
-msgstr ""
-
-#: servport.c:80
-#, c-format
-msgid "Cannot resolve service %s to port number.\n"
-msgstr ""
-
-#: servport.c:81
-msgid "Please specify the service as decimal port number.\n"
-msgstr ""
-
-#: sink.c:231
+#: sink.c:249
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:319
+#: sink.c:351
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: ('bounce' iletisi g�vdesi)\n"
 
-#: sink.c:322
+#. this will usually go to sylog...
+#: sink.c:354
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
 
-#: sink.c:457
+#: sink.c:464
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Kaydedilen hata hala %d\n"
 
-#: sink.c:509 sink.c:608
+#: sink.c:527 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP hatas�: %s\n"
 
-#: sink.c:553
-msgid "SMTP server requires STARTTLS, keeping message.\n"
-msgstr ""
-
-#: sink.c:736
-#, fuzzy, c-format
-msgid "BSMTP file open failed: %s\n"
+#: sink.c:761
+msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
 
-#: sink.c:782
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
-msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
-
-#: sink.c:996
+#: sink.c:982
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi al�c� adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:1003
+#: sink.c:989
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi al�c� adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "hi�bir adres uyu�mad�; postmaster yok.\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile g�nderilemedi!\n"
 "\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hi�bir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1223
+#: sink.c:1198
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek �zereyim: %s\n"
 
-#: sink.c:1234
-#, c-format
-msgid "Cannot switch effective user id to %ld: %s\n"
-msgstr ""
-
-#: sink.c:1246
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
-#: sink.c:1253
+#: sink.c:1222
 msgid "MDA open failed\n"
 msgstr "MDA a�ma ba�ar�s�z oldu\n"
 
-#: sink.c:1292
+#: sink.c:1259
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%2$s'e %1$cMTP ba�lant�s� ba�ar�s�z oldu\n"
 
-#: sink.c:1316
+#: sink.c:1283
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici �al��t�r�lamad�; %s denenecek"
 
-#: sink.c:1374
-#, fuzzy, c-format
-msgid "Message termination or close of BSMTP file failed: %s\n"
-msgstr ""
-"�letiyi bitirme ya da BSMTP dosyas�n� kapatma i�lemi ba�ar�s�zl�kla "
-"sonu�land�\n"
-
-#: sink.c:1399
-#, fuzzy, c-format
-msgid "Error writing to MDA: %s\n"
-msgstr "%s'e iletiliyor\n"
-
-#: sink.c:1402
+#: sink.c:1339
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile �ld�r�ld�\n"
 
-#: sink.c:1405
+#: sink.c:1342
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA s�f�rdan ba�ka bir durum kodu d�nd�rd� (%d)\n"
 
-#: sink.c:1408
-#, fuzzy, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+#: sink.c:1345
+#, c-format
+msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Garip: MDA pclose durum kodu olarak %d d�nd�rd�, %s:%d'de sorun\n"
 
-#: sink.c:1433
+#: sink.c:1366
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "�letiyi bitirme ya da BSMTP dosyas�n� kapatma i�lemi ba�ar�s�zl�kla sonu�land�\n"
+
+#: sink.c:1387
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi da��t�m� reddetti\n"
 
-#: sink.c:1463
+#: sink.c:1417
 msgid "LMTP delivery error on EOM\n"
 msgstr "�leti sonunda LMTP da��t�m hatas�\n"
 
-#: sink.c:1466
+#: sink.c:1420
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM'a beklenmeyen, 503 olmayan yan�t: %s\n"
 
-#: sink.c:1632
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1570
+msgid ""
+"--\n"
+"\t\t\t\tThe Fetchmail Daemon\n"
 msgstr ""
 "--\n"
 "\t\t\t\tFetchmail Daemon'u\n"
 
-#: smtp.c:81
+#: smtp.c:86
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-Md5 Kimlik kan�tlamas�...\n"
 
-#: smtp.c:87 smtp.c:137
+#. Server rejects AUTH
+#: smtp.c:93 smtp.c:153
 msgid "Server rejected the AUTH command.\n"
 msgstr "Sunucu AUTH komutunu reddetti.\n"
 
-#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
+#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
 msgid "Bad base64 reply from server.\n"
 msgstr "Sunucudan ge�ersiz base64 yan�t�.\n"
 
-#: smtp.c:99
+#: smtp.c:105
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "'Challenge'�n kodu ��z�ld�: %s\n"
 
-#: smtp.c:116
+#: smtp.c:126
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN Kimlik kan�tlamas�...\n"
 
-#: smtp.c:131
+#: smtp.c:146
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Kimlik kan�tlamas�...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:361 smtp.c:384
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatas�\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:108 socket.c:134
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ba�ar�s�z oldu\n"
 
-#: socket.c:171
+#: socket.c:166
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ba�ar�s�z oldu\n"
 
-#: socket.c:177
+#. error
+#: socket.c:172
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ba�ar�s�z oldu\n"
 
-#: socket.c:184
+#: socket.c:180
 msgid "dup2 failed\n"
 msgstr "dup2 ba�ar�s�z oldu\n"
 
-#: socket.c:190
+#: socket.c:186
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s �al��t�r�l�yor (makina %s hizmet %s)\n"
 
-#: socket.c:195
+#: socket.c:189
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ba�ar�s�z oldu\n"
 
-#: socket.c:270
-#, c-format
-msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
-msgstr ""
-
-#: socket.c:273
-msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-
-#: socket.c:287 socket.c:290
-#, fuzzy, c-format
-msgid "unknown (%s)"
-msgstr "bilinmeyen"
-
-#: socket.c:293
-#, c-format
-msgid "Trying to connect to %s/%s..."
-msgstr ""
-
-#: socket.c:302
-#, c-format
-msgid "cannot create socket: %s\n"
-msgstr ""
-
-#: socket.c:304
-#, c-format
-msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr ""
-
-#: socket.c:322
-#, fuzzy
-msgid "connection failed.\n"
-msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
-
-#: socket.c:324
-#, fuzzy, c-format
-msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
-
-#: socket.c:325
-#, fuzzy, c-format
-msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
-
-#: socket.c:331
-#, fuzzy
-msgid "connected.\n"
-msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
-
-#: socket.c:344
-#, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
-
-#: socket.c:406
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:641
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:647
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "Sunucu Seritifikas�'n�n kullan�m s�resi doldu"
-
-#: socket.c:652
+#: socket.c:281
 #, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
+msgid "fetchmail: getaddrinfo(%s.%s)\n"
+msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:655
+#: socket.c:428
 #, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
+msgid "fetchmail: illegal address length received for host %s\n"
+msgstr "fetchmail: %s makinesi i�in ge�ersiz adres uzunlu�u al�nd�\n"
 
-#: socket.c:661
+#: socket.c:778
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "��karan Kurum: %s\n"
 
-#: socket.c:664
+#: socket.c:780
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uyar�: ��karan Kurum Ad� �ok uzun (sonundan kesilmi� olabilir).\n"
 
-#: socket.c:666
+#: socket.c:782
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:668
+#: socket.c:784
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "��karan `CommonName'i: %s\n"
 
-#: socket.c:671
+#: socket.c:786
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uyar�: ��karan `CommonName'i �ok uzun (sonundan kesilmi� olabilir).\n"
 
-#: socket.c:673
+#: socket.c:788
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen ��karan `CommonName'i\n"
 
-#: socket.c:679
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "��karan `CommonName'i: %s\n"
-
-#: socket.c:685
-msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
-
-#: socket.c:691
-#, fuzzy
-msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
-
-#: socket.c:719
+#: socket.c:792
 #, c-format
-msgid "Subject Alternative Name: %s\n"
-msgstr ""
+msgid "Server CommonName: %s\n"
+msgstr "Sunucu `CommonName'i: %s\n"
 
-#: socket.c:725
-#, fuzzy
-msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+#. 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
+msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
 
-#: socket.c:742
+#: socket.c:812
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyu�mazl���: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:818
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu ad� ayarlanmam��, sertifikay� do�rulayam�yorum!\n"
 
-#: socket.c:754
+#: socket.c:823
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:756
+#: socket.c:825
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu ad� sertifikada belirtilmemi�!\n"
 
-#: socket.c:768
+#: socket.c:835
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ba�ar�s�z oldu!\n"
 
-#: socket.c:772
+#: socket.c:839
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:780
+#: socket.c:851
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu �ok k���k!\n"
 
-#: socket.c:786
+#: socket.c:857
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtar� parmak izi: %s\n"
 
-#: socket.c:790
+#: socket.c:861
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyu�uyor.\n"
 
-#: socket.c:792
+#: socket.c:864
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s parmak izleri uyu�muyor!\n"
 
-#: socket.c:804
-#, fuzzy, c-format
-msgid "Server certificate verification error: %s\n"
-msgstr "Uyar�: sunucu sertifikas� do�rulamas�: %s\n"
-
-#: socket.c:819
-#, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr ""
-
-#: socket.c:821
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
-msgstr ""
-
-#: socket.c:831
-#, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
-
-#: socket.c:834
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page.\n"
-msgstr ""
-
-#: socket.c:907 socket.c:985
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:925 socket.c:1003
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:956 socket.c:1035
-#, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Ge�ersiz SSL protokol� '%s' belirtildi, �ntan�ml� olan kullan�l�yor "
-"(SSLv23).\n"
-
-#: socket.c:1070
+#: socket.c:872
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
+msgid "Warning: server certificate verification: %s\n"
+msgstr "Uyar�: sunucu sertifikas� do�rulamas�: %s\n"
 
-#: socket.c:1075
+#: socket.c:878
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "bilinmeyen ��karan firma ad� (ilk %d karakter): %s\n"
 
-#: socket.c:1095
+#: socket.c:931
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL i�in s�n�rlar d���nda"
 
-#: socket.c:1115
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1183
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1198
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1235
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1238
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1238
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1258
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1261
+#: socket.c:948
 #, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "Ge�ersiz SSL protokol� '%s' belirtildi, �ntan�ml� olan kullan�l�yor (SSLv23).\n"
 
-#: socket.c:1268
+#: socket.c:1008
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi do�rulamas� bir bi�imde atland�!\n"
 
-#: socket.c:1285
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-
-#: socket.c:1327
+#: socket.c:1080
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1330
+#: socket.c:1083
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma ba�ar�s�z oldu!\n"
 
-#: transact.c:79
-#, fuzzy, c-format
-msgid "mapped address %s to local %s\n"
-msgstr "%s yerel %s'e e�lendi\n"
-
-#: transact.c:101
+#: transact.c:70
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s yerel %s'e e�lendi\n"
 
 # kaynak koduna bak�lacak
-#: transact.c:168
+#: transact.c:134
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "%2$s ile uyu�an %1$s ge�irildi\n"
 
-#: transact.c:240
+#: transact.c:203
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -3401,325 +2729,140 @@ msgstr ""
 "'Received' sat�r� ��z�mleniyor:\n"
 "%s"
 
-#: transact.c:279
+#: transact.c:242
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "sat�r kabul edildi, %s posta sunucusu i�in bir takma ad\n"
 
-#: transact.c:285
+#: transact.c:248
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "sat�r kabul edilmedi, %s posta sunucusu i�in bir takma ad de�il\n"
 
-#: transact.c:359
+#: transact.c:322
 msgid "no Received address found\n"
 msgstr "hi�bir Received adresi bulunamad�\n"
 
-#: transact.c:368
+#: transact.c:331
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "`%s' Received adresi bulundu\n"
 
 # delimiter = s�n�r belirteci  (Sankur'un s�zl���nden)
-#: transact.c:613
-#, fuzzy
-msgid "incorrect header line found - see manpage for bad-header option\n"
+#: transact.c:531
+msgid "message delimiter found while scanning headers\n"
+msgstr "ba�l�klar taran�rken ileti s�n�r belirteci bulundu\n"
+
+# delimiter = s�n�r belirteci  (Sankur'un s�zl���nden)
+#: transact.c:552
+msgid "incorrect header line found while scanning headers\n"
 msgstr "ba�l�klar taran�rken ge�ersiz ba�l�k sat�r� bulundu\n"
 
-#: transact.c:615
+#: transact.c:554
 #, c-format
 msgid "line: %s"
 msgstr "sat�r: %s"
 
-#: transact.c:1105 transact.c:1115
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1130
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr ""
-"'Received' sat�r� ��z�mleniyor:\n"
-"%s"
-
-#: transact.c:1142
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1160
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1175
+#: transact.c:1074
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "yerelde uyan bulunamad�, %s'e iletiliyor\n"
 
-#: transact.c:1190
+#: transact.c:1089
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "iletme ve silme DNS hatalar� nedeniyle yap�lm�yor\n"
 
-#: transact.c:1301
+#: transact.c:1225
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers yaz�l�yor\n"
 
-#: transact.c:1320
+#: transact.c:1246
 msgid "no recipient addresses matched declared local names"
-msgstr ""
-"al�c� adreslerinden hi�biri bildirilen yerel adlardan hi�birine uymuyor"
+msgstr "al�c� adreslerinden hi�biri bildirilen yerel adlardan hi�birine uymuyor"
 
-#: transact.c:1327
+#: transact.c:1257
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "al�c� adresi %s yerel adlardan hi�birine uymuyor"
 
-#: transact.c:1336
+#: transact.c:1271
 msgid "message has embedded NULs"
 msgstr "iletinin i�inde NUL karakterleri var"
 
 # listener = dinleyici
-#: transact.c:1344
+#: transact.c:1284
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP dinleyicisi yerel al�c� adreslerini reddetti: "
 
-#: transact.c:1394
-#, fuzzy
-msgid "error writing message text\n"
+#: transact.c:1409
+msgid "writing message text\n"
 msgstr "ileti metni yaz�l�yor\n"
 
-#: transact.c:1670
+#: uid.c:137
 #, c-format
-msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
+msgid "lstat: %s: %s\n"
+msgstr "lstat: %s: %s\n"
 
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:248
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "%s'den eski UID listesi:"
 
 # kaynak koduna bak�lacak
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
 msgid " <empty>"
 msgstr " <bo�>"
 
-#: uid.c:273
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:260
+msgid "Scratch list of UIDs:"
 msgstr "M�svedde UID listesi:"
 
-#: uid.c:357 uid.c:401
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#. 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:"
 msgstr "%s'den UID listesi birle�tirildi:"
 
-#: uid.c:360
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:514
+#, c-format
+msgid "New UID list from %s:"
 msgstr "%s'den yeni UID listesi:"
 
-#: uid.c:390
+#: uid.c:542
+msgid "swapping UID lists\n"
+msgstr "UID listeleri takas ediliyor\n"
+
+#: uid.c:550
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID listeleri takas edilmiyor, hi�bir UID bu sorguyu g�rmedi\n"
 
-#: uid.c:410
+#: uid.c:575
 msgid "discarding new UID list\n"
 msgstr "yeni UID listeleri siliniyor\n"
 
-#: uid.c:466
+#: uid.c:610
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids dosyas� siliniyor.\n"
 
-#: uid.c:469
-#, fuzzy, c-format
-msgid "Error deleting %s: %s\n"
-msgstr "Credential'lar b�rak�l�rken hata\n"
-
-#: uid.c:476
+#: uid.c:616
 msgid "Writing fetchids file.\n"
 msgstr "fetchids dosyas� yaz�l�yor.\n"
 
-#: uid.c:490 uid.c:499
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "fetchids dosyas� yaz�l�yor.\n"
-
-#: uid.c:511
-#, c-format
-msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-
-#: uid.c:515
-#, c-format
-msgid "Cannot rename fetchids file %s to %s: %s\n"
-msgstr ""
-
-#: uid.c:519
-#, c-format
-msgid "Cannot open fetchids file %s for writing: %s\n"
-msgstr ""
-
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc ba�ar�s�z oldu\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc ba�ar�s�z oldu\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "UID listeleri takas ediliyor\n"
-
-#~ msgid ""
-#~ "Subject: Fetchmail oversized-messages warning.\n"
-#~ "\n"
-#~ "The following oversized messages remain on the mail server %s:"
-#~ msgstr ""
-#~ "Subject: Fetchmail �ok b�y�k ileti uyar�s�.\n"
-#~ "\n"
-#~ "A�a��da yaz�l� �ok b�y�k iletiler sunucu %s �zerinde b�rak�ld�:"
-
-#~ msgid " (%d %soctets)"
-#~ msgstr " (%d %ssekizlik)"
-
-#~ msgid "header "
-#~ msgstr "ba�l�k "
-
-#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-#~ msgstr "bir MDA'dan SIGPIPE f�rlat�ld� ya da stream soket hatas�\n"
-
-#~ msgid "internal inconsistency\n"
-#~ msgstr "i� tutars�zl�k\n"
-
-#~ msgid "name is valid but has no IP address."
-#~ msgstr "ad ge�erli ama IP adresi yok."
-
-# unrecoverable = d�zeltilemez (Sankur'un s�zl��� 'kurtar�lamaz' diyor ama buraya pek
-# uymuyor bence...
-#~ msgid "unrecoverable name server error."
-#~ msgstr "d�zeltilemeyen ad sunucusu hatas�."
-
-#~ msgid "temporary name server error."
-#~ msgstr "ge�ici ad sunucusu hatas�."
-
-#~ msgid "unknown DNS error %d."
-#~ msgstr "bilinmeyen DNS hatas� %d."
-
-#~ msgid ""
-#~ "Subject: Fetchmail unreachable-server warning.\n"
-#~ "\n"
-#~ "Fetchmail could not reach the mail server %s:"
-#~ msgstr ""
-#~ "Subject: Fetcmail ula��lamayan sunucu uyar�s�.\n"
-#~ "\n"
-#~ "Fetchmail posta sunucusuna (%s) ula�amad�:"
-
-# bir �nceki ve bir sonraki iletilerle ilgili.
-# Bunun T�rk�ede tekil �erilmesi gerek, ��nk� hemen �n�nde bir say� olacak.
-#~ msgid "messages"
-#~ msgstr "ileti"
-
-# �nceki iki ileti ile ilgili.
-#~ msgid "message"
-#~ msgstr "ileti"
-
-#~ msgid "Option --remote is not supported with ETRN\n"
-#~ msgstr "--remote se�ene�i ETRN ile desteklenmiyor\n"
-
-#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
-#~ msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
-
-#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
-#~ msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
-
-#~ msgid " (using network security options %s)"
-#~ msgstr " (�u a� g�venli�i se�eneklerini kullan�yorum: %s)"
-
-#~ msgid " (using port %d)"
-#~ msgstr " (port %d kullan�l�yor)"
-
-#~ msgid "All"
-#~ msgstr "Hepsi"
-
-#~ msgid "Only new"
-#~ msgstr "Yaln�zca yeniler"
-
-#~ msgid "enabled"
-#~ msgstr "etkin"
-
-#~ msgid "disabled"
-#~ msgstr "etkin de�il"
-
-# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
-# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropstatus ? "on" : "off");
-# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
-# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropdelivered ? "on" : "off");
-#
-# DIKKAT: 'discarded' ve 'kept'in durumlari �zel; at�lacak ve tutulacak
-# olarak �evrilmeleri gerekiyor.
-#~ msgid "discarded"
-#~ msgstr "at�lacak"
-
-#~ msgid "kept"
-#~ msgstr "tutulacak"
-
-# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
-# bak�n�z.
-#~ msgid "IP address.\n"
-#~ msgstr "Sunucu takma adlar� IP adresleri kullan�larak kar��la�t�r�lacak.\n"
-
-# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
-# bak�n�z.
-#~ msgid "name.\n"
-#~ msgstr "Sunucu takma adlar�, adlar� kullan�larak kar��la�t�r�lacak.\n"
-
-# Bu ileti yukar�daki "Envelope header is assumed to be: %" iletisine
-# ba�l�.
-#~ msgid "Received"
-#~ msgstr "Received"
-
-#~ msgid "alloca failed"
-#~ msgstr "alloca ba�ar�s�z oldu"
-
-#~ msgid "warning: found \"%s\" before any host names"
-#~ msgstr "uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu"
-
-#~ msgid "Option --remote is not supported with ODMR\n"
-#~ msgstr "--remote se�ene�i ODMR ile desteklenmiyor\n"
-
-#~ msgid "fetchmail: network security support is disabled\n"
-#~ msgstr "fetchmail: a� g�venli�i deste�i etkin de�il\n"
-
-#~ msgid "  -T, --netsec      set IP security request\n"
-#~ msgstr "  -T, --netsec      IP g�venli�i iste\n"
-
-#~ msgid "invalid security request"
-#~ msgstr "ge�ersiz g�venlik iste�i"
-
-#~ msgid "network-security support disabled"
-#~ msgstr "a� g�venli�i deste�ini etkisizle�tirildi"
-
-#~ msgid "partial error message buffer overflow"
-#~ msgstr "hata ileti tamponu ta�mas�"
-
-#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
-#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
-
-#~ msgid "fetchmail: illegal address length received for host %s\n"
-#~ msgstr "fetchmail: %s makinesi i�in ge�ersiz adres uzunlu�u al�nd�\n"
-
-#~ msgid "unknown issuer (first %d characters): %s\n"
-#~ msgstr "bilinmeyen ��karan firma ad� (ilk %d karakter): %s\n"
-
-# delimiter = s�n�r belirteci  (Sankur'un s�zl���nden)
-#~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr "ba�l�klar taran�rken ileti s�n�r belirteci bulundu\n"
-
-#~ msgid "lstat: %s: %s\n"
-#~ msgstr "lstat: %s: %s\n"
-
 #~ msgid "Skipping message %d, length -1\n"
 #~ msgstr "�leti %d atlan�yor, uzunluk -1\n"
+
+#, fuzzy
+#~ msgid "unknown issuer= %s"
+#~ msgstr "bilinmeyen"
+
+#~ msgid "Server Certificate expired"
+#~ msgstr "Sunucu Seritifikas�'n�n kullan�m s�resi doldu"
diff --git a/po/vi.po b/po/vi.po
index 2bf311f1..86ddb647 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.4.0.rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-25 19:12+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-08-26 07:28+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 67025af9..b0052bf1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.22.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2019-08-24 12:40+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2013-03-08 09:33+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: checkalias.c:174
@@ -365,7 +366,7 @@ msgstr "正在选择或重检默认邮箱\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s 在 %s (邮箱 %s)"
 
-#: driver.c:1335 rcfile_y.y:391
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
@@ -652,86 +653,86 @@ msgstr "警告: 不提倡以 root 身份运行\n"
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: 调用参数"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "无法得到当前工作目录\n"
 
-#: fetchmail.c:298
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "这是 fetchmail 发行版 %s"
 
-#: fetchmail.c:323
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "nodetach 选项在起作用，忽略 logfile 选项。\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "未以 daemon 模式运行，忽略 logfile 选项。\n"
 
-#: fetchmail.c:337
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "日志文件 \"%s\" 不存在，忽略 logfile 选项。\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "日志文件 \"%s\" 不可写，退出。\n"
 
-#: fetchmail.c:361
+#: fetchmail.c:359
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr "同时指定了 syslog 和 logfile 选项，忽略 syslog 并登录至 %s"
 
-#: fetchmail.c:449
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "正从命令行获得选项 %s%s\n"
 
-#: fetchmail.c:450
+#: fetchmail.c:448
 msgid " and "
 msgstr "和"
 
-#: fetchmail.c:455
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "未设置邮件服务器 -- 可能未找到 %s？\n"
 
-#: fetchmail.c:476
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: 未指定邮件服务器\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
 
-#: fetchmail.c:494
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: 终止 %s fetchmail 进程号 %ld 时出错；退出。\n"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "后台"
 
-#: fetchmail.c:495 fetchmail.c:504
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "前台"
 
-#: fetchmail.c:503
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %ld 终止。\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:524
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:530
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -739,861 +740,861 @@ msgid ""
 msgstr ""
 "fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
 
-#: fetchmail.c:539
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %ld 正在运行。\n"
 
-#: fetchmail.c:549
+#: fetchmail.c:547
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: 后台 fetchmail 进程号 %ld 被唤醒\n"
 
-#: fetchmail.c:573
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: 上次 fetchmail 进程号 %ld 不明原因的终止\n"
 
-#: fetchmail.c:588
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: 无法找到 %s@%s 的密码\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "输入 %s@%s 的密码:"
 
-#: fetchmail.c:634
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: 无法转入后台。退出\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "开启 fetchmail %s 后台服务\n"
 
-#: fetchmail.c:654 fetchmail.c:656
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "无法打开 %s 添加记录\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "开启 --check 模式, 而非真正取回邮件\n"
 
-#: fetchmail.c:697
+#: fetchmail.c:695
 #, fuzzy, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "无法时限检测 %s (错误号 %d)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "正在重启 fetchmail (%s 改变了)\n"
 
-#: fetchmail.c:707
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "由于目录尚未重置，因此重新执行的尝试可能失败\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "重新执行 fetchmail 的尝试失败了\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "时间间隔未到，不查寻 %s \n"
 
-#: fetchmail.c:814
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "查询状态=0 (成功)\n"
 
-#: fetchmail.c:816
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "查询状态=1 (无邮件)\n"
 
-#: fetchmail.c:818
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "查询状态=2 (套接字输入输出错误)\n"
 
-#: fetchmail.c:820
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "查询状态=3 (用户验证失败)\n"
 
-#: fetchmail.c:822
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "查询状态=4 (协议无效)\n"
 
-#: fetchmail.c:824
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "查询状态=5 (命令行语法错误)\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "查询状态=6 (配置文件权限错误)\n"
 
-#: fetchmail.c:828
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "查询状态=7 (协议错误)\n"
 
-#: fetchmail.c:830
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "查询状态=8 (客户端受到排斥)\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "查询状态=9 (服务器死锁)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "查询状态=10 (SMTP 错误)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "查询状态=11 (DNS 错误)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "查询状态=12 (无法打开批量输出)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "查询状态=13 (到达收件上限)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "查询状态=%d\n"
 
-#: fetchmail.c:884
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "所有连接堵塞。退出\n"
 
-#: fetchmail.c:892
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "在 %s 休眠 %d 秒\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "通过信号 %s 唤醒\n"
 
-#: fetchmail.c:919
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "通过信号 %d 唤醒\n"
 
-#: fetchmail.c:927
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "在 %s 被唤醒\n"
 
-#: fetchmail.c:932
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1093
+#: fetchmail.c:1089
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1127
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
-#: fetchmail.c:1166
+#: fetchmail.c:1162
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 支持未编译在内\n"
 
-#: fetchmail.c:1295
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "设置了 GSSAPI 支持，但未编译在内\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1333
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
 
-#: fetchmail.c:1348
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1362
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "fetchmail: %s 配置无效，为服务或端口指定大于零的端口\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1405
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1411
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1439
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%1$s 在 %4$s 查寻 %2$s (协议 %3$s): 收件开始\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%1$s 在 %4$s 查询 %2$s (协议 %3$s): 收件完成\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr " 邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1651
 #, 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] "每隔 %d 秒将收取此服务器中的邮件\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr " 服务器的实名为 %s。\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr " 若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr " 若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "密码会被提示\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr " APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr " RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr " 密码 = “%s”\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr " 协议是 %s"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr " 将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr " 强制密码验证\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr " 强制 MSN 验证\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr " 强制 NTLM 验证\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验证\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr " 强制 CRAM-MD5 验证\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr " 强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr " 强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " 强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr " 假设为终端到终端加密\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr " 邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "启用 SSL 加密会话\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr " SSL 协议: %s\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr " SSL 受信证书文件: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL 服务器名: %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr " 服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr " 已选中默认邮箱。\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr " 选中的邮箱是:"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr " 收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr " 只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1776
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1778
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1779
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr " 回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr " 不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1790
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1791
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr " 收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr " 邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr " 无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr " 每 %2$d 次收件中有 %1$d 次对 UIDs 进行折半查找 (--fastuidl %3$d).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr " 要收取的邮件位于服务器:"
 
-#: fetchmail.c:1860 fetchmail.c:1880
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr " 邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr " 邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr " 邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr " RCPT TO 这一行中将要被送往 SMTP 的地址是　%s\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1903
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr " 关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr " 无连接前要执行的程序。\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr " 无连接后要执行的程序。\n"
 
-#: fetchmail.c:1917
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr " 此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr " 多投模式: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr " 单投模式: "
 
-#: fetchmail.c:1931
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr " 启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1948
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr " 服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr " 禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr " 邮件头假定为: %s\n"
 
-#: fetchmail.c:1962
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr " 跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr " 将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1968
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr " 没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr " 预先声明的邮件服务器昵称: "
 
-#: fetchmail.c:1981
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr " 本地域:"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr " 必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr " 未指定地址要求。\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr " 收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr " 未指定监听地址。\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:2007
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:2014
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr " 未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:2017
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr " 保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 " 无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr " 邮件头错误的邮件将被拒收。\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr " 邮件头错误的邮件可以接收。\n"
 
-#: fetchmail.c:2038
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1615,88 +1616,88 @@ msgstr ""
 "\n"
 "遇到信号 SIGINT... 正在退出\n"
 
-#: gssapi.c:52
+#: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
 msgstr "来自 <%s> 的 gss_display_status 调用中有 GSSAPI 错误\n"
 
-#: gssapi.c:55
+#: gssapi.c:56
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "GSSAPI 错误 %s: %.*s\n"
 
-#: gssapi.c:90
+#: gssapi.c:91
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "无法获得服务 [%s]\n"
 
-#: gssapi.c:95
+#: gssapi.c:96
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "正在使用服务 [%s]\n"
 
-#: gssapi.c:122
+#: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "未找到合适的 GSSAPI 证书。忽略 GSSAPI 认证。\n"
 
-#: gssapi.c:123
+#: gssapi.c:124
 msgid ""
 "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr "如您想使用 GSSAPI，您首先需要证书，也许来自 kinit。\n"
 
-#: gssapi.c:159
+#: gssapi.c:160
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "接收到怪异的请求 \"%s GSSAPI\"！\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 msgid "Sending credentials\n"
 msgstr "正在发送证书\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error exchanging credentials\n"
 msgstr "交换证书时出错\n"
 
-#: gssapi.c:242
+#: gssapi.c:243
 msgid "Couldn't unwrap security level data\n"
 msgstr "无法解开加密数据\n"
 
-#: gssapi.c:247
+#: gssapi.c:248
 msgid "Credential exchange complete\n"
 msgstr "证书交换完成\n"
 
-#: gssapi.c:251
+#: gssapi.c:252
 msgid "Server requires integrity and/or privacy\n"
 msgstr "服务器要求完整性和(或)隐私检查\n"
 
-#: gssapi.c:260
+#: gssapi.c:261
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "解开的加密标识: %s%s%s\n"
 
-#: gssapi.c:264
+#: gssapi.c:265
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "最大 GSS 标识大小为 %ld\n"
 
-#: gssapi.c:273
+#: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
 msgstr ""
 
-#: gssapi.c:282
+#: gssapi.c:283
 msgid "Error creating security level request\n"
 msgstr "创建加密请求时出错\n"
 
-#: gssapi.c:286
+#: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
 msgstr ""
 
-#: gssapi.c:297
+#: gssapi.c:298
 msgid "Releasing GSS credentials\n"
 msgstr "正在清空 GSS 证书\n"
 
-#: gssapi.c:301
+#: gssapi.c:302
 msgid "Error releasing credentials\n"
 msgstr "清空证书时出错\n"
 
@@ -1705,129 +1706,125 @@ msgstr "清空证书时出错\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: 线程休眠 %d 秒。\n"
 
-#: imap.c:74
+#: imap.c:75
 #, fuzzy, c-format
 msgid "Received BYE response from IMAP server: %s\n"
 msgstr "从IMAP 服务器收到 BYE 指令: %s"
 
-#: imap.c:96
+#: imap.c:97
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "发现伪造邮件\"%s\"！"
 
-#: imap.c:143
+#: imap.c:144
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "发现伪造的EXPUNGE \"%s\"！"
 
-#: imap.c:354
+#: imap.c:355
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "协议被识别为 IMAP4 版本 1\n"
 
-#: imap.c:360
+#: imap.c:361
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "协议被识别为 IMAP4 版本 0\n"
 
-#: imap.c:367
+#: imap.c:368
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "协议被识别为 IMAP2 或 IMAP2BIS\n"
 
-#: imap.c:384
+#: imap.c:385
 msgid "will idle after poll\n"
 msgstr "收件后恢复至 idle 模式\n"
 
-#: imap.c:475 pop3.c:473
+#: imap.c:476 pop3.c:474
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: 成功升级至 TLS 协议。\n"
 
-#: imap.c:481 pop3.c:479
+#: imap.c:482 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: 升级至 TLS 协议失败。\n"
 
-#: imap.c:486
+#: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: 即时升级至 TLS 协议失败，继续尝试\n"
 
-#: imap.c:501
+#: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
 msgstr ""
 
-#: imap.c:606
+#: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "需要的 OTP 功能未被编译进 fetchmail\n"
 
-#: imap.c:626 pop3.c:559
+#: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "需要的 NTLM 功能未被编译进 fetchmail\n"
 
-#: imap.c:635
-msgid "Required LOGIN capability not supported by server\n"
-msgstr "需要的 LOGIN 功能未被编译进 fetchmail\n"
-
-#: imap.c:699
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "邮件删除数不相等 (实际删除 %d 封!= 已删除 %d 封)\n"
 
-#: imap.c:826
+#: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu 封未读\n"
 
-#: imap.c:876 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
+#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u 未读\n"
 
-#: imap.c:911 imap.c:970
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "重新收件失败\n"
 
-#: imap.c:919 imap.c:975
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "重新收件后又有 %d 封邮件等待收取\n"
 
-#: imap.c:936
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "邮箱选择失败\n"
 
-#: imap.c:940
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "首次收件后又有 %d 封邮件等待收取\n"
 
-#: imap.c:954
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "删除操作失败\n"
 
-#: imap.c:958
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "删除操作后有 %d 封邮件等待收取\n"
 
-#: imap.c:997
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "查找未读邮件失败\n"
 
-#: imap.c:1002 pop3.c:867
+#: imap.c:994 pop3.c:852
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
-#: imap.c:1086
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
 
-#: imap.c:1185 imap.c:1192
+#: imap.c:1177 imap.c:1184
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "FETCH 响应不正确: %s。\n"
@@ -2023,202 +2020,202 @@ msgstr "ODMR 不支持 --folder 选项\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "ODMR 不支持 --check 选项\n"
 
-#: opie.c:42
+#: opie.c:43
 msgid "server recv fatal\n"
 msgstr "服务器 recv 错\n"
 
-#: opie.c:56
+#: opie.c:57
 msgid "Could not decode OTP challenge\n"
 msgstr "无法解码 OTP 请求\n"
 
-#: opie.c:64 pop3.c:586
+#: opie.c:65 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "密码短语:"
 
-#: options.c:178 options.c:222
+#: options.c:179 options.c:223
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
 
-#: options.c:187
+#: options.c:188
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
 
-#: options.c:188
+#: options.c:189
 msgid "smaller"
 msgstr "小"
 
-#: options.c:188
+#: options.c:189
 msgid "larger"
 msgstr "大"
 
-#: options.c:336
+#: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "设定的错误邮件头处理方式‘%s’无效。\n"
 
-#: options.c:377
+#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "指定了无效的协议 ‘%s’\n"
 
-#: options.c:424
+#: options.c:425
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "指定了无效的认证方式 ‘%s’\n"
 
-#: options.c:640
+#: options.c:641
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "用法: fetchmail [选项] [服务器...]\n"
 
-#: options.c:641
+#: options.c:642
 msgid "  Options are as follows:\n"
 msgstr "选项如下:\n"
 
-#: options.c:642
+#: options.c:643
 msgid "  -?, --help        display this option help\n"
 msgstr " -?, --help\t显示此选项帮助\n"
 
-#: options.c:643
+#: options.c:644
 msgid "  -V, --version     display version info\n"
 msgstr " -V, --version\t显示版本信息\n"
 
-#: options.c:645
+#: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr " -c, --check\t只检查邮件而不收取\n"
 
-#: options.c:646
+#: options.c:647
 msgid "  -s, --silent      work silently\n"
 msgstr " -s, --silent\t运行时不要显示多余信息\n"
 
-#: options.c:647
+#: options.c:648
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
 
-#: options.c:648
+#: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
 
-#: options.c:649
+#: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr " -N, --nodetach\t不分离后台进程\n"
 
-#: options.c:650
+#: options.c:651
 msgid "  -q, --quit        kill daemon process\n"
 msgstr " -q, --quit\t终止后台进程\n"
 
-#: options.c:651
+#: options.c:652
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile\t指定日志文件名\n"
 
-#: options.c:652
+#: options.c:653
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
 
-#: options.c:653
+#: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
 
-#: options.c:655
+#: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
 
-#: options.c:656
+#: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
 
-#: options.c:657
+#: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr " --pidfile\t指定可选的进程(锁)文件\n"
 
-#: options.c:658
+#: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr " --postmaster\t指定邮件管理员\n"
 
-#: options.c:659
+#: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
 
-#: options.c:660
+#: options.c:661
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
 
-#: options.c:661
+#: options.c:662
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr "      --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
 
-#: options.c:663
+#: options.c:664
 msgid "  -I, --interface   interface required specification\n"
 msgstr " -I, --interface\t指定网络地址\n"
 
-#: options.c:664
+#: options.c:665
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
 
-#: options.c:667
+#: options.c:668
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr " --ssl\t启用 ssl 加密会话\n"
 
-#: options.c:668
+#: options.c:669
 msgid "      --sslkey      ssl private key file\n"
 msgstr " --sslkey\tssl 私钥文件\n"
 
-#: options.c:669
+#: options.c:670
 msgid "      --sslcert     ssl client certificate\n"
 msgstr " --sslcert\tssl 客户端证书\n"
 
-#: options.c:670
+#: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
 
-#: options.c:671
+#: options.c:672
 #, fuzzy
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
 msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
 
-#: options.c:672
+#: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile     受信 CA ssl 证书文件名\n"
 
-#: options.c:673
+#: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath     受信 CA ssl 证书文件的目录\n"
 
-#: options.c:674
+#: options.c:675
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
 
-#: options.c:675
+#: options.c:676
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr " --sslfingerprint\t指定一个指纹，它必须与服务器证书的指纹匹配\n"
 
-#: options.c:676
+#: options.c:677
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (see manual)\n"
 msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
 
-#: options.c:678
+#: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
 msgstr " --plugin\t指定外部程序打开连接\n"
 
-#: options.c:679
+#: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
 
-#: options.c:680
+#: options.c:681
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
@@ -2226,148 +2223,148 @@ msgstr ""
 "      --bad-header {reject|accept}\n"
 "                    设定对邮件头错误的邮件的处理方式\n"
 
-#: options.c:683
+#: options.c:684
 #, fuzzy
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
 msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
 
-#: options.c:684
+#: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
 
-#: options.c:685
+#: options.c:686
 msgid ""
 "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port\t要连接的 TCP 端口(过时了，用 --service)\n"
 
-#: options.c:687
+#: options.c:688
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
 
-#: options.c:688
+#: options.c:689
 #, fuzzy
 msgid "      --auth        authentication type (see manual)\n"
 msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
 
-#: options.c:689
+#: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
 
-#: options.c:690
+#: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
 msgstr " -E, --envelope\t指定邮件地址头\n"
 
-#: options.c:691
+#: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
 
-#: options.c:692
+#: options.c:693
 msgid "      --principal   mail service principal\n"
 msgstr " --principal\t邮件服务验证方\n"
 
-#: options.c:693
+#: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
 
-#: options.c:695
+#: options.c:696
 #, fuzzy
 msgid "  -u, --user[name]  specify users's login on server\n"
 msgstr " -u, --username\t指定登录服务器的用户名\n"
 
-#: options.c:696
+#: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
 
-#: options.c:697
+#: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
 
-#: options.c:698
+#: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
 
-#: options.c:699
+#: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr " -F, --flush\t从服务器上删除旧邮件\n"
 
-#: options.c:700
+#: options.c:701
 msgid "      --limitflush  delete oversized messages\n"
 msgstr " --limitflush\t删除过大的邮件\n"
 
-#: options.c:701
+#: options.c:702
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr " -n, --norewrite\t不要重写地址头\n"
 
-#: options.c:702
+#: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr " -l, --limit\t不收超过指定大小的邮件\n"
 
-#: options.c:703
+#: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr " -w, --warnings\t邮件通知警告的间隔\n"
 
-#: options.c:705
+#: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
 
-#: options.c:706
+#: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr " --fetchdomains\t收取指定域的邮件\n"
 
-#: options.c:707
+#: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
 
-#: options.c:708
+#: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr " --smtpname\t设置 SMTP 全名，用户名@域\n"
 
-#: options.c:709
+#: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
 
-#: options.c:710
+#: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
 
-#: options.c:711
+#: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
 
-#: options.c:712
+#: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr " --fetchsizelimit\t设置收件大小限制\n"
 
-#: options.c:713
+#: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
 
-#: options.c:714
+#: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
 
-#: options.c:715
+#: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr " -m, --mda\t设置用于转发的 MDA\n"
 
-#: options.c:716
+#: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
 
-#: options.c:717
+#: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
 
-#: options.c:718
+#: options.c:719
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr " -r, --folder\t指定远程邮箱名\n"
 
-#: options.c:719
+#: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
 
@@ -2379,126 +2376,126 @@ msgstr ""
 msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr ""
 
-#: pop3.c:329
+#: pop3.c:330
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr "警告: 发现\"Maillennium POP3\"，用 RETR 命令代替 TOP。\n"
 
-#: pop3.c:413
+#: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "强制使用 TLS 会话，但服务器拒绝 CAPA 命令。\n"
 
-#: pop3.c:414
+#: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "而 CPAC 命令对于 TLS 协议来说是必须要有的。\n"
 
-#: pop3.c:491
+#: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: 升级到 TLS 协议失败了，继续尝试。\n"
 
-#: pop3.c:497
+#: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
 msgstr ""
 
-#: pop3.c:622
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "我们已经用完了可用的验证方式，无法继续\n"
 
-#: pop3.c:636
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在 greeting 中未发现所需的 APOP 时间戳\n"
 
-#: pop3.c:645
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中时间戳语法错误\n"
 
-#: pop3.c:661
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "无效的 APOP 时间戳\n"
 
-#: pop3.c:685
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中有未定义的协议请求\n"
 
-#: pop3.c:706
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "死锁！是否有另一个会话在运行？\n"
 
-#: pop3.c:785
+#: pop3.c:770
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "无法操作来自上游服务器的 UIDL 响应。\n"
 
-#: pop3.c:808
+#: pop3.c:793
 msgid "Server responded with UID for wrong message.\n"
 msgstr "响应的服务器带有错误消息的 UID。\n"
 
-#: pop3.c:837
+#: pop3.c:822
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (数量=%u 封)已被删除，但仍然存在！\n"
 
-#: pop3.c:949
+#: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "邮件被插入服务器列表。无法处理。\n"
 
-#: pop3.c:1047
+#: pop3.c:1032
 msgid "protocol error\n"
 msgstr "协议错\n"
 
-#: pop3.c:1063
+#: pop3.c:1048
 msgid "protocol error while fetching UIDLs\n"
 msgstr "正在读取 UIDLs 时协议出错\n"
 
-#: pop3.c:1094
+#: pop3.c:1079
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id = %s (数量 = %d 封) 已被删除，但仍然存在！\n"
 
-#: pop3.c:1445
+#: pop3.c:1389
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 不支持 --folder 选项\n"
 
-#: rcfile_y.y:131
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "服务器选项在用户选项后"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
-#: rcfile_y.y:218
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:226
+#: rcfile_y.y:227
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:340
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL 不可用"
 
-#: rcfile_y.y:392
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "输入结束"
 
-#: rcfile_y.y:430
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "文件 %s 必须是个普通文件。\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "文件 %s 必须归您所有。\n"
@@ -2726,123 +2723,127 @@ msgstr "SMTP: (回送邮件内容)\n"
 msgid "mail from %s bounced to %s\n"
 msgstr "邮件从 %s 回送至 %s\n"
 
-#: sink.c:457
-#, c-format
-msgid "Saved error is still %d\n"
-msgstr "保留的错误仍然为 %d\n"
-
-#: sink.c:509 sink.c:608
+#: sink.c:497 sink.c:590
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP 出错: %s\n"
 
-#: sink.c:553
+#: sink.c:535
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP 服务器需要 STARTTLS 认证，正在保存邮件。\n"
 
-#: sink.c:736
+#: sink.c:714
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "打开 BSMTP 文件失败: %s\n"
 
-#: sink.c:782
+#: sink.c:760
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "写入 BSMTP 报头失败: %s。\n"
 
-#: sink.c:996
+#: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP 端不认可收件人地址 “%s”\n"
 
-#: sink.c:1003
+#: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
 
-#: sink.c:1049
+#: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
 msgstr "无匹配的地址；也无 postmaster 设置\n"
 
-#: sink.c:1061
+#: sink.c:1039
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "无法稳定发送至 %s！\n"
 
-#: sink.c:1067
+#: sink.c:1045
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "无匹配的地址；转发至 %s。\n"
 
-#: sink.c:1223
+#: sink.c:1167
+#, c-format
+msgid "MDA option contains single-quoted %%%c expansion.\n"
+msgstr ""
+
+#: sink.c:1168
+msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
+msgstr ""
+
+#: sink.c:1211
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "即将用 %s 投递\n"
 
-#: sink.c:1234
+#: sink.c:1222
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "无法将当前用户名切换为 %ld: %s\n"
 
-#: sink.c:1246
+#: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr "无法将当前用户名切换回之前的用户名 %ld: %s\n"
 
-#: sink.c:1253
+#: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "打开 MDA 失败\n"
 
-#: sink.c:1292
+#: sink.c:1280
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP 连接至 %s 失败\n"
 
-#: sink.c:1316
+#: sink.c:1304
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "无法启动 MDA 代理；正在转到 MDA 代理 %s"
 
-#: sink.c:1374
+#: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
 
-#: sink.c:1399
+#: sink.c:1387
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "写入 MDA 时出错: %s\n"
 
-#: sink.c:1402
+#: sink.c:1390
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA 被信号 %d 终止\n"
 
-#: sink.c:1405
+#: sink.c:1393
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA 返回非零值 %d\n"
 
-#: sink.c:1408
+#: sink.c:1396
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s，在 %s:%d 无法处理\n"
 
-#: sink.c:1433
+#: sink.c:1421
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 端拒绝投递\n"
 
-#: sink.c:1463
+#: sink.c:1451
 msgid "LMTP delivery error on EOM\n"
 msgstr "邮件结尾时用 LTMP 协议投递错误\n"
 
-#: sink.c:1466
+#: sink.c:1454
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
 
-#: sink.c:1632
+#: sink.c:1620
 #, fuzzy
 msgid "The Fetchmail Daemon"
 msgstr ""
@@ -2878,80 +2879,80 @@ msgstr "ESMTP LOGIN 验证...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
-#: socket.c:110 socket.c:139
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc 失败\n"
 
-#: socket.c:171
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair 失败\n"
 
-#: socket.c:177
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork 失败\n"
 
-#: socket.c:184
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 失败\n"
 
-#: socket.c:190
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "正在运行 %s (主机 %s 服务 %s)\n"
 
-#: socket.c:195
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) 失败\n"
 
-#: socket.c:270
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(“%s”，“%s”) 错误: %s\n"
 
-#: socket.c:273
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
 
-#: socket.c:287 socket.c:290
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "未知 (%s)"
 
-#: socket.c:293
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "正在尝试连接至 %s/%s..."
 
-#: socket.c:302
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-#: socket.c:304
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "名称 %d: 无法创建套接字 %d 类型 %d: %s\n"
 
-#: socket.c:322
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "连接失败。\n"
 
-#: socket.c:324
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "名称 %d: 连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:331
+#: socket.c:332
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:344
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -2960,133 +2961,133 @@ msgstr ""
 "此服务器连接错误:\n"
 "%s"
 
-#: socket.c:406
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr ""
 
-#: socket.c:641
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr ""
 
-#: socket.c:647
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "服务器认证:\n"
 
-#: socket.c:652
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "验证链从根到节点，在 %d 开始:\n"
 
-#: socket.c:655
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "验证处于 %d 层:\n"
 
-#: socket.c:661
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:664
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:666
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:668
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者: %s\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者名称太长 (可能截短)。\n"
 
-#: socket.c:673
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者名称\n"
 
-#: socket.c:679
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "邮件标题: %s\n"
 
-#: socket.c:685
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 邮件标题太长!\n"
 
-#: socket.c:691
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题名中带有 NUL 字符，退出！\n"
 
-#: socket.c:719
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "邮件标题别名: %s\n"
 
-#: socket.c:725
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题别名带有 NUL 字符，退出！\n"
 
-#: socket.c:742
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器名不匹配: %s != %s\n"
 
-#: socket.c:749
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器名\n"
 
-#: socket.c:756
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:768
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:772
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:780
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:786
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:790
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:792
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:804
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:819
+#: socket.c:824
 #, fuzzy, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:821
+#: socket.c:826
 #, fuzzy
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
@@ -3097,12 +3098,12 @@ msgstr ""
 "此错误通常出现在服务器提供了一个不完整的验证链，fetchmain 对此无能为力。详细"
 "信息请查看随同 fetchmail 发行的 README.SSL-SERVER 文档。\n"
 
-#: socket.c:831
+#: socket.c:836
 #, fuzzy, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr " SSL 受信证书文件: %s\n"
 
-#: socket.c:834
+#: socket.c:839
 #, fuzzy
 msgid ""
 "This could mean that the root CA's signing certificate is not in the trusted "
@@ -3113,104 +3114,104 @@ msgstr ""
 "这意味着根证书(为 %s 而颁发)不在 CA 证书受信路径处，或是 c_rehash 需要在证书"
 "目录下运行。详细信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
 
-#: socket.c:907 socket.c:985
+#: socket.c:912 socket.c:990
 #, fuzzy
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "您的系统不支持 SSLv2。\n"
 
-#: socket.c:925 socket.c:1003
+#: socket.c:930 socket.c:1008
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "您的系统不支持 SSLv2。\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:941 socket.c:1019
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "您的系统不支持 SSLv2。\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:952 socket.c:1030
 #, fuzzy
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "您的系统不支持 SSLv2。\n"
 
-#: socket.c:956 socket.c:1035
+#: socket.c:961 socket.c:1040
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:1070
+#: socket.c:1075
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr ""
 
-#: socket.c:1075
+#: socket.c:1080
 #, c-format
 msgid ""
 "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr ""
 
-#: socket.c:1095
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:1115
+#: socket.c:1121
 msgid ""
 "Note that some distributions disable older protocol versions in weird non-"
 "standard ways. Try a newer protocol version.\n"
 msgstr ""
 
-#: socket.c:1183
+#: socket.c:1189
 #, c-format
 msgid ""
 "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
 "continue.\n"
 msgstr ""
 
-#: socket.c:1198
+#: socket.c:1204
 #, c-format
 msgid ""
 "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
 "to continue.\n"
 msgstr ""
 
-#: socket.c:1235
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr ""
 
-#: socket.c:1238
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr ""
 
-#: socket.c:1258
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
 msgstr ""
 
-#: socket.c:1261
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr ""
 
-#: socket.c:1268
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1285
+#: socket.c:1291
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr "警告:此连接不安全，但会继续运行。(最好使用 --sslcertck！)\n"
 
-#: socket.c:1327
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1330
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -3266,60 +3267,60 @@ msgstr "发现不正确的 header 行，查看手册页中的 bad-header 选项\
 msgid "line: %s"
 msgstr "行: %s"
 
-#: transact.c:1105 transact.c:1115
+#: transact.c:1087 transact.c:1097
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "正在解析邮件\"%s\"，名称\"%-.*s\"\n"
 
-#: transact.c:1130
+#: transact.c:1112
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "正在解析 Received 信息\"%-.*s\"\n"
 
-#: transact.c:1142
+#: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "未发现邮件接收人，采用猜测邮件头的方式。\n"
 
-#: transact.c:1160
+#: transact.c:1142
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "正在从邮件头\"%-.*s\"猜测。\n"
 
-#: transact.c:1175
+#: transact.c:1157
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "无本地匹配的收件人，正在转发至 %s\n"
 
-#: transact.c:1190
+#: transact.c:1172
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "正在转发且由于 DNS 错误，删除被取消了\n"
 
-#: transact.c:1301
+#: transact.c:1283
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
 
-#: transact.c:1320
+#: transact.c:1302
 msgid "no recipient addresses matched declared local names"
 msgstr "收件人地址与本地已知的用户名不匹配"
 
-#: transact.c:1327
+#: transact.c:1309
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
 
-#: transact.c:1336
+#: transact.c:1318
 msgid "message has embedded NULs"
 msgstr "邮件嵌入了 NULs"
 
-#: transact.c:1344
+#: transact.c:1326
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP 端拒绝本地收件人地址:"
 
-#: transact.c:1394
+#: transact.c:1376
 msgid "error writing message text\n"
 msgstr "在写邮件文本时出错\n"
 
-#: transact.c:1670
+#: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr ""
@@ -3358,35 +3359,35 @@ msgstr "不转储 UID 列表，本次查寻无 UIDs 读取\n"
 msgid "discarding new UID list\n"
 msgstr "正在撤消新的 UID 列表\n"
 
-#: uid.c:466
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "正在删除 fetchids 文件\n"
 
-#: uid.c:469
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "删除 %s 时出错: %s\n"
 
-#: uid.c:476
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "正在写入 fetchids 文件。\n"
 
-#: uid.c:490 uid.c:499
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "将错误写入 fetchids 文件 %s: %s\n"
 
-#: uid.c:511
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "写入 fetchids 文件 %s 时出错，存在旧文件。\n"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
 
-#: uid.c:519
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "无法打开 fetchids 文件 %s 写入: %s\n"
@@ -3399,12 +3400,18 @@ msgstr "malloc 失败\n"
 msgid "realloc failed\n"
 msgstr "realloc 失败\n"
 
-#~ msgid "swapping UID lists\n"
-#~ msgstr "正在转储 UID 列表\n"
+#~ msgid "Required LOGIN capability not supported by server\n"
+#~ msgstr "需要的 LOGIN 功能未被编译进 fetchmail\n"
+
+#~ msgid "Saved error is still %d\n"
+#~ msgstr "保留的错误仍然为 %d\n"
 
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "未知的发行者　(前 %d 个字符): %s\n"
 
+#~ msgid "swapping UID lists\n"
+#~ msgstr "正在转储 UID 列表\n"
+
 #~ msgid ""
 #~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 #~ msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录！\n"