Record automatic po/ update from make distcheck.

20 files changed, 8030 insertions, 14315 deletions

diff --git a/po/ca.po b/po/ca.po
index 7970876c..bb9497d0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-09-05 21:30+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -136,8 +136,7 @@ msgstr " (%d octets, cos) "
 
 #: driver.c:770
 #, 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 "%s@%s:%d no té la mida esperada (%d real != %d esperada)\n"
 
 #: driver.c:802
@@ -155,12 +154,9 @@ msgstr "no eliminat\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] ""
-"s'ha assolit el límit de %d; queda %d missatge al servidor %s compte %s\n"
-msgstr[1] ""
-"s'ha assolit el límit de %d; queden %d missatges al servidor %s compte %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "s'ha assolit el límit de %d; queda %d missatge al servidor %s compte %s\n"
+msgstr[1] "s'ha assolit el límit de %d; queden %d missatges al servidor %s compte %s\n"
 
 #: driver.c:899
 #, c-format
@@ -193,9 +189,7 @@ msgstr "El fetchmail exhaureix el temps d'espera repetidament"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
 msgstr ""
 "El fetchmail ha exhaurit el temps d'espera més de %d cops quan intentava\n"
 "obtenir el correu de %s@%s.\n"
@@ -294,8 +288,7 @@ msgstr ""
 "\n"
 "Com que en ocasions anteriors s'havia obtingut autorització per aquesta\n"
 "connexió, probablement es tracta d'algun problema (com ara, que el servidor\n"
-"està ocupat) que el fetchmail no pot identificar perquè el servidor no "
-"envia\n"
+"està ocupat) que el fetchmail no pot identificar perquè el servidor no envia\n"
 "missatges d'error que ho permetin."
 
 #: driver.c:1216
@@ -330,8 +323,7 @@ msgid ""
 msgstr ""
 "L'intent d'obtenir autorització ha fallat.\n"
 "\n"
-"Probablement això vol dir que la contrasenya no és vàlida, però també "
-"podria\n"
+"Probablement això vol dir que la contrasenya no és vàlida, però també podria\n"
 "ser un altre tipus d'error que el fetchmail no pot identificar perquè el\n"
 "servidor no envia missatges d'error apropiats.\n"
 "\n"
@@ -381,7 +373,7 @@ msgstr "se selecciona o es torna a comprovar la carpeta per omissió\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s a %s (carpeta %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
@@ -515,7 +507,7 @@ msgstr "L'opció --all no està suportada amb %s\n"
 msgid "Option --limit is not supported with %s\n"
 msgstr "L'opció --limit no està suportada amb %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -530,55 +522,44 @@ msgstr ""
 "Proveu \"env QMAILINJECT= %s ELS VOSTRES ARGUMENTS AQUÍ\"\n"
 "%s: S'avorta.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
 "%s: La variable d'entorn NULLMAILER_FLAGS està definida.\n"
-"Això és perillós perquè pot provocar que el nullmailer alteri les "
-"capçaleres\n"
+"Això és perillós perquè pot provocar que el nullmailer alteri les capçaleres\n"
 "From, Message-ID o Return-Path.\n"
 "Proveu \"env NULLMAILER_FLAGS= %s ELS VOSTRES ARGUMENTS AQUÍ\"\n"
 "%s: S'avorta.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: El vostre usuari no existeix.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: no es pot determinar aquesta màquina!"
 
-#: env.c:223
+#: env.c:172
 #, c-format
 msgid "getaddrinfo failed for %s\n"
 msgstr "ha fallat la funció getaddrinfo per %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "No és possible trobar el nom de xarxa qualificat d'aquesta màquina!\n"
 
-#: env.c:229
+#: 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 ""
 "S'intenta continuar amb el nom de màquina sense qualificar.\n"
@@ -650,14 +631,13 @@ msgstr "L'opció --folder no està suportada amb ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'opció --check no està suportada amb ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2005 - 2019 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -665,911 +645,838 @@ msgstr ""
 "Copyright (C) 2005 - 2012 Sunil Shetye\n"
 "Copyright (C) 2005 - 2019 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: 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 ""
-"El fetchmail es distribueix SENSE CAP TIPUS DE GARANTIA.  Aquest programa "
-"és\n"
+"El fetchmail es distribueix SENSE CAP TIPUS DE GARANTIA.  Aquest programa és\n"
 "programari lliure i sou lliure de redistribuir-lo sota determinades\n"
 "condicions.  Per a més detalls, vegeu el fitxer COPYING en el directori de\n"
 "documentació o del codi font.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:187
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ATENCIÓ: Executar el fetchmail com a root no és recomanable.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:199
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocat amb"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "no es pot determinar el directori de treball actual\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail versió %s"
 
-#: fetchmail.c:308
-#, fuzzy
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr "La vostra versió d'OpenSSL no suporta TLS v1.3.\n"
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Es troba en efecte l'opció nodetach, s'ignora l'opció logfile.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "No s'està executant en mode dimoni, s'ignora l'opció logfile.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "El fitxer \"%s\" no existeix, s'ignora l'opció logfile.\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "No es pot escriure al fitxer \"%s\", s'avorta.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:359
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"Heu especificat tant syslog com logfile, s'ignora syslog i s'escriu a \"%s\""
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "Heu especificat tant syslog com logfile, s'ignora syslog i s'escriu a \"%s\""
 
-#: fetchmail.c:469
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Les opcions s'obtenen de la línia d'ordres%s%s\n"
 
 # després d'això vé el nom d'un fitxer
-#: fetchmail.c:470
+#: fetchmail.c:448
 msgid " and "
 msgstr " i de "
 
 # %s -> .fetchmailrc
-#: fetchmail.c:475
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hi ha servidors de correu configurats.  Potser falta el %s?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no heu especificat cap servidor de correu.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no hi ha cap altre fetchmail executant-se\n"
 
 # bailing out
-#: fetchmail.c:514
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
-msgstr ""
-"fetchmail: error en finalitzar el fetchmail %s a %ld; es deixa estar.\n"
+msgstr "fetchmail: error en finalitzar el fetchmail %s a %ld; es deixa estar.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "en segon terme"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "en primer terme"
 
-#: fetchmail.c:523
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: el fetchmail %s a %ld ha estat finalitzat.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: no es pot comprovar el correu mentre funciona un altre procés "
-"fetchmail a la mateixa màquina.\n"
+#: fetchmail.c:524
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: no es pot comprovar el correu mentre funciona un altre procés fetchmail a la mateixa màquina.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:530
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: no es poden comprovar els servidors especificats mentre hi ha un "
-"altre fetchmail funcionant a %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: no es poden comprovar els servidors especificats mentre hi ha un altre fetchmail funcionant a %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
-msgstr ""
-"fetchmail: hi ha un altre fetchmail funcionant en primer terme a %ld.\n"
+msgstr "fetchmail: hi ha un altre fetchmail funcionant en primer terme a %ld.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: no s'admeten opcions mentre funciona un altre fetchmail en segon "
-"terme.\n"
+#: fetchmail.c:547
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: no s'admeten opcions mentre funciona un altre fetchmail en segon terme.\n"
 
-#: fetchmail.c:581
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: el fetchmail en segon terme a %ld s'ha despertat.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: un procés del fetchmail ha finalitzat misteriosament a %ld.\n"
+msgstr "fetchmail: un procés del fetchmail ha finalitzat misteriosament a %ld.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no s'ha trobat cap contrasenya per a %s@%s.\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduïu la contrasenya per a %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: No es pot passar a segon terme.  S'avorta.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "s'inicia el dimoni fetchmail %s\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "no es pot obrir %s per a afegir-hi registres\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "s'ha especificat mode --check, no es recollirà correu\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no s'ha pogut comprovar la data de %s (error %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "es reinicia el fetchmail (%s ha canviat)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "la reinicialització pot fallar perquè el directori no s'ha restaurat\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "la reinicialització del fetchmail ha fallat\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"se salta la comprovació de %s (l'autenticació ha fallat o s'ha exhaurit el "
-"temps massa cops)\n"
+msgstr "se salta la comprovació de %s (l'autenticació ha fallat o s'ha exhaurit el temps massa cops)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "l'interval no ha finalitzat, no es comprova %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estat de la comprovació=0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estat de la comprovació=1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estat de la comprovació=2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estat de la comprovació=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estat de la comprovació=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estat de la comprovació=5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estat de la comprovació=6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estat de la comprovació=7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estat de la comprovació=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estat de la comprovació=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estat de la comprovació=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Estat de la comprovació=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estat de la comprovació=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estat de la comprovació=13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estat de la comprovació=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Totes les connexions estan encallades.  Sortint.\n"
 
 # %s és la sortida de timestamp()
-#: fetchmail.c:910
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "adormit el %s durant %d segons\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertat per %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertat per un senyal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertat el %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "finalització normal, estat %d\n"
 
 # nota: run-control és fitxer de control (i.e. .fetchmailrc)
-#: fetchmail.c:1114
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "no s'ha pogut obtenir la data de modificació del fitxer rc\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Atenció: el servidor %s apareix duplicat al fitxer de configuració\n"
 
 # l'apartat 'defaults' estableix els valors per defecte
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Error: el fitxer de configuració conté més d'un apartat \"defaults"
-"\".\n"
+#: fetchmail.c:1162
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "fetchmail: Error: el fitxer de configuració conté més d'un apartat \"defaults\".\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "no s'ha compilat suport per a SSL.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "KERBEROS v4 està configurat, però no està compilat.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "KERBEROS v5 està configurat, però no està compilat.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI està configurat, però no està compilat.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1333
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: atenció: no hi ha DNS disponible per inferir els destinataris de "
-"%s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: atenció: no hi ha DNS disponible per inferir els destinataris de %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "atenció: la configuració de %s requereix l'opció envelope!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "atenció: No us queixeu si tot el correu va al postmaster!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1362
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: la configuració de %s no és vàlida, el port no pot ser número "
-"negatiu\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: la configuració de %s no és vàlida, el port no pot ser número negatiu\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: la configuració de %s no és vàlida, RPOP requereix un port "
-"privilegiat\n"
+msgstr "fetchmail: la configuració de %s no és vàlida, RPOP requereix un port privilegiat\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"la configuració de %s no és vàlida, LMTP no pot usar el port SMTP normal\n"
+msgstr "la configuració de %s no és vàlida, LMTP no pot usar el port SMTP normal\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "En mode dimoni o idle les opcions fetchall i keep són un error!\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Error: el mode idle no funciona amb múltiples carpetes o "
-"comptes!\n"
+#: fetchmail.c:1411
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Error: el mode idle no funciona amb múltiples carpetes o comptes!\n"
 
 # s'executa al final de cada comprovació
-#: fetchmail.c:1468
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "s'ha finalitzat amb senyal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s comprovant %s (protocol %s) el %s: inici de la comprovació\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "no s'ha configurat suport per a POP2.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "no s'ha configurat suport per a POP3.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "no s'ha configurat suport per a IMAP.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "no s'ha configurat suport per a ETRN.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "no s'ha configurat suport per a ODMR.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "el protocol seleccionat no està suportat.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s comprovant %s (protocol %s) el %s: final de la comprovació\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre comprovacions és de %d segons\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre és %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificadors és %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Els missatges de progrés es registren via syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "No es generen línies Recieved\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "S'inclouen punts de progressió als fitxers de registre.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Els missatges mal adreçats s'envien a %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Els missatges d'error s'envien al postmaster.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Els missatges d'error s'envien al remitent.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Els errors permanents es consideren permanents (es descarten els "
-"missatges).\n"
+msgstr "Els errors permanents es consideren permanents (es descarten els missatges).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Els errors permanents es consideren temporals (es desen els missatges).\n"
+msgstr "Els errors permanents es consideren temporals (es desen els missatges).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu es recull via %s\n"
 
-#: fetchmail.c:1684
+#: 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] "  Aquest servidor es comprova a cada interval.\n"
 msgstr[1] "  Aquest servidor es comprova cada %d intervals.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom real del servidor és %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  No es comprova aquest servidor quan no se n'ha especificat cap.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Es comprova aquest servidor quan no se n'ha especificat cap.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demana la contrasenya.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificació RPOP = \"%s\".\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol és KPOP amb autenticació per Kerberos %s"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol és %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (servei %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (port per defecte)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (es força l'ús d'identificadors)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intenten tots els mètodes d'autenticació disponibles.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Es força l'autenticació per contrasenya.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Es força l'autenticació per MSN.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Es força l'autenticació per NTLM.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Es força l'autenticació per OTP.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Es força l'autenticació per CRAM-MD5.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Es força l'autenticació per GSSAPI.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Es força l'autenticació per Kerberos V4.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Es força l'autenticació per Kerberos V5.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se suposa que la connexió és xifrada.\n"
 
 # Té a veure amb l'autenticació Kerberos
-#: fetchmail.c:1761
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servei de correu és: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  El xifrat SSL està habilitat.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  La comprovació de certificats SSL està habilitada.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1737
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  La comprovació de certificats SSL no està habilitada.\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Fitxer de certificats SSL confiables: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL confiables: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Nom SSL del servidor: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Empremta SSL (es comprova amb la del servidor): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El temps d'espera màxim és de %d segons"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  S'ha seleccionat la bústia per defecte.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  S'han seleccionat les següents bústies:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Es recullen tots els missatges (--all on).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Només es recullen els missatges nous (--all off).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Els missatges recollits no s'esborren del servidor (--keep on).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Els missatges recollits s'esborren del servidor (--keep off).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Els missatges vells s'eliminen a l'inici de la sessió (--flush on).\n"
+msgstr "  Els missatges vells s'eliminen a l'inici de la sessió (--flush on).\n"
 
-#: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Els missatges vells no s'eliminen a l'inici de la sessió (--flush off).\n"
+#: fetchmail.c:1776
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Els missatges vells no s'eliminen a l'inici de la sessió (--flush off).\n"
 
-#: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Els missatges de mida excessiva s'eliminen a l'inici de la sessió (--"
-"limitflush on).\n"
+#: fetchmail.c:1778
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Els missatges de mida excessiva s'eliminen a l'inici de la sessió (--limitflush on).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Els missatges de mida excessiva no s'eliminen a l'inici de la sessió (--"
-"limitflush off).\n"
+#: fetchmail.c:1779
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Els missatges de mida excessiva no s'eliminen a l'inici de la sessió (--limitflush off).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Les adreces locals no es modifiquen (--norewrite off).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Les adreces locals es modifiquen (--norewrite on).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Els retorns de carro s'eliminen (stripcr on).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Els retorns de carro no s'eliminen (stripcr off).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  S'afegeixen retorns de carro (forcecr on).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No s'afegeixen retorns de carro (forcecr off).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1790
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  No s'interpreta el Content-Transfer-Encoding (pass8bits on).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1791
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  S'interpreta el Content-Transfer-Encoding (pass8bits off).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Es desxifren dades MIME (mimedecode on).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  No es desxifren dades MIME (mimedecode off).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  S'entra en mode idle després de la comprovació (idle on).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No s'entra en mode idle després de la comprovació (idle off).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Les línies Status amb informació s'eliminen (dropstatus on)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Les línies Status amb informació no s'eliminen (dropstatus off)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les línies Delivered-To s'eliminen (dropdelivered on)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les línies Delivered-To no s'eliminen (dropdelivered off)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  La mida màxima dels missatges és %d octets (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha limitació de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Els avisos sobre mida excessiva són cada %d segons (--warnings %d).\n"
+msgstr "  Els avisos sobre mida excessiva són cada %d segons (--warnings %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-"  Els avisos sobre mida excessiva són a cada comprovació (--warnings 0).\n"
+msgstr "  Els avisos sobre mida excessiva són a cada comprovació (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  El nombre màxim de missatges recollits és %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha limitació sobre el nombre de missatges (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  La mida màxima dels missatges és %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha limitació de mida (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Es fa cerca binària sempre (--fastuidl 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "  Es fa cerca binària %d de cada %d comprovacions (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Es fa cerca lineal sempre (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Límit de missatges que s'envien per SMTP de cop: %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr ""
-"  No hi ha límit de missatges que s'envien per SMTP de cop (--batchlimit "
-"0).\n"
+msgstr "  No hi ha límit de missatges que s'envien per SMTP de cop (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Els missatges esborrats s'eliminen cada %d missatge(s) (--expunge %d).\n"
+msgstr "  Els missatges esborrats s'eliminen cada %d missatge(s) (--expunge %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
-msgstr ""
-"  Els missatges esborrats s'eliminen al final de la sessió (--expunge 0).\n"
+msgstr "  Els missatges esborrats s'eliminen al final de la sessió (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Es recull el correu pels dominis:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (per omissió)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Els missatges s'annexen a %s com a BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuren via \"%s\".\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges s'envien per %cMTP a:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El servidor utilitzat a la línia MAIL FROM és %s\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adreça RCPT TO és %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Els codis antispam del servidor són:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  No es fa bloqueig d'spam\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexió amb el servidor s'iniciarà amb \"%s\".\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexió.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexió amb el servidor es finalitzarà amb \"%s\".\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexió.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per a aquest servidor.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Es lliura a diversos usuaris: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Es lliura a un usuari: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1577,117 +1484,116 @@ msgstr[0] "S'ha reconegut %d nom local.\n"
 msgstr[1] "S'han reconegut %d noms locals.\n"
 
 # Mirar la secció CONCEPTS del manual.
-#: fetchmail.c:1976
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Es cerquen destinataris locals mitjançant DNS.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No es cerquen destinataris locals mitjançant DNS.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1948
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Les adreces es comparen amb els servidors per IP.\n"
 
-#: fetchmail.c:1983
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Les adreces es comparen compararen amb els servidors per nom.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  No s'infereix el destinatari a partir de les capçaleres.\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  El destinatari s'infereix a partir de: %s \n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nombre de capçaleres que no es tenen en compte: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  S'elimina el prefix %s del nom d'usuari\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  No s'elimina cap prefix del nom d'usuari\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Àlies del servidor:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Noms de domini locals:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexió s'estableix obligatòriament a través de %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  No es requereix cap interfície de xarxa específica.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitora la interfície %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  No es monitora cap interfície de xarxa.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Les connexions amb el servidor s'estableixen via %s (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  No hi ha cap ordre de connexió.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Les connexions SMTP s'estableixen via %s (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  No hi ha cap ordre de connexió SMTP.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat identificadors de missatges.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d identificadors.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  S'afegeixen línies Received.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr "  No s'afegeixen línies Received.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Els missatges amb capçaleres errònies no són admesos.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Els missatges amb capçaleres errònies són admesos.\n"
 
 # opcions que es passen a extensions del fetchmail
-#: fetchmail.c:2068
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats utilitzades per extensions \"%s\".\n"
@@ -1697,12 +1603,6 @@ msgstr "  Propietats utilitzades per extensions \"%s\".\n"
 msgid "Cannot modify signal mask: %s"
 msgstr "No es pot modificar la màscara de senyals: %s"
 
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERROR: no hi ha suport per a la rutina getpassword()\n"
@@ -1739,12 +1639,10 @@ msgstr "S'usa el nom de servei [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"No es troben credencials GSSAPI adequades.  Se salta l'autenticació GSSAPI.\n"
+msgstr "No es troben credencials GSSAPI adequades.  Se salta l'autenticació GSSAPI.\n"
 
 #: gssapi.c:124
-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 requereix que obtingueu credencials, possiblement de kinit.\n"
 
 #: gssapi.c:160
@@ -1928,8 +1826,7 @@ msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge no llegit\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Atenció: s'ignora informació errònia sobre la mida dels missatges.\n"
 
 #: imap.c:1177 imap.c:1184
@@ -1939,9 +1836,7 @@ msgstr "Resposta incorrecta a un FETCH: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"No es pot obrir la interfície kvm.  Assegureu-vos que el SGID del fetchmail "
-"és kmem."
+msgstr "No es pot obrir la interfície kvm.  Assegureu-vos que el SGID del fetchmail és kmem."
 
 #: interface.c:396
 #, c-format
@@ -2049,35 +1944,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: error en llegir el fitxer de bloqueig \"%s\": %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: s'esborra un fitxer de bloqueig antic\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: error en obrir el fitxer de bloqueig \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: error en llegir el fitxer de bloqueig \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: error en obrir el fitxer de bloqueig \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: no s'ha pogut crear el fitxer de bloqueig.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: error en llegir el fitxer de bloqueig \"%s\": %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2227,8 +2105,7 @@ msgstr "  -v, --verbose     genera missatges informatius i de diagnòstic\n"
 
 #: options.c:649
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
-msgstr ""
-"  -d, --daemon      funciona en mode dimoni, en intervals de n segons\n"
+msgstr "  -d, --daemon      funciona en mode dimoni, en intervals de n segons\n"
 
 #: options.c:650
 msgid "  -N, --nodetach    don't detach daemon process\n"
@@ -2243,11 +2120,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     fitxer de registre d'activitat\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      en mode dimoni, registra l'activitat via syslog(3)\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      en mode dimoni, registra l'activitat via syslog(3)\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2279,16 +2153,12 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    retorna els missatges no lliurats al postmaster\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce esborra permanentment els missatges no lliurats\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  deixa els missatges no lliurats al servidor (predet.)\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  deixa els missatges no lliurats al servidor (predet.)\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2316,8 +2186,7 @@ msgstr "      --sslcertck   verifica el certificat (recomanat)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck omet la verificació estricta del certificat (insegur)\n"
+msgstr "      --nosslcertck omet la verificació estricta del certificat (insegur)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
@@ -2328,16 +2197,11 @@ msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath directori de certificats ssl d'ACs confiables\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  accepta aquest nom com a nom del servidor (no "
-"recomanat)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  accepta aquest nom com a nom del servidor (no recomanat)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr "      --sslfingerprint empremta del certificat del servidor\n"
 
 #: options.c:677
@@ -2369,22 +2233,16 @@ msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        força l'ús d'identificadors (només pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        diu al servidor IMAP que notifiqui l'arribada de "
-"missatges\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        diu al servidor IMAP que notifiqui l'arribada de missatges\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        port TCP/IP on connectar-se (obsolet, useu --service)\n"
+msgstr "      --port        port TCP/IP on connectar-se (obsolet, useu --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     servei TCP/IP al qual connectar-se (o número de port)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     servei TCP/IP al qual connectar-se (o número de port)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2392,8 +2250,7 @@ msgstr "      --auth        tipus d'autenticació (vegeu el manual)\n"
 
 #: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
-msgstr ""
-"  -t, --timeout     temps màxim d'espera per a la resposta del servidor\n"
+msgstr "  -t, --timeout     temps màxim d'espera per a la resposta del servidor\n"
 
 #: options.c:691
 msgid "  -E, --envelope    envelope address header\n"
@@ -2421,8 +2278,7 @@ msgstr "  -a, --[fetch]all  recull tots els missatges, tant nous com vells\n"
 
 #: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
-msgstr ""
-"  -K, --nokeep      esborra els missatges nous després de recollir-los\n"
+msgstr "  -K, --nokeep      esborra els missatges nous després de recollir-los\n"
 
 #: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
@@ -2442,8 +2298,7 @@ msgstr "  -n, --norewrite   no modifica les adreces de les capçaleres\n"
 
 #: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       omet els missatges que superen la mida especificada\n"
+msgstr "  -l, --limit       omet els missatges que superen la mida especificada\n"
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
@@ -2467,13 +2322,11 @@ msgstr "      --smtpname    nom d'usuari SMTP complet (nomusuari@domini)\n"
 
 #: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr ""
-"  -Z, --antispam,   codis de resposta del servidor considerats antispam\n"
+msgstr "  -Z, --antispam,   codis de resposta del servidor considerats antispam\n"
 
 #: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  nombre màxim de missatges enviats en bloc via SMTP\n"
+msgstr "  -b, --batchlimit  nombre màxim de missatges enviats en bloc via SMTP\n"
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
@@ -2485,13 +2338,11 @@ msgstr "      --fetchsizelimit mida màxima dels missatges\n"
 
 #: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
-msgstr ""
-"      --fastuidl    cerca identificadors mitjançant una cerca binària\n"
+msgstr "      --fastuidl    cerca identificadors mitjançant una cerca binària\n"
 
 #: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     nombre màxim de missatges eliminats abans de confirmar\n"
+msgstr "  -e, --expunge     nombre màxim de missatges eliminats abans de confirmar\n"
 
 #: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2511,8 +2362,7 @@ msgstr "  -r, --folder      nom de la carpeta remota\n"
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    inclou marques de progressió als fitxers de registre\n"
+msgstr "      --showdots    inclou marques de progressió als fitxers de registre\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2523,10 +2373,8 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 només suporta autenticació per contrasenya. Es deixa estar.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Atenció: detectat servidor POP3 \"Maillennium\", s'usa RETR en lloc de TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Atenció: detectat servidor POP3 \"Maillennium\", s'usa RETR en lloc de TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2605,49 +2453,41 @@ msgstr "id=%s (núm=%d) s'havia esborrat, però hi segueix sent!\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "El protocol POP3 no admet l'opció --folder\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "hi ha opcions de servidor després de les opcions d'usuari"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "SDPS no està habilitat."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opció `interface' només està suportada a Linux (sense IPv6) i "
-"FreeBSD\n"
+#: rcfile_y.y:219
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opció `interface' només està suportada a Linux (sense IPv6) i FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opció `monitor' només està suportada a Linux (sense IPv6) i "
-"FreeBSD\n"
+#: rcfile_y.y:227
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opció `monitor' només està suportada a Linux (sense IPv6) i FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "SSL no està habilitat"
 
-#: rcfile_y.y:391
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "final de l'entrada"
 
-#: rcfile_y.y:429
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El fitxer %s ha de ser un fitxer ordinari.\n"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "El fitxer %s no pot tenir més permisos que -rwx------ (0700).\n"
 
-#: rcfile_y.y:451
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "El fitxer %s ha de ser de la vostra propietat.\n"
@@ -2981,10 +2821,8 @@ msgstr "L'MDA ha retornat un codi diferent de zero: %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Error: L'MDA ha retornat %d i errno %d/%s, no es pot continuar a %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Error: L'MDA ha retornat %d i errno %d/%s, no es pot continuar a %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3032,82 +2870,82 @@ msgstr "Autenticació ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "error de protocol del servidor smtp\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: la rutina malloc ha fallat\n"
 
-#: socket.c:173
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: la rutina socketpair ha fallat\n"
 
-#: socket.c:179
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: la rutina fork ha fallat\n"
 
-#: socket.c:186
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "la rutina dup2 ha fallat\n"
 
 # el primer %s és el nom del "plugin"
 # no sembla que aquesta funció es cridi a cap lloc
-#: socket.c:192
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "s'executa %s (màquina %s, servei %s)\n"
 
-#: socket.c:197
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "la rutina execvp(%s) ha fallat\n"
 
-#: socket.c:272
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") ha fallat: %s\n"
 
-#: socket.c:275
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Proveu l'opció --service (vegeu també el punt R12 de les PMF).\n"
 
-#: socket.c:289 socket.c:292
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "desconegut (%s)"
 
-#: socket.c:295
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "S'intenta la connexió a %s/%s..."
 
-#: socket.c:304
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "no es pot crear el socket: %s\n"
 
-#: socket.c:306
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "nom %d: no és pot crear el socket, família %d, tipus %d: %s\n"
 
-#: socket.c:324
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "la connexió ha fallat.\n"
 
-#: socket.c:326
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "la connexió a %s:%s [%s/%s] ha fallat: %s.\n"
 
-#: socket.c:327
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "nom %d: la connexió a %s:%s [%s/%s] ha fallat: %s.\n"
 
-#: socket.c:333
+#: socket.c:332
 msgid "connected.\n"
 msgstr "connectat.\n"
 
-#: socket.c:346
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3116,275 +2954,232 @@ msgstr ""
 "Errors de connexió en aquesta comprovació:\n"
 "%s"
 
-#: socket.c:416
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL diu: %s\n"
 
-#: socket.c:651
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"Profunditat de verificació per a SSL %d: preverify_ok == %d, err = %d, %s\n"
+msgstr "Profunditat de verificació per a SSL %d: preverify_ok == %d, err = %d, %s\n"
 
-#: socket.c:657
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Certificat del servidor:\n"
 
-#: socket.c:662
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "Cadena de certificats, a partir del nivell %d:\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certificat en el nivell %d:\n"
 
-#: socket.c:671
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organització expedidora: %s\n"
 
-#: socket.c:674
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Atenció: El nom és massa llarg (pot estar escapçat).\n"
 
-#: socket.c:676
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Organització desconeguda\n"
 
-#: socket.c:678
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nom comú de l'expedidor: %s\n"
 
-#: socket.c:681
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Atenció: El nom és massa llarg (pot estar escapçat).\n"
 
-#: socket.c:683
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nom comú de l'expedidor desconegut\n"
 
-#: socket.c:689
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Nom comú del titular: %s\n"
 
-#: socket.c:695
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificat erroni: El nom comú del titular és massa llarg!\n"
 
-#: socket.c:701
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Certificat erroni: El nom comú del titular conté nuls, s'avorta!\n"
 
-#: socket.c:729
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nom alternatiu del titular: %s\n"
 
-#: socket.c:735
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Certificat erroni: El nom alternatiu del titular conté nuls, s'avorta!\n"
+msgstr "Certificat erroni: El nom alternatiu del titular conté nuls, s'avorta!\n"
 
-#: socket.c:752
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "El nom comú del servidor no coincideix: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Falta el nom del servidor, no es pot verificar el certificat!\n"
 
-#: socket.c:764
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Nom comú del servidor desconegut\n"
 
-#: socket.c:766
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "El certificat no especifica el nom del servidor!\n"
 
-#: socket.c:778
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ha fallat!\n"
 
-#: socket.c:782
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Memòria exhaurida!\n"
 
 # digest text
-#: socket.c:790
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "La memòria intermèdia per al sumari de text és insuficient!\n"
 
-#: socket.c:796
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Empremta de %s: %s\n"
 
-#: socket.c:800
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Les empremtes de %s coincideixen.\n"
 
-#: socket.c:802
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Les empremtes de %s no coincideixen!\n"
 
-#: socket.c:814
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Error en verificar el certificat del servidor: %s\n"
 
-#: socket.c:829
+#: socket.c:824
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "La cadena de certificació està trencada a: %s\n"
 
-#: socket.c:831
-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 ""
-"Això pot significar que el servidor no proporciona els certificats de les "
-"autoritats de certificació intermèdies.  Per a més detalls, vegeu el "
-"document README.SSL-SERVER que s'inclou amb el fetchmail.\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 "Això pot significar que el servidor no proporciona els certificats de les autoritats de certificació intermèdies.  Per a més detalls, vegeu el document README.SSL-SERVER que s'inclou amb el fetchmail.\n"
 
-#: socket.c:841
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Falta el certificat d'una autoritat confiable: %s\n"
 
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Això pot significar que el certificat de l'autoritat de certificació (AC) "
-"arrel que s'ha emprat en la signatura no es troba a la ubicació de "
-"certificats d'AC confiables, o que és necessari executat el programa "
-"c_rehash en el directori de certificats.  Per a més detalls, vegeu la "
-"documentació referent a les opcions --sslcertpath i --sslcertfile en el "
-"manual del fetchmail.\n"
-
-#: socket.c:918 socket.c:996
+#: 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 "Això pot significar que el certificat de l'autoritat de certificació (AC) arrel que s'ha emprat en la signatura no es troba a la ubicació de certificats d'AC confiables, o que és necessari executat el programa c_rehash en el directori de certificats.  Per a més detalls, vegeu la documentació referent a les opcions --sslcertpath i --sslcertfile en el manual del fetchmail.\n"
+
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "La vostra versió d'OpenSSL no suporta SSLv3.\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "La vostra versió d'OpenSSL no suporta TLS v1.1.\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "La vostra versió d'OpenSSL no suporta TLS v1.2.\n"
 
-#: socket.c:958 socket.c:1036
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "La vostra versió d'OpenSSL no suporta TLS v1.3.\n"
 
-#: socket.c:967 socket.c:1046
+#: socket.c:961 socket.c:1040
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"El protocol SSL especificat '%s' no és vàlid, se selecciona automàticament.\n"
+msgstr "El protocol SSL especificat '%s' no és vàlid, se selecciona automàticament.\n"
 
-#: socket.c:1081
+#: socket.c:1075
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"La biblioteca OpenSSL %#lx és més antiga que les capçaleres %#lx, es "
-"refusa.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "La biblioteca OpenSSL %#lx és més antiga que les capçaleres %#lx, es refusa.\n"
 
-#: socket.c:1086
+#: socket.c:1080
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"La biblioteca OpenSSL %#lx és més recent que les capçaleres %#lx, s'intenta "
-"continuar.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "La biblioteca OpenSSL %#lx és més recent que les capçaleres %#lx, s'intenta continuar.\n"
 
-#: socket.c:1106
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "El descriptor del fitxer no és vàlid per a SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Tingueu en compte que algunes distribucions deshabiliten versions antigues "
-"del protocol.  Proveu una versió més recent.\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 "Tingueu en compte que algunes distribucions deshabiliten versions antigues del protocol.  Proveu una versió més recent.\n"
 
-#: socket.c:1195
+#: socket.c:1189
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Atenció: la rutina SSL_set_tlsext_host_name(%p, \"%s\") ha fallat (codi "
-"%#lx), s'intenta continuar.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Atenció: la rutina SSL_set_tlsext_host_name(%p, \"%s\") ha fallat (codi %#lx), s'intenta continuar.\n"
 
-#: socket.c:1210
+#: socket.c:1204
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Atenció: la rutina X509_VERIFY_PARAM_set1_host(%p, \"%s\") ha fallat (codi "
-"%#x), s'intenta continuar.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Atenció: la rutina X509_VERIFY_PARAM_set1_host(%p, \"%s\") ha fallat (codi %#x), s'intenta continuar.\n"
 
-#: socket.c:1247
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-"El servidor ha tallat la connexió prematurament durant SSL_connect().\n"
+msgstr "El servidor ha tallat la connexió prematurament durant SSL_connect().\n"
 
-#: socket.c:1250
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr "Error del sistema durant SSL_connect(): %s\n"
 
-#: socket.c:1250
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr "la salutació ha fallat a nivell de protocol o connexió."
 
-#: socket.c:1270
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"No s'ha pogut obtenir el xifratge SSL/TLS - no hi ha sessió establerta?\n"
+msgstr "No s'ha pogut obtenir el xifratge SSL/TLS - no hi ha sessió establerta?\n"
 
-#: socket.c:1273
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr "SSL/TLS: protocol %s, xifratge %s, bits secret/processats %d/%d\n"
 
-#: socket.c:1280
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "No s'ha verificat el certificat o l'empremta!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
+#: socket.c:1291
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
 msgstr ""
 "Atenció: la connexió no és segura, però es continua igualment.  (Millor que\n"
 "utilitzeu --sslcertck!)\n"
 
-#: socket.c:1339
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:1342
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Ha fallat la lectura del socket Cygwin per segon cop!\n"
 
@@ -3499,80 +3294,71 @@ msgstr "error en escriure el text del missatge\n"
 #: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-"No hi ha prou memòria intermèdia.  Això és un bug a qui ha cridat %s:%lu.\n"
-
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: error en llegir el fitxer de bloqueig \"%s\": %s\n"
+msgstr "No hi ha prou memòria intermèdia.  Això és un bug a qui ha cridat %s:%lu.\n"
 
 # UID == unique id, és un sistema per identificar els missatges en el protocol
 # POP3
 # UIDL és l'ordre per obtenir una llista de UIDs
-#: uid.c:273
+#: uid.c:262
 #, c-format
 msgid "Old UID list from %s:\n"
 msgstr "Llista antiga d'identificadors de %s:\n"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:266 uid.c:275 uid.c:343
 msgid " <empty>"
 msgstr " <buit>"
 
-#: uid.c:284
+#: uid.c:273
 msgid "Scratch list of UIDs:\n"
 msgstr "Llista preliminar d'identificadors:\n"
 
-#: uid.c:369 uid.c:413
+#: uid.c:357 uid.c:401
 #, c-format
 msgid "Merged UID list from %s:\n"
 msgstr "Llista unificada d'identificadors de %s:\n"
 
-#: uid.c:372
+#: uid.c:360
 #, c-format
 msgid "New UID list from %s:\n"
 msgstr "Llista nova d'identificadors de %s:\n"
 
-#: uid.c:402
+#: uid.c:390
 msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr ""
-"s'omet l'intercanvi de llistes d'identificadors, no s'han trobat "
-"identificadors en aquesta comprovació\n"
+msgstr "s'omet l'intercanvi de llistes d'identificadors, no s'han trobat identificadors en aquesta comprovació\n"
 
-#: uid.c:422
+#: uid.c:410
 msgid "discarding new UID list\n"
 msgstr "es descarta la nova llista d'identificadors\n"
 
-#: uid.c:479
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "S'esborra el fitxer d'identificadors.\n"
 
-#: uid.c:482
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error en eliminar %s: %s\n"
 
-#: uid.c:489
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "S'escriu el fitxer d'identificadors.\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Error en escriure al fitxer d'identificadors %s: %s\n"
 
-#: uid.c:524
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Error en escriure al fitxer d'identificadors %s, es conserva l'antic.\n"
+msgstr "Error en escriure al fitxer d'identificadors %s, es conserva l'antic.\n"
 
-#: uid.c:528
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "No s'ha pogut reanomenar el fitxer d'identificadors de %s a %s: %s\n"
 
-#: uid.c:532
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "No s'ha pogut escriure al fitxer d'identificadors %s: %s\n"
@@ -3601,11 +3387,9 @@ msgstr "la rutina realloc ha fallat\n"
 #~ msgid "Fetchmail could not reach the mail server %s:"
 #~ msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 #~ msgstr ""
-#~ "fetchmail: Atenció: es registra tant via syslog com en un fitxer "
-#~ "dedicat.\n"
+#~ "fetchmail: Atenció: es registra tant via syslog com en un fitxer dedicat.\n"
 #~ "\n"
 
 #~ msgid "Server CommonName: %s\n"
@@ -3615,5 +3399,4 @@ msgstr "la rutina realloc ha fallat\n"
 #~ msgstr "emissor desconegut (primers %d caràcters): %s\n"
 
 #~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr ""
-#~ "s'ha trobat un delimitador de missatge quan s'analitzava l'encapçalament\n"
+#~ msgstr "s'ha trobat un delimitador de missatge quan s'analitzava l'encapçalament\n"
diff --git a/po/cs.po b/po/cs.po
index 11e9244f..29c2cf46 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-14 19:38+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -142,11 +142,8 @@ msgstr " (%d oktetů v těle)"
 
 #: driver.c:770
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"zpráva %s@%s:%d nemá o�ekávanou velikost (%d ve skute�nosti != %d "
-"o�ekáváno)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "zpráva %s@%s:%d nemá o�ekávanou velikost (%d ve skute�nosti != %d o�ekáváno)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -163,14 +160,10 @@ msgstr " nesmazána\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] ""
-"limit stahování %d dosažen; %d zpráva ponechána na serveru %s ú�et %s\n"
-msgstr[1] ""
-"limit stahování %d dosažen; %d zprávy ponechány na serveru %s ú�et %s\n"
-msgstr[2] ""
-"limit stahování %d dosažen; %d zpráv ponecháno na serveru %s ú�et %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limit stahování %d dosažen; %d zpráva ponechána na serveru %s ú�et %s\n"
+msgstr[1] "limit stahování %d dosažen; %d zprávy ponechány na serveru %s ú�et %s\n"
+msgstr[2] "limit stahování %d dosažen; %d zpráv ponecháno na serveru %s ú�et %s\n"
 
 #: driver.c:899
 #, c-format
@@ -203,11 +196,8 @@ msgstr "fetchmail zaznamenává opakované vypršení �asu"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmailu vypršel �as více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmailu vypršel �as více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -542,8 +532,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 ""
@@ -579,15 +568,12 @@ msgstr "funkce getaddrinfo pro %s selhala\n"
 
 #: env.c:225
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Nemohu nalézt své vlastní jméno v databázi jmen strojů, abych jej mohl "
-"doplnit na celé jméno!\n"
+msgstr "Nemohu nalézt své vlastní jméno v databázi jmen strojů, abych jej mohl doplnit na celé jméno!\n"
 
 #: env.c:229
 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 ""
 "Zkusím pokra�ovat s nekvalifikovaným jménem stroje.\n"
@@ -679,8 +665,7 @@ msgid ""
 "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 nedává ABSOLUTNĚ Ž�DNÉ Z�RUKY. Toto je svobodné programové "
-"vybavení\n"
+"Fetchmail nedává ABSOLUTNĚ Ž�DNÉ Z�RUKY. Toto je svobodné programové vybavení\n"
 "a budeme rádi, když jej budete za jistých podmínek dále šířit. Podrobnosti\n"
 "naleznete v souboru COPYING v adresáři se zdrojovými kódy nebo dokumentací.\n"
 
@@ -706,8 +691,7 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "POZOR: Vaše knihovna s SSL/TLS nepodporuje TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
 msgstr "POZOR: Přeloženo s LibreSSL, což není podporovaná konfigurace.\n"
 
 #: fetchmail.c:314
@@ -734,11 +718,8 @@ msgstr "Do souboru s protokolem „%s“ nelze zapisovat, kon�í se.\n"
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"ObÄ› volby syslog a logfile jsou nastaveny, syslog se ignoruje a protokol "
-"bude zapisován do %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "Obě volby syslog a logfile jsou nastaveny, syslog se ignoruje a protokol bude zapisován do %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -783,21 +764,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: fetchmail %s s PID %ld byl zabit.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému "
-"po�íta�i.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému po�íta�i.\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: nelze se dotazovat zadaných serverů, běží-li jiný fetchmail s PID "
-"%ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: nelze se dotazovat zadaných serverů, běží-li jiný fetchmail s PID %ld.\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -805,8 +778,7 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: v popředí běží jiný fetchmail s PID %ld.\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: neakceptuji přepína�e, když na fetchmail běží na pozadí.\n"
 
 #: fetchmail.c:581
@@ -868,8 +840,7 @@ msgstr "pokus znovu spustit fetchmail selhal\n"
 #: fetchmail.c:782
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"stahování z %s přesko�eno (chyba autentizace nebo mnohokrát vypršel �as)\n"
+msgstr "stahování z %s přesko�eno (chyba autentizace nebo mnohokrát vypršel �as)\n"
 
 #: fetchmail.c:794
 #, c-format
@@ -976,12 +947,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varování: po�íta� %s je v konfigura�ním souboru zmíněn vícekrát\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Chyba: záznam „defaults“ je v konfigura�ním souboru zmíněn "
-"vícekrát nebo „defaults“ není prvním záznamem.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Chyba: záznam „defaults“ je v konfigura�ním souboru zmíněn vícekrát nebo „defaults“ není prvním záznamem.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -1001,11 +968,8 @@ msgstr "Podpora pro GSSAPI je nastavena, ale není zakompilována.\n"
 
 #: fetchmail.c:1366
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných "
-"schránek z %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných schránek z %s\n"
 
 #: fetchmail.c:1377
 #, c-format
@@ -1014,23 +978,17 @@ msgstr "varování: spole�né schránky pro %s vyžadují přepína� envelope!
 
 #: fetchmail.c:1378
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
+msgstr "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: chybná konfigurace %s, zadejte kladné �íslo portu pro službu nebo "
-"port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: chybná konfigurace %s, zadejte kladné �íslo portu pro službu nebo port\n"
 
 #: fetchmail.c:1402
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: Nastavení %s není platné, PROP vyžaduje privilegovaný port\n"
+msgstr "fetchmail: Nastavení %s není platné, PROP vyžaduje privilegovaný port\n"
 
 #: fetchmail.c:1420
 #, c-format
@@ -1039,14 +997,11 @@ msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMT
 
 #: fetchmail.c:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Jak fetchall, tak i keep jsou v démonu zapnuty nebo režim idle je chyba!\n"
+msgstr "Jak fetchall, tak i keep jsou v démonu zapnuty nebo režim idle je chyba!\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: chyba: režim zahálení nefunguje při více složkách nebo ú�tech!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: chyba: režim zahálení nefunguje při více složkách nebo ú�tech!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1117,9 +1072,7 @@ msgstr "Fetchmail bude zobrazovat te�ky průběhu i v souborech záznamů.\n"
 #: fetchmail.c:1659
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail bude přeposílat špatně adresované zprávy ze spole�ných schránek na "
-"%s.\n"
+msgstr "Fetchmail bude přeposílat špatně adresované zprávy ze spole�ných schránek na %s.\n"
 
 #: fetchmail.c:1663
 msgid "Fetchmail will direct error mail to the postmaster.\n"
@@ -1131,13 +1084,11 @@ msgstr "Fetchmail bude chybové zprávy posílat odesílateli.\n"
 
 #: fetchmail.c:1668
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail bude považovat trvalé chyby za trvalé (zprávy bude zahazovat).\n"
+msgstr "Fetchmail bude považovat trvalé chyby za trvalé (zprávy bude zahazovat).\n"
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail bude považovat trvalé chyby za do�asné (zprávy bude uchovávat).\n"
+msgstr "Fetchmail bude považovat trvalé chyby za do�asné (zprávy bude uchovávat).\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1164,13 +1115,11 @@ msgstr "  Skute�né jméno serveru je %s.\n"
 
 #: fetchmail.c:1691
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Pokud není zadán žádný po�íta�, nebude se stahovat z tohoto po�íta�e.\n"
+msgstr "  Pokud není zadán žádný po�íta�, nebude se stahovat z tohoto po�íta�e.\n"
 
 #: fetchmail.c:1692
 msgid "  This host will be queried when no host is specified.\n"
-msgstr ""
-"  Pokud není zadán žádný po�íta�, bude se stahovat z tohoto po�íta�e.\n"
+msgstr "  Pokud není zadán žádný po�íta�, bude se stahovat z tohoto po�íta�e.\n"
 
 #: fetchmail.c:1696
 msgid "  Password will be prompted for.\n"
@@ -1331,40 +1280,27 @@ msgstr "  Stažené zprávy nebudou ponechány na serveru (--keep vypnuto).\n"
 
 #: fetchmail.c:1808
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
+msgstr "  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Před za�átkem stahování budou příliš velké zprávy smazány (--limitflush "
-"zapnuto).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Před za�átkem stahování budou příliš velké zprávy smazány (--limitflush zapnuto).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Před za�átkem stahování nebudou příliš velké zprávy smazány (--limitflush "
-"vypnuto).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Před za�átkem stahování nebudou příliš velké zprávy smazány (--limitflush vypnuto).\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Přepisování adres místních na serveru je povoleno (--norewrite vypnuto).\n"
+msgstr "  Přepisování adres místních na serveru je povoleno (--norewrite vypnuto).\n"
 
 #: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Přepisování adres místních na serveru je zakázáno (--norewrite zapnuto).\n"
+msgstr "  Přepisování adres místních na serveru je zakázáno (--norewrite zapnuto).\n"
 
 #: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
@@ -1383,16 +1319,12 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
 #: fetchmail.c:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
@@ -1524,8 +1456,7 @@ msgstr "  Název po�íta�e v řádku MAIL FROM bude %s\n"
 #: fetchmail.c:1918
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
+msgstr "  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
 
 #: fetchmail.c:1927
 msgid "  Recognized listener spam block responses are:"
@@ -1582,17 +1513,12 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy spole�ných schránek je zakázáno.\n"
 
 #: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
-"IP adres.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle IP adres.\n"
 
 #: fetchmail.c:1983
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
-"názvu.\n"
+msgstr "  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle názvu.\n"
 
 #: fetchmail.c:1986
 msgid "  Envelope-address routing is disabled\n"
@@ -1646,8 +1572,7 @@ msgstr "  Nezadáno žádné sledované rozhraní.\n"
 #: fetchmail.c:2031
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
+msgstr "  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
 
 #: fetchmail.c:2033
 msgid "  No plugin command specified.\n"
@@ -1656,9 +1581,7 @@ msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 #: fetchmail.c:2035
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Připojení k poslucha�i budou navazovány zásuvným modulem %s (--plugout "
-"%s).\n"
+msgstr "  Připojení k poslucha�i budou navazovány zásuvným modulem %s (--plugout %s).\n"
 
 #: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
@@ -1675,13 +1598,11 @@ msgstr "  Ukládáno %d UID.\n"
 
 #: fetchmail.c:2053
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Informace pro sledování stahování budou přidány do hlavi�ky Received.\n"
+msgstr "  Informace pro sledování stahování budou přidány do hlavi�ky Received.\n"
 
 #: fetchmail.c:2055
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Informace pro sledování stahování nebudou přidány do hlavi�ky Received.\n"
+msgstr "  Informace pro sledování stahování nebudou přidány do hlavi�ky Received.\n"
 
 #: fetchmail.c:2060
 msgid "  Messages with bad headers will be rejected.\n"
@@ -1702,12 +1623,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Masku signálů nelze změnit: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Váš opera�ní systém ani nedefinuje PATH_MAX, ani nepřijímá realpath(f, "
-"NULL). Kon�í se.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Váš opera�ní systém ani nedefinuje PATH_MAX, ani nepřijímá realpath(f, NULL). Kon�í se.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1743,16 +1660,11 @@ msgstr "Používám název služby [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Nenalezeny žádné vhodné autentiza�ní údaje GSSAPI. Autentizace GSSAPI bude "
-"vynechána.\n"
+msgstr "Nenalezeny žádné vhodné autentiza�ní údaje GSSAPI. Autentizace GSSAPI bude vynechána.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Chcete-li používat GSSAPI, potřebujete nejprve autentiza�ní údaje, obvykle "
-"z kinitu.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Chcete-li používat GSSAPI, potřebujete nejprve autentiza�ní údaje, obvykle z kinitu.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1791,8 +1703,7 @@ msgstr "Maximální velikost tokenu GSS je %ld\n"
 
 #: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-"Uživatelské jméno GSSAPI je příliš dlouhé pro staticky alokované pole.\n"
+msgstr "Uživatelské jméno GSSAPI je příliš dlouhé pro staticky alokované pole.\n"
 
 #: gssapi.c:283
 msgid "Error creating security level request\n"
@@ -1801,9 +1712,7 @@ msgstr "Chyba při vytváření požadavku na úroveň zabezpe�ení\n"
 #: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-"GSSAPI send_token byl během zasílání uživatelského jména příliš velký "
-"(%lu).\n"
+msgstr "GSSAPI send_token byl během zasílání uživatelského jména příliš velký (%lu).\n"
 
 #: gssapi.c:298
 msgid "Releasing GSS credentials\n"
@@ -1938,10 +1847,8 @@ msgid "%u is first unseen\n"
 msgstr "%u je první nepře�tená\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -2061,8 +1968,7 @@ msgstr "fetchmail: odstraňuje se starý soubor zámku „%s“\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: souboru zámku „%s“ nelze odstranit (%s), zkusí se do něj zapsat\n"
+msgstr "fetchmail: souboru zámku „%s“ nelze odstranit (%s), zkusí se do něj zapsat\n"
 
 #: lock.c:116
 #, c-format
@@ -2246,11 +2152,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ur�uje název souboru se protokolem\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      použije syslog(3) pro většinu zpráv při běhu jako démon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      použije syslog(3) pro většinu zpráv při běhu jako démon\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2278,22 +2181,15 @@ msgstr "      --postmaster  ur�uje nouzového příjemce pošty\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    přesměruje vracené zprávy od uživatele postmasterovi\n"
+msgstr "      --nobounce    přesměruje vracené zprávy od uživatele postmasterovi\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail bude mazat trvale nedoru�itelné zprávy\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail bude mazat trvale nedoru�itelné zprávy\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  ponechá trvale nedoru�itelné zprávy na serveru "
-"(výchozí)\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  ponechá trvale nedoru�itelné zprávy na serveru (výchozí)\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2321,33 +2217,23 @@ msgstr "      --sslcertck   přísně ověřuje certifikát serveru (doporu�eno
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck  vynechá přísné ověřování certifikátu serveru "
-"(nebezpe�né)\n"
+msgstr "      --nosslcertck  vynechá přísné ověřování certifikátu serveru (nebezpe�né)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile cesta k souboru s SSL certifikáty důvěryhodných CA\n"
+msgstr "      --sslcertfile cesta k souboru s SSL certifikáty důvěryhodných CA\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath cesta k adresáři s SSL certifikáty důvěryhodných CA\n"
+msgstr "      --sslcertpath cesta k adresáři s SSL certifikáty důvěryhodných CA\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  od serveru o�ekává toto obecné jméno (CN) "
-"(nedoporu�eno)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  od serveru o�ekává toto obecné jméno (CN) (nedoporu�eno)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint otisk, který musí odpovídat certifikátu serveru\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint otisk, který musí odpovídat certifikátu serveru\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2372,32 +2258,23 @@ msgstr ""
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]  ur�uje protokol pro stahování (vizte manuálovou "
-"stránku)\n"
+msgstr "  -p, --proto[col]  ur�uje protokol pro stahování (vizte manuálovou stránku)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        vnutí používání UIDL (jen POP3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        řekne IMAP serveru, aby posílal upozornění na nové "
-"zprávy\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        řekne IMAP serveru, aby posílal upozornění na nové zprávy\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        TCP port, kam se připojovat (zastaralé, použijte --"
-"service)\n"
+msgstr "      --port        TCP port, kam se připojovat (zastaralé, použijte --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     TCP služba, kam se připojit (smí být �íselný port TCP)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     TCP služba, kam se připojit (smí být �íselný port TCP)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2413,8 +2290,7 @@ msgstr "  -E, --envelope    hlavi�ka adresy z obálky\n"
 
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual    předpona, která se odstraní z ID místního uživatele\n"
+msgstr "  -Q, --qvirtual    předpona, která se odstraní z ID místního uživatele\n"
 
 #: options.c:693
 msgid "      --principal   mail service principal\n"
@@ -2422,9 +2298,7 @@ msgstr "      --principal   principál poštovní služby\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  přidá informace pro sledování stahování do hlavi�ky "
-"Received\n"
+msgstr "      --tracepolls  přidá informace pro sledování stahování do hlavi�ky Received\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
@@ -2500,8 +2374,7 @@ msgstr "      --fastuidl    hledá UIDL binárně\n"
 
 #: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     nastaví maximální po�et odstraňování mezi �ištěními\n"
+msgstr "  -e, --expunge     nastaví maximální po�et odstraňování mezi �ištěními\n"
 
 #: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2532,11 +2405,8 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 podporuje pouze přihlašování heslem. Nelze pokra�ovat.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Pozor: Nalezen server „Maillennium POP3“, použije se příkaz RETR namísto "
-"TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Pozor: Nalezen server „Maillennium POP3“, použije se příkaz RETR namísto TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2558,8 +2428,7 @@ msgstr "%s: POZOR: server nabídl STLS, ale je zadáno sslproto ''.\n"
 
 #: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Vy�erpali jsme všechny povolené autentikátory, a tak nelze pokra�ovat.\n"
+msgstr "Vy�erpali jsme všechny povolené autentikátory, a tak nelze pokra�ovat.\n"
 
 #: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2624,19 +2493,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS není povoleno."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: přepína� interface je podporován jen v Linuxu (bez IPv6) a "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: přepína� interface je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: přepína� monitor je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: přepína� monitor je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2987,8 +2849,7 @@ msgstr "MDA vrátil nenulový stav %d\n"
 
 #: sink.c:1396
 #, 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 "Záhada: MDA pclose vrátil %d a errno %d/%s, nezle zpracovat v %s:%d\n"
 
 #: sink.c:1421
@@ -3127,8 +2988,7 @@ msgstr "Zpráva z OpenSSL: %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"Zpětné volání pro ověřování SSL: hloubka %d, preverify_ok %d, chyba %d, %s\n"
+msgstr "Zpětné volání pro ověřování SSL: hloubka %d, preverify_ok %d, chyba %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3164,8 +3024,7 @@ msgstr "Obecné jméno (CN) vydavatele: %s\n"
 
 #: socket.c:681
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Varování: Obecné jméno (CN) vydavatele je příliš dlouhé (možná zkráceno).\n"
+msgstr "Varování: Obecné jméno (CN) vydavatele je příliš dlouhé (možná zkráceno).\n"
 
 #: socket.c:683
 msgid "Unknown Issuer CommonName\n"
@@ -3191,8 +3050,7 @@ msgstr "Alternativní jméno subjektu: %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Špatný certifikát: Alternativní jméno subjektu obsahuje NUL, zrušuje se!\n"
+msgstr "Špatný certifikát: Alternativní jméno subjektu obsahuje NUL, zrušuje se!\n"
 
 #: socket.c:752
 #, c-format
@@ -3249,15 +3107,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Řetěz certifikátů je rozbitý u: %s\n"
 
 #: socket.c:831
-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 ""
-"To může znamenat, že server neposkytl certifikáty mezilehlých autorit, "
-"s �ímž fetchmail nemůže nic udělat. Podrobnější vysvětlení lze nalézt "
-"v dokumentu README.SSL-SERVER, který je s fetchmailem dodáván.\n"
+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 "To může znamenat, že server neposkytl certifikáty mezilehlých autorit, s �ímž fetchmail nemůže nic udělat. Podrobnější vysvětlení lze nalézt v dokumentu README.SSL-SERVER, který je s fetchmailem dodáván.\n"
 
 #: socket.c:841
 #, c-format
@@ -3265,17 +3116,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Chybí důvěryhodný certifikát: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"To může znamenat, že podpisový certifikát kořenové autority není uveden "
-"v seznamu certifikátů důvěryhodných autorit nebo že je třeba v adresáři "
-"s certifikáty spustit c_rehash. Podrobnější vysvětlení lze nalézt "
-"v dokumentaci --sslcertpath a --sslcertfile v manuálové stránce. Pro "
-"podrobnosti vizte README.SSL.\n"
+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. See README.SSL for details.\n"
+msgstr "To může znamenat, že podpisový certifikát kořenové autority není uveden v seznamu certifikátů důvěryhodných autorit nebo že je třeba v adresáři s certifikáty spustit c_rehash. Podrobnější vysvětlení lze nalézt v dokumentaci --sslcertpath a --sslcertfile v manuálové stránce. Pro podrobnosti vizte README.SSL.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3296,54 +3138,35 @@ msgstr "Vaše verze OpenSSL nepodporuje TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Zadán neplatný protokol SSL „%s“, použije se výchozí automatický výběr "
-"(auto).\n"
+msgstr "Zadán neplatný protokol SSL „%s“, použije se výchozí automatický výběr (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Zavedená knihovna OpenSSL %#lx je starší než verze hlavi�ek %#lx. Konec.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Zavedená knihovna OpenSSL %#lx je starší než verze hlavi�ek %#lx. Konec.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Zavedená knihovna OpenSSL %#lx je novější než verze hlavi�ek %#lx. Pokra�uje "
-"se.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Zavedená knihovna OpenSSL %#lx je novější než verze hlavi�ek %#lx. Pokra�uje se.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Deskriptor souboru mimo rozsah pro SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Vezměte na vědomí, že některé distribuce vypínají starší verze protokolů "
-"podivnými způsoby. Zkuste novější verzi protokolu.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Vezměte na vědomí, že některé distribuce vypínají starší verze protokolů podivnými způsoby. Zkuste novější verzi protokolu.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Pozor: SSL_set_tlsext_host_name(%p, \"%s\") selhalo (kód %#lx), pokra�uje "
-"se.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Pozor: SSL_set_tlsext_host_name(%p, \"%s\") selhalo (kód %#lx), pokra�uje se.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Pozor: X509_VERIFY_PARAM_set1_host(%p, \"%s\") selhalo (kód %#x), pokra�uje "
-"se.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Pozor: X509_VERIFY_PARAM_set1_host(%p, \"%s\") selhalo (kód %#x), pokra�uje se.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3360,26 +3183,20 @@ msgstr "dojednání spojení selhalo na úrovni protokolu nebo transportní vrst
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"Sou�asnou šifru SSL/TLS nelze získat – žádné spojení nebylo ustanoveno?\n"
+msgstr "Sou�asnou šifru SSL/TLS nelze získat – žádné spojení nebylo ustanoveno?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: používá se protokol %s, šifra %s, %d/%d bitů tajemství/procesních\n"
+msgstr "SSL/TLS: používá se protokol %s, šifra %s, %d/%d bitů tajemství/procesních\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Ověření certifikátu/otisku bylo nějak přesko�eno!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Pozor: spojení není zabezpe�eno, přesto se bude pokra�ovat. (Raději použijte "
-"--sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Pozor: spojení není zabezpe�eno, přesto se bude pokra�ovat. (Raději použijte --sslcertck!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3434,9 +3251,7 @@ msgstr "nalezena adresa Received „%s“\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"nalezen neplatný řádek hlavi�ky – vizte volbu bad-header v manuálové "
-"stránce\n"
+msgstr "nalezen neplatný řádek hlavi�ky – vizte volbu bad-header v manuálové stránce\n"
 
 #: transact.c:615
 #, c-format
@@ -3455,8 +3270,7 @@ msgstr "Rozebírají se názvy Received „%-.*s“\n"
 
 #: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"V obálce nenalezen žádný příjemce, je třeba se uchýlit k hádání z hlavi�ky.\n"
+msgstr "V obálce nenalezen žádný příjemce, je třeba se uchýlit k hádání z hlavi�ky.\n"
 
 #: transact.c:1142
 #, c-format
@@ -3500,9 +3314,7 @@ msgstr "chyba při zápisu textu zprávy\n"
 #: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-"Vyrovnávací paměť je příliš malá. Jedná se o chybu volající funkce v %s:"
-"%lu.\n"
+msgstr "Vyrovnávací paměť je příliš malá. Jedná se o chybu volající funkce v %s:%lu.\n"
 
 #: uid.c:262
 #, c-format
@@ -3561,8 +3373,7 @@ msgstr "Chyba zápisu do souboru fetchids %s: %s\n"
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Chyba při zápisu do souboru fetchids %s, starý soubor ponechán na místě.\n"
+msgstr "Chyba při zápisu do souboru fetchids %s, starý soubor ponechán na místě.\n"
 
 #: uid.c:528
 #, c-format
@@ -3594,11 +3405,8 @@ msgstr "realloc selhalo\n"
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "neznámý vydavatel (prvních %d znaků): %s\n"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: Varování: syslog i soubor s protokolem jsou nastaveny. Záznamy "
-#~ "hledejte v obou!\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr "fetchmail: Varování: syslog i soubor s protokolem jsou nastaveny. Záznamy hledejte v obou!\n"
 
 #~ msgid "setsockopt(%d, SOL_SOCKET) failed: %s\n"
 #~ msgstr "setsockopt(%d, SOL_SOCKET) selhalo: %s\n"
diff --git a/po/da.po b/po/da.po
index 6651ca85..7c0c3faf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,42 +15,42 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+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-03-11 07:50+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\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"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Tjekker om %s virkelig er samme maskine som %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Ja, deres IP-adresser stemmer overens\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Nej, deres IP-adresser stemmer ikke overens\n"
 
-#: checkalias.c:207
+#: checkalias.c:212
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "navneserverfejl ved opslag på »%s« ved prøvning af %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:237
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "navneserverfejl ved opslag på »%s« ved prøvning af %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "kunne ikke afkode BASE64-anråb\n"
 
@@ -70,8 +70,7 @@ msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server siger »%s«]\n"
 
 #: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Emne: Fetchmailadvarsel vedrørende for lange breve"
 
 #: driver.c:349
@@ -103,110 +102,103 @@ msgstr[1] "  %d. breve, %d oktetter lang, sprunget over af fetchmail."
 msgid "skipping message %s@%s:%d"
 msgstr "springer brev %s@%s:%d over"
 
-#: driver.c:577
+#: driver.c:576
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:593
+#: driver.c:592
 msgid " (length -1)"
 msgstr " (længde -1)"
 
-#: driver.c:596
+#: driver.c:595
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:614
+#: driver.c:613
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "kunne ikke hente brevhoveder, brev %s@%s:%d (%d oktetter)\n"
 
-#: driver.c:632
+#: driver.c:631
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "læser brev %s@%s:%d af %d"
 
-#: driver.c:637
+#: driver.c:636
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktetter)"
 
-#: driver.c:638
+#: driver.c:637
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetter i brevhoved)"
 
-#: driver.c:708
+#: driver.c:707
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:770
+#: driver.c:769
 #, 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 "brev %s@%s:%d havde ikke den forventede længde (%d != %d forventet)\n"
 
-#: driver.c:802
+#: driver.c:801
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:812
+#: driver.c:811
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:824
+#: driver.c:823
 msgid " not flushed\n"
 msgstr " ikke slettet\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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "afhentningsgrænse %d nået; %d brev tilbage på server %s konto %s\n"
 msgstr[1] "afhentningsgrænse %d nået; %d breve tilbage på server %s konto %s\n"
 
-#: driver.c:899
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på forbindelse til server %s.\n"
 
-#: driver.c:903
+#: driver.c:902
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på server %s.\n"
 
-#: driver.c:907
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på %s.\n"
 
-#: driver.c:912
+#: driver.c:911
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tidsafbrud efter %d sekunders venten på svar fra modtager.\n"
 
-#: driver.c:915
+#: driver.c:914
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:926
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Emne: fetchmail har gentagne tidsafbrud"
 
-#: 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 fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %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"
@@ -222,73 +214,73 @@ msgstr ""
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
 # ser ud til at det er bevidst at pre ikke er med i oversættelse.
-#: driver.c:960
+#: driver.c:959
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "forbindelseskommando mislykkedes med signal %d\n"
 
-#: driver.c:963
+#: driver.c:962
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:987
+#: driver.c:986
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:1008
+#: driver.c:1007
 msgid "Lead server has no name.\n"
 msgstr "Fører-server har ikke noget navn.\n"
 
-#: driver.c:1035
+#: driver.c:1034
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "kunne ikke finde kanonisk DNS-navn for %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1081
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:1111
+#: driver.c:1110
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: driver.c:1166
+#: driver.c:1165
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lås optaget-fejl på %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1169
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server optaget-fejl på %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1174
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Godkendelsesfejl på %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1177
 msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
-#: driver.c:1181
+#: driver.c:1180
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 msgstr "For hjælp, så se 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 "Emne: fetchmail - godkendelse mislykkedes på %s@%s"
 
-#: driver.c:1206
+#: driver.c:1205
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %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"
@@ -302,7 +294,7 @@ msgstr ""
 "fetchmail ikke kan se fordi serveren ikke sendte en ordentlig fejl-\n"
 "meddelelse."
 
-#: driver.c:1216
+#: driver.c:1215
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -322,7 +314,7 @@ msgstr ""
 "Der vil ikke blive sendt flere påmindelser før at tjenesten er\n"
 "genetableret."
 
-#: 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"
@@ -342,183 +334,182 @@ msgstr ""
 "Der vil ikke blive sendt flere på påmindelser før at tjenesten er\n"
 "genetableret."
 
-#: driver.c:1242
+#: driver.c:1241
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Prøver straks igen %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1246
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl på %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1270
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden på %s@%s\n"
 
-#: 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 "Emne: fetchmail - godkendelse i orden på %s@%s"
 
-#: driver.c:1281
+#: driver.c:1280
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail var i stand til at logge ind på %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1284
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1318
+#: driver.c:1317
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vælger eller prøver igen brevbakke %s\n"
 
-#: driver.c:1320
+#: driver.c:1319
 msgid "selecting or re-polling default folder\n"
 msgstr "vælger eller prøver igen indbakken\n"
 
-#: driver.c:1332
+#: driver.c:1331
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1334 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: driver.c:1340
+#: driver.c:1339
 #, c-format
 msgid "Polling %s\n"
 msgstr "Prøver %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 besked (%d %s) til %s"
 msgstr[1] "%d beskeder (%d %s) til %s"
 
-#: driver.c:1347
+#: driver.c:1346
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gammel"
 msgstr[1] "gamle"
 
-#: driver.c:1350
+#: driver.c:1349
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d besked til %s"
 msgstr[1] "%d beskeder til %s"
 
-#: driver.c:1357
+#: driver.c:1356
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1363
+#: driver.c:1362
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1396
+#: driver.c:1395
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1448
+#: driver.c:1447
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"For meget e-post udeladt (%d > %d) på grund af forsendelsesfejl for %s\n"
+msgstr "For meget e-post udeladt (%d > %d) på grund af forsendelsesfejl for %s\n"
 
-#: driver.c:1549
+#: driver.c:1548
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1552
+#: driver.c:1551
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1555
+#: driver.c:1554
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1558
+#: driver.c:1557
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1561
+#: driver.c:1560
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1564
+#: driver.c:1563
 msgid "lock busy on server"
 msgstr "server låst-"
 
-#: driver.c:1567
+#: driver.c:1566
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1570
+#: driver.c:1569
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1573
+#: driver.c:1572
 msgid "undefined"
 msgstr "udefineret"
 
-#: driver.c:1579
+#: driver.c:1578
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s fejl under hentning fra %s@%s og levering til SMTP-vært fra %s\n"
 
-#: driver.c:1581
+#: driver.c:1580
 msgid "unknown"
 msgstr "ukendt"
 
-#: driver.c:1583
+#: driver.c:1582
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s fejl ved hentning fra %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1594
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "afslutningskommando fejlede med signal %d\n"
 
-#: driver.c:1597
+#: driver.c:1596
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1616
+#: driver.c:1615
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-støtte.\n"
 
-#: driver.c:1624
+#: driver.c:1623
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-støtte.\n"
 
-#: driver.c:1635
+#: driver.c:1634
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke understøttet med %s\n"
 
-#: driver.c:1641
+#: driver.c:1640
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke understøttet med %s\n"
 
-#: driver.c:1650
+#: driver.c:1649
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke understøttet med %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -533,13 +524,12 @@ msgstr ""
 "Prøv \"env QMAILINJECT= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
@@ -550,44 +540,33 @@ msgstr ""
 "Prøv \"env NULLMAILER_FLAGS= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Du findes ikke.  Fjern dig.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: kan ikke bestemme din værtsmaskine!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:172
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fejlede for %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Kan ikke finde min egen vært i værtsdatabasen for at kvalificere den!\n"
+msgstr "Kan ikke finde min egen vært i værtsdatabasen for at kvalificere den!\n"
 
-#: env.c:229
+#: 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 ""
 "Forsøger at fortsætte med ukvalificeret værtsnavn.\n"
-"Rapporter IKKE ødelagt Received: brevhoveder, HELO/EHLO-linjer eller "
-"lignende\n"
+"Rapporter IKKE ødelagt Received: brevhoveder, HELO/EHLO-linjer eller lignende\n"
 "problemer\n"
 "Reparer I STEDET FOR din /etc/hosts, DNS, NIS eller LDAP.\n"
 
@@ -655,14 +634,13 @@ msgstr "Tilvalg --folder er ikke understøttet med ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Tilvalg --check er ikke understøttet med ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
 "Ophavsret 2002, 2003 Eric S. Raymond\n"
 "Ophavsret 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -670,7 +648,7 @@ msgstr ""
 "Ophavsret 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
 "Ophavsret 2005 - 2013 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: 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"
@@ -680,1027 +658,930 @@ msgstr ""
 "velkommen til at videredistribuere den under visse betingelser. For\n"
 "detaljer så se venligst filen COPYING i kilde- eller dokumentationsmappen.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ADVARSEL: Kørsel som administrator (root) frarådes.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "kunne ikke få det nuværende arbejdskatalog\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
+#: fetchmail.c:313
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Tilvalget nodetach er aktiveret, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:320
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Kører ikke i dæmontilstand, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:327
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "Logfil »%s« findes ikke, ignorerer logfiltilvalg.\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:333
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Logfil »%s« er ikke skrivbar, afbryder.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:351
 #, 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"
+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:469
+#: fetchmail.c:439
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:440
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:475
+#: fetchmail.c:445
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - måske mangler %s?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:466
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:478
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail kører\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:484
 #, 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:515 fetchmail.c:524
+#: fetchmail.c:485 fetchmail.c:494
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:485 fetchmail.c:494
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:523
+#: fetchmail.c:493
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail på %ld dræbt.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært "
-"kører.\n"
+#: fetchmail.c:516
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært kører.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:522
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail "
-"kører på %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail kører på %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:529
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail kører på %ld.\n"
 
-#: fetchmail.c:569
-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: kan ikke tage tilvalg mens en baggrundsfetchmail kører.\n"
 
-#: fetchmail.c:581
+#: fetchmail.c:545
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: baggrundsfetchmail på %ld vækket.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:557
 #, 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:608
+#: fetchmail.c:572
 #, 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:612
+#: fetchmail.c:576
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv adgangskode for %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:618
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Kan ikke frigøre til baggrunden. Afbryder.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:622
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starter fetchmail %s-dæmon\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:638 fetchmail.c:640
 #, 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:695
+#: fetchmail.c:659
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "tilstanden --check aktiveret, henter ikke post\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:681
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsfæste %s (fejl %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:686
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s ændret)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:691
 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"
+msgstr "forsøg på at genstarte kan mislykkes da kataloget ikke er genoprettet\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:718
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "forsøg på at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:748
 #, 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"
+msgstr "prøve af %s droppet (mislykket godkendelse eller for mange tidsafbrud)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:760
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke nået, spørger ikke %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:798
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Spørgestatus=0 (succes)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:800
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Spørgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:802
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Spørgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:804
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Spørgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:806
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Spørgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:808
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Spørgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:810
 msgid "Query status=6 (IOERR)\n"
 msgstr "Spørgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:812
 msgid "Query status=7 (ERROR)\n"
 msgstr "Spørgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:814
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Spørgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:816
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Spørgestatus=9 (lås optaget)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:818
 msgid "Query status=10 (SMTP)\n"
 msgstr "Spørgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:820
 msgid "Query status=11 (DNS)\n"
 msgstr "Spørgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:822
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Spørgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:824
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Spørgestatus=13 (afhentningsgrænse nået)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:826
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Spørgestatus=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:868
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:876
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sover %s for %d sekunder\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:900
 #, c-format
 msgid "awakened by %s\n"
 msgstr "vækket af %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:903
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "vækket af signal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:911
 #, c-format
 msgid "awakened at %s\n"
 msgstr "vækket %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:916
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1075
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsfæste kørselskontrolfilen\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1109
 #, 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:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
+#: fetchmail.c:1148
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Fejl: flere \"standardposter\" i konfigurationsfil.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1270
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-understøttelse.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1277
 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:1330
+#: fetchmail.c:1283
 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:1336
+#: fetchmail.c:1289
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-understøttelse er konfigureret, men ikke kompileret ind.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: advarsel: ingen DNS er tilgængelig til at kontrollere "
-"afhentninger fra %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: advarsel: ingen DNS er tilgængelig til at kontrollere afhentninger fra %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1330
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "advarsel: flerdrop for %s kræver kuverttilvalg!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1331
 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:1395
+#: fetchmail.c:1348
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: konfiguration af %s er forkert, angiv positivt portnummer for "
-"tjeneste eller port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: konfiguration af %s er forkert, angiv positivt portnummer for tjeneste eller port\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1355
 #, 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"
+msgstr "fetchmail: konfiguration af %s er forkert, RPOP kræver en privilegeret port\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1373
 #, 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:1434
+#: fetchmail.c:1387
 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"
+msgstr "Brug af både fetchall og keep i dæmon- eller ledig tilstand er en fejl!\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1412
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1485
 #, 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:1566
+#: fetchmail.c:1510
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-understøttelse.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1522
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-understøttelse.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1532
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-understøttelse.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1538
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-understøttelse.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1546
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-understøttelse.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1553
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-understøttet protokol valgt.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1563
 #, 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:1645
+#: fetchmail.c:1580
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Prøvemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1582
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1584
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1587
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forløbsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1590
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1592
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forløbsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1594
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
+msgstr "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1600
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1603
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail vil opfatte permanente fejl som permanent (drop beskeder).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1605
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail vil opfatte permanente fejl som midlertidig (bevar beskeder).\n"
+msgstr "Fetchmail vil opfatte permanente fejl som midlertidig (bevar beskeder).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1612
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1616
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1684
+#: 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] "  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:1688
+#: fetchmail.c:1623
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1626
 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"
+msgstr "  Denne vært vil ikke blive forespurgt når ingen vært er specificeret.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1627
 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:1696
+#: fetchmail.c:1631
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1635
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = »%s«.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1638
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = »%s«.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1641
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = »%s«.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1650
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1653
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1655
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1657
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1659
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1665
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilgængelige godkendelsesmetoder vil blive forsøgt.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1668
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er påkrævet.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1671
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1674
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1677
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1680
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1683
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1686
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1689
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1692
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1696
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1699
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1701
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1703
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  SSL-servercertifikat tjekkes.\n"
-
-#: fetchmail.c:1773
+#: fetchmail.c:1706
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  SSL-certifikatfil: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1710
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL-servers almennavn %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1712
 #, 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:1782
+#: fetchmail.c:1715
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter på svar fra server i højst %d sekunder"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1717
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1724
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1729
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1735
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle breve vil blive hentet (--all aktiveret).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1736
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Kun nye breve vil blive hentet (--all deaktiveret).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1738
 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:1806
+#: fetchmail.c:1739
 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"
+msgstr "  Hentede breve vil ikke blive gemt på serveren (--keep deaktiveret).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1741
 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:1809
-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:1742
+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:1811
-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:1744
+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:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  For lange breve vil blive slettet før hentning (--limitflush "
-"deaktiveret).\n"
+#: fetchmail.c:1745
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  For lange breve vil blive slettet før hentning (--limitflush deaktiveret).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1747
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Omskrivning af serverlokale adresser er aktiveret (--norewrite "
-"deaktiveret).\n"
+msgstr "  Omskrivning af serverlokale adresser er aktiveret (--norewrite deaktiveret).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1748
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Omskrivning af serverlokale adresser er deaktiveret (--norewrite "
-"aktiveret).\n"
+msgstr "  Omskrivning af serverlokale adresser er deaktiveret (--norewrite aktiveret).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1750
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Fjernelse af vognreturtegn er aktiveret (stripcr aktiveret).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1751
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er deaktiveret (stripcr deaktiveret).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1753
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Indsættelse af vognreturtegn er aktiveret (forcecr aktiveret).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1754
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Indsættelse af vognreturtegn er deaktiveret (forcecr deaktiveret).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Fortolkning af Content-Transfer-Encoding er deaktiveret (pass8bit "
-"aktiveret).\n"
+#: fetchmail.c:1756
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Fortolkning af Content-Transfer-Encoding er deaktiveret (pass8bit aktiveret).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Fortolkning af Content-Transfer-Encoding er aktiveret (pass8bit "
-"deaktiveret).\n"
+#: fetchmail.c:1757
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Fortolkning af Content-Transfer-Encoding er aktiveret (pass8bit deaktiveret).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1759
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er aktiveret (mimedecode aktiveret).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1760
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-afkodning er deaktiveret (mimedecode deaktiveret).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1762
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter prøvning er aktiveret (idle aktiveret).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1763
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Tomgang efter prøvning er deaktiveret (idle deaktiveret).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1765
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive fjernet (dropstatus aktiveret)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1766
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive bevaret (dropstatus deaktiveret)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1768
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-"  \"Delivered-To\"-linjer vil blive fjernet (dropdelivered aktiveret)\n"
+msgstr "  \"Delivered-To\"-linjer vil blive fjernet (dropdelivered aktiveret)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1769
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-"  \"Delivered-To\"-linjer vil blive bevaret (dropdelivered deaktiveret)\n"
+msgstr "  \"Delivered-To\"-linjer vil blive bevaret (dropdelivered deaktiveret)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1773
 #, 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:1843
+#: fetchmail.c:1776
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1778
 #, 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:1848
+#: fetchmail.c:1781
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Størrelsesadvarsler ved hver prøvning (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1784
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1787
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1789
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1792
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal størrelse på hentede breve (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1796
 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:1865
+#: fetchmail.c:1798
 #, 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"
+msgstr "  Udfør binær søgning for UID'er under %d ud for %d prøvninger (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1801
 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"
+msgstr "   Udfør lineær søgning for UID'er under hver prøvning (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1803
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgrænse er %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1805
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgrænse (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1809
 #, 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:1878
+#: fetchmail.c:1811
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1818
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domæner som der vil blive hentet post til:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1823 fetchmail.c:1843
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilføjet %s som BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1830
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med »%s«.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1837
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1848
 #, 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:1918
+#: fetchmail.c:1851
 #, 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:1927
+#: fetchmail.c:1860
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1866
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er slået fra\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1869
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med »%s«.\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1872
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1874
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med »%s«.\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1877
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1880
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne vært.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1890
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1892
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1894
 #, 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:1976
+#: fetchmail.c:1909
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er aktiveret.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1910
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er deaktiveret.\n"
 
-#: fetchmail.c:1981
-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:1914
+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:1983
+#: fetchmail.c:1916
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Serveraliasser vil blive sammenholdt med flermodtager-adresser efter "
-"navn.\n"
+msgstr "  Serveraliasser vil blive sammenholdt med flermodtager-adresser efter navn.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1919
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Adressering efter konvolutadressen er slået fra\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1922
 #, 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:1992
+#: fetchmail.c:1925
 #, 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:1995
+#: fetchmail.c:1928
 #, 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:1998
+#: fetchmail.c:1931
 msgid "  No prefix stripping\n"
 msgstr "  Ingen præfikssletning\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1936
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderklærede postserveraliaser:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1944
 msgid "  Local domains:"
 msgstr "  Lokale domæner:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1954
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem grænseflade %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1956
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen grænsefladekrav specificeret.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1958
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Prøveløkke vil overvåge %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1960
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overvågning af grænseflade specificeret.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1964
 #, 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"
+msgstr "  Serverforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:1966
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1968
 #, 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"
+msgstr "  Modtagerforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:1970
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1975
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne vært.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1984
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1992
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:1994
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Sporingsinformation vil ikke blive tilføjet \"Received\"-brevhovedet.\n"
+msgstr "  Sporingsinformation vil ikke blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:1999
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Beskeder med ugyldige brevhoveder vil blive afvist.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2002
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Beskeder med ugyldige brevhoveder vil blive videresendt.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:2007
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: »%s«.\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "FEJL: ingen understøttelse til getpassword()-funktion\n"
@@ -1713,91 +1594,78 @@ msgstr ""
 "\n"
 "Fangede SIGINT... Jeg trækker mig.\n"
 
-#: gssapi.c:53
+#: gssapi.c:52
 #, 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:56
+#: gssapi.c:55
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "GSSAPI-fejl %s: %.*s\n"
 
-#: gssapi.c:91
+#: gssapi.c:90
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kunne ikke få servicenavn for [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:95
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Bruger servicenavn [%s]\n"
 
-#: gssapi.c:123
+#: gssapi.c:122
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Ingen egnede GSSAPI-akkreditiver fundet. Springer GSSAPI-godkendelse over.\n"
+msgstr "Ingen egnede GSSAPI-akkreditiver fundet. Springer GSSAPI-godkendelse over.\n"
 
-#: 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:123
+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:160
+#: gssapi.c:159
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Modtaget forkert udformet udfordring til \"%s GSSAPI\"!\n"
 
-#: gssapi.c:170
+#: gssapi.c:169
 msgid "Sending credentials\n"
 msgstr "Sender akkreditiver\n"
 
-#: gssapi.c:201
+#: gssapi.c:200
 msgid "Error exchanging credentials\n"
 msgstr "Fejl ved udveksling af akkreditiver\n"
 
-#: gssapi.c:243
+#: gssapi.c:242
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
 
-#: gssapi.c:248
+#: gssapi.c:247
 msgid "Credential exchange complete\n"
 msgstr "Akkreditiver udvekslet\n"
 
-#: gssapi.c:252
+#: gssapi.c:251
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server kræver integritet og/eller hemmeligholdelse\n"
 
-#: gssapi.c:261
+#: gssapi.c:260
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:264
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksimal GSS-symbolstørrelse er %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "Frigiver GSS-akkreditiver\n"
 
-#: gssapi.c:302
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
@@ -1806,66 +1674,64 @@ 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:75
-#, fuzzy, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+#: imap.c:74
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
 msgstr "Modtaget BYE-svar fra IMAP-server: %s"
 
-#: imap.c:97
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "falsk brev-tal i »%s«!"
 
-#: imap.c:144
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "falsk EXPUNGE-tal i »%s«!"
 
-#: imap.c:355
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:361
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:368
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr "går i tomgang efter prøvning\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opgradering til TLS lykkedes.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opgradering til TLS fejlede.\n"
 
-#: imap.c:487
+#: imap.c:482
 #, 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"
+msgstr "%s: opportunistisk opgradering til TLS fejlede, forsøger at fortsætte\n"
 
-#: imap.c:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:607
+#: imap.c:598
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som påkrævet\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:618 pop3.c:558
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 
+#: imap.c:627
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
+
 #: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
@@ -1876,7 +1742,7 @@ msgstr "postsletning fejlmatch (%d aktuel != %d forventer)\n"
 msgid "%lu is unseen\n"
 msgstr "%lu er usete\n"
 
-#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
@@ -1918,17 +1784,14 @@ msgstr[1] "%d breve venter efter sletning\n"
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:994 pop3.c:865
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
 
 #: 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"
+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:1177 imap.c:1184
 #, c-format
@@ -2017,21 +1880,21 @@ msgstr "aktivitet på %s var %d, er %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "kunne ikke afkode det indledende BASE64-anråb\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "fuldmagtsgiver %s i billet stemmer ikke overens med bruger %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "ikke-tom foranledning (%s) kan medføre underlig adfærd\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "kunne ikke afkode BASE64 klar-svar\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "uoverensstemmelse i anråb\n"
 
@@ -2041,35 +1904,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: fejl under læsning af låsefil »%s«: %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: fjerner efterladt låsefil\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: fejl under åbning af låsefil »%s«: %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: fejl under læsning af låsefil »%s«: %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: fejl under åbning af låsefil »%s«: %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: oprettelse af låsefil mislykkedes\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: fejl under læsning af låsefil »%s«: %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2080,15 +1926,6 @@ msgstr "%s:%d: advarsel: fandt »%s« før noget værtsnavn\n"
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: advarsel: ukendt symbol »%s«\n"
 
-#: ntlmsubr.c:35
-#, fuzzy
-msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr "Modtaget forkert udformet udfordring til \"%s GSSAPI\"!\n"
-
-#: 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"
@@ -2143,489 +1980,419 @@ 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:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "fatal fejl ved læsning fra server\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
-#: options.c:179 options.c:223
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Strengen '%s' er ikke en gyldig talstreng.\n"
 
-#: options.c:188
+#: options.c:185
 #, 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:189
+#: options.c:186
 msgid "smaller"
 msgstr "mindre"
 
-#: options.c:189
+#: options.c:186
 msgid "larger"
 msgstr "større"
 
-#: options.c:337
+#: options.c:323
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Ugyldig politik for ugyldig-hoved '%s' specificeret.\n"
 
-#: options.c:378
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ugyldig protokol '%s' specificeret.\n"
 
-#: options.c:425
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ugyldig godkendelse '%s' specificeret.\n"
 
-#: options.c:641
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "brug: fetchmail [tilvalg] [server ...]\n"
 
-#: options.c:642
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Mulige tilvalg er:\n"
 
-#: options.c:643
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        vis denne hjælp\n"
 
-#: options.c:644
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     vis versionsinformation\n"
 
-#: options.c:646
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tjek om der er breve uden at hente dem\n"
 
-#: options.c:647
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      vær stille\n"
 
-#: options.c:648
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     vær larmende (diagnostisk uddata)\n"
 
-#: options.c:649
+#: options.c:628
 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:650
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    sæt ikke dæmonprocessen i baggrunden\n"
 
-#: options.c:651
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        dræb dæmonproces\n"
 
-#: options.c:652
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     angiv navn på logfil\n"
 
-#: options.c:653
-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      brug syslog(3) som dæmon til de fleste beskeder\n"
 
-#: options.c:654
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
-
-#: options.c:655
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   skriv ikke Received-linjer & lav værtssløring\n"
 
-#: options.c:656
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specificer en alternativ kørselskontrolfil\n"
 
-#: options.c:657
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:658
+#: options.c:636
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specificer en alternativ PID-fil (lås)\n"
 
-#: options.c:659
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specificer modtager som sidste udvej\n"
 
-#: options.c:660
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
+msgstr "      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
 
-#: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail sletter permanent beskeder der ikke kan "
-"leveres.\n"
+#: options.c:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail sletter permanent beskeder der ikke kan leveres.\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  bevar permanent beskeder der ikke kan leveres på "
-"serveren (standard).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  bevar permanent beskeder der ikke kan leveres på serveren (standard).\n"
 
-#: options.c:664
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   specifikation af krævet grænseflade\n"
 
-#: options.c:665
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     overvåg grænseflade for aktivitet\n"
 
-#: options.c:668
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         brug ssl-kryptering\n"
 
-#: options.c:669
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      privat ssl-nøglefil\n"
 
-#: options.c:670
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:671
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   udfør streng kontrol af servercertifikat (anbefales)\n"
-
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --sslcertck   udfør streng kontrol af servercertifikat (anbefales)\n"
+msgstr "      --sslcertck   udfør streng kontrol af servercertifikat (anbefales)\n"
 
-#: options.c:673
+#: options.c:650
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile sti til troværdigt-CA ssl-certifikatfil\n"
 
-#: options.c:674
+#: options.c:651
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath sti til troværdig-CA ssl-certifikatmappe\n"
 
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  forvent dette CommonName fra server (frarådes)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  forvent dette CommonName fra server (frarådes)\n"
 
-#: 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:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint fingeraftryk som skal matche serverens certifikat.\n"
 
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:654
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    brug bestemt ssl-protokol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hjælpeprogram til at åbne forbindelse\n"
 
-#: options.c:680
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     specificer hjælpeprogram til at åbne smtp-forbindelse\n"
+msgstr "      --plugout     specificer hjælpeprogram til at åbne smtp-forbindelse\n"
 
-#: options.c:681
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {afvis|accepter}\n"
-"                    specificer politik for håndtering af beskeder med "
-"ugyldige hoveder\n"
+"                    specificer politik for håndtering af beskeder med ugyldige hoveder\n"
 
-#: options.c:684
-#, 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    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:685
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        TCP-port at forbinde til (forældet, brug --service)\n"
+msgstr "      --port        TCP-port at forbinde til (forældet, brug --service)\n"
 
-#: 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:664
+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:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
+#: options.c:665
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:691
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:692
+#: options.c:668
 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:693
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:694
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  tilføj sporingsinformation i \"Received\"-brevhovedet\n"
+msgstr "      --tracepolls  tilføj sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:696
-#, 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    specificer brugernavn på server\n"
 
-#: options.c:697
+#: options.c:673
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  hent gamle og nye breve\n"
 
-#: options.c:698
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:699
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:700
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve på server\n"
 
-#: options.c:701
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  slet for lange breve\n"
 
-#: options.c:702
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:703
+#: options.c:679
 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:704
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:706
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anfør vært til SMTP-levering\n"
 
-#: options.c:707
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:708
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anfør SMTP-afleveringsdomæne at bruge\n"
 
-#: options.c:709
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anfør fuldt SMTP-navn - brugernavn@domæne\n"
 
-#: options.c:710
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anfør antispam-svarværdier\n"
 
-#: options.c:711
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  anfør maks. antal afleveringer pr. SMTP-forbindelse\n"
+msgstr "  -b, --batchlimit  anfør maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:712
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  anfør maks. antal hentninger pr. serverforbindelse\n"
+msgstr "  -B, --fetchlimit  anfør maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:713
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit angiv begrænsning for hentning af brev\n"
 
-#: options.c:714
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    udfør en binær søgning for UIDL'er\n"
 
-#: options.c:715
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     anfør maks. antal sletninger mellem effektueringer\n"
+msgstr "  -e, --expunge     anfør maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:716
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anfør MDA til brug for levering\n"
 
-#: options.c:717
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anfør BSMTP-uddatafil\n"
 
-#: options.c:718
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:719
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 
-#: options.c:720
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
+#: pop3.c:327
+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: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:414
+#: pop3.c:411
 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:415
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "CAPA-kommandoen er dog nødvendig for TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:494
 #, 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"
+msgstr "%s: Opportunistisk opgradering til TLS mislykkedes, forsøger at fortsætte.\n"
 
-#: pop3.c:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
+#: pop3.c:621
 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:637
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:646
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:662
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ugyldigt APOP-tidsstempel.\n"
 
-#: pop3.c:686
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:770
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Kan ikke håndtere UIDL-svar fra opstrømsserver.\n"
 
-#: pop3.c:793
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server svarede med UID for forkert besked.\n"
 
-#: pop3.c:822
+#: pop3.c:835
 #, 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:934
+#: pop3.c:941
 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:1032
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:1048
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1079
+#: pop3.c:1086
 #, 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:1389
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --folder er ikke understøttet med POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:131
 msgid "server option after user options"
 msgstr "tilvalg vedr. server efter brugertilvalgene"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:174
 msgid "SDPS not enabled."
 msgstr "SDPS er ikke slået til."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: grænsefladetilvalg (interface) er kun understøttet under Linux "
-"(uden IPv6) og FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: grænsefladetilvalg (interface) er kun understøttet under Linux (uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: overvågningstilvalg (monitor) er kun understøttet under Linux "
-"(uden IPv6) og FreeBSD\n"
+#: rcfile_y.y:226
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: overvågningstilvalg (monitor) er kun understøttet under Linux (uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL er ikke slået til"
 
@@ -2863,140 +2630,134 @@ msgstr "Angiv venligst tjenesten som decimalportnummer.\n"
 msgid "forwarding to %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst til afvisningsbrev)\n"
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "afvisning af brev fra %s sendt til %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:456
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Gemt fejlkode er stadig %d\n"
+
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:535
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP-server kræver STARTTLS, bevarer besked.\n"
 
-#: sink.c:714
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Ã…bning af BSMTP-fil mislykkedes: %s\n"
 
-#: sink.c:760
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Skrivning af BSMTP-indledning mislykkedes: %s.\n"
 
-#: sink.c:974
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:981
+#: sink.c:1002
 #, 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:1027
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1039
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1045
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: 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
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1222
+#: sink.c:1233
 #, 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:1234
+#: sink.c:1245
 #, 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:1241
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "MDA-Ã¥bning mislykkedes\n"
 
-#: sink.c:1280
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1304
+#: sink.c:1315
 #, 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:1362
+#: sink.c:1373
 #, 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:1387
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fejl ved skrivning til MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1393
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1396
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Underligt: MDA pclose returnede %d og fejlnr. %d/%s, kan ikke håndtere det i "
-"%s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Underligt: MDA pclose returnede %d og fejlnr. %d/%s, kan ikke håndtere det i %s:%d\n"
 
-#: sink.c:1421
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1451
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1454
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
 #: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "Fetchmail-dæmonen"
@@ -3026,84 +2787,84 @@ msgstr "ESMTP PLAIN-godkendelse...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Authentication...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:110 socket.c:137
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:173
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#: socket.c:179
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:186
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:192
+#: socket.c:188
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udfører %s (server %s service %s)\n"
 
-#: socket.c:197
+#: socket.c:193
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:272
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(»%s«,»%s«) fejl: %s\n"
 
-#: socket.c:275
+#: socket.c:271
 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:289 socket.c:292
+#: socket.c:285 socket.c:288
 #, c-format
 msgid "unknown (%s)"
 msgstr "ukendt (%s)"
 
-#: socket.c:295
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Forsøger at forbinde til %s/%s..."
 
-#: socket.c:304
+#: socket.c:300
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: socket.c:306
+#: socket.c:302
 #, 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:324
+#: socket.c:320
 msgid "connection failed.\n"
 msgstr "forbindelse mislykkedes.\n"
 
-#: socket.c:326
+#: socket.c:322
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "forbindelse til %s:%s [%s/%s] mislykkedes: %s.\n"
 
-#: socket.c:327
+#: socket.c:323
 #, 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:333
+#: socket.c:329
 msgid "connected.\n"
 msgstr "forbundet.\n"
 
-#: socket.c:346
+#: socket.c:342
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3112,263 +2873,166 @@ msgstr ""
 "Forbindelsesfejl for denne prøvning:\n"
 "%s"
 
-#: socket.c:416
+#: socket.c:387
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL rapporteret: %s\n"
 
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
+#: socket.c:622
 msgid "Server certificate:\n"
 msgstr "Servercertifikat:\n"
 
-#: socket.c:662
+#: socket.c:627
 #, 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:665
+#: socket.c:630
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certifikat på dybde %d:\n"
 
-#: socket.c:671
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:674
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (måske afskåret).\n"
 
-#: socket.c:676
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:678
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:681
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (måske afskåret).\n"
 
-#: socket.c:683
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:689
+#: socket.c:654
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Emne almennavn: %s\n"
 
-#: socket.c:695
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "DÃ¥rligt certifikat: almennavn for langt!\n"
 
-#: socket.c:701
+#: socket.c:666
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "DÃ¥rligt certifikat: Emne almennavn indeholder NUL, afbryder!\n"
 
-#: socket.c:729
+#: socket.c:694
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Emne alternativt navn: %s\n"
 
-#: socket.c:735
+#: socket.c:700
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "DÃ¥rligt certifikat: Emne almennavn indeholder NUL, afbryder!\n"
 
-#: socket.c:752
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anført, kunne ikke verificere certifikat!\n"
 
-#: socket.c:764
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:766
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:778
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:782
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:790
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:796
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s nøgle-fingeraftryk: %s\n"
 
-#: socket.c:800
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:802
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:814
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fejl vedrørende verificering af servercertifikat: %s\n"
 
-#: socket.c:829
+#: socket.c:794
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Ugyldig certifikatkæde ved: %s\n"
 
-#: socket.c:831
-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 ""
-"Dette kan betyde at serveren ikke leverede den mellemliggende CA's "
-"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: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 "Dette kan betyde at serveren ikke leverede den mellemliggende CA's 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:841
+#: socket.c:806
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Manglende betroet ankercertifikat: %s\n"
 
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Dette kan betyde, at rod-CA'ens underskriftcertifikatet ikke er i "
-"placeringen for troværdige CA-certifikater, eller at c_rehash skal køres på "
-"certifikatmappen. For detaljer så se venligst dokumentationen for --"
-"sslcertpath og --sslcertfile i manualsiden.\n"
-
-#: socket.c:918 socket.c:996
-#, fuzzy
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
-
-#: socket.c:936 socket.c:1014
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
-
-#: socket.c:947 socket.c:1025
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
-
-#: socket.c:958 socket.c:1036
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr "Dit operativsystem understøtter ikke SSLv2.\n"
-
-#: socket.c:967 socket.c:1046
-#, 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:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
+#: 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 "Dette kan betyde, at rod-CA'ens underskriftcertifikatet ikke er i placeringen for troværdige CA-certifikater, eller at c_rehash skal køres på certifikatmappen. For detaljer så se venligst dokumentationen for --sslcertpath og --sslcertfile i manualsiden.\n"
 
-#: socket.c:1106
+#: socket.c:902
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert værdi til SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-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 "Dit operativsystem understøtter ikke SSLv2.\n"
 
-#: socket.c:1273
+#: socket.c:923
 #, 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 "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:1280
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
-msgstr ""
-"Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget "
-"over!\n"
+msgstr "Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget over!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Advarsel: Forbindelsen er usikker, fortsætter alligevel. (Brug hellere --"
-"sslcertck!)\n"
+#: socket.c:1039
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Advarsel: Forbindelsen er usikker, fortsætter alligevel. (Brug hellere --sslcertck!)\n"
 
-#: socket.c:1339
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr "Forsøger igen at læse cygwin-sokkel\n"
 
-#: socket.c:1342
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Forsøg på at læse cygwin-sokkel mislykkedes!\n"
 
@@ -3417,160 +3081,146 @@ msgstr "fandt \"Received\"-adresse `%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"ukorrekt brevhovedlinje fundet - se manualside for bad-header-tilvalg\n"
+msgstr "ukorrekt brevhovedlinje fundet - se manualside for bad-header-tilvalg\n"
 
 #: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "linje: %s"
 
-#: transact.c:1087 transact.c:1097
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Fortolker kuvert »%s« navne \"%-.*s\"\n"
 
-#: transact.c:1112
+#: transact.c:1132
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Fortolker modtagne navne \"%-.*s\"\n"
 
-#: transact.c:1124
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Ingen kuvertmodtager fundet, falder tilbage til brevhovedgæt.\n"
 
-#: transact.c:1142
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Gætter fra hoved \"%-.*s\".\n"
 
-#: transact.c:1157
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1172
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1283
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1302
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erklærede lokale navne"
 
-#: transact.c:1309
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1318
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1326
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1376
+#: transact.c:1493
 msgid "error writing message text\n"
 msgstr "fejl ved skrivning af beskedtekst\n"
 
-#: transact.c:1652
+#: transact.c:1641
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-"Mellemlager for lille. Dette er en fejl i kaldeprogrammet for %s:%lu.\n"
-
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: fejl under læsning af låsefil »%s«: %s\n"
+msgstr "Mellemlager for lille. Dette er en fejl i kaldeprogrammet for %s:%lu.\n"
 
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:249
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "Gammel UID-liste fra %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <tom>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Liste af øvrige UID'er:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:325 uid.c:374
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Sammenføj UID-liste fra %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:328
+#, c-format
+msgid "New UID list from %s:"
 msgstr "Ny UID-liste fra %s:"
 
-#: uid.c:402
+#: uid.c:355
+msgid "swapping UID lists\n"
+msgstr "ombytter UID-lister\n"
+
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "ombytter ikke UID-lister, ingen UID'er set ved denne forespørgsel\n"
 
-#: uid.c:422
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr "fjerner ny UID-liste\n"
 
-#: uid.c:479
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Sletter fetchids-fil\n"
 
-#: uid.c:482
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fejl ved sletning af %s: %s\n"
 
-#: uid.c:489
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Skriver fetchids-fil.\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:439 uid.c:447
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Skriver fejl til fetchids-fil %s: %s\n"
 
-#: uid.c:524
+#: uid.c:459
 #, 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:528
+#: uid.c:463
 #, 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:532
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Kan ikke åbne fetchids-fil %s for skrivning: %s\n"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc mislykkedes\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 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"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Gemt fejlkode er stadig %d\n"
-
-#~ msgid "swapping UID lists\n"
-#~ msgstr "ombytter UID-lister\n"
-
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "ukendt udsteder (de første %d tegn): %s\n"
diff --git a/po/de.po b/po/de.po
index 50a08da8..2fb0f49e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-25 14:50+0100\n"
 "PO-Revision-Date: 2020-10-15 19:57+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 43578a53..39d97c26 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,16 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
-"Language: en_GB\n"
+"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"
 
 #: checkalias.c:174
@@ -31,17 +30,17 @@ msgstr "Yes, their IP addresses match\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "No, their IP addresses don't match\n"
 
-#: checkalias.c:207
+#: checkalias.c:198
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "nameserver failure while looking for '%s' during poll of %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "nameserver failure while looking for `%s' during poll of %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "could not decode BASE64 challenge\n"
 
@@ -50,155 +49,142 @@ msgstr "could not decode BASE64 challenge\n"
 msgid "decoded as %s\n"
 msgstr "decoded as %s\n"
 
-#: driver.c:199
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos error %s\n"
 
-#: driver.c:259 driver.c:265
-#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s']\n"
+#: driver.c:249 driver.c:254
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server says '%*s'] \n"
 
-#: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+#: driver.c:335
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: Fetchmail oversized-messages warning"
 
-#: driver.c:349
+#: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr "The following oversized messages were deleted on server %s account %s:"
 
-#: driver.c:353
+#: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
 msgstr "The following oversized messages remain on server %s account %s:"
 
-#: driver.c:372
-#, fuzzy, c-format
-msgid "  %d message  %d octets long deleted by fetchmail."
-msgid_plural "  %d messages %d octets long deleted by fetchmail."
-msgstr[0] "  %d msg %d octets long deleted by fetchmail."
-msgstr[1] "  %d msg %d octets long deleted by fetchmail."
+#: driver.c:362
+#, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "  %d msg %d octets long deleted by fetchmail."
 
-#: driver.c:377
-#, fuzzy, c-format
-msgid "  %d message  %d octets long skipped by fetchmail."
-msgid_plural "  %d messages %d octets long skipped by fetchmail."
-msgstr[0] "  %d msg %d octets long skipped by fetchmail."
-msgstr[1] "  %d msg %d octets long skipped by fetchmail."
+#: driver.c:366
+#, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
+msgstr "  %d msg %d octets long skipped by fetchmail."
 
-#: driver.c:522
+#: driver.c:501
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "skipping message %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:555
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "skipping message %s@%s:%d (%d octets)"
 
-#: driver.c:593
+#: driver.c:571
 msgid " (length -1)"
 msgstr " (length -1)"
 
-#: driver.c:596
+#: driver.c:574
 msgid " (oversized)"
 msgstr " (oversized)"
 
-#: driver.c:614
+#: driver.c:589
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 
-#: driver.c:632
+#: driver.c:606
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "reading message %s@%s:%d of %d"
 
-#: driver.c:637
+#: driver.c:611
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octets)"
 
-#: driver.c:638
+#: driver.c:612
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d header octets)"
 
-#: driver.c:708
+#: driver.c:682
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d body octets)"
 
-#: driver.c:770
+#: driver.c:743
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 
-#: driver.c:802
+#: driver.c:774
 msgid " retained\n"
 msgstr " retained\n"
 
-#: driver.c:812
+#: driver.c:784
 msgid " flushed\n"
 msgstr " flushed\n"
 
-#: driver.c:824
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " not flushed\n"
 
-#: driver.c:842
+#: driver.c:819
 #, 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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgstr[1] "fetchlimit %d reached; %d messages left on server %s account %s\n"
 
-#: driver.c:899
+#: driver.c:876
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "timeout after %d seconds waiting to connect to server %s.\n"
 
-#: driver.c:903
+#: driver.c:880
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "timeout after %d seconds waiting for server %s.\n"
 
-#: driver.c:907
+#: driver.c:884
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "timeout after %d seconds waiting for %s.\n"
 
-#: driver.c:912
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "timeout after %d seconds waiting for listener to respond.\n"
 
-#: driver.c:915
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "timeout after %d seconds.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:904
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail sees repeated timeouts"
 
-#: driver.c:930
+#: driver.c:907
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:911
 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"
@@ -214,73 +200,73 @@ msgstr ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 
-#: driver.c:960
-#, fuzzy, c-format
-msgid "pre-connection command terminated with signal %d\n"
-msgstr "pre-connection command failed with status %d\n"
-
-#: driver.c:963
+#: driver.c:936
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-connection command failed with status %d\n"
 
-#: driver.c:987
+#: driver.c:960
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "couldn't find HESIOD pobox for %s\n"
 
-#: driver.c:1008
+#: driver.c:981
 msgid "Lead server has no name.\n"
 msgstr "Lead server has no name.\n"
 
-#: driver.c:1035
+#: driver.c:1005
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "couldn't find canonical DNS name of %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1052
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s connection to %s failed"
 
-#: driver.c:1111
+#: driver.c:1068
+msgid "Subject: Fetchmail unreachable-server warning."
+msgstr "Subject: Fetchmail unreachable-server warning."
+
+#: driver.c:1070
+#, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail could not reach the mail server %s:"
+
+#: driver.c:1096 imap.c:423 pop3.c:465
 msgid "SSL connection failed.\n"
 msgstr "SSL connection failed.\n"
 
-#: driver.c:1166
+#: driver.c:1149
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-busy error on %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1153
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server busy error on %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1158
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authorisation failure on %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1161
 msgid " (previously authorized)"
 msgstr " (previously authorised)"
 
-#: 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:1182
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail authentication failed on %s@%s"
 
-#: driver.c:1206
+#: driver.c:1186
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail could not get mail from %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1190
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -294,7 +280,7 @@ msgstr ""
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
 "error message."
 
-#: driver.c:1216
+#: driver.c:1196
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -314,7 +300,7 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1226
+#: driver.c:1206
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -334,182 +320,172 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1242
+#: driver.c:1222
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Repoll immediately on %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1227
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unknown login or authentication error on %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1251
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authorisation OK on %s@%s\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1257
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail authentication OK on %s@%s"
 
-#: driver.c:1281
+#: driver.c:1261
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail was able to log into %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1265
 msgid "Service has been restored.\n"
 msgstr "Service has been restored.\n"
 
-#: driver.c:1318
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecting or re-polling folder %s\n"
 
-#: driver.c:1320
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "selecting or re-polling default folder\n"
 
-#: driver.c:1332
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s at %s (folder %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1314 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
-#: driver.c:1340
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polling %s\n"
 
-#: driver.c:1344
+#: driver.c:1323
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d message (%d %s) for %s"
 msgstr[1] "%d messages (%d %s) for %s"
 
-#: driver.c:1347
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "seen"
 msgstr[1] "seen"
 
-#: driver.c:1350
+#: driver.c:1329
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d message for %s"
 msgstr[1] "%d messages for %s"
 
-#: driver.c:1357
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1363
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No mail for %s\n"
 
-#: driver.c:1396
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "bogus message count!"
 
-#: 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:1517
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1552
+#: driver.c:1520
 msgid "missing or bad RFC822 header"
 msgstr "missing or bad RFC822 header"
 
-#: driver.c:1555
+#: driver.c:1523
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1526
 msgid "client/server synchronization"
 msgstr "client/server synchronisation"
 
-#: driver.c:1561
+#: driver.c:1529
 msgid "client/server protocol"
 msgstr "client/server protocol"
 
-#: driver.c:1564
+#: driver.c:1532
 msgid "lock busy on server"
 msgstr "lock busy on server"
 
-#: driver.c:1567
+#: driver.c:1535
 msgid "SMTP transaction"
 msgstr "SMTP transaction"
 
-#: driver.c:1570
+#: driver.c:1538
 msgid "DNS lookup"
 msgstr "DNS lookup"
 
-#: driver.c:1573
+#: driver.c:1541
 msgid "undefined"
 msgstr "undefined"
 
-#: driver.c:1579
+#: driver.c:1547
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 
-#: driver.c:1581
+#: driver.c:1549
 msgid "unknown"
 msgstr "unknown"
 
-#: driver.c:1583
+#: driver.c:1551
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s error while fetching from %s@%s\n"
 
-#: driver.c:1595
-#, fuzzy, c-format
-msgid "post-connection command terminated with signal %d\n"
-msgstr "post-connection command failed with status %d\n"
-
-#: driver.c:1597
+#: driver.c:1562
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "post-connection command failed with status %d\n"
 
-#: driver.c:1616
+#: driver.c:1581
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 support not linked.\n"
 
-#: driver.c:1624
+#: driver.c:1589
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 support not linked.\n"
 
-#: driver.c:1635
+#: driver.c:1600
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush is not supported with %s\n"
 
-#: driver.c:1641
+#: driver.c:1606
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all is not supported with %s\n"
 
-#: driver.c:1650
+#: driver.c:1615
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit is not supported with %s\n"
 
-#: env.c:58
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -524,63 +500,51 @@ msgstr ""
 "Try \"env QMAILINJECT= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 
-#: env.c:70
+#: env.c:71
 #, 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 ""
 "%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"
 
-#: env.c:82
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: You don't exist.  Go away.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: can't determine your host!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:168
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname failed for %s\n"
 
-#: env.c:225
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "Cannot find my own host in hosts database to qualify it!\n"
 
-#: env.c:229
+#: env.c:174
 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 ""
 "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"
 
-#: etrn.c:49 odmr.c:61
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "%s's SMTP listener does not support ESMTP\n"
@@ -644,21 +608,17 @@ msgstr "Option --folder is not supported with ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Option --check is not supported with ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: fetchmail.c:132
 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 - %d Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
-"Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:148
+#: fetchmail.c:136
 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"
@@ -668,1010 +628,873 @@ msgstr ""
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:170
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WARNING: Running as root is discouraged.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:182
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invoked with"
 
-#: fetchmail.c:223
+#: fetchmail.c:206
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:268
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "This is fetchmail release %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:383
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:384
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:475
+#: fetchmail.c:389
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:410
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:422
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:514
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
+#: fetchmail.c:428
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:429 fetchmail.c:438
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:429 fetchmail.c:438
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:523
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:437
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+#: fetchmail.c:460
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: can't check mail while another fetchmail to same host is running.\n"
 
-#: fetchmail.c:552
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+#: fetchmail.c:466
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:559
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:473
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: another foreground fetchmail is running at %d.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+#: fetchmail.c:483
+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:581
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:489
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:593
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
+#: fetchmail.c:501
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:516
 #, 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:612
+#: fetchmail.c:520
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:545 fetchmail.c:581
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+
+#: fetchmail.c:557
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:658
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:561
+#, c-format
+msgid "starting fetchmail %s daemon \n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:674 fetchmail.c:676
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:577 fetchmail.c:579
+#, c-format
+msgid "could not open %s to append logs to \n"
 msgstr "could not open %s to append logs to \n"
 
-#: fetchmail.c:695
-msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
-
-#: fetchmail.c:717
+#: fetchmail.c:618
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:623
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:628
 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:752
+#: fetchmail.c:655
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:683
 #, 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:794
+#: fetchmail.c:695
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:733
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:735
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:737
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:739
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:741
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:743
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:745
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:747
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:749
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:751
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:753
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:755
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:757
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:759
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:761
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:807
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:814
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:838
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:841
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:848
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:854
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1006
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1039
 #, 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:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
+#: fetchmail.c:1072
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1194
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1324
-#, fuzzy
-msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1330
-#, fuzzy
-msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1336
-#, fuzzy
-msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1366
+#: fetchmail.c:1225
 #, 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"
+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:1377
+#: fetchmail.c:1236
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1237
 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:1395
+#: fetchmail.c:1254
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"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: %s configuration invalid, specify positive port number for service or port\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1261
 #, 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:1420
+#: fetchmail.c:1279
 #, 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:1434
+#: fetchmail.c:1293
 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:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1318
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1391
 #, 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:1566
+#: fetchmail.c:1416
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1428
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1438
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1444
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1452
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1459
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1469
 #, 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:1645
+#: fetchmail.c:1486
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1488
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1490
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1493
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1496
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1498
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1500
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1504
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1506
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1668
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-
-#: fetchmail.c:1670
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "Fetchmail will direct error mail to the sender.\n"
-
-#: fetchmail.c:1677
+#: fetchmail.c:1513
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1517
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1520
 #, 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:1688
+#: fetchmail.c:1524
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1527
 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:1692
+#: fetchmail.c:1528
 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:1696
+#: fetchmail.c:1532
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1536
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1539
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1542
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1551
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1554
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1556
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1572
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1575
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1578
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1745
-#, fuzzy
-msgid "  CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1581
+msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1584
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1587
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1590
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1593
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1597
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1600
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1602
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1604
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  SSL server certificate checking enabled.\n"
-
-#: fetchmail.c:1773
-#, fuzzy, c-format
-msgid "  SSL trusted certificate file: %s\n"
-msgstr "  SSL trusted certificate directory: %s\n"
-
-#: fetchmail.c:1775
+#: fetchmail.c:1606
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1777
-#, fuzzy, c-format
-msgid "  SSL server CommonName: %s\n"
-msgstr "Server CommonName: %s\n"
-
-#: fetchmail.c:1779
+#: fetchmail.c:1609
 #, 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:1782
+#: fetchmail.c:1612
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1614
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1621
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1626
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1632
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1633
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1635
 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:1806
+#: fetchmail.c:1636
 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:1808
+#: fetchmail.c:1638
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  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:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1639
+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:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+#: fetchmail.c:1641
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1642
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1644
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1645
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1647
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1648
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1650
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1651
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1653
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1654
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1656
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1657
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1659
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1660
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1662
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1663
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1665
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1666
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1670
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1673
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1675
 #, 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:1848
+#: fetchmail.c:1678
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1681
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1684
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1686
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1689
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1693
 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:1865
+#: fetchmail.c:1695
 #, 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"
+msgstr "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1698
 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:1870
+#: fetchmail.c:1700
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1702
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1706
 #, 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:1878
+#: fetchmail.c:1708
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1715
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1720 fetchmail.c:1740
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1725
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1734
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1745
 #, 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:1918
+#: fetchmail.c:1748
 #, 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:1927
+#: fetchmail.c:1757
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1763
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1766
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1769
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1771
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1774
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1777
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1787
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1789
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1791
 #, 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:1976
+#: fetchmail.c:1806
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1807
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1811
+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:1983
+#: fetchmail.c:1813
 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:1986
+#: fetchmail.c:1816
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1819
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1822
 #, 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:1995
+#: fetchmail.c:1825
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1828
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1835
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1844
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1854
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1856
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1858
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1860
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1864
 #, 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:2033
+#: fetchmail.c:1866
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1868
 #, 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:2037
+#: fetchmail.c:1870
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1875
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1884
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1892
 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:2055
-#, fuzzy
-msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
+#: fetchmail.c:1894
+msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-
-#: fetchmail.c:2060
-msgid "  Messages with bad headers will be rejected.\n"
-msgstr ""
-
-#: fetchmail.c:2063
-msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
+"  No poll trace information will be added to the Received header.\n"
+".\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:1897
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERROR: no support for getpassword() routine\n"
@@ -1684,88 +1507,55 @@ msgstr ""
 "\n"
 "Caught SIGINT... bailing out.\n"
 
-#: gssapi.c:53
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:56
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "%cMTP error: %s\n"
-
-#: gssapi.c:91
+#: gssapi.c:66
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Couldn't get service name for [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Using service name [%s]\n"
 
-#: gssapi.c:123
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:160
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:170
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Sending credentials\n"
 
-#: gssapi.c:201
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Error exchanging credentials\n"
 
-#: gssapi.c:243
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "Couldn't unwrap security level data\n"
 
-#: gssapi.c:248
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Credential exchange complete\n"
 
-#: gssapi.c:252
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server requires integrity and/or privacy\n"
 
-#: gssapi.c:261
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Unwrapped security level flags: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximum GSS token size is %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Error creating security level request\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Releasing GSS credentials\n"
 
-#: gssapi.c:302
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Error releasing credentials\n"
 
@@ -1774,132 +1564,94 @@ msgstr "Error releasing credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread sleeping for %d sec.\n"
 
-#: imap.c:75
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:97
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "bogus message count!"
-
-#: imap.c:144
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:355
+#: imap.c:316
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:361
+#: imap.c:322
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:368
+#: imap.c:329
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:344
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: 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:482 pop3.c:480
-#, fuzzy, c-format
-msgid "%s: upgrade to TLS failed.\n"
-msgstr "%s: opportunistic upgrade to TLS.\n"
-
-#: 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:502
+#: imap.c:427 pop3.c:469
 #, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
+msgid "%s: opportunistic upgrade to TLS.\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:607
+#: imap.c:540
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:562 pop3.c:372
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:691
+#: imap.c:571
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Required LOGIN capability not supported by server\n"
+
+#: imap.c:645
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:818
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu is unseen\n"
-
-#: 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:903 imap.c:962
+#: imap.c:749 imap.c:808
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:911 imap.c:967
+#: imap.c:757 imap.c:813
 #, 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:928
+#: imap.c:774
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:932
+#: imap.c:778
 #, 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:946
+#: imap.c:792
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:950
+#: imap.c:796
 #, 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:989
+#: imap.c:838
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:866
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu is unseen\n"
+
+#: imap.c:878 pop3.c:788
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-
-#: imap.c:1177 imap.c:1184
-#, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+#: imap.c:969
+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"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1937,44 +1689,44 @@ msgstr "No interface found with name %s"
 msgid "No IP address found for %s"
 msgstr "No IP address found for %s"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "missing IP interface address\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "invalid IP interface address\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "invalid IP interface mask\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "skipping poll of %s, %s down\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "skipping poll of %s, %s IP address excluded\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "skipping poll of %s, %s inactive\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "activity on %s was %d, is %d\n"
@@ -1983,817 +1735,684 @@ msgstr "activity on %s was %d, is %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "could not decode initial BASE64 challenge\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "principal %s in ticket does not match -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "non-null instance (%s) might cause strange behavior\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "could not decode BASE64 ready response\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "challenge mismatch\n"
 
-#: lock.c:87
+#: lock.c:86
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
 
-#: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+#: lock.c:96
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: removing stale lockfile\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:106
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:153
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: lock creation failed.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: warning: found \"%s\" before any host names\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: warning: unknown token \"%s\"\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
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "%s's SMTP listener does not support ATRN\n"
 
-#: odmr.c:105
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "Turnaround now...\n"
 
-#: odmr.c:110
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "ATRN request refused.\n"
 
-#: odmr.c:114
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "Unable to process ATRN request now\n"
 
-#: odmr.c:119
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "You have no mail.\n"
 
-#: odmr.c:123
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Command not implemented\n"
 
-#: odmr.c:127
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Authentication required.\n"
 
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:130
+#, c-format
+msgid "Unknown ODMR error %d\n"
 msgstr "Unknown ODMR error %d\n"
 
-#: odmr.c:192
+#: odmr.c:189
 msgid "receiving message data\n"
 msgstr "receiving message data\n"
 
-#: odmr.c:245
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Option --keep is not supported with ODMR\n"
 
-#: odmr.c:249
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Option --flush is not supported with ODMR\n"
 
-#: odmr.c:253
+#: odmr.c:250
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "Option --folder is not supported with ODMR\n"
 
-#: odmr.c:257
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Option --check is not supported with ODMR\n"
 
-#: opie.c:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Could not decode OTP challenge\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:552
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
-#: options.c:179 options.c:223
+#: options.c:166 options.c:210
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is not a valid number string.\n"
 
-#: options.c:188
+#: options.c:175
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Value of string '%s' is %s than %d.\n"
 
-#: options.c:189
+#: options.c:176
 msgid "smaller"
 msgstr "smaller"
 
-#: options.c:189
+#: options.c:176
 msgid "larger"
 msgstr "larger"
 
 #: options.c:337
-#, fuzzy, c-format
-msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr "Invalid protocol `%s' specified.\n"
-
-#: options.c:378
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Invalid protocol `%s' specified.\n"
 
-#: options.c:425
+#: options.c:384
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Invalid authentication `%s' specified.\n"
 
-#: options.c:641
+#: options.c:585
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [options] [server ...]\n"
 
-#: options.c:642
+#: options.c:586
 msgid "  Options are as follows:\n"
 msgstr "  Options are as follows:\n"
 
-#: options.c:643
+#: options.c:587
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        display this option help\n"
 
-#: options.c:644
+#: options.c:588
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     display version info\n"
 
-#: options.c:646
+#: options.c:590
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       check for messages without fetching\n"
 
-#: options.c:647
+#: options.c:591
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      work silently\n"
 
-#: options.c:648
+#: options.c:592
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     work noisily (diagnostic output)\n"
 
-#: options.c:649
+#: options.c:593
 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:650
+#: options.c:594
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    don't detach daemon process\n"
 
-#: options.c:651
+#: options.c:595
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        kill daemon process\n"
 
-#: options.c:652
+#: options.c:596
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specify logfile name\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-
-#: options.c:654
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:597
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 
-#: options.c:655
+#: options.c:598
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   don't write Received & enable host spoofing\n"
 
-#: options.c:656
+#: options.c:599
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specify alternate run control file\n"
 
-#: options.c:657
+#: options.c:600
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specify alternate UIDs file\n"
 
-#: options.c:658
+#: options.c:601
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specify alternate PID (lock) file\n"
 
-#: options.c:659
+#: options.c:602
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specify recipient of last resort\n"
 
-#: options.c:660
+#: options.c:603
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirect bounces from user to postmaster.\n"
 
-#: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-
-#: options.c:664
+#: options.c:605
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:665
+#: options.c:606
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor interface for activity\n"
 
-#: options.c:668
+#: options.c:609
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         enable ssl encrypted session\n"
 
-#: options.c:669
+#: options.c:610
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl private key file\n"
 
-#: options.c:670
+#: options.c:611
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl client certificate\n"
 
-#: options.c:671
+#: options.c:612
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
 
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
-
-#: options.c:673
-#, fuzzy
-msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
+#: options.c:613
+msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath path to ssl certificates\n"
 
-#: options.c:674
-#, fuzzy
-msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr "      --sslcertpath path to ssl certificates\n"
-
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
+#: options.c:614
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 
-#: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:615
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:617
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specify external command to open connection\n"
 
-#: options.c:680
+#: options.c:618
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     specify external command to open smtp connection\n"
 
-#: options.c:681
-msgid ""
-"      --bad-header {reject|accept}\n"
-"                    specify policy for handling messages with bad headers\n"
-msgstr ""
-
-#: options.c:684
-#, fuzzy
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
+#: options.c:620
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specify retrieval protocol (see man page)\n"
 
-#: options.c:685
+#: options.c:621
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 
-#: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:622
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        TCP port to connect to (obsolete, use --service)\n"
 
-#: 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:623
+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:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
+#: options.c:624
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:625
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server nonresponse timeout\n"
 
-#: options.c:691
+#: options.c:626
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelope address header\n"
 
-#: options.c:692
+#: options.c:627
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix to remove from local user id\n"
 
-#: options.c:693
+#: options.c:628
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   mail service principal\n"
 
-#: options.c:694
+#: options.c:629
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  add poll-tracing information to Received header\n"
 
-#: options.c:696
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:631
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specify users's login on server\n"
 
-#: options.c:697
+#: options.c:632
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  retrieve old and new messages\n"
 
-#: options.c:698
+#: options.c:633
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      delete new messages after retrieval\n"
 
-#: options.c:699
+#: options.c:634
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        save new messages after retrieval\n"
 
-#: options.c:700
+#: options.c:635
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       delete old messages from server\n"
 
-#: options.c:701
+#: options.c:636
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  delete oversized messages\n"
 
-#: options.c:702
+#: options.c:637
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   don't rewrite header addresses\n"
 
-#: options.c:703
+#: options.c:638
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       don't fetch messages over given size\n"
 
-#: options.c:704
+#: options.c:639
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval between warning mail notification\n"
 
-#: options.c:706
+#: options.c:641
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    set SMTP forwarding host\n"
 
-#: options.c:707
+#: options.c:642
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains fetch mail for specified domains\n"
 
-#: options.c:708
+#: options.c:643
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress set SMTP delivery domain to use\n"
 
-#: options.c:709
+#: options.c:644
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    set SMTP full name username@domain\n"
 
-#: options.c:710
+#: options.c:645
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   set antispam response values\n"
 
-#: options.c:711
+#: options.c:646
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  set batch limit for SMTP connections\n"
 
-#: options.c:712
+#: options.c:647
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  set fetch limit for server connections\n"
 
-#: options.c:713
+#: options.c:648
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit set fetch message size limit\n"
 
-#: options.c:714
+#: options.c:649
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    do a binary search for UIDLs\n"
 
-#: options.c:715
+#: options.c:650
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:716
+#: options.c:651
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         set MDA to use for forwarding\n"
 
-#: options.c:717
+#: options.c:652
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       set output BSMTP file\n"
 
-#: options.c:718
+#: options.c:653
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        use LMTP (RFC2033) for delivery\n"
 
-#: options.c:719
+#: options.c:654
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specify remote folder name\n"
 
-#: options.c:720
+#: options.c:655
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    show progress dots even in logfiles\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
-
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
-
-#: pop3.c:414
-msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-
-#: pop3.c:415
-msgid "The CAPA command is however necessary for TLS.\n"
-msgstr ""
-
-#: 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:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
-msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
+#: pop3.c:342
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
 
-#: pop3.c:637
+#: pop3.c:590
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Required APOP timestamp not found in greeting\n"
 
-#: pop3.c:646
+#: pop3.c:599
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Timestamp syntax error in greeting\n"
 
-#: pop3.c:662
-msgid "Invalid APOP timestamp.\n"
-msgstr ""
-
-#: pop3.c:686
+#: pop3.c:621
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Undefined protocol request in POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:629
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy!  Is another session active?\n"
 
-#: pop3.c:770
+#: pop3.c:708
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Cannot handle UIDL response from upstream server.\n"
 
-#: pop3.c:793
+#: pop3.c:731
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server responded with UID for wrong message.\n"
 
-#: pop3.c:822
-#, fuzzy, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
+#: pop3.c:758 pop3.c:1004
+#, 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:934
+#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u is unseen\n"
+
+#: pop3.c:864
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
 
-#: pop3.c:1032
+#: pop3.c:956
 msgid "protocol error\n"
 msgstr "protocol error\n"
 
-#: pop3.c:1048
+#: pop3.c:972
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocol error while fetching UIDLs\n"
 
-#: 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:1389
+#: pop3.c:1342
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "server option after user options"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "SDPS not enabled."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:213
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:220
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL is not enabled"
 
-#: rcfile_y.y:391
+#: rcfile_y.y:382
 msgid "end of input"
 msgstr "end of input"
 
-#: rcfile_y.y:429
+#: rcfile_y.y:419
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "File %s must be a regular file.\n"
 
-#: rcfile_y.y:439
-#, fuzzy, c-format
-msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+#: rcfile_y.y:429
+#, c-format
+msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 
-#: rcfile_y.y:451
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "File %s must be owned by you.\n"
 
-#: report.c:67
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: report.c:92
-#, fuzzy, c-format
-msgid "%s (log message incomplete)\n"
+#: report.c:104
+#, c-format
+msgid "%s (log message incomplete)"
 msgstr "%s (log message incomplete)"
 
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: rfc822.c:76
+#, c-format
+msgid "About to rewrite %s"
 msgstr "About to rewrite %s"
 
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:212
+#, c-format
+msgid "Rewritten version is %s\n"
 msgstr "Rewritten version is %s\n"
 
-#: rpa.c:118
+#: rpa.c:117
 msgid "Success"
 msgstr "Success"
 
-#: rpa.c:119
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Restricted user (something wrong with account)"
 
-#: rpa.c:120
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Invalid userid or passphrase"
 
-#: rpa.c:121
+#: rpa.c:120
 msgid "Deity error"
 msgstr "Deity error"
 
-#: rpa.c:174
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 decode error\n"
 
-#: rpa.c:185
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service chose RPA version %d.%d\n"
 
-#: rpa.c:191
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service challenge (l=%d):\n"
 
-#: rpa.c:200
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service timestamp %s\n"
 
-#: rpa.c:205
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2 length error\n"
 
-#: rpa.c:209
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Realm list: %s\n"
 
-#: rpa.c:213
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "RPA error in service@realm string\n"
 
-#: rpa.c:250
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 decode error\n"
 
-#: rpa.c:261
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "User authentication (l=%d):\n"
 
-#: rpa.c:275
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA status: %02X\n"
 
-#: rpa.c:281
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4 length error\n"
 
-#: rpa.c:288
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA rejects you: %s\n"
 
-#: rpa.c:290
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA rejects you, reason unknown\n"
 
-#: rpa.c:298
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA User Authentication length error: %d\n"
 
-#: rpa.c:303
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Session key length error: %d\n"
 
-#: rpa.c:309
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth fail. Spoof server?\n"
 
-#: rpa.c:314
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Session key established:\n"
 
-#: rpa.c:345
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "RPA authorisation complete\n"
 
-#: rpa.c:372
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "Get response\n"
 
-#: rpa.c:402
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Get response return %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Hdr not 60\n"
 
-#: rpa.c:484
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Token length error\n"
 
-#: rpa.c:489
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Token Length %d disagrees with rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "Mechanism field incorrect\n"
 
-#: rpa.c:531
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64 error at char %d: %x\n"
 
-#: rpa.c:546
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Inbound binary data:\n"
 
-#: rpa.c:582
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Outbound data:\n"
 
-#: rpa.c:645
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "RPA String too long\n"
 
-#: rpa.c:650
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:709
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA Failed open of /dev/urandom. This shouldn't\n"
 
-#: rpa.c:710
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    prevent you logging in, but means you\n"
 
-#: rpa.c:711
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    cannot be sure you are talking to the\n"
 
-#: rpa.c:712
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    service that you think you are (replay\n"
 
-#: rpa.c:713
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    attacks by a dishonest service are possible.)\n"
 
-#: rpa.c:724
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "User challenge:\n"
 
-#: rpa.c:874
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 being applied to data block:\n"
 
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:886
+msgid "MD5 result is: \n"
 msgstr "MD5 result is: \n"
 
 #: servport.c:53
@@ -2810,520 +2429,340 @@ msgstr "Cannot resolve service %s to port number.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Please specify the service as decimal port number.\n"
 
-#: sink.c:231
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "forwarding to %s\n"
 
-#: sink.c:319
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message body)\n"
 
-#: sink.c:322
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "mail from %s bounced to %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:442
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Saved error is still %d\n"
+
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP error: %s\n"
 
-#: sink.c:535
-msgid "SMTP server requires STARTTLS, keeping message.\n"
-msgstr ""
-
-#: sink.c:714
-#, fuzzy, c-format
-msgid "BSMTP file open failed: %s\n"
-msgstr "BSMTP file open or preamble write failed\n"
-
-#: sink.c:760
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
+#: sink.c:752
+msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:974
+#: sink.c:967
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:981
+#: sink.c:974
 #, 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:1027
+#: sink.c:1020
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1039
+#: sink.c:1032
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1045
+#: sink.c:1038
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: 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
+#: sink.c:1194
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
-#: 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:1234
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
-#: sink.c:1241
+#: sink.c:1218
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1280
+#: sink.c:1255
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1304
+#: sink.c:1279
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: 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:1387
+#: sink.c:1341
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1344
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1393
+#: sink.c:1347
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1396
+#: sink.c:1350
 #, 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"
+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:1421
+#: sink.c:1372
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "Message termination or close of BSMTP file failed\n"
+
+#: sink.c:1394
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1451
+#: sink.c:1424
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1454
+#: sink.c:1427
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1582
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "The Fetchmail Daemon"
 
-#: smtp.c:81
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5 Authentication...\n"
 
-#: smtp.c:87 smtp.c:137
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Server rejected the AUTH command.\n"
 
-#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Bad base64 reply from server.\n"
 
-#: smtp.c:99
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Challenge decoded: %s\n"
 
-#: smtp.c:116
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN Authentication...\n"
 
-#: smtp.c:131
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Authentication...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "smtp listener protocol error\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc failed\n"
 
-#: socket.c:173
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair failed\n"
 
-#: socket.c:179
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork failed\n"
 
-#: socket.c:186
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 failed\n"
 
-#: socket.c:192
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "running %s (host %s service %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) failed\n"
 
-#: socket.c:272
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:275
+#: socket.c:285
 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:289 socket.c:292
+#: socket.c:296 socket.c:299
 #, c-format
 msgid "unknown (%s)"
 msgstr "unknown (%s)"
 
-#: socket.c:295
+#: socket.c:302
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Trying to connect to %s/%s..."
 
-#: socket.c:304
+#: socket.c:310
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "cannot create socket: %s\n"
 
-#: socket.c:306
-#, fuzzy, c-format
-msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr "cannot create socket: %s\n"
-
-#: socket.c:324
+#: socket.c:326
 msgid "connection failed.\n"
 msgstr "connection failed.\n"
 
-#: socket.c:326
+#: socket.c:328
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
 
-#: socket.c:327
-#, 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:333
+#: socket.c:334
 msgid "connected.\n"
 msgstr "connected.\n"
 
-#: socket.c:346
-#, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
-
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "Server certificate verification error: %s\n"
-
-#: socket.c:662
-#, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-
-#: socket.c:665
-#, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
-
-#: socket.c:671
+#: socket.c:660
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Issuer Organisation: %s\n"
 
-#: socket.c:674
+#: socket.c:662
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
 
-#: socket.c:676
+#: socket.c:664
 msgid "Unknown Organization\n"
 msgstr "Unknown Organisation\n"
 
-#: socket.c:678
+#: socket.c:666
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:681
+#: socket.c:668
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Warning: Issuer CommonName too long (possibly truncated).\n"
 
-#: socket.c:683
+#: socket.c:670
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unknown Issuer CommonName\n"
 
-#: socket.c:689
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "Issuer CommonName: %s\n"
-
-#: socket.c:695
-msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "Bad certificate: Subject CommonName too long!\n"
-
-#: socket.c:701
-#, fuzzy
-msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "Bad certificate: Subject CommonName too long!\n"
-
-#: socket.c:729
+#: socket.c:674
 #, c-format
-msgid "Subject Alternative Name: %s\n"
-msgstr ""
+msgid "Server CommonName: %s\n"
+msgstr "Server CommonName: %s\n"
 
-#: socket.c:735
-#, fuzzy
-msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+#: socket.c:678
+msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:752
+#: socket.c:724
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server CommonName mismatch: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:730
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server name not set, could not verify certificate!\n"
 
-#: socket.c:764
+#: socket.c:735
 msgid "Unknown Server CommonName\n"
 msgstr "Unknown Server CommonName\n"
 
-#: socket.c:766
+#: socket.c:737
 msgid "Server name not specified in certificate!\n"
 msgstr "Server name not specified in certificate!\n"
 
-#: socket.c:778
+#: socket.c:749
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() failed!\n"
 
-#: socket.c:782
+#: socket.c:753
 msgid "Out of memory!\n"
 msgstr "Out of memory!\n"
 
-#: socket.c:790
+#: socket.c:761
 msgid "Digest text buffer too small!\n"
 msgstr "Digest text buffer too small!\n"
 
-#: socket.c:796
+#: socket.c:767
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s key fingerprint: %s\n"
 
-#: socket.c:800
+#: socket.c:771
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingerprints match.\n"
 
-#: socket.c:802
+#: socket.c:773
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingerprints do not match!\n"
 
-#: socket.c:814
+#: socket.c:782
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Server certificate verification error: %s\n"
-
-#: socket.c:831
-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:841
+#: socket.c:788
 #, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
-
-#: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "unknown issuer (first %d characters): %s\n"
 
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, 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:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1106
+#: socket.c:875
 msgid "File descriptor out of range for SSL"
 msgstr "File descriptor out of range for SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
+#: socket.c:891
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1273
-#, 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 "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 
-#: socket.c:1280
+#: socket.c:964
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certificate/fingerprint verification was somehow skipped!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-
-#: socket.c:1339
+#: socket.c:1042
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin socket read retry\n"
 
-#: socket.c:1342
+#: socket.c:1045
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin socket read retry failed!\n"
 
-#: transact.c:79
+#: transact.c:67
 #, c-format
 msgid "mapped address %s to local %s\n"
 msgstr "mapped address %s to local %s\n"
 
-#: transact.c:101
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "mapped %s to local %s\n"
 
-#: transact.c:168
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "passed through %s matching %s\n"
 
-#: transact.c:240
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -3332,198 +2771,139 @@ msgstr ""
 "analyzing Received line:\n"
 "%s"
 
-#: transact.c:279
+#: transact.c:265
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "line accepted, %s is an alias of the mailserver\n"
 
-#: transact.c:285
+#: transact.c:271
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "line rejected, %s is not an alias of the mailserver\n"
 
-#: transact.c:359
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "no Received address found\n"
 
-#: transact.c:368
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "found Received address `%s'\n"
 
-#: transact.c:613
-#, fuzzy
-msgid "incorrect header line found - see manpage for bad-header option\n"
+#: transact.c:551
+msgid "message delimiter found while scanning headers\n"
+msgstr "message delimiter found while scanning headers\n"
+
+#: transact.c:582
+msgid "incorrect header line found while scanning headers\n"
 msgstr "incorrect header line found while scanning headers\n"
 
-#: transact.c:615
+#: transact.c:584
 #, c-format
 msgid "line: %s"
 msgstr "line: %s"
 
-#: transact.c:1087 transact.c:1097
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1112
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr ""
-"analyzing Received line:\n"
-"%s"
-
-#: transact.c:1124
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1142
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1157
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no local matches, forwarding to %s\n"
 
-#: transact.c:1172
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "forwarding and deletion suppressed due to DNS errors\n"
 
-#: transact.c:1283
+#: transact.c:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "writing RFC822 msgblk.headers\n"
 
-#: transact.c:1302
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "no recipient addresses matched declared local names"
 
-#: transact.c:1309
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "recipient address %s didn't match any local name"
 
-#: transact.c:1318
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "message has embedded NULs"
 
-#: transact.c:1326
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP listener rejected local recipient addresses: "
 
-#: transact.c:1376
+#: transact.c:1445
 msgid "error writing message text\n"
 msgstr "error writing message text\n"
 
-#: transact.c:1652
+#: uid.c:250
 #, 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 "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr "Old UID list from %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <empty>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Scratch list of UIDs:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:517 uid.c:569
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Merged UID list from %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:519
+#, c-format
+msgid "New UID list from %s:"
 msgstr "New UID list from %s:"
 
-#: uid.c:402
+#: uid.c:548
+msgid "swapping UID lists\n"
+msgstr "swapping UID lists\n"
+
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "not swapping UID lists, no UIDs seen this query\n"
 
-#: uid.c:422
+#: uid.c:581
 msgid "discarding new UID list\n"
 msgstr "discarding new UID list\n"
 
-#: uid.c:479
+#: uid.c:616
 msgid "Deleting fetchids file.\n"
 msgstr "Deleting fetchids file.\n"
 
-#: uid.c:482
+#: uid.c:618
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error deleting %s: %s\n"
 
-#: uid.c:489
+#: uid.c:624
 msgid "Writing fetchids file.\n"
 msgstr "Writing fetchids file.\n"
 
-#: uid.c:503 uid.c:512
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "Writing fetchids file.\n"
-
-#: uid.c:524
+#: uid.c:643
 #, 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:528
+#: uid.c:647
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Cannot rename fetchids file %s to %s: %s\n"
 
-#: uid.c:532
+#: uid.c:651
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Cannot open fetchids file %s for writing: %s\n"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc failed\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc failed\n"
-
-#~ msgid "Subject: Fetchmail unreachable-server warning."
-#~ msgstr "Subject: Fetchmail unreachable-server warning."
-
-#, c-format
-#~ msgid "Fetchmail could not reach the mail server %s:"
-#~ msgstr "Fetchmail could not reach the mail server %s:"
-
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-
-#~ msgid "Required LOGIN capability not supported by server\n"
-#~ msgstr "Required LOGIN capability not supported by server\n"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Saved error is still %d\n"
-
-#, c-format
-#~ 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 de6d62f3..52ba2864 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:12+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-19 16:09-0400\n"
 "Last-Translator: Keith Bowes <zooplah@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -70,8 +70,7 @@ msgstr "Averto pri trograndaj mesa�oj de Fetchmail"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"La sekvaj trograndaj mesa�oj estis forigataj ĉe la servilo %s, konto %s:"
+msgstr "La sekvaj trograndaj mesa�oj estis forigataj ĉe la servilo %s, konto %s:"
 
 #: driver.c:353
 #, c-format
@@ -137,8 +136,7 @@ msgstr " (%d korpaj bitokoj)"
 
 #: driver.c:770
 #, 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 "mesa�o %s@%s:%d ne havis atendatan longon (%d nunaj != %d atendataj)\n"
 
 #: driver.c:802
@@ -156,8 +154,7 @@ msgstr " ne elbufrigita\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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "haviglimo %d atingita; %d mesa�o restas sur servilo %s konto %s\n"
 msgstr[1] "haviglimo %d atingita; %d mesa�oj restas sur servilo %s konto %s\n"
 
@@ -179,8 +176,7 @@ msgstr "tempolimo atingita post %d sekundoj atendante por %s.\n"
 #: driver.c:912
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"tempolimo atingita post %d sekunkoj atendante por aÅ­skultulo respondi.\n"
+msgstr "tempolimo atingita post %d sekunkoj atendante por aÅ­skultulo respondi.\n"
 
 #: driver.c:915
 #, c-format
@@ -193,12 +189,8 @@ msgstr "fetchmail alfrontas ripetitajn tempolimojn"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail alfrontis pli ol %d atingitajn tempolimojn dum penado havigi la "
-"po�ton de %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail alfrontis pli ol %d atingitajn tempolimojn dum penado havigi la po�ton de %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -291,8 +283,7 @@ msgid ""
 "error message."
 msgstr ""
 "La provo havigi permeson malsukcesis.\n"
-"Ĉar ni jam sukcesis havigi rajtigon por ĉi tiu konekto, ĉi tio estas "
-"probable\n"
+"Ĉar ni jam sukcesis havigi rajtigon por ĉi tiu konekto, ĉi tio estas probable\n"
 "alia malsukcesa re�imo (kiel okupata servilo), kiun fetchmail ne povas\n"
 "distingi ĉar la servilo ne sendis utilan eraran mesa�on."
 
@@ -425,8 +416,7 @@ msgstr "falsa mesa�-nombro!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"Tro multaj po�toj pretersaltitaj (%d > %d) pro dummomentaj eraroj por %s\n"
+msgstr "Tro multaj po�toj pretersaltitaj (%d > %d) pro dummomentaj eraroj por %s\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -521,8 +511,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: La medivariablo QMAILINJECT estas difinita.\n"
-"Ĉi tio estas dan�era ĉar �i povas igi ke qmail-inject aŭ ke la sendmail-"
-"kovrilo\n"
+"Ĉi tio estas dan�era ĉar �i povas igi ke qmail-inject aŭ ke la sendmail-kovrilo\n"
 "de qmail makulu viajn ĉapliniojn From: aŭ Message-ID:.\n"
 "Provu \"env QMAILINJECT= %s VIAJ ARGUMENTOJ ĈI TIE\"\n"
 "%s: Ĉesigo.\n"
@@ -532,14 +521,12 @@ 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: La medivariablo NULLMAILER_FLAGS estas difinita.\n"
-"Ĉi tio estas dan�era ĉar �i povas igi ke nullmailer-inject aŭ ke la "
-"sendmail-\n"
+"Ĉi tio estas dan�era ĉar �i povas igi ke nullmailer-inject aŭ ke la sendmail-\n"
 "kovrilo de nullmailer makulu viajn ĉap-liniojn From:, Message-ID: aŭ\n"
 "Return-Path:.\n"
 "Provu \"env NULLMAILER_FLAGS= %s VIAJ ARGUMENTOJ ĈI TIE\"\n"
@@ -577,13 +564,11 @@ msgstr ""
 #: env.c:229
 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 ""
 "Ni provas daÅ­rigi kun la nura gastigejo.\n"
-"NE raportu rompitan ĉapliniojn Received:, linioj HELO/EHLO aŭ similajn "
-"problemojn!\n"
+"NE raportu rompitan ĉapliniojn Received:, linioj HELO/EHLO aŭ similajn problemojn!\n"
 "AnstataÅ­e, RIPARU vian /etc/hosts, DNS, NIS aÅ­ LDAP.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -671,11 +656,9 @@ msgid ""
 "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 venas kun ABSOLUTE NENIA GARANTIO. Ĉi tio estas libera "
-"programaro,\n"
+"Fetchmail venas kun ABSOLUTE NENIA GARANTIO. Ĉi tio estas libera programaro,\n"
 "kaj vi estas bonvena redistribui �in laŭ certaj kondiĉoj. Por detaloj,\n"
-"bonvolu vidi la dosieron COPYING en la fontkodo aÅ­ en la dokumentada "
-"dosierujo.\n"
+"bonvolu vidi la dosieron COPYING en la fontkodo aÅ­ en la dokumentada dosierujo.\n"
 
 #: fetchmail.c:188
 msgid "WARNING: Running as root is discouraged.\n"
@@ -699,8 +682,7 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "AVERTO: Via SSL/TLS-biblioteko ne komprenas eldonon 1.3 de TLS.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
 msgstr "AVERTO: Kompilumita kontraÅ­ LibreSSL, kie ne estas subtenata.\n"
 
 #: fetchmail.c:314
@@ -718,8 +700,7 @@ msgstr "Ni ne rulas laŭ demona re�imo, ni preteratentas la opcion logfile.\n"
 #: fetchmail.c:354
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-"La protokoldosiero \"%s\" ne ekzistas, ni preteratentas la opcion logfile.\n"
+msgstr "La protokoldosiero \"%s\" ne ekzistas, ni preteratentas la opcion logfile.\n"
 
 #: fetchmail.c:360
 #, c-format
@@ -728,11 +709,8 @@ msgstr "La protokoldosiero \"%s\" ne skribeblas, ni ĉesas.\n"
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"La opcioj syslog kaj logfile estas ambaÅ­ aktivaj, ni preterpasas syslog kaj "
-"protokolas en %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "La opcioj syslog kaj logfile estas ambaÅ­ aktivaj, ni preterpasas syslog kaj protokolas en %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -775,21 +753,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail ĉe %ld ĉesigita.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: ne eblas kontroli po�ton dum alia fetchmail por la sama gastigejo "
-"rulas.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: ne eblas kontroli po�ton dum alia fetchmail por la sama gastigejo rulas.\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: ne eblas enketi specifitajn gastigejojn kun alia fetchmail "
-"rulanta ĉe %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: ne eblas enketi specifitajn gastigejojn kun alia fetchmail rulanta ĉe %ld.\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -797,8 +767,7 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: alia malfona fetchmail rulas ĉe %ld.\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: ne eblas akcepti opciojn dum fona fetchmail rulas.\n"
 
 #: fetchmail.c:581
@@ -860,8 +829,7 @@ msgstr "provo re-ruli fetchmail malsukcesis\n"
 #: fetchmail.c:782
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"enketo de %s estas preterpasita (malsukcesa aÅ­tentiko aÅ­ tro da tempolimoj)\n"
+msgstr "enketo de %s estas preterpasita (malsukcesa aÅ­tentiko aÅ­ tro da tempolimoj)\n"
 
 #: fetchmail.c:794
 #, c-format
@@ -968,12 +936,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Averto: pluraj mencioj de gastigejo %s en agorda dosiero\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Eraro: pluraj rikordoj \"defaults\" en agorda dosiero, aÅ­ "
-"\"defaults\" ne estas la una rikordo.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Eraro: pluraj rikordoj \"defaults\" en agorda dosiero, aÅ­ \"defaults\" ne estas la una rikordo.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -993,11 +957,8 @@ msgstr "Subteno al GSSAPI estas agordita, sed ne enkompilumita.\n"
 
 #: fetchmail.c:1366
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: averto: neniu DNS disponeblas por kontroli mult-falaj alportoj el "
-"%s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: averto: neniu DNS disponeblas por kontroli mult-falaj alportoj el %s\n"
 
 #: fetchmail.c:1377
 #, c-format
@@ -1010,12 +971,8 @@ msgstr "averto: Ne petu subtenon se ĉiu po�to iras al la po�testro!\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: %s agordo nevalida, specifu pozitivan pordan numeron por servo aÅ­ "
-"pordo\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: %s agordo nevalida, specifu pozitivan pordan numeron por servo aÅ­ pordo\n"
 
 #: fetchmail.c:1402
 #, c-format
@@ -1029,16 +986,11 @@ msgstr "%s agordo nevalida, LMTP ne povas uzi defaÅ­ltan SMTP pordon\n"
 
 #: fetchmail.c:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Kaj 'fetchall' kaj 'keep' aktivaj sub demona aŭ senokupa re�imo estas "
-"eraro!\n"
+msgstr "Kaj 'fetchall' kaj 'keep' aktivaj sub demona aŭ senokupa re�imo estas eraro!\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Eraro: senokupa re�imo ne funkcias por multoblaj dosierujoj aŭ "
-"kontoj!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Eraro: senokupa re�imo ne funkcias por multoblaj dosierujoj aŭ kontoj!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1125,8 +1077,7 @@ msgstr "Fetchmail traktos daŭrantajn erarojn kiel daŭraj (faligi mesa�ojn).\n
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail traktos daŭrantajn erarojn kiel provizorajn (gardi mesa�ojn).\n"
+msgstr "Fetchmail traktos daŭrantajn erarojn kiel provizorajn (gardi mesa�ojn).\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1152,14 +1103,11 @@ msgstr "  Vera nomo de servilo estas %s.\n"
 
 #: fetchmail.c:1691
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Ĉi tiu gastigejo ne estos informpetita kiam neniu gastigejo estas "
-"specifita.\n"
+msgstr "  Ĉi tiu gastigejo ne estos informpetita kiam neniu gastigejo estas specifita.\n"
 
 #: fetchmail.c:1692
 msgid "  This host will be queried when no host is specified.\n"
-msgstr ""
-"  Ĉi tiu gastigejo estos informpetita kiam neniu gastigejo estas specifita.\n"
+msgstr "  Ĉi tiu gastigejo estos informpetita kiam neniu gastigejo estas specifita.\n"
 
 #: fetchmail.c:1696
 msgid "  Password will be prompted for.\n"
@@ -1283,8 +1231,7 @@ msgstr "  SSL-servilo CommonName: %s\n"
 #: fetchmail.c:1779
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
-msgstr ""
-"  SSL-�losila fingropremo (kontrolita kontraŭ la servila �losilo): %s\n"
+msgstr "  SSL-�losila fingropremo (kontrolita kontraŭ la servila �losilo): %s\n"
 
 #: fetchmail.c:1782
 #, c-format
@@ -1317,46 +1264,31 @@ msgstr "  Alportitaj mesa�oj estos tenataj sur la servilo (--keep aktiva).\n"
 
 #: fetchmail.c:1806
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Alportitaj mesa�oj ne estos gardataj ĉe la servilo (--keep malaktiva).\n"
+msgstr "  Alportitaj mesa�oj ne estos gardataj ĉe la servilo (--keep malaktiva).\n"
 
 #: fetchmail.c:1808
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Malnovaj mesa�oj estos forigataj antaŭ mesa�havigo (--flush aktiva).\n"
+msgstr "  Malnovaj mesa�oj estos forigataj antaŭ mesa�havigo (--flush aktiva).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Malnovaj mesa�oj ne estos forigataj antaŭ mesa�havigo (--flush "
-"malaktiva).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Malnovaj mesa�oj ne estos forigataj antaŭ mesa�havigo (--flush malaktiva).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Trograndaj mesa�oj estos forigataj antaŭ mesa�havigo (--limitflush "
-"aktiva).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Trograndaj mesa�oj estos forigataj antaŭ mesa�havigo (--limitflush aktiva).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Trograndaj mesa�oj ne estos forigataj antaŭ mesa�havigo (--limitflush "
-"malaktiva).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Trograndaj mesa�oj ne estos forigataj antaŭ mesa�havigo (--limitflush malaktiva).\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Reskribo de servila-lokaj adresoj estas ebligita (--norewrite malaktiva).\n"
+msgstr "  Reskribo de servila-lokaj adresoj estas ebligita (--norewrite malaktiva).\n"
 
 #: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Reskribo de servila-lokaj adresoj estas malebligita (--norewrite aktiva).\n"
+msgstr "  Reskribo de servila-lokaj adresoj estas malebligita (--norewrite aktiva).\n"
 
 #: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
@@ -1375,18 +1307,12 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Ĉaretrevena perforto estas malebligita (forcecr malaktiva).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretado de Content-Transfer-Encoding estas malebligita (pass8bits "
-"aktiva).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretado de Content-Transfer-Encoding estas malebligita (pass8bits aktiva).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretado de Content-Transfer-Encoding estas ebligita (paas8bits "
-"malaktiva).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretado de Content-Transfer-Encoding estas ebligita (paas8bits malaktiva).\n"
 
 #: fetchmail.c:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
@@ -1432,8 +1358,7 @@ msgstr "  Neniu grando-limo de mesa�o (--limit 0).\n"
 #: fetchmail.c:1845
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Intervalo de averto pri mesa�o-grando estas %d sekundoj (--warnings %d).\n"
+msgstr "  Intervalo de averto pri mesa�o-grando estas %d sekundoj (--warnings %d).\n"
 
 #: fetchmail.c:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
@@ -1482,8 +1407,7 @@ msgstr "  Neniu stapla limo de SMTP-mesa�o (--batchlimit 0).\n"
 #: fetchmail.c:1876
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  La forig-intervalo inter forvi�oj estas perfortita al %d (--expunge %d).\n"
+msgstr "  La forig-intervalo inter forvi�oj estas perfortita al %d (--expunge %d).\n"
 
 #: fetchmail.c:1878
 msgid "  No forced expunges (--expunge 0).\n"
@@ -1576,15 +1500,12 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-serĉo por mult-falaj adresoj estas malebligita.\n"
 
 #: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Servilaj alinomoj estos komparataj kun mult-falaj adresoj per IP adreso.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Servilaj alinomoj estos komparataj kun mult-falaj adresoj per IP adreso.\n"
 
 #: fetchmail.c:1983
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Servilaj alinomoj estos komparataj kun mult-falaj adresoj per nomo.\n"
+msgstr "  Servilaj alinomoj estos komparataj kun mult-falaj adresoj per nomo.\n"
 
 #: fetchmail.c:1986
 msgid "  Envelope-address routing is disabled\n"
@@ -1638,8 +1559,7 @@ msgstr "  Neniu observ-interfaco estas specifita.\n"
 #: fetchmail.c:2031
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Servilaj konektoj estos farataj per la enkonektilo %s (--plugin %s).\n"
+msgstr "  Servilaj konektoj estos farataj per la enkonektilo %s (--plugin %s).\n"
 
 #: fetchmail.c:2033
 msgid "  No plugin command specified.\n"
@@ -1648,8 +1568,7 @@ msgstr "  Neniu enkonekta komando estas specifita.\n"
 #: fetchmail.c:2035
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  AÅ­skultantaj konektoj estos faritaj per la elkonektilo %s (--plugout %s).\n"
+msgstr "  AÅ­skultantaj konektoj estos faritaj per la elkonektilo %s (--plugout %s).\n"
 
 #: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
@@ -1691,12 +1610,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Ne eblas modifi signalan maskon: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Via operaciumo nek difinas la konstanton PATH_MAX nek akceptas la "
-"funkcivokon realpath(f, NULL). Ĉesas.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Via operaciumo nek difinas la konstanton PATH_MAX nek akceptas la funkcivokon realpath(f, NULL). Ĉesas.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1732,13 +1647,10 @@ msgstr "Ni uzas servilan nomon [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Neniu taŭga GSSAPI-legitimaĵo estis trovata. Ni preterpasas GSSAPI-"
-"aÅ­tentikigon.\n"
+msgstr "Neniu taŭga GSSAPI-legitimaĵo estis trovata. Ni preterpasas GSSAPI-aŭtentikigon.\n"
 
 #: gssapi.c:124
-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 "Se vi volas uzi GSSAPI, vi bezonas legitimaĵon unue, eble el kinit.\n"
 
 #: gssapi.c:160
@@ -1919,11 +1831,8 @@ msgid "%u is first unseen\n"
 msgstr "%u estas la unua nevidita\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Averto: ni ignoras falsajn datumojn por mesa�aj grandoj revenitaj de la "
-"servilo.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Averto: ni ignoras falsajn datumojn por mesa�aj grandoj revenitaj de la servilo.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1932,8 +1841,7 @@ msgstr "Nekorekta FETCH-respondo: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Ne eblas malfermi kvm-interfacon. Certigu ke fetchmail estas SGID kmem."
+msgstr "Ne eblas malfermi kvm-interfacon. Certigu ke fetchmail estas SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2044,9 +1952,7 @@ msgstr "fetchmail: forigas malfre�an �losildosieron \"%s\"\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: ne eblas malligi �losildosieron \"%s\" (%s), provanta skribi al "
-"�i\n"
+msgstr "fetchmail: ne eblas malligi �losildosieron \"%s\" (%s), provanta skribi al �i\n"
 
 #: lock.c:116
 #, c-format
@@ -2230,12 +2136,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specifi protokolan dosieran nomon\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      uzi syslog(3) por plej multaj mesa�oj, rulante kiel "
-"demono\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      uzi syslog(3) por plej multaj mesa�oj, rulante kiel demono\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2243,8 +2145,7 @@ msgstr "      --nosyslog    mal�alti uzon de syslog(3)\n"
 
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   ne skribi Received kaj ebligi gastigejan mistifikon\n"
+msgstr "      --invisible   ne skribi Received kaj ebligi gastigejan mistifikon\n"
 
 #: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
@@ -2267,18 +2168,12 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirekti ne-livereblojn de uzanto al po�testro.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail forigas daŭre ne-livereblajn mesa�ojn.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail forigas daŭre ne-livereblajn mesa�ojn.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  gardi daŭre ne-livereblajn mesa�ojn sur servilo "
-"(defaÅ­lto).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  gardi daŭre ne-livereblajn mesa�ojn sur servilo (defaŭlto).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2302,15 +2197,11 @@ msgstr "      --sslcert     ssl-klienta atestilo\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   fari striktan kontrolon de servil-atestilo "
-"(rekomendinde)\n"
+msgstr "      --sslcertck   fari striktan kontrolon de servil-atestilo (rekomendinde)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck preterpasi striktan kontrolon de servil-atestilo "
-"(malsekure)\n"
+msgstr "      --nosslcertck preterpasi striktan kontrolon de servil-atestilo (malsekure)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
@@ -2321,19 +2212,12 @@ msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath pado al fidinda-CA ssl-atestila dosierujo\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  atendi ĉi tiun 'CommonName' de servilo "
-"(malrekomendinde)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  atendi ĉi tiun 'CommonName' de servilo (malrekomendinde)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint fingropremo kiu devas kongrui kun tiu de la servila "
-"atestilo.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint fingropremo kiu devas kongrui kun tiu de la servila atestilo.\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2345,8 +2229,7 @@ msgstr "      --plugin      specifi eksteran komandon por malfermi konekton\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     specifi eksteran komando por malfermi smtp-konekton\n"
+msgstr "      --plugout     specifi eksteran komando por malfermi smtp-konekton\n"
 
 #: options.c:681
 msgid ""
@@ -2354,35 +2237,27 @@ msgid ""
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    specifi politikon por trakti mesa�ojn kun malbonaj "
-"ĉapoj\n"
+"                    specifi politikon por trakti mesa�ojn kun malbonaj ĉapoj\n"
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]  specifi havigantan protokolon (konsultu manlibron)\n"
+msgstr "  -p, --proto[col]  specifi havigantan protokolon (konsultu manlibron)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        devigi la uzon de UIDL-ojn (pop3 nur)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        petas de la servilo IMAP ke �i sendu notojn pri novaj "
-"mesa�oj\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        petas de la servilo IMAP ke �i sendu notojn pri novaj mesa�oj\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        TCP-pordo por konekti (malaktuala, uzu --service)\n"
+msgstr "      --port        TCP-pordo por konekti (malaktuala, uzu --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     TCP-servo por konekti (povas esti cifera TCP-pordo)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     TCP-servo por konekti (povas esti cifera TCP-pordo)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2406,8 +2281,7 @@ msgstr "      --principal   po�ta serva ĉefo\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  aldoni enketo-spursekva informon al ĉapojn Received\n"
+msgstr "      --tracepolls  aldoni enketo-spursekva informon al ĉapojn Received\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
@@ -2503,8 +2377,7 @@ msgstr "  -r, --folder      specifi foran dosierujan nomon\n"
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    montri progresajn punktojn eĉ en protokol-dosieroj\n"
+msgstr "      --showdots    montri progresajn punktojn eĉ en protokol-dosieroj\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2515,10 +2388,8 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 nur subtenas pavortan aÅ­tentikigon. Ni rezignas.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Averto: trovinte \"Maillennium POP3\", ni uzas RETR-komandon anstataÅ­ TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Averto: trovinte \"Maillennium POP3\", ni uzas RETR-komandon anstataÅ­ TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2607,20 +2478,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS ne estas ebligita."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: interfaca opcio estas nur subtenata sub Linukso (sen IPv6) kaj "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: interfaca opcio estas nur subtenata sub Linukso (sen IPv6) kaj FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: observa opcio estas subtenata nur sub Linukso (sen IPv6) kaj "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: observa opcio estas subtenata nur sub Linukso (sen IPv6) kaj FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2638,8 +2501,7 @@ msgstr "Dosiero %s devas esti ordinara dosiero.\n"
 #: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr ""
-"Dosiero %s ne devas havi permesojn pli ampleksaj ol -rwx------ (0700).\n"
+msgstr "Dosiero %s ne devas havi permesojn pli ampleksaj ol -rwx------ (0700).\n"
 
 #: rcfile_y.y:451
 #, c-format
@@ -2972,10 +2834,8 @@ msgstr "MDA liveris nenulan staton %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Stranga: MDA pclose liveris %d kaj errno %d/%s, ne eblas trakti ĉe %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Stranga: MDA pclose liveris %d kaj errno %d/%s, ne eblas trakti ĉe %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3175,8 +3035,7 @@ msgstr "Tema Alternativa Nomo: %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Malbona atestilo: Tema Alternativa Nomo enhavas SENVALOROn, ni ĉesigas!\n"
+msgstr "Malbona atestilo: Tema Alternativa Nomo enhavas SENVALOROn, ni ĉesigas!\n"
 
 #: socket.c:752
 #, c-format
@@ -3233,15 +3092,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Rompita atestila ĉeno ĉe: %s\n"
 
 #: socket.c:831
-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 ""
-"Tio povus signifi ke la servilo ne provizis la intermeza(j)n atestilo(j)n de "
-"CA, pri kiu fetchmail povas fari nenion.  Por detaloj, bonvolu konsulti la "
-"dokumenton README.SSL-SERVER, kiu venas kun fetchmail.\n"
+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 "Tio povus signifi ke la servilo ne provizis la intermeza(j)n atestilo(j)n de CA, pri kiu fetchmail povas fari nenion.  Por detaloj, bonvolu konsulti la dokumenton README.SSL-SERVER, kiu venas kun fetchmail.\n"
 
 #: socket.c:841
 #, c-format
@@ -3249,17 +3101,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Mankas fidinda ankra atestilo: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Tio ĉi povus indiki ke la radika subskriba atestilo de CA ne estas en la "
-"fidinda CA-atestila loko, aÅ­ ke c_rehash bezonas esti plenumigita sur la "
-"atestila dosierujo. Por detaloj, bonvolu konsulti la dokumentadon de --"
-"sslcertpath kaj --sslcertfile en la manlibro. Vidu je README.SSL por "
-"detaloj.\n"
+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. See README.SSL for details.\n"
+msgstr "Tio ĉi povus indiki ke la radika subskriba atestilo de CA ne estas en la fidinda CA-atestila loko, aŭ ke c_rehash bezonas esti plenumigita sur la atestila dosierujo. Por detaloj, bonvolu konsulti la dokumentadon de --sslcertpath kaj --sslcertfile en la manlibro. Vidu je README.SSL por detaloj.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3280,53 +3123,35 @@ msgstr "Via versio de OpenSSL ne subtenas TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Nevalida SSL-protokolo '%s' estas specifita, ni uzas aÅ­tomatan elekton "
-"(auto).\n"
+msgstr "Nevalida SSL-protokolo '%s' estas specifita, ni uzas aÅ­tomatan elekton (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Åœargita biblioteko OpenSSL %#lx pli malnova ol kapoj %#lx, rifuzas funkcii.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Åœargita biblioteko OpenSSL %#lx pli malnova ol kapoj %#lx, rifuzas funkcii.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Åœargita biblioteko OpenSSL %#lx pli nova ol kapoj %#lx, provas daÅ­rigi.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Åœargita biblioteko OpenSSL %#lx pli nova ol kapoj %#lx, provas daÅ­rigi.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Dosiera priskribilo forestas de la intervalo por SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Rimarku ke kelkaj distribuoj malebligas pli malnovajn versiojn de protokolo "
-"laŭ stranga maniero. Provu pli novan version de protokolo.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Rimarku ke kelkaj distribuoj malebligas pli malnovajn versiojn de protokolo laŭ stranga maniero. Provu pli novan version de protokolo.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Averto: SSL_set_tlsext_host_name(%p, \"%s\") malsukcesis (kodo %#lx), ni "
-"provas daÅ­rigi.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Averto: SSL_set_tlsext_host_name(%p, \"%s\") malsukcesis (kodo %#lx), ni provas daÅ­rigi.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Averto: X509_VERIFY_PARAM_set1_host(%p, \"%s\") malsukcesis (kodo %#x), ni "
-"provas daÅ­rigi.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Averto: X509_VERIFY_PARAM_set1_host(%p, \"%s\") malsukcesis (kodo %#x), ni provas daÅ­rigi.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3348,20 +3173,15 @@ msgstr "Ne eblas preni kurantan ĉifron de SSL/TLS - ĉu neniun seancon?\n"
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: uzas protokolon %s, ĉifron %s, %d/%d sekretaj/procezitaj bitoj\n"
+msgstr "SSL/TLS: uzas protokolon %s, ĉifron %s, %d/%d sekretaj/procezitaj bitoj\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Atestila/fingroprema kontrolo estis iel preterpasita!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Averto: la konekto estas nesekura, ni daÅ­rigas tamen. (Plibonas uzi --"
-"sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Averto: la konekto estas nesekura, ni daÅ­rigas tamen. (Plibonas uzi --sslcertck!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3416,9 +3236,7 @@ msgstr "ni trovis adreson Received '%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"nekorekta ĉap-linio estis trovata - konsultu manlibron pri malbona-ĉapa "
-"opcio\n"
+msgstr "nekorekta ĉap-linio estis trovata - konsultu manlibron pri malbona-ĉapa opcio\n"
 
 #: transact.c:615
 #, c-format
@@ -3437,8 +3255,7 @@ msgstr "Ni analizas nomojn Received \"%-.*s\"\n"
 
 #: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"Neniu koverta ricevanto estis trovata, ni revenas al ĉapa konjektado.\n"
+msgstr "Neniu koverta ricevanto estis trovata, ni revenas al ĉapa konjektado.\n"
 
 #: transact.c:1142
 #, c-format
@@ -3542,9 +3359,7 @@ msgstr "Skriberaro sur fetchids-dosiero %s: %s\n"
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Eraro skribante al fetchids-dosiero %s, malnova dosiero estas forlasita "
-"loke.\n"
+msgstr "Eraro skribante al fetchids-dosiero %s, malnova dosiero estas forlasita loke.\n"
 
 #: uid.c:528
 #, c-format
diff --git a/po/es.po b/po/es.po
index cd802d79..a619c8ce 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,45 +8,41 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.12\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2009-08-24 21:16+0200\n"
 "PO-Revision-Date: 2009-10-06 19:04+0200\n"
 "Last-Translator: Francisco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
-"Language: es\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"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Verificando si %s es realmente el mismo nodo que %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Sí, sus direcciones IP coinciden\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "No, sus direcciones IP no coinciden\n"
 
-#: checkalias.c:207
+#: checkalias.c:203
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"fallo en la resolución de nombres buscando «%s» durante la consulta de %s:"
-"%s\n"
+msgstr "fallo en la resolución de nombres buscando «%s» durante la consulta de %s:%s\n"
 
-#: checkalias.c:230
+#: checkalias.c:228
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"fallo en la resolución de nombres buscando «%s» durante la consulta de %s.\n"
+msgstr "fallo en la resolución de nombres buscando «%s» durante la consulta de %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "no fue posible decodificar el desafío BASE64\n"
 
@@ -55,168 +51,151 @@ msgstr "no fue posible decodificar el desafío BASE64\n"
 msgid "decoded as %s\n"
 msgstr "decodificado como %s\n"
 
-#: driver.c:199
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "error de kerberos %s\n"
 
-#: driver.c:259 driver.c:265
-#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s']\n"
+#: driver.c:249
+#, c-format
+msgid "krb5_sendauth: %s [server says '%s'] \n"
 msgstr "krb5_sendauth: %s [el servidor dice «%s»] \n"
 
-#: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+#: driver.c:254
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
+msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n"
+
+#: driver.c:335
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Asunto: aviso de fetchmail, mensajes excedidos en tamaño"
 
-#: driver.c:349
+#: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Los siguientes mensajes excedidos de tamaño se borraron del servidor %s "
-"cuenta %s:"
+msgstr "Los siguientes mensajes excedidos de tamaño se borraron del servidor %s cuenta %s:"
 
-#: driver.c:353
+#: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"Los siguientes mensajes excedidos de tamaño permanecen en el servidor %s "
-"cuenta %s:"
+msgstr "Los siguientes mensajes excedidos de tamaño permanecen en el servidor %s cuenta %s:"
 
-#: driver.c:372
+#: driver.c:362
 #, c-format
 msgid "  %d message  %d octets long deleted by fetchmail."
 msgid_plural "  %d messages %d octets long deleted by fetchmail."
 msgstr[0] "  %d mensaje de %d octetos de largo borrado por fetchmail."
 msgstr[1] "  %d mensajes de %d octetos de largo borrados por fetchmail."
 
-#: driver.c:377
+#: driver.c:367
 #, c-format
 msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d mensaje de %d octetos de largo omitido por fetchmail."
 msgstr[1] "  %d mensajes de %d octetos de largo omitidos por fetchmail."
 
-#: driver.c:522
+#: driver.c:511
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "omitiendo mensaje %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:565
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "omitiendo mensaje %s@%s:%d (%d octetos)"
 
-#: driver.c:593
+#: driver.c:581
 msgid " (length -1)"
 msgstr " (longitud -1)"
 
-#: driver.c:596
+#: driver.c:584
 msgid " (oversized)"
 msgstr " (demasiado grande)"
 
-#: driver.c:614
+#: driver.c:602
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr ""
-"no fue posible recibir los encabezados, mensaje %s@%s:%d (%d octetos)\n"
+msgstr "no fue posible recibir los encabezados, mensaje %s@%s:%d (%d octetos)\n"
 
-#: driver.c:632
+#: driver.c:619
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "leyendo el mensaje %s@%s:%d de %d"
 
-#: driver.c:637
+#: driver.c:624
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octetos)"
 
-#: driver.c:638
+#: driver.c:625
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos en la cabecera) "
 
-#: driver.c:708
+#: driver.c:692
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos en el cuerpo) "
 
-#: driver.c:770
+#: driver.c:751
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d "
-"esperada)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d esperada)\n"
 
-#: driver.c:802
+#: driver.c:783
 msgid " retained\n"
 msgstr " retenido\n"
 
-#: driver.c:812
+#: driver.c:793
 msgid " flushed\n"
 msgstr " eliminado\n"
 
-#: driver.c:824
+#: driver.c:810
 msgid " not flushed\n"
 msgstr " no eliminado\n"
 
-#: driver.c:842
+#: driver.c:828
 #, 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] ""
-"límite de %d mensajes alcanzado; se dejó %d mensaje en la cuenta %s del "
-"servidor %s\n"
-msgstr[1] ""
-"límite de %d mensajes alcanzado; se dejaron %d mensajes en la cuenta %s del "
-"servidor %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "límite de %d mensajes alcanzado; se dejó %d mensaje en la cuenta %s del servidor %s\n"
+msgstr[1] "límite de %d mensajes alcanzado; se dejaron %d mensajes en la cuenta %s del servidor %s\n"
 
-#: driver.c:899
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"tiempo agotado después de %d segundos de espera para conectarse con el "
-"servidor %s.\n"
+msgstr "tiempo agotado después de %d segundos de espera para conectarse con el servidor %s.\n"
 
-#: driver.c:903
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tiempo agotado después de %d segundos de espera por el servidor %s.\n"
 
-#: driver.c:907
+#: driver.c:893
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tiempo agotado después de %d segundos de espera por %s.\n"
 
-#: driver.c:912
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"tiempo agotado después de %d segundos de esperar respuesta del cliente.\n"
+msgstr "tiempo agotado después de %d segundos de esperar respuesta del cliente.\n"
 
-#: driver.c:915
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tiempo agotado después de %d segundos.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:913
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Asunto: fetchmail ve repetidos excesos del tiempo de espera"
 
-#: driver.c:930
+#: driver.c:916
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba "
-"obtener correo de %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba obtener correo de %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:920
 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"
@@ -231,73 +210,78 @@ msgstr ""
 "para diagnosticar el problema.\n"
 "Fetchmail no consultará esta casilla hasta que lo reinicie.\n"
 
-#: driver.c:960
+#: driver.c:946
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "la orden de preconexión falló con la señal %d\n"
 
-#: driver.c:963
+#: driver.c:949
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "la orden de preconexión falló con la señal %d\n"
 
-#: driver.c:987
+#: driver.c:973
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no fue posible encontrar la casilla HESIOD para %s\n"
 
-#: driver.c:1008
+#: driver.c:994
 msgid "Lead server has no name.\n"
 msgstr "El servidor líder no tiene nombre.\n"
 
-#: driver.c:1035
+#: driver.c:1021
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "no se encontró el nombre DNS canónico de %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1068
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Falló la conexión de %s a %s"
 
-#: driver.c:1111
+#: driver.c:1084
+msgid "Subject: Fetchmail unreachable-server warning."
+msgstr "Asunto: aviso de fetchmail servidor fuera de alcance."
+
+#: driver.c:1086
+#, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
+
+#: driver.c:1114
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
-#: driver.c:1166
+#: driver.c:1167
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Error «lock-busy» en %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1171
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Error: servidor ocupado en %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1176
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallo de autorización en %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1179
 msgid " (previously authorized)"
 msgstr " (previamente autorizado)"
 
-#: 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:1200
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Asunto: la autenticación de fetchmail falló en %s@%s"
 
-#: driver.c:1206
+#: driver.c:1204
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail no pudo obtener correo de %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1208
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -319,7 +303,7 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio se restablezca."
 
-#: driver.c:1216
+#: driver.c:1214
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -339,7 +323,7 @@ msgstr ""
 "en cada ciclo.  No se enviarán futuras notificaciones hasta que el servicio\n"
 "se restaure."
 
-#: driver.c:1226
+#: driver.c:1224
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -351,8 +335,7 @@ msgid ""
 "is restored."
 msgstr ""
 "El intento de obtener autorización falló.\n"
-"Esto probablemente signifique que su contraseña no es válida. Aunque "
-"algunos\n"
+"Esto probablemente signifique que su contraseña no es válida. Aunque algunos\n"
 "servidores POP3 tienen otros modos de fallar que fetchmail no puede\n"
 "distinguir de éste porque no envían mensajes de error útiles cuando se\n"
 "falla en el acceso.\n"
@@ -361,182 +344,177 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio se restablezca."
 
-#: driver.c:1242
+#: driver.c:1240
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Volver a consultar inmediatamente %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1245
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Error de entrada o de autenticación desconocido en %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1269
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorización correcta en %s@%s\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1275
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Asunto: autenticación de fetchmail correcta en %s@%s"
 
-#: driver.c:1281
+#: driver.c:1279
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail pudo registrarse en %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1283
 msgid "Service has been restored.\n"
 msgstr "El servicio se ha reestablecido.\n"
 
-#: driver.c:1318
+#: driver.c:1315
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionando o volviendo a consultar la carpeta %s\n"
 
-#: driver.c:1320
+#: driver.c:1317
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionando o volviendo a consultar la carpeta predeterminada\n"
 
-#: driver.c:1332
+#: driver.c:1329
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1332 rcfile_y.y:384
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1340
+#: driver.c:1337
 #, c-format
 msgid "Polling %s\n"
 msgstr "Consultando %s\n"
 
-#: driver.c:1344
+#: driver.c:1341
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mensaje (%d %s) para %s"
 msgstr[1] "%d mensajes (%d %s) para %s"
 
-#: driver.c:1347
+#: driver.c:1344
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "visto"
 msgstr[1] "vistos"
 
-#: driver.c:1350
+#: driver.c:1347
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mensaje para %s"
 msgstr[1] "%d mensajes para %s"
 
-#: driver.c:1357
+#: driver.c:1354
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1363
+#: driver.c:1360
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1396
+#: driver.c:1393 imap.c:90
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
-#: 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:1537
 msgid "socket"
 msgstr "zócalo"
 
-#: driver.c:1552
+#: driver.c:1540
 msgid "missing or bad RFC822 header"
 msgstr "el encabezado RFC822 falta o es incorrecto"
 
-#: driver.c:1555
+#: driver.c:1543
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1546
 msgid "client/server synchronization"
 msgstr "sincronización cliente/servidor"
 
-#: driver.c:1561
+#: driver.c:1549
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1564
+#: driver.c:1552
 msgid "lock busy on server"
 msgstr "bloqueo ocupado en el servidor"
 
-#: driver.c:1567
+#: driver.c:1555
 msgid "SMTP transaction"
 msgstr "Transacción SMTP"
 
-#: driver.c:1570
+#: driver.c:1558
 msgid "DNS lookup"
 msgstr "búsqueda en DNS"
 
-#: driver.c:1573
+#: driver.c:1561
 msgid "undefined"
 msgstr "indefinido"
 
-#: driver.c:1579
+#: driver.c:1567
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "error %s al recibir de %s@%s y entregar al anfitrión SMTP %s\n"
 
-#: driver.c:1581
+#: driver.c:1569
 msgid "unknown"
 msgstr "desconocida"
 
-#: driver.c:1583
+#: driver.c:1571
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "error %s al recibir de %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1583
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "la orden de postconexión falló con la señal %d\n"
 
-#: driver.c:1597
+#: driver.c:1585
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "la orden de postconexión falló con estado %d\n"
 
-#: driver.c:1616
+#: driver.c:1604
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Soporte de Kerberos V4 no incluido.\n"
 
-#: driver.c:1624
+#: driver.c:1612
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Soporte de Kerberos V5 no incluido.\n"
 
-#: driver.c:1635
+#: driver.c:1623
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opción --flush no permitida con %s\n"
 
-#: driver.c:1641
+#: driver.c:1629
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opción --all no permitida con %s\n"
 
-#: driver.c:1650
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opción --limit no permitida con %s\n"
 
-#: env.c:58
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -551,13 +529,12 @@ msgstr ""
 "Pruebe “env QMAILINJECT= %s SUS ARGUMENTOS AQU��\n"
 "%s: Abortar.\n"
 
-#: env.c:70
+#: env.c:71
 #, 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 ""
@@ -568,48 +545,36 @@ msgstr ""
 "Prueba “env NULLMAILER_FLAGS= %s SUS ARGUMENTOS AQU��\n"
 "%s: Abortar.\n"
 
-#: env.c:82
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: No existe. Fuera.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: ¡no se puede determinar su anfitrión!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:168
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falló para %s\n"
 
-#: env.c:225
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"No puedo encontrar mi propio anfitrión en la base de datos de anfitriones "
-"para cualificarlo.\n"
+msgstr "No puedo encontrar mi propio anfitrión en la base de datos de anfitriones para cualificarlo.\n"
 
-#: env.c:229
+#: env.c:174
 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 ""
 "Intentando continuar con un anfitrión no cualificado.\n"
-"NO informe de cabeceras «Received:» rotas, líneas HELO/EHLO o problemas "
-"similares\n"
+"NO informe de cabeceras «Received:» rotas, líneas HELO/EHLO o problemas similares\n"
 "REPARE su /etc/hosts, DNS, NIS o LDAP.\n"
 
-#: etrn.c:49 odmr.c:61
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "El servidor de SMTP de %s no permite ESMTP\n"
@@ -673,1086 +638,922 @@ msgstr "La opción --folder se permite con ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "La opción --check no se permite con ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2009 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
-"Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
 "Copyright (C) 2005 - 2006 Sunil Shetye\n"
 "Copyright (C) 2005 - 2009 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: fetchmail.c:142
 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 viene SIN GARANT�A DE NINGUNA CLASE. Esto es software libre y se\n"
-"le anima a redistribuirlo bajo ciertas concidiones. Para conocer más "
-"detalles,\n"
+"le anima a redistribuirlo bajo ciertas concidiones. Para conocer más detalles,\n"
 "vea el archivo COPYING en la fuente o en el directorio de documentación.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "AVISO: se recomienda no ejecutar esta aplicación como root.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocado con"
 
-#: fetchmail.c:223
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "no fue posible obtener el directorio de trabajo actual\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:283
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Esta es la versión %s de fetchmail"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:403
 #, 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:470
+#: fetchmail.c:404
 msgid " and "
 msgstr " y "
 
-#: fetchmail.c:475
+#: fetchmail.c:409
 #, 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:496
+#: fetchmail.c:430
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no se han especificado servidores de correo.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:442
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ningún otro fetchmail se está ejecutando\n"
 
-#: fetchmail.c:514
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
+#: fetchmail.c:448
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:449 fetchmail.c:458
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:449 fetchmail.c:458
 msgid "foreground"
 msgstr "primer plano"
 
-#: fetchmail.c:523
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:457
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminado.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: no es posible verificar el correo mientras otro fetchmail está en "
-"ejecución hacia el mismo anfitrión\n"
+#: fetchmail.c:480
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: no es posible verificar el correo mientras otro fetchmail está en ejecución hacia el mismo anfitrión\n"
 
-#: fetchmail.c:552
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: no es posible consultar los anfitriones especificados con otro "
-"fetchmail (%d) en ejecución.\n"
+#: fetchmail.c:486
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: no es posible consultar los anfitriones especificados con otro fetchmail (%d) en ejecución.\n"
 
-#: fetchmail.c:559
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:493
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: otro fetchmail (%d) está en ejecución en primer plano.\n"
 
-#: fetchmail.c:569
-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:503
+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:581
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:509
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n"
 
-#: fetchmail.c:593
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
+#: fetchmail.c:521
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: el proceso hijo más antiguo (%d) murió misteriosamente.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:536
 #, 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:612
+#: fetchmail.c:540
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduzca contraseña para %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:582
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: No se puede separar en segundo plano. Abortando.\n"
 
-#: fetchmail.c:658
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:586
+#, c-format
+msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
-#: fetchmail.c:674 fetchmail.c:676
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:602 fetchmail.c:604
+#, 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:695
+#: fetchmail.c:606
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: Aviso: syslog y logfile están establecidos. Compruebe ambos registros\n"
+
+#: fetchmail.c:625
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "--check mode activado, no recibir correo\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:647
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no se pudo temporizar %s (error %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:652
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s cambió)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:657
 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"
+msgstr "el intento de volver a ejectuar puede fallar dado que el directorio no se ha restaurado\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:684
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "el intento de volver a ejecutar fetchmail falló\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:714
 #, 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"
+msgstr "la consulta %s se omitió (fallo en la autenticación o demasiados excesos de espera)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:726
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo no alcanzado, no se consultará %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:764
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:766
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:768
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:770
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:772
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:774
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:776
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:778
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:780
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:782
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:784
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:786
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:788
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:790
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:792
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado de la consulta=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas las conexiones están trabadas. Saliendo.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:842
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "durmiendo en %s por %d segundos\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:866
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertado por %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:869
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertado por la señal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:877
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertado en %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:882
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1036
 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:1148
+#: fetchmail.c:1069
 #, 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"
+msgstr "Aviso: múltiples menciones del anfitrión %s en el archivo de configuración\n"
 
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Error: múltiples registros «predeterminados» en el archivo de "
-"configuración.\n"
+#: fetchmail.c:1102
+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:1317
+#: fetchmail.c:1224
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no se compiló.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1231
 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:1330
+#: fetchmail.c:1237
 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:1336
+#: fetchmail.c:1243
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "El soporte de  GSSAPI está configurado pero no compilado\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1273
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: aviso: no hay DNS disponible para verificar recepciones "
-"«multidrop» de %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: aviso: no hay DNS disponible para verificar recepciones «multidrop» de %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1284
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "aviso: ¡«multidrop» para %s requiere la opción «envelope»!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1285
 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"
+msgstr "aviso: ¡no pida soporte técnico si todo el correo está dirigido al postmaster!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1302
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: la configuración %s no es válida, especifique un número de puerto "
-"positivo para el servicio el puerto\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+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:1402
+#: fetchmail.c:1309
 #, 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"
+msgstr "fetchmail: la configuración %s no es válida, RPOP requiere un puerto privilegiado\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1327
 #, 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"
+msgstr "configuración de %s inválida, LMTP no puede usar el puerto SMTP predeterminado\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1341
 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"
+msgstr "Ambos, «fetchall» y «keep on» en el demonio o en el modo de espera, es un error\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1366
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1439
 #, 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:1566
+#: fetchmail.c:1464
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1476
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1486
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1492
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1500
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1507
 msgid "unsupported protocol selected.\n"
 msgstr "se seleccionó un protocolo no permitido.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1517
 #, 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:1645
+#: fetchmail.c:1534
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1536
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1538
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1541
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso se registrarán vía syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1544
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará «Received»\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1546
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n"
+msgstr "Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1548
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes «multidrop» mal direccionados a %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1552
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al «postmaster».\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1554
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1668
-#, 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:1557
+msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n"
+msgstr "Fetchmail tratará los errores permanentes como permanentes (soltar mensajes).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1559
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail tratará los errores permanentes como temporales (mantener "
-"mensajes).\n"
+msgstr "Fetchmail tratará los errores permanentes como temporales (mantener mensajes).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1566
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1570
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo se recibirá vía %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1573
 #, 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:1688
+#: fetchmail.c:1577
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1580
 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"
+msgstr "  Este anfitrión no será consultado cuando no se especifica un anfitrión.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1581
 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"
+msgstr "  Este anfitrión será consultado cuando no se especifique ningún anfitrión.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1585
 msgid "  Password will be prompted for.\n"
 msgstr "  Se pedirá la contraseña.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1589
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = «%s».\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1592
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identidad RPOP = «%s».\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1595
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contraseña = «%s».\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1604
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1607
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1609
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1611
 msgid " (using default port)"
 msgstr " (usando puerto predeterminado)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1613
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1619
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1622
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con contraseña.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1625
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación MSN.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1628
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1631
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1745
-#, fuzzy
-msgid "  CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1634
+msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1637
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1640
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1643
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1646
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1650
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1653
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones cifradas con SSL activadas.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1655
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1657
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Comprobación de certificados SSL del servidor activada.\n"
-
-#: fetchmail.c:1773
-#, fuzzy, c-format
-msgid "  SSL trusted certificate file: %s\n"
-msgstr "  Directorio del certificado SSL de confianza: %s\n"
-
-#: fetchmail.c:1775
+#: fetchmail.c:1659
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1662
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "«CommonName» del servidor SSL: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1664
 #, 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"
+msgstr "  Huella digital de la clave SSL (comprobada con la clave del servidor): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1667
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1669
 msgid " (default).\n"
 msgstr " (predeterminado).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1676
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla predeterminada está seleccionada.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1681
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1687
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes se recibirán (--all on).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1688
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1690
 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:1806
+#: fetchmail.c:1691
 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:1808
+#: fetchmail.c:1693
 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"
+msgstr "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush on).\n"
 
-#: fetchmail.c:1809
-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:1694
+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:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Los mensajes demasiado grandes se eliminarán antes de recibir nuevos (--"
-"limitflush on).\n"
+#: fetchmail.c:1696
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Los mensajes demasiado grandes se eliminarán antes de recibir nuevos (--limitflush on).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Los mensajes demasiado garndes no se eliminarán antes de recibir nuevos (--"
-"limitflush off).\n"
+#: fetchmail.c:1697
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Los mensajes demasiado garndes no se eliminarán antes de recibir nuevos (--limitflush off).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1699
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1700
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1702
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro se eliminarán (stripcr on).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1703
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se eliminarán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1705
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se añadirán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1706
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se añadirán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1823
-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:1708
+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:1824
-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:1709
+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:1826
+#: fetchmail.c:1711
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1712
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1714
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1715
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1717
 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"
+msgstr "  Las líneas «Status» que no estén vacías se descartarán (dropstatus on).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1718
 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"
+msgstr "  Las líneas «Status» que no estén vacías se conservarán (dropstatus off).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1720
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas «Delivered-To» se descartarán (dropdelivered on).\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1721
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas «Delivered-To» se conservarán (dropdelivered off).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1725
 #, 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:1843
+#: fetchmail.c:1728
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1730
 #, 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"
+msgstr "  Los avisos sobre el tamaño de los mensajes se darán cada %d segundos (--warnings %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1733
 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"
+msgstr "  Los avisos sobre el tamaño de los mensajes se darán en cada consulta (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1736
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
-msgstr ""
-"  La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n"
+msgstr "  La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1739
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr ""
-"  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
+msgstr "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1741
 #, 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"
+msgstr "  El límite de tamaño para los mensajes recibidos es de %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1744
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1748
 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"
+msgstr "  Utilizar búsqueda binaria de UID durante cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1750
 #, 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"
+msgstr "  Utilizar búsqueda binaria de UID durante %d de cada %d consultas (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1753
 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"
+msgstr "  Utilizar búsqueda lineal de UID durante cada consulta (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1755
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensajes por lote SMTP es %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1757
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr ""
-"  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
+msgstr "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1761
 #, 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"
+msgstr "  El intervalo de borrado entre eliminaciones está forzado a %d (--expunge %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1763
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1770
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1775 fetchmail.c:1795
 msgid " (default)"
 msgstr " (predeterminado)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1780
 #, 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:1897
+#: fetchmail.c:1782
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes se entregarán con «%s».\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1789
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes se reenviarán con %cMTP a:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1800
 #, 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:1918
+#: fetchmail.c:1803
 #, 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"
+msgstr "  La dirección a poner en las líneas RCPT TO enviadas al STMP será %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1812
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de basura son:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1818
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de  basura está desactivado\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1821
 #, 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:1939
+#: fetchmail.c:1824
 msgid "  No pre-connection command.\n"
 msgstr "  No hay orden de preconexión.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1826
 #, 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:1944
+#: fetchmail.c:1829
 msgid "  No post-connection command.\n"
 msgstr "  No hay orden de postconexión.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1832
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para este anfitrión.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1842
 msgid "  Multi-drop mode: "
 msgstr "  Modo «multi-drop»: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1844
 msgid "  Single-drop mode: "
 msgstr "  Modo «single-drop»: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1846
 #, 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:1976
+#: fetchmail.c:1861
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1862
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1981
-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:1866
+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:1983
+#: fetchmail.c:1868
 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"
+msgstr "  Se comparará el nombre de los alias del servidor contra las direcciones «multidrop».\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1871
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El enrutado por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1874
 #, 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:1992
+#: fetchmail.c:1877
 #, 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:1995
+#: fetchmail.c:1880
 #, 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:1998
+#: fetchmail.c:1883
 msgid "  No prefix stripping\n"
 msgstr "  No se eliminará ningún prefijo\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1890
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1899
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1909
 #, 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:2023
+#: fetchmail.c:1911
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificaron requerimientos de la interfaz.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1913
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta se monitorizará %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1915
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitorización.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1919
 #, 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"
+msgstr "  Las conexiones al servidor se llevarán a cabo a través del complemento %s (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:1921
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó una orden para el complemento.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1923
 #, 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"
+msgstr "  Las conexiones al cliente se llevarán a cabo a través del «plugout» %s (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:1925
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó una orden para el «plugout».\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1930
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UID guardadas de este anfitrión.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1939
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID guardadas.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1947
 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:2055
-#, 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:2060
-msgid "  Messages with bad headers will be rejected.\n"
-msgstr ""
+msgstr "  Se añadirá información de traceado sobre la consulta al encabezado «Received».\n"
 
-#: fetchmail.c:2063
-msgid "  Messages with bad headers will be passed on.\n"
-msgstr ""
+#: fetchmail.c:1949
+msgid ""
+"  No poll trace information will be added to the Received header.\n"
+".\n"
+msgstr "  No se añadirá información de traceado sobre la consulta al encabezado «Received».\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:1952
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso «%s».\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERROR: no hay soporte para la rutina getpassword()\n"
@@ -1765,88 +1566,55 @@ msgstr ""
 "\n"
 "SIGINT recibido... abortando.\n"
 
-#: gssapi.c:53
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:56
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "Error de %cMTP: %s\n"
-
-#: gssapi.c:91
+#: gssapi.c:66
 #, 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:96
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Usando nombre de servicio [%s]\n"
 
-#: gssapi.c:123
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:160
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:170
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Enviando credenciales\n"
 
-#: gssapi.c:201
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Error intercambiando credenciales\n"
 
-#: gssapi.c:243
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "No fue posible desenvolver los datos del nivel de seguridad\n"
 
-#: gssapi.c:248
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Intercambio de credenciales completo\n"
 
-#: gssapi.c:252
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "El servidor requiere integridad o privacidad\n"
 
-#: gssapi.c:261
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Opciones de nivel de seguridad desenvueltas: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "El máximo tamaño del componente GSS es %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Error creando petición de nivel de seguridad\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando las credenciales GSS\n"
 
-#: gssapi.c:302
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Error liberando las credenciales\n"
 
@@ -1855,139 +1623,108 @@ 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:75
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:97
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "¡cantidad de mensajes incorrecta!"
-
-#: imap.c:144
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:355
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:361
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:368
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "descansará después de consultar\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: actualización a TLS correcta.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: falló la actualización a TLS.\n"
 
-#: imap.c:487
+#: imap.c:459
 #, 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:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:607
+#: imap.c:579
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no se compiló en fetchmail\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:601 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no se compiló en fetchmail\n"
 
-#: imap.c:691
+#: imap.c:610
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n"
+
+#: imap.c:676
 #, 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:818
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu no fue visto\n"
-
-#: 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:903 imap.c:962
+#: imap.c:782 imap.c:841
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:911 imap.c:967
+#: imap.c:790 imap.c:846
 #, 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:928
+#: imap.c:807
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:932
+#: imap.c:811
 #, 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:946
+#: imap.c:825
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:950
+#: imap.c:829
 #, 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:989
+#: imap.c:871
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no vistos falló\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:899
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu no fue visto\n"
+
+#: imap.c:911 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: 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:1177 imap.c:1184
-#, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+#: imap.c:1002
+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"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"No es posible abrir la interfaz kvm. Asegúrese de que fetchmail este SGID "
-"kmem."
+msgstr "No es posible abrir la interfaz kvm. Asegúrese de que fetchmail este SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2021,44 +1758,44 @@ msgstr "No se encontró una interfaz con el nombre %s"
 msgid "No IP address found for %s"
 msgstr "No se encontró dirección IP para %s"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "falta la dirección IP de la interfaz\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "la dirección IP de la interfaz no es válida\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "la máscara IP de la interfaz no es válida\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "actividad en %s -vista- como %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "omitiendo consulta %s, %s desactivada\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "no se consulta %s, la dirección IP de %s se excluyó\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "actividad en %s verificada como %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "no se consulta %s, %s inactiva\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "la actividad en %s era %d, es %d\n"
@@ -2067,659 +1804,520 @@ msgstr "la actividad en %s era %d, es %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "no fue posible decodificar el desafío BASE64 inicial\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "%s principal en el «ticket» no coincide con -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "La instancia no nula (%s) puede causar un comportamiento extraño\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "no fue posible decodificar la respuesta BASE64 «ready»\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "desafío no coincidente\n"
 
-#: lock.c:87
+#: lock.c:86
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: error leyendo el archivo de bloqueo «%s»: %s\n"
 
-#: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+#: lock.c:97
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: eliminando archivo de bloqueo viejo\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: error abriendo archivo de bloqueo \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: error leyendo el archivo de bloqueo «%s»: %s\n"
-
-#: lock.c:126
+#: lock.c:121
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: error abriendo archivo de bloqueo \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:168
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: falló la creación del bloqueo.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: error leyendo el archivo de bloqueo «%s»: %s\n"
-
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
-msgstr ""
-"%s:%d: aviso: «%s» encontrado antes que cualquier nombre de anfitrión\n"
+msgstr "%s:%d: aviso: «%s» encontrado antes que cualquier nombre de anfitrión\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: aviso: el componente «%s» es desconocido\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
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "El SMTP de %s no permite ATRN\n"
 
-#: odmr.c:105
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "Dese la vuelta ahora...\n"
 
-#: odmr.c:110
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "Petición ATRN rechazada.\n"
 
-#: odmr.c:114
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "No es posible procesar el pedido ATRN\n"
 
-#: odmr.c:119
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "No tiene correo.\n"
 
-#: odmr.c:123
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Orden no implementada\n"
 
-#: odmr.c:127
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Autenticación requerida.\n"
 
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:130
+#, c-format
+msgid "Unknown ODMR error %d\n"
 msgstr "Error ODMR desconocido %d\n"
 
-#: odmr.c:192
+#: odmr.c:189
 msgid "receiving message data\n"
 msgstr "recibiendo datos del mensaje\n"
 
-#: odmr.c:245
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "La opción --keep no se permite con ODMR\n"
 
-#: odmr.c:249
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "La opción --flush no se permite con ODMR\n"
 
-#: odmr.c:253
+#: odmr.c:250
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "La opción --folder no se permite con ODMR\n"
 
-#: odmr.c:257
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "La opción --check no se permite con ODMR\n"
 
-#: opie.c:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "fatal recv del servidor\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
-#: options.c:179 options.c:223
+#: options.c:172 options.c:216
 #, 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:188
+#: options.c:181
 #, 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:189
+#: options.c:182
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:189
+#: options.c:182
 msgid "larger"
 msgstr "mayor"
 
-#: 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:378
+#: options.c:349
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocolo «%s» especificado no es válido.\n"
 
-#: options.c:425
+#: options.c:396
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Se especificó una autenticación «%s» inválida.\n"
 
-#: options.c:641
+#: options.c:601
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opciones] [servidor ...]\n"
 
-#: options.c:642
+#: options.c:602
 msgid "  Options are as follows:\n"
 msgstr "  Las opciones son las siguientes:\n"
 
-#: options.c:643
+#: options.c:603
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        muestra esta ayuda\n"
 
-#: options.c:644
+#: options.c:604
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     muestra información sobre la versión\n"
 
-#: options.c:646
+#: options.c:606
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       verifica si hay mensajes sin recibir\n"
 
-#: options.c:647
+#: options.c:607
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabajar silenciosamente\n"
 
-#: options.c:648
+#: options.c:608
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr ""
-"  -v, --verbose     trabajar ruidosamente (información de diagnóstico)\n"
+msgstr "  -v, --verbose     trabajar ruidosamente (información de diagnóstico)\n"
 
-#: options.c:649
+#: options.c:609
 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"
+msgstr "  -d, --daemon      correr en segundo plano y activarse una vez cada n segundos\n"
 
-#: options.c:650
+#: options.c:610
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    no lanzar un proceso en segundo plano\n"
 
-#: options.c:651
+#: options.c:611
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        terminar el proceso en segundo plano\n"
 
-#: options.c:652
+#: options.c:612
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especificar el nombre del archivo de registro\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      usar syslog(3) para la mayoría de los mensajes cuando se "
-"ejecuta en segundo plano\n"
-
-#: options.c:654
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:613
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      usar syslog(3) para la mayoría de los mensajes cuando se ejecuta en segundo plano\n"
 
-#: options.c:655
+#: options.c:614
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   no escribir «Received» y activar falsificación del "
-"anfitrión\n"
+msgstr "      --invisible   no escribir «Received» y activar falsificación del anfitrión\n"
 
-#: options.c:656
+#: options.c:615
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc especificar archivo de control de ejecución alterno\n"
+msgstr "  -f, --fetchmailrc especificar archivo de control de ejecución alterno\n"
 
-#: options.c:657
+#: options.c:616
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      especificar archivo de UID alterno\n"
 
-#: options.c:658
+#: options.c:617
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     especificar archivo PID alternativo (bloqueado)\n"
 
-#: options.c:659
+#: options.c:618
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especificar el recipiente de último recurso\n"
 
-#: options.c:660
+#: options.c:619
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirigir rebotes del usuario al postmaster.\n"
 
-#: 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:620
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail borra permanentemente los mensajes que no se pueden entregar.\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  mantiene permanentemente los mensajes que no se pueden "
-"entregar en el servidor (predeterminado).\n"
+#: options.c:621
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  mantiene permanentemente los mensajes que no se pueden entregar en el servidor (predeterminado).\n"
 
-#: options.c:664
+#: options.c:623
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificación de interfaz requerida\n"
 
-#: options.c:665
+#: options.c:624
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar interfaz por actividad\n"
 
-#: options.c:668
+#: options.c:627
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesión cifrada con ssl\n"
 
-#: options.c:669
+#: options.c:628
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      archivo de clave privada ssl\n"
 
-#: options.c:670
+#: options.c:629
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl del cliente\n"
 
-#: options.c:671
+#: options.c:630
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcert     comprobación estricta del certificado del servidor "
-"(recomendado)\n"
-
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --sslcert     comprobación estricta del certificado del servidor "
-"(recomendado)\n"
+msgstr "      --sslcert     comprobación estricta del certificado del servidor (recomendado)\n"
 
-#: options.c:673
-#, fuzzy
-msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
+#: options.c:631
+msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ubicación de los certificados ssl\n"
 
-#: 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:632
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  esperar este «CommonName» del servidor (desaconsejado)\n"
 
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  esperar este «CommonName» del servidor "
-"(desaconsejado)\n"
+#: options.c:633
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint huella digital que debe coincidir con la del certificado del servidor.\n"
 
-#: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint huella digital que debe coincidir con la del "
-"certificado del servidor.\n"
-
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:634
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    forzar protocolo (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:636
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      especificar la orden externa para abrir una conexión\n"
+msgstr "      --plugin      especificar la orden externa para abrir una conexión\n"
 
-#: options.c:680
+#: options.c:637
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     especificar la orden externa para abrir una conexión "
-"smtp\n"
+msgstr "      --plugout     especificar la orden externa para abrir una conexión smtp\n"
 
-#: options.c:681
-msgid ""
-"      --bad-header {reject|accept}\n"
-"                    specify policy for handling messages with bad headers\n"
-msgstr ""
-
-#: 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:639
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
+msgstr "  -p, --protocol    especificar el protocolo de recepción (ver página man)\n"
 
-#: options.c:685
+#: options.c:640
 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:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:641
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        Puerto TCP a conectar (obsoleto, use --service)\n"
 
-#: 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:642
+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:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
-msgstr ""
-"      --auth        tipo de autenticación (contraseña/kerberos/ssh/otp)\n"
+#: options.c:643
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
+msgstr "      --auth        tipo de autenticación (contraseña/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:644
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tiempo de espera por respuesta del servidor\n"
 
-#: options.c:691
+#: options.c:645
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envolver encabezados de dirección\n"
 
-#: options.c:692
+#: options.c:646
 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"
+msgstr "  -Q, --qvirtual    prefijo a eliminar de la identificación local del usuario\n"
 
-#: options.c:693
+#: options.c:647
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal del servicio de correo\n"
 
-#: options.c:694
+#: options.c:648
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  añadir información sobre traceado de consultas al "
-"encabezado «Received»\n"
+msgstr "      --tracepolls  añadir información sobre traceado de consultas al encabezado «Received»\n"
 
-#: options.c:696
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:650
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    especificar el acceso del usuario en el servidor\n"
 
-#: options.c:697
+#: options.c:651
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  recuperar antiguos y nuevos mensajes\n"
 
-#: options.c:698
+#: options.c:652
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borrar nuevos mensajes después de recibidos\n"
 
-#: options.c:699
+#: options.c:653
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        guardar nuevos mensajes después de recibidos\n"
 
-#: options.c:700
+#: options.c:654
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:701
+#: options.c:655
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  borrar mensajes demasiado grandes\n"
 
-#: options.c:702
+#: options.c:656
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescribir las direcciones del encabezado\n"
 
-#: options.c:703
+#: options.c:657
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       no recibir mensajes más grandes de lo especificado\n"
+msgstr "  -l, --limit       no recibir mensajes más grandes de lo especificado\n"
 
-#: options.c:704
+#: options.c:658
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre las notificaciones de correo\n"
 
-#: options.c:706
+#: options.c:660
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configurar el anfitrión de reenvío de SMTP\n"
 
-#: options.c:707
+#: options.c:661
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:708
+#: options.c:662
 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:709
+#: options.c:663
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr ""
-"      --smtpname    usar nombreusuario@dominio como nombre completo para "
-"SMTP\n"
+msgstr "      --smtpname    usar nombreusuario@dominio como nombre completo para SMTP\n"
 
-#: options.c:710
+#: options.c:664
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurar los valores de respuesta anti basura\n"
 
-#: options.c:711
+#: options.c:665
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  configurar el límite de mensajes para las conexiones "
-"SMTP\n"
+msgstr "  -b, --batchlimit  configurar el límite de mensajes para las conexiones SMTP\n"
 
-#: options.c:712
+#: options.c:666
 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"
+msgstr "  -B, --fetchlimit  configurar el límite de mensajes para las conexiones al servidor\n"
 
-#: options.c:713
+#: options.c:667
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit configurar el límite de tamaño de mensaje\n"
 
-#: options.c:714
+#: options.c:668
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    utilizar búsqueda binaria para los UIDL\n"
 
-#: options.c:715
+#: options.c:669
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     configurar la cantidad de mensajes borrados entre "
-"eliminaciones\n"
+msgstr "  -e, --expunge     configurar la cantidad de mensajes borrados entre eliminaciones\n"
 
-#: options.c:716
+#: options.c:670
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         configurar el MDA para que reenvíe\n"
 
-#: options.c:717
+#: options.c:671
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configurar archivo de salida de BSMTP\n"
 
-#: options.c:718
+#: options.c:672
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para entrega\n"
 
-#: options.c:719
+#: options.c:673
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especificar nombre de la carpeta remota\n"
 
-#: options.c:720
+#: options.c:674
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    mostrar puntos de progreso incluso en los archivos de "
-"registro\n"
+msgstr "      --showdots    mostrar puntos de progreso incluso en los archivos de registro\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
+#: pop3.c:355
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en vez de TOP.\n"
 
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
-
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en "
-"vez de TOP.\n"
-
-#: pop3.c:414
+#: pop3.c:454
 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"
+msgstr "TLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n"
 
-#: pop3.c:415
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "La orden CAPA, no obstante, es necesaria para TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:538
 #, 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:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
+#: pop3.c:646
 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:637
+#: pop3.c:660
 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:646
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en el sello de tiempo en el saludo\n"
 
-#: pop3.c:662
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "Sello de tiempo APOP inválido.\n"
 
-#: pop3.c:686
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petición de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:770
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:793
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:822
-#, fuzzy, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
+#: pop3.c:859 pop3.c:1105
+#, 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:934
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u no fue visto\n"
+
+#: pop3.c:965
 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"
+msgstr "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
 
-#: pop3.c:1032
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:1048
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDL\n"
 
-#: 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:1389
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está permitida con POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:126
 msgid "server option after user options"
 msgstr "opciones de servidor tras opciones de usuario"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:169
 msgid "SDPS not enabled."
 msgstr "SDPS no activado."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: la opción «interface» solo está permitida bajo Linux (sin IPv6) y "
-"FreeBSD\n"
+#: rcfile_y.y:215
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: la opción «interface» solo está permitida bajo Linux (sin IPv6) y FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: la opción «monitor» sólo está permitida bajo Linux (sin IPv6) y "
-"FreeBSD\n"
+#: rcfile_y.y:222
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: la opción «monitor» sólo está permitida bajo Linux (sin IPv6) y FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:335
 msgid "SSL is not enabled"
 msgstr "SSL no está activado"
 
-#: rcfile_y.y:391
+#: rcfile_y.y:385
 msgid "end of input"
 msgstr "fin de entrada"
 
-#: rcfile_y.y:429
+#: rcfile_y.y:423
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El archivo %s debe ser de tipo normal.\n"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:433
 #, 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:451
+#: rcfile_y.y:445
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Usted debe ser el propietario del archivo %s.\n"
@@ -2733,191 +2331,190 @@ msgstr "Error de sistema desconocido"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (mensaje de registro incompleto)\n"
 
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: rfc822.c:76
+#, c-format
+msgid "About to rewrite %s"
 msgstr "A punto de reescribir %s"
 
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:212
+#, c-format
+msgid "Rewritten version is %s\n"
 msgstr "La versión reescrita es %s\n"
 
-#: rpa.c:118
+#: rpa.c:117
 msgid "Success"
 msgstr "Éxito"
 
-#: rpa.c:119
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuario restringido (hay un problema con la cuenta)"
 
-#: rpa.c:120
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Nombre de usuario o contraseña inválidos"
 
-#: rpa.c:121
+#: rpa.c:120
 msgid "Deity error"
 msgstr "Error en deidad"
 
-#: rpa.c:174
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "Componente RPA 2: error de decodificación Base64\n"
 
-#: rpa.c:185
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "El servicio eligió RPA versión %d.%d\n"
 
-#: rpa.c:191
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Desafío del servicio (l=%d):\n"
 
-#: rpa.c:200
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Sello de tiempo del servicio %s\n"
 
-#: rpa.c:205
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "Error de longitud en el componente RPA 2\n"
 
-#: rpa.c:209
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de reinos: %s\n"
 
-#: rpa.c:213
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "Error de RPA en la cadena servicio@reino\n"
 
-#: rpa.c:250
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "Componente RPA 4: error de decodificación\n"
 
-#: rpa.c:261
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticación de usuario (l=%d):\n"
 
-#: rpa.c:275
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estado RPA: %02X\n"
 
-#: rpa.c:281
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "Error de longitud en el componente RPA 4\n"
 
-#: rpa.c:288
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA lo rechaza: %s\n"
 
-#: rpa.c:290
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA lo rechaza, razón desconocida\n"
 
-#: rpa.c:298
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Error de longitud en la autenticación de usuario RPA: %d\n"
 
-#: rpa.c:303
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Error de longitud en la clave de sesión RPA: %d\n"
 
-#: rpa.c:309
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallo en la autenticación del _servicio_ RPA. ¿Servidor falso?\n"
 
-#: rpa.c:314
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Clave de sesión establecida:\n"
 
-#: rpa.c:345
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Autorización RPA completa\n"
 
-#: rpa.c:372
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "Obtener respuesta\n"
 
-#: rpa.c:402
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Obtener respuesta %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Encabezado no es 60\n"
 
-#: rpa.c:484
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Error de longitud en el componente\n"
 
-#: rpa.c:489
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "La longitud %d del componente no está de acuerdo con rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "Campo del mecanismo incorrecto\n"
 
-#: rpa.c:531
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "Error de dec64 en el carácter %d: %x\n"
 
-#: rpa.c:546
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Datos binarios entrantes:\n"
 
-#: rpa.c:582
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Datos salientes:\n"
 
-#: rpa.c:645
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "Cadena RPA muy larga\n"
 
-#: rpa.c:650
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:709
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA falló abriendo /dev/urandom. Esto no debería\n"
 
-#: rpa.c:710
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    prevenir su ingreso, pero significa que\n"
 
-#: rpa.c:711
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    no se puede estar seguro de estar hablando\n"
 
-#: rpa.c:712
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    al servicio que usted cree (son posibles\n"
 
-#: rpa.c:713
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ataques de respuesta por un servicio deshonesto).\n"
 
-#: rpa.c:724
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Desafío de usuario:\n"
 
-#: rpa.c:874
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "Aplicando MD5 al bloque de datos:\n"
 
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:886
+msgid "MD5 result is: \n"
 msgstr "El resultado de MD5 es: \n"
 
 #: servport.c:53
@@ -2934,145 +2531,127 @@ msgstr "No se puede resolver el servicio %s al número de puerto.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Especifique el servicio como un número de puerto decimal.\n"
 
-#: sink.c:231
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:319
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:322
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:446
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "El error guardado es aún %d\n"
+
+#: sink.c:506 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:535
+#: sink.c:550
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "El servidor SMTP necesita STARTTLS, manteniendo mensaje.\n"
 
-#: sink.c:714
+#: sink.c:730
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Fallo en la apertura del archivo de BSMTP: %s\n"
 
-#: sink.c:760
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
+#: sink.c:776
+msgid "BSMTP preamble write failed.\n"
 msgstr "Fallo en la escritura del preámbulo\n"
 
-#: sink.c:974
+#: sink.c:990
 #, 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:981
+#: sink.c:997
 #, 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"
+msgstr "Al servidor %cMTP realmente no le gusta la dirección de recipiente «%s»\n"
 
-#: sink.c:1027
+#: sink.c:1043
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1039
+#: sink.c:1055
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1045
+#: sink.c:1061
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: 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
+#: sink.c:1217
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: 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:1234
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
 #: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1280
+#: sink.c:1278
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1304
+#: sink.c:1302
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: 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:1387
+#: sink.c:1364
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error escribiendo a MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1367
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA murió por la señal %d\n"
 
-#: sink.c:1393
+#: sink.c:1370
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA devolvió un estado %d distinto de cero\n"
 
-#: sink.c:1396
+#: sink.c:1373
 #, 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"
+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:1395
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
 
-#: sink.c:1421
+#: sink.c:1417
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1451
+#: sink.c:1447
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1454
+#: sink.c:1450
 #, 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:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1605
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "El demonio de Fetchmail"
@@ -3102,11 +2681,11 @@ msgstr "Autenticación ESMTP PLAIN...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticación ESMTP LOGIN...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "error de protocolo en el servidor smtp\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:115 socket.c:141
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc falló\n"
 
@@ -3127,338 +2706,187 @@ msgstr "dup2 falló\n"
 msgid "running %s (host %s service %s)\n"
 msgstr "ejecutando %s (anfitrión %s servicio %s)\n"
 
-#: socket.c:197
+#: socket.c:195
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) falló\n"
 
-#: socket.c:272
+#: socket.c:286
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(«%s»,«%s») error: %s\n"
 
-#: socket.c:275
+#: socket.c:289
 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"
+msgstr "Intentando añadir la opción --service (vea también FAQ elemento R12).\n"
 
-#: socket.c:289 socket.c:292
+#: socket.c:300 socket.c:303
 #, c-format
 msgid "unknown (%s)"
 msgstr "desconocido (%s)"
 
-#: socket.c:295
+#: socket.c:306
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Intentando conectar a %s/%s..."
 
-#: socket.c:304
+#: socket.c:314
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "no se puede crear el zócalo %s\n"
 
-#: socket.c:306
-#, 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:324
+#: socket.c:330
 msgid "connection failed.\n"
 msgstr "Fallo en la conexión.\n"
 
-#: socket.c:326
+#: socket.c:332
 #, 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:327
-#, 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:333
+#: socket.c:338
 msgid "connected.\n"
 msgstr "conectado.\n"
 
-#: socket.c:346
-#, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
-
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "Falló la verificación del certificado del servidor: %s\n"
-
-#: socket.c:662
-#, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-
-#: socket.c:665
-#, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
-
-#: socket.c:671
+#: socket.c:616
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organización emisora: %s\n"
 
-#: socket.c:674
+#: socket.c:619
 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"
+msgstr "Aviso: el nombre de la organización emisora es muy largo (posiblemente truncado).\n"
 
-#: socket.c:676
+#: socket.c:621
 msgid "Unknown Organization\n"
 msgstr "Organización desconocida\n"
 
-#: socket.c:678
+#: socket.c:623
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "«CommonName» del emisor: %s\n"
 
-#: socket.c:681
+#: socket.c:626
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Aviso: el «CommonName» del emisor es muy largo (posiblemente truncado).\n"
+msgstr "Aviso: el «CommonName» del emisor es muy largo (posiblemente truncado).\n"
 
-#: socket.c:683
+#: socket.c:628
 msgid "Unknown Issuer CommonName\n"
 msgstr "«CommonName» del emisor desconocido\n"
 
-#: socket.c:689
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "«CommonName» del emisor: %s\n"
+#: socket.c:632
+#, c-format
+msgid "Server CommonName: %s\n"
+msgstr "«CommonName» del servidor: %s\n"
 
-#: socket.c:695
+#: socket.c:638
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificado incorrecto: el «CommonName» del asunto es muy largo.\n"
 
-#: socket.c:701
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr ""
-"Certificado incorrecto: el «CommonName» del asunto contiene NUL, abortando.\n"
+msgstr "Certificado incorrecto: el «CommonName» del asunto contiene NUL, abortando.\n"
 
-#: socket.c:729
+#: socket.c:665
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nombre alternativo del asunto: %s\n"
 
-#: socket.c:735
+#: socket.c:671
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Certificado incorrecto: El nombre alternativo del asunto contiene NUL, "
-"abortando.\n"
+msgstr "Certificado incorrecto: El nombre alternativo del asunto contiene NUL, abortando.\n"
 
-#: socket.c:752
+#: socket.c:699
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "«CommonName» del servidor no coincide: %s = %s\n"
 
-#: socket.c:759
+#: socket.c:706
 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"
+msgstr "El nombre de servidor no fue configurado, ¡no fue posible verificar el certificado!\n"
 
-#: socket.c:764
+#: socket.c:711
 msgid "Unknown Server CommonName\n"
 msgstr "«CommonName» del servidor desconocido\n"
 
-#: socket.c:766
+#: socket.c:713
 msgid "Server name not specified in certificate!\n"
 msgstr "¡No se especifica el nombre del servidor en el certificado!\n"
 
-#: socket.c:778
+#: socket.c:725
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falló\n"
 
-#: socket.c:782
+#: socket.c:729
 msgid "Out of memory!\n"
 msgstr "¡No hay memoria!\n"
 
-#: socket.c:790
+#: socket.c:737
 msgid "Digest text buffer too small!\n"
 msgstr "¡El espacio para el resumen de texto es muy pequeño!\n"
 
-#: socket.c:796
+#: socket.c:743
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Huella digital de la clave %s: %s\n"
 
-#: socket.c:800
+#: socket.c:747
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Las huellas digitales de %s coinciden.\n"
 
-#: socket.c:802
+#: socket.c:749
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "¡Las huellas digitales de %s no coinciden!\n"
 
-#: socket.c:814
+#: socket.c:758
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Falló la verificación del certificado del servidor: %s\n"
-
-#: socket.c:831
-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:841
-#, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
-
-#: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, 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:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
+#: socket.c:764
 #, 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 "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:1106
+#: socket.c:851
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
+#: socket.c:867
 #, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "El protocolo SSL «%s» especificado es inválido, usando el predeterminado (SSLv23).\n"
 
-#: socket.c:1273
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-
-#: socket.c:1280
+#: socket.c:943
 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:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
+msgstr "¡La verificación de certificado/huella digital fue de algún modo omitida!\n"
 
-#: socket.c:1339
+#: socket.c:1021
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del zócalo cygwin\n"
 
-#: socket.c:1342
+#: socket.c:1024
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del zócalo cygwin\n"
 
-#: transact.c:79
+#: transact.c:65
 #, c-format
 msgid "mapped address %s to local %s\n"
 msgstr "dirección %s asignada al %s local\n"
 
-#: transact.c:101
+#: transact.c:87
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s asignado al %s local\n"
 
-#: transact.c:168
+#: transact.c:154
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "se atravesó %s coincidiendo con %s\n"
 
-#: transact.c:240
+#: transact.c:224
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -3467,217 +2895,141 @@ msgstr ""
 "analizando línea «Received»:\n"
 "%s"
 
-#: transact.c:279
+#: transact.c:263
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "línea aceptada, %s es un alias del servidor de correo\n"
 
-#: transact.c:285
+#: transact.c:269
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "línea rechazada, %s no es un alias del servidor de correo\n"
 
-#: transact.c:359
+#: transact.c:343
 msgid "no Received address found\n"
 msgstr "no se encontró la dirección de «Received»\n"
 
-#: transact.c:368
+#: transact.c:352
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "se encontró la dirección de «Received» «%s»\n"
 
-#: transact.c:613
-#, fuzzy
-msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"encabezado incorrecto encontrado durante la exploración de encabezados\n"
+#: transact.c:592
+msgid "incorrect header line found while scanning headers\n"
+msgstr "encabezado incorrecto encontrado durante la exploración de encabezados\n"
 
-#: transact.c:615
+#: transact.c:594
 #, c-format
 msgid "line: %s"
 msgstr "línea: %s"
 
-#: transact.c:1087 transact.c:1097
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1112
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr ""
-"analizando línea «Received»:\n"
-"%s"
-
-#: transact.c:1124
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1142
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1157
+#: transact.c:1133
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no hay coincidencias locales, reenviado a %s\n"
 
-#: transact.c:1172
+#: transact.c:1148
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
 
-#: transact.c:1283
+#: transact.c:1258
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribiendo encabezados RFC822\n"
 
-#: transact.c:1302
+#: transact.c:1277
 msgid "no recipient addresses matched declared local names"
-msgstr ""
-"ninguna dirección de destino coincidió con los nombres locales declarados"
+msgstr "ninguna dirección de destino coincidió con los nombres locales declarados"
 
-#: transact.c:1309
+#: transact.c:1284
 #, 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:1318
+#: transact.c:1293
 msgid "message has embedded NULs"
 msgstr "el mensaje contiene NULs"
 
-#: transact.c:1326
+#: transact.c:1301
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
 
-#: transact.c:1376
+#: transact.c:1440
 msgid "error writing message text\n"
 msgstr "error al escribir el texto del mensaje\n"
 
-#: transact.c:1652
+#: uid.c:250
 #, 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 "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: error leyendo el archivo de bloqueo «%s»: %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr "Lista de UID antiguas de %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <vacía>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Lista borrador de UID:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:517 uid.c:569
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Se combinó la lista de UID de %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:519
+#, c-format
+msgid "New UID list from %s:"
 msgstr "Lista de UID nuevas de %s:"
 
-#: uid.c:402
+#: uid.c:548
+msgid "swapping UID lists\n"
+msgstr "se intercambian listas de UID\n"
+
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr ""
-"no se intercambian las listas de UID, no se encontraron UID en esta "
-"consulta\n"
+msgstr "no se intercambian las listas de UID, no se encontraron UID en esta consulta\n"
 
-#: uid.c:422
+#: uid.c:581
 msgid "discarding new UID list\n"
 msgstr "descartando la nueva lista de UID\n"
 
-#: uid.c:479
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Borrando el archivo fetchids.\n"
 
-#: uid.c:482
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error borrando %s: %s\n"
 
-#: uid.c:489
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Escribiendo el archivo fetchids.\n"
 
-#: uid.c:503 uid.c:512
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "Escribiendo el archivo fetchids.\n"
-
-#: uid.c:524
+#: uid.c:645
 #, 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"
+msgstr "Error escribiendo al archivo fetchids %s. Se dejó el archivo original intacto.\n"
 
-#: uid.c:528
+#: uid.c:649
 #, 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:532
+#: uid.c:653
 #, 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"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc falló\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc falló\n"
 
-#, c-format
-#~ msgid "krb5_sendauth: %s [server says '%*s'] \n"
-#~ msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n"
-
-#~ msgid "Subject: Fetchmail unreachable-server warning."
-#~ msgstr "Asunto: aviso de fetchmail servidor fuera de alcance."
-
-#, c-format
-#~ msgid "Fetchmail could not reach the mail server %s:"
-#~ msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
-
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "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"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "El error guardado es aún %d\n"
-
-#, c-format
-#~ msgid "Server CommonName: %s\n"
-#~ msgstr "«CommonName» del servidor: %s\n"
-
-#, c-format
-#~ 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"
+#~ msgstr "delimitador de mensajes encontrado durante la exploración de encabezados\n"
 
 #~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 #~ msgstr "SIGPIPE lanzado desde un MDA o un error de socket de flujo\n"
diff --git a/po/fr.po b/po/fr.po
index 6bb0fa97..a06e9a2b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:12+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-16 08:58+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -38,15 +38,12 @@ msgstr "Non, leurs adresses IP ne coïncident pas\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"échec de la résolution de nom pour « %s » durant la réception depuis %s: "
-"%s.\n"
+msgstr "échec de la résolution de nom pour « %s » durant la réception depuis %s: %s.\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"échec de la résolution de nom pour « %s » durant la réception depuis %s.\n"
+msgstr "échec de la résolution de nom pour « %s » durant la réception depuis %s.\n"
 
 #: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
@@ -74,16 +71,12 @@ msgstr "Alerte de messages trop grands pour Fetchmail"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Les messages suivants, qui sont trop grands, ont été effacés du serveur de "
-"mail %s (compte %s) :"
+msgstr "Les messages suivants, qui sont trop grands, ont été effacés du serveur de mail %s (compte %s) :"
 
 #: driver.c:353
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"Les messages suivants, qui sont trop grands, restent sur le serveur de mail "
-"%s (compte %s) :"
+msgstr "Les messages suivants, qui sont trop grands, restent sur le serveur de mail %s (compte %s) :"
 
 #: driver.c:372
 #, c-format
@@ -144,11 +137,8 @@ msgstr " (%d octets dans le corps)"
 
 #: driver.c:770
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"le message %s@%s:%d n'est pas de la longueur attendue (%d actuelle != %d "
-"attendue)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "le message %s@%s:%d n'est pas de la longueur attendue (%d actuelle != %d attendue)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -165,19 +155,14 @@ msgstr " non éliminé\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] ""
-"fetchlimit %d atteinte; %d message demeure sur le serveur %s (compte %s)\n"
-msgstr[1] ""
-"fetchlimit %d atteinte; %d messages demeurent sur le serveur %s (compte %s)\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "fetchlimit %d atteinte; %d message demeure sur le serveur %s (compte %s)\n"
+msgstr[1] "fetchlimit %d atteinte; %d messages demeurent sur le serveur %s (compte %s)\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"délai dépassé après %d secondes d'attente d'une connexion avec le serveur "
-"%s.\n"
+msgstr "délai dépassé après %d secondes d'attente d'une connexion avec le serveur %s.\n"
 
 #: driver.c:903
 #, c-format
@@ -205,12 +190,8 @@ msgstr "fetchmail a rencontré des dépassements de délai à plusieurs reprises
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail a rencontré plus de %d dépassements de délais en récupérant du "
-"courrier depuis %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail a rencontré plus de %d dépassements de délais en récupérant du courrier depuis %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -284,9 +265,7 @@ msgstr " (précédemment autorisée)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Si vous avez besoin d'aide, consultez http://www.fetchmail.info/fetchmail-"
-"FAQ.html#R15\n"
+msgstr "Si vous avez besoin d'aide, consultez http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
 #: driver.c:1202
 #, c-format
@@ -309,8 +288,7 @@ msgid ""
 msgstr ""
 "Votre demande d'autorisation a échoué.\n"
 "Puisque nous avons déjà réussi à obtenir une autorisation pour cette\n"
-"connexion, ceci est probablement une autre erreur (telle qu'un serveur "
-"occupé)\n"
+"connexion, ceci est probablement une autre erreur (telle qu'un serveur occupé)\n"
 "que fetchmail ne sait pas distinguer car le serveur n'envoie pas de\n"
 "message d'erreur utile en cas d'échec du login."
 
@@ -486,8 +464,7 @@ msgstr "non définie"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"erreur %s durant la réception de %s@%s et l'envoi vers le serveur SMTP %s\n"
+msgstr "erreur %s durant la réception de %s@%s et l'envoi vers le serveur SMTP %s\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -551,8 +528,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 ""
@@ -570,15 +546,11 @@ msgstr "%s : Vous n'existez pas.  Allez vous en.\n"
 
 #: env.c:143
 msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-"Impossible de trouver le chemin absolu du répertoire personnel de "
-"l'utilisateur.\n"
+msgstr "Impossible de trouver le chemin absolu du répertoire personnel de l'utilisateur.\n"
 
 #: env.c:167
 msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-"Impossible de trouver le chemin absolu du répertoire personnel de "
-"fetchmail.\n"
+msgstr "Impossible de trouver le chemin absolu du répertoire personnel de fetchmail.\n"
 
 #: env.c:200
 #, c-format
@@ -599,8 +571,7 @@ msgstr ""
 #: env.c:229
 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 ""
 "Tentative de continuer sans nom d'hôte qualifié.\n"
@@ -693,16 +664,13 @@ msgid ""
 "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 vient ABSOLUMENT SANS AUCUNE GARANTIE. Il est un logiciel libre, "
-"et vous\n"
+"Fetchmail vient ABSOLUMENT SANS AUCUNE GARANTIE. Il est un logiciel libre, et vous\n"
 "êtes autorisé à le redistribuer sous certaines conditions. Pour en savoir\n"
 "plus, voyez le fichier COPYING s'il vous plaît.\n"
 
 #: fetchmail.c:188
 msgid "WARNING: Running as root is discouraged.\n"
-msgstr ""
-"Avertissement: appeler fetchmail avec les privilèges de « root » est "
-"déconseillé.\n"
+msgstr "Avertissement: appeler fetchmail avec les privilèges de « root » est déconseillé.\n"
 
 #: fetchmail.c:200
 msgid "fetchmail: invoked with"
@@ -722,11 +690,8 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "AVERTISSEMENT : Votre bibliothèque SSL/TLS ne supporte pas TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"AVERTISSEMENT : Compilé avec LibreSSL, ce n'est pas une configuration "
-"supportée.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "AVERTISSEMENT : Compilé avec LibreSSL, ce n'est pas une configuration supportée.\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
@@ -743,8 +708,7 @@ msgstr "Ne fonctionne pas en mode démon. L'option « logfile » est ignorée.
 #: fetchmail.c:354
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-"Le fichier journal « %s » n'existe pas. L'option « logfile » est ignorée.\n"
+msgstr "Le fichier journal « %s » n'existe pas. L'option « logfile » est ignorée.\n"
 
 #: fetchmail.c:360
 #, c-format
@@ -753,11 +717,8 @@ msgstr "Le fichier journal « %s » n'est pas accessible en écriture. Abandon
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"Les options « syslog » et « logfile » sont toutes les deux spécifiées. "
-"« syslog » est ignoré et le journal est écrit dans %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "Les options « syslog » et « logfile » sont toutes les deux spécifiées. « syslog » est ignoré et le journal est écrit dans %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -800,34 +761,22 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: fetchmail %s (%ld) terminé.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est "
-"exécuté sur le même hôte\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est exécuté sur le même hôte\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: impossible de récupérer le courrier si un autre fetchmail est "
-"exécuté avec le pid %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: impossible de récupérer le courrier si un autre fetchmail est exécuté avec le pid %ld.\n"
 
 #: fetchmail.c:559
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
-msgstr ""
-"fetchmail: un autre fetchmail, au premier plan, s'exécute avec le pid %ld.\n"
+msgstr "fetchmail: un autre fetchmail, au premier plan, s'exécute avec le pid %ld.\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne "
-"en tâche de fond.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne en tâche de fond.\n"
 
 #: fetchmail.c:581
 #, c-format
@@ -879,9 +828,7 @@ msgstr "redémarrage de fetchmail (%s a changé)\n"
 
 #: fetchmail.c:726
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"la tentative de réexécution peut échouer car le répertoire n'a pas été "
-"recréé\n"
+msgstr "la tentative de réexécution peut échouer car le répertoire n'a pas été recréé\n"
 
 #: fetchmail.c:752
 msgid "attempt to re-exec fetchmail failed\n"
@@ -890,8 +837,7 @@ msgstr "la tentative d'exécuter à nouveau fetchmail a échoué\n"
 #: fetchmail.c:782
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"réception de %s ignorée (échec d'authentification ou dépassement de délai)\n"
+msgstr "réception de %s ignorée (échec d'authentification ou dépassement de délai)\n"
 
 #: fetchmail.c:794
 #, c-format
@@ -995,17 +941,11 @@ msgstr "impossible de contrôler le temps du fichier run-control\n"
 #: fetchmail.c:1148
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Attention : plusieurs mentions de l'hôte %s dans le fichier de "
-"configuration\n"
+msgstr "Attention : plusieurs mentions de l'hôte %s dans le fichier de configuration\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Erreur: plusieurs blocs «defaults» dans le fichier de "
-"configuration, ou « defaults » n'est pas le premier enregistrement.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Erreur: plusieurs blocs «defaults» dans le fichier de configuration, ou « defaults » n'est pas le premier enregistrement.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -1013,74 +953,52 @@ msgstr "Le support de SSL n'a pas été activé à la compilation.\n"
 
 #: fetchmail.c:1324
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr ""
-"Le support de KERBEROS v4 est configuré, mais pas activé à la compilation.\n"
+msgstr "Le support de KERBEROS v4 est configuré, mais pas activé à la compilation.\n"
 
 #: fetchmail.c:1330
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr ""
-"Le support de KERBEROS v5 est configuré, mais pas activé à la compilation.\n"
+msgstr "Le support de KERBEROS v5 est configuré, mais pas activé à la compilation.\n"
 
 #: fetchmail.c:1336
 msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr ""
-"Le support de GSSAPI est configuré, mais pas activé à la compilation.\n"
+msgstr "Le support de GSSAPI est configuré, mais pas activé à la compilation.\n"
 
 #: fetchmail.c:1366
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: attention: aucun DNS disponible pour vérifier les réceptions "
-"« multidrop » depuis %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: attention: aucun DNS disponible pour vérifier les réceptions « multidrop » depuis %s\n"
 
 #: fetchmail.c:1377
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
-msgstr ""
-"attention: des réceptions « multidrop » depuis %s exigent l'option "
-"« envelope » !\n"
+msgstr "attention: des réceptions « multidrop » depuis %s exigent l'option « envelope » !\n"
 
 #: fetchmail.c:1378
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"attention: N'attendez pas d'aide du support si tous les mails sont expédiés "
-"au postmaster !\n"
+msgstr "attention: N'attendez pas d'aide du support si tous les mails sont expédiés au postmaster !\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: configuration de %s non valide, le service requiert un numéro de "
-"port positif\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: configuration de %s non valide, le service requiert un numéro de port positif\n"
 
 #: fetchmail.c:1402
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: configuration de %s non valide, RPOP requiert un port privilégié\n"
+msgstr "fetchmail: configuration de %s non valide, RPOP requiert un port privilégié\n"
 
 #: fetchmail.c:1420
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"configuration de %s non valide, LMTP ne peut utiliser le port SMTP par "
-"défaut\n"
+msgstr "configuration de %s non valide, LMTP ne peut utiliser le port SMTP par défaut\n"
 
 #: fetchmail.c:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Utiliser « fetchall » et « keep » ensemble en mode démon ou mode "
-"« idle » (inactif) est une erreur !\n"
+msgstr "Utiliser « fetchall » et « keep » ensemble en mode démon ou mode « idle » (inactif) est une erreur !\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Erreur : le mode « idle » (inactif) ne fonctionne pas avec "
-"plusieurs dossiers ou comptes !\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Erreur : le mode « idle » (inactif) ne fonctionne pas avec plusieurs dossiers ou comptes !\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1151,8 +1069,7 @@ msgstr "Fetchmail affichera des points de progression, même dans le journal\n"
 #: fetchmail.c:1659
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail réexpédiera les messages « multidrop » mal aiguillés vers %s.\n"
+msgstr "Fetchmail réexpédiera les messages « multidrop » mal aiguillés vers %s.\n"
 
 #: fetchmail.c:1663
 msgid "Fetchmail will direct error mail to the postmaster.\n"
@@ -1164,15 +1081,11 @@ msgstr "Fetchmail expédiera les erreurs de messagerie à l'envoyeur\n"
 
 #: fetchmail.c:1668
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail traitera les erreurs permanentes comme permanentes (perd les "
-"messages).\n"
+msgstr "Fetchmail traitera les erreurs permanentes comme permanentes (perd les messages).\n"
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail traitera les erreurs permanentes comme temporaires (garde les "
-"messages).\n"
+msgstr "Fetchmail traitera les erreurs permanentes comme temporaires (garde les messages).\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1188,10 +1101,8 @@ msgstr "  Le courrier sera reçu via %s\n"
 #, 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 réception depuis ce serveur s'opérera à chaque (%d) intervalle.\n"
-msgstr[1] ""
-"  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
+msgstr[0] "  La réception depuis ce serveur s'opérera à chaque (%d) intervalle.\n"
+msgstr[1] "  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
 
 #: fetchmail.c:1688
 #, c-format
@@ -1361,36 +1272,23 @@ msgstr "  Tout message récupéré sera conservé sur le serveur (--keep on).\n"
 
 #: fetchmail.c:1806
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
+msgstr "  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
 
 #: fetchmail.c:1808
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
+msgstr "  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush "
-"off).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush off).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Tout message trop grand sera éliminé avant relève du courrier (--"
-"limitflush on).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Tout message trop grand sera éliminé avant relève du courrier (--limitflush on).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Tout message trop grand ne sera pas éliminé avant relève du courrier (--"
-"limitflush off).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Tout message trop grand ne sera pas éliminé avant relève du courrier (--limitflush off).\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
@@ -1398,8 +1296,7 @@ msgstr "  La ré-écriture des adresses locales est activée (--norewrite off).\
 
 #: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  La ré-écriture des adresses locales est désactivée (--norewrite on).\n"
+msgstr "  La ré-écriture des adresses locales est désactivée (--norewrite on).\n"
 
 #: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
@@ -1418,18 +1315,12 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Le forçage des retour-chariots est désactivé (forcecr off).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  L'interprétation des « Content-Transfer-Encoding » est désactivée "
-"(pass8bits on).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  L'interprétation des « Content-Transfer-Encoding » est désactivée (pass8bits on).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  L'interprétation des « Content-Transfer-Encoding » est activée (pass8bits "
-"off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  L'interprétation des « Content-Transfer-Encoding » est activée (pass8bits off).\n"
 
 #: fetchmail.c:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
@@ -1453,19 +1344,15 @@ msgstr "  Les lignes « Status » non vides seront ignorées (dropstatus on).\
 
 #: fetchmail.c:1833
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr ""
-"  Les lignes « Status » non vides seront conservées (dropstatus off).\n"
+msgstr "  Les lignes « Status » non vides seront conservées (dropstatus off).\n"
 
 #: fetchmail.c:1835
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-"  Les lignes « Delivered-To » non vides seront ignorées (dropdelivered on).\n"
+msgstr "  Les lignes « Delivered-To » non vides seront ignorées (dropdelivered on).\n"
 
 #: fetchmail.c:1836
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-"  Les lignes « Delivered-To » non vides seront conservées (dropdelivered "
-"off).\n"
+msgstr "  Les lignes « Delivered-To » non vides seront conservées (dropdelivered off).\n"
 
 #: fetchmail.c:1840
 #, c-format
@@ -1479,14 +1366,11 @@ msgstr "  La taille des messages n'est pas limitée (--limit 0).\n"
 #: fetchmail.c:1845
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Alertes sur la taille des messages toutes les %d secondes (--warnings "
-"%d).\n"
+msgstr "  Alertes sur la taille des messages toutes les %d secondes (--warnings %d).\n"
 
 #: fetchmail.c:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-"  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
+msgstr "  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
 
 #: fetchmail.c:1851
 #, c-format
@@ -1500,31 +1384,24 @@ msgstr "  Le nombre de messages reçus n'est pas limité (--fetchlimit 0).\n"
 #: fetchmail.c:1856
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-"  La limite de taille de récupération de messages est %d (--fetchsizelimit "
-"%d)\n"
+msgstr "  La limite de taille de récupération de messages est %d (--fetchsizelimit %d)\n"
 
 #: fetchmail.c:1859
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
-msgstr ""
-"  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
+msgstr "  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
 
 #: fetchmail.c:1863
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
+msgstr "  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
 
 #: fetchmail.c:1865
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--"
-"fastuidl %d).\n"
+msgstr "  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--fastuidl %d).\n"
 
 #: fetchmail.c:1868
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
+msgstr "  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
 
 #: fetchmail.c:1870
 #, c-format
@@ -1538,8 +1415,7 @@ msgstr "  Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n
 #: fetchmail.c:1876
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
+msgstr "  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
 
 #: fetchmail.c:1878
 msgid "  No forced expunges (--expunge 0).\n"
@@ -1632,17 +1508,12 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La requête DNS des adresses « multidrop » est désactivée.\n"
 
 #: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Les alias du serveur seront comparés avec les adresses « multidrop » par "
-"leurs adresses IP.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Les alias du serveur seront comparés avec les adresses « multidrop » par leurs adresses IP.\n"
 
 #: fetchmail.c:1983
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Les alias du serveur seront comparés avec les adresses « multidrop » par "
-"leurs noms.\n"
+msgstr "  Les alias du serveur seront comparés avec les adresses « multidrop » par leurs noms.\n"
 
 #: fetchmail.c:1986
 msgid "  Envelope-address routing is disabled\n"
@@ -1722,14 +1593,11 @@ msgstr "  %d UID enregistrés.\n"
 
 #: fetchmail.c:2053
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Information de traçage de la réception ajoutée aux en-têtes « Received ».\n"
+msgstr "  Information de traçage de la réception ajoutée aux en-têtes « Received ».\n"
 
 #: fetchmail.c:2055
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Aucun ajout d'information de traçage de la réception aux en-têtes "
-"« Received ».\n"
+msgstr "  Aucun ajout d'information de traçage de la réception aux en-têtes « Received ».\n"
 
 #: fetchmail.c:2060
 msgid "  Messages with bad headers will be rejected.\n"
@@ -1750,12 +1618,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Impossible de modifier le masque du signal : %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Votre système d'exploitation ne défini pas PATH_MAX et n'accepte pas non "
-"plus realpath(f, NULL). Abandon.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Votre système d'exploitation ne défini pas PATH_MAX et n'accepte pas non plus realpath(f, NULL). Abandon.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1791,16 +1655,11 @@ msgstr "Utilise le nom de service [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Pas de justificatif d'identité GSSAPI valable. L'authentification GSSAPI est "
-"ignorée.\n"
+msgstr "Pas de justificatif d'identité GSSAPI valable. L'authentification GSSAPI est ignorée.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Si vous voulez utiliser GSSAPI, vous avez besoin d'un justificatif "
-"d'identité, probablement de kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Si vous voulez utiliser GSSAPI, vous avez besoin d'un justificatif d'identité, probablement de kinit.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1848,9 +1707,7 @@ msgstr "Erreur à la création de la requête de niveau de sécurité\n"
 #: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-"Le send_token de GSSAPI est trop grand (%lu) lors de l'envoi du nom "
-"d'utilisateur.\n"
+msgstr "Le send_token de GSSAPI est trop grand (%lu) lors de l'envoi du nom d'utilisateur.\n"
 
 #: gssapi.c:298
 msgid "Releasing GSS credentials\n"
@@ -1914,9 +1771,7 @@ msgstr "%s: échec de la négociation TLS mais on continue quand-même\n"
 #: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-"%s: AVERTISSEMENT : le serveur a offert STARTTLS mais sslproto '' a été "
-"fourni.\n"
+msgstr "%s: AVERTISSEMENT : le serveur a offert STARTTLS mais sslproto '' a été fourni.\n"
 
 #: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
@@ -1929,8 +1784,7 @@ msgstr "La fonctionnalité NTLM requise n'est pas compilée dans fetchmail.\n"
 #: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr ""
-"pas de concordance de la purge des messages (%d effectifs != %d attendus)\n"
+msgstr "pas de concordance de la purge des messages (%d effectifs != %d attendus)\n"
 
 #: imap.c:818
 #, c-format
@@ -1985,11 +1839,8 @@ msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Avertissement : des données farfelues retournées par le serveur pour la "
-"taille des messages sont ignorées.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Avertissement : des données farfelues retournées par le serveur pour la taille des messages sont ignorées.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1998,9 +1849,7 @@ msgstr "Réponse FETCH incorrecte: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Impossible d'ouvrir l'interface kvm. Assurez-vous que fetchmail est SGID "
-"kmem."
+msgstr "Impossible d'ouvrir l'interface kvm. Assurez-vous que fetchmail est SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2111,15 +1960,12 @@ msgstr "fetchmail: suppression de l'ancien fichier verrou « %s »\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: échec de la suppression du fichier verrou « %s » (%s), tentative "
-"d'écrire dedans\n"
+msgstr "fetchmail: échec de la suppression du fichier verrou « %s » (%s), tentative d'écrire dedans\n"
 
 #: lock.c:116
 #, c-format
 msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr ""
-"fetchmail: échec de l'écriture dans le fichier verrou « %s » (%s), arrêt\n"
+msgstr "fetchmail: échec de l'écriture dans le fichier verrou « %s » (%s), arrêt\n"
 
 #: lock.c:126
 #, c-format
@@ -2134,8 +1980,7 @@ msgstr "fetchmail: impossible de créer le verrou, fichier pid « %s »: %s\n"
 #: lock.c:187
 #, c-format
 msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr ""
-"fetchmail: impossible de supprimer ou tronquer le fichier pid « %s »: %s\n"
+msgstr "fetchmail: impossible de supprimer ou tronquer le fichier pid « %s »: %s\n"
 
 #: netrc.c:220
 #, c-format
@@ -2242,8 +2087,7 @@ msgstr "plus grande"
 #: options.c:337
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr ""
-"L'action « %s » spécifié pour les mauvais en-têtes n'est pas valable.\n"
+msgstr "L'action « %s » spécifié pour les mauvais en-têtes n'est pas valable.\n"
 
 #: options.c:378
 #, c-format
@@ -2300,11 +2144,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     spécifier le nom du fichier de traces\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      utiliser syslog(3) pour les messages, en mode démon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      utiliser syslog(3) pour les messages, en mode démon\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2312,8 +2153,7 @@ msgstr "      --nosyslog    désactiver l'utilisation du syslog(3)\n"
 
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   ne pas écrire de «Received» et activer la mystification\n"
+msgstr "      --invisible   ne pas écrire de «Received» et activer la mystification\n"
 
 #: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
@@ -2325,8 +2165,7 @@ msgstr "  -i, --idfile      spécifier un autre fichier contenant les UID\n"
 
 #: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr ""
-"      --pidfile     spécifier un autre fichier contenant la PID (le verrou)\n"
+msgstr "      --pidfile     spécifier un autre fichier contenant la PID (le verrou)\n"
 
 #: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
@@ -2337,19 +2176,12 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    rediriger les rebonds vers le postmaster.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail efface les messages non délivrables en "
-"permanence.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail efface les messages non délivrables en permanence.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  conserve sur le serveur les messages non délivrables en "
-"permanence.\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  conserve sur le serveur les messages non délivrables en permanence.\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2373,39 +2205,27 @@ msgstr "      --sslcert     certificat de session SSL\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   vérification stricte des certificats du serveur "
-"(recommandé)\n"
+msgstr "      --sslcertck   vérification stricte des certificats du serveur (recommandé)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck ne pas vérifier strictement les certificats du serveur "
-"(peu sûr)\n"
+msgstr "      --nosslcertck ne pas vérifier strictement les certificats du serveur (peu sûr)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile fichier du certificat SSL de l'autorité de "
-"certification\n"
+msgstr "      --sslcertfile fichier du certificat SSL de l'autorité de certification\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath répertoire des certificats SSL des autorités de "
-"certification\n"
+msgstr "      --sslcertpath répertoire des certificats SSL des autorités de certification\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr "      --sslcommonname  attend ce nom du serveur (non recommandé)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint signature qui doit correspondre à celle du serveur.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint signature qui doit correspondre à celle du serveur.\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2413,14 +2233,11 @@ msgstr "      --sslproto    force le protocole ssl (consultez le manuel)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      spécifier la commande externe pour ouvrir la connexion\n"
+msgstr "      --plugin      spécifier la commande externe pour ouvrir la connexion\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     spécifier la commande externe pour ouvrir la connexion "
-"smtp\n"
+msgstr "      --plugout     spécifier la commande externe pour ouvrir la connexion smtp\n"
 
 #: options.c:681
 msgid ""
@@ -2433,33 +2250,23 @@ msgstr ""
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]  spécifier le protocole de récupération (voir la page "
-"man)\n"
+msgstr "  -p, --proto[col]  spécifier le protocole de récupération (voir la page man)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forcer l'utilisation des UIDL (uniquement pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        demander au serveur IMAP d'envoyer des notifications "
-"pour les nouveaux messages\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        demander au serveur IMAP d'envoyer des notifications pour les nouveaux messages\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        port TCP auquel se connecter (obsolète, utilisez --"
-"service)\n"
+msgstr "      --port        port TCP auquel se connecter (obsolète, utilisez --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service      service TCP auquel se connecter (peut être un port "
-"numérique)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service      service TCP auquel se connecter (peut être un port numérique)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2489,8 +2296,7 @@ msgstr ""
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
-msgstr ""
-"  -u, --user[name]  spécifier le login de l'utilisateur sur le serveur\n"
+msgstr "  -u, --user[name]  spécifier le login de l'utilisateur sur le serveur\n"
 
 #: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
@@ -2498,13 +2304,11 @@ msgstr "  -a, --[fetch]all  récupérer les anciens et nouveaux messages\n"
 
 #: options.c:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
-msgstr ""
-"  -K, --nokeep      supprimer les nouveaux messages après récupération\n"
+msgstr "  -K, --nokeep      supprimer les nouveaux messages après récupération\n"
 
 #: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr ""
-"  -k, --keep        conserver les nouveaux messages après récupération\n"
+msgstr "  -k, --keep        conserver les nouveaux messages après récupération\n"
 
 #: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
@@ -2520,8 +2324,7 @@ msgstr "  -n, --norewrite   ne pas récrire les adresses d'en-tête\n"
 
 #: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       limite maximale de la taille des messages à récupérer\n"
+msgstr "  -l, --limit       limite maximale de la taille des messages à récupérer\n"
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
@@ -2549,18 +2352,15 @@ msgstr "  -Z, --antispam    configurer les valeurs de réponse anti-spam\n"
 
 #: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  limite du nombre de messages pour chaque connexion SMTP\n"
+msgstr "  -b, --batchlimit  limite du nombre de messages pour chaque connexion SMTP\n"
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  limite des récupérations pour les connexions au serveur\n"
+msgstr "  -B, --fetchlimit  limite des récupérations pour les connexions au serveur\n"
 
 #: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit indiquer la taille maximale des messages récupérés\n"
+msgstr "      --fetchsizelimit indiquer la taille maximale des messages récupérés\n"
 
 #: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2568,8 +2368,7 @@ msgstr "      --fastuidl    effectuer une recherche binaire des UIDL\n"
 
 #: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     limite du nombre des suppressions entre deux purges\n"
+msgstr "  -e, --expunge     limite du nombre des suppressions entre deux purges\n"
 
 #: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2589,9 +2388,7 @@ msgstr "  -r, --folder      spécifier le nom du dossier distant\n"
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    afficher des points de progression, même dans le "
-"journal\n"
+msgstr "      --showdots    afficher des points de progression, même dans le journal\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2599,20 +2396,15 @@ msgstr "POP2 ne supporte pas STLS. J'abandonne.\n"
 
 #: pop2.c:73
 msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
-"POP2 ne supporte que l'authentification par mot de passe. J'abandonne.\n"
+msgstr "POP2 ne supporte que l'authentification par mot de passe. J'abandonne.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Avertissement: découverte d'un « Maillennium POP3 », la commande RETR est "
-"utilisé au lieu de TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Avertissement: découverte d'un « Maillennium POP3 », la commande RETR est utilisé au lieu de TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"TLS est requis pour cette session mais le serveur refuse la commande CAPA.\n"
+msgstr "TLS est requis pour cette session mais le serveur refuse la commande CAPA.\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2626,14 +2418,11 @@ msgstr "%s: échec du passage en TLS mais on continue quand-même.\n"
 #: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-"%s: AVERTISSEMENT : le serveur a offert STLS mais sslproto '' a été fourni.\n"
+msgstr "%s: AVERTISSEMENT : le serveur a offert STLS mais sslproto '' a été fourni.\n"
 
 #: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Nous avons épuisé toutes les techniques d'authentification permises et ne "
-"pouvons continuer.\n"
+msgstr "Nous avons épuisé toutes les techniques d'authentification permises et ne pouvons continuer.\n"
 
 #: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2698,20 +2487,12 @@ msgid "SDPS not enabled."
 msgstr "le support de SDPS est désactivé."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'option interface n'est supportée que sous Linux (sans IPv6) et "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'option interface n'est supportée que sous Linux (sans IPv6) et FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'option monitor n'est supportée que sous Linux (sans IPv6) et "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'option monitor n'est supportée que sous Linux (sans IPv6) et FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2833,8 +2614,7 @@ msgstr "RPA vous a rejeté pour une raison inconnue\n"
 #: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
-msgstr ""
-"Erreur dans la longueur de l'authentification RPA de l'utilisateur : %d\n"
+msgstr "Erreur dans la longueur de l'authentification RPA de l'utilisateur : %d\n"
 
 #: rpa.c:303
 #, c-format
@@ -2987,8 +2767,7 @@ msgstr "Le serveur %cMTP n'apprécie pas l'adresse de destinataire « %s »\n"
 #: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr ""
-"Le serveur %cMTP n'apprécie vraiment pas l'adresse du destinataire « %s »\n"
+msgstr "Le serveur %cMTP n'apprécie vraiment pas l'adresse du destinataire « %s »\n"
 
 #: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
@@ -3011,9 +2790,7 @@ msgstr "L'option MDA contient une expansion %%%c entre apostrophes.\n"
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-"La distribution est rejetée. Consultez le manuel et corrigez votre option "
-"mda.\n"
+msgstr "La distribution est rejetée. Consultez le manuel et corrigez votre option mda.\n"
 
 #: sink.c:1211
 #, c-format
@@ -3047,8 +2824,7 @@ msgstr "ne peut relever l'agent ; se replie sur %s"
 #: sink.c:1362
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
-msgstr ""
-"Échec à la terminaison du message ou à la fermeture du fichier BSMTP: %s\n"
+msgstr "Échec à la terminaison du message ou à la fermeture du fichier BSMTP: %s\n"
 
 #: sink.c:1387
 #, c-format
@@ -3067,11 +2843,8 @@ msgstr "MDA a retourné un état non nul (%d)\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Étrange : le MDA a retourné %d et errno %d/%s lors du pclose; cas impossible "
-"à gérer %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Étrange : le MDA a retourné %d et errno %d/%s lors du pclose; cas impossible à gérer %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3172,8 +2945,7 @@ msgstr "la connexion ne peut pas être créée : %s\n"
 #: socket.c:306
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr ""
-"nom %d: impossible de créer une connexion de la famille %d type %d: %s\n"
+msgstr "nom %d: impossible de créer une connexion de la famille %d type %d: %s\n"
 
 #: socket.c:324
 msgid "connection failed.\n"
@@ -3210,9 +2982,7 @@ msgstr "OpenSSL a rapporté : %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"Profondeur de la routine d'appel de vérification SSL %d : preverify_ok == "
-"%d, err = %d, %s\n"
+msgstr "Profondeur de la routine d'appel de vérification SSL %d : preverify_ok == %d, err = %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3221,9 +2991,7 @@ msgstr "Certificat du serveur:\n"
 #: socket.c:662
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-"Chaîne de certification, depuis la racine jusqu'au correspondant, débutant à "
-"la profondeur %d:\n"
+msgstr "Chaîne de certification, depuis la racine jusqu'au correspondant, débutant à la profondeur %d:\n"
 
 #: socket.c:665
 #, c-format
@@ -3237,9 +3005,7 @@ msgstr "Organisation de l'expéditeur: %s\n"
 
 #: socket.c:674
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Avertissement: le nom de l'organisation de l'expéditeur est trop long (et "
-"peut être tronqué).\n"
+msgstr "Avertissement: le nom de l'organisation de l'expéditeur est trop long (et peut être tronqué).\n"
 
 #: socket.c:676
 msgid "Unknown Organization\n"
@@ -3252,8 +3018,7 @@ msgstr "Nom commun de l'émetteur : %s\n"
 
 #: socket.c:681
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Avertissement: le nom de l'expéditeur est trop long (et peut être tronqué).\n"
+msgstr "Avertissement: le nom de l'expéditeur est trop long (et peut être tronqué).\n"
 
 #: socket.c:683
 msgid "Unknown Issuer CommonName\n"
@@ -3279,8 +3044,7 @@ msgstr "Nom Alternatif du Sujet : %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Certificat erroné : Nom alternatif du sujet contient un NUL, abandon !\n"
+msgstr "Certificat erroné : Nom alternatif du sujet contient un NUL, abandon !\n"
 
 #: socket.c:752
 #, c-format
@@ -3289,9 +3053,7 @@ msgstr "Pas de concordance du nom commun du serveur: %s != %s\n"
 
 #: socket.c:759
 msgid "Server name not set, could not verify certificate!\n"
-msgstr ""
-"Le nom du serveur n'est pas spécifié, impossible de vérifier le "
-"certificat !\n"
+msgstr "Le nom du serveur n'est pas spécifié, impossible de vérifier le certificat !\n"
 
 #: socket.c:764
 msgid "Unknown Server CommonName\n"
@@ -3339,15 +3101,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Chaîne de certification rompue à : %s\n"
 
 #: socket.c:831
-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 ""
-"Ceci peut signifier que le serveur n'a pas fourni le ou les certificat(s) "
-"intermédiaire(s). Il n'y a rien que fetchmail puisse faire à cela. Pour plus "
-"de détails, consultez le document README.SSL-SERVER fourni avec fetchmail.\n"
+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 "Ceci peut signifier que le serveur n'a pas fourni le ou les certificat(s) intermédiaire(s). Il n'y a rien que fetchmail puisse faire à cela. Pour plus de détails, consultez le document README.SSL-SERVER fourni avec fetchmail.\n"
 
 #: socket.c:841
 #, c-format
@@ -3355,17 +3110,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Certificat approuvé manquant : %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Ceci pourrait signifier que le certificat de signature du CA racine n'est "
-"pas dans la liste des certificats des CA de confiance ou que c_rehash doit "
-"être exécuté sur le répertoire des certificats. Pour plus de détails, "
-"consultez la documentation de --sslcertpath et --sslcertfile dans la page du "
-"manuel. Consultez README.SSL pour plus d'informations.\n"
+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. See README.SSL for details.\n"
+msgstr "Ceci pourrait signifier que le certificat de signature du CA racine n'est pas dans la liste des certificats des CA de confiance ou que c_rehash doit être exécuté sur le répertoire des certificats. Pour plus de détails, consultez la documentation de --sslcertpath et --sslcertfile dans la page du manuel. Consultez README.SSL pour plus d'informations.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3386,61 +3132,39 @@ msgstr "Votre version de OpenSSL ne supporte pas TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Le protocole SSL « %s » spécifié est invalide, on utilise l'auto sélection "
-"par défaut (auto).\n"
+msgstr "Le protocole SSL « %s » spécifié est invalide, on utilise l'auto sélection par défaut (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"La bibliothèque OpenSSL %#lx utilisée est plus vieille que l'en-tête %#lx, "
-"impossible de travailler.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "La bibliothèque OpenSSL %#lx utilisée est plus vieille que l'en-tête %#lx, impossible de travailler.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"La bibliothèque OpenSSL %#lx utilisée est plus récente que l'en-tête %#lx, "
-"on essaie de continuer.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "La bibliothèque OpenSSL %#lx utilisée est plus récente que l'en-tête %#lx, on essaie de continuer.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Descripteur de fichier inaccessible pour SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Notez que certaines distributions désactivent les anciennes versions des "
-"protocoles de manières étranges et non standard. Essayez un protocole d'une "
-"version plus récente.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Notez que certaines distributions désactivent les anciennes versions des protocoles de manières étranges et non standard. Essayez un protocole d'une version plus récente.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Avertissement : SSL_set_tlsext_host_name(%p, \"%s\") a échoué (code %#lx), "
-"on essaie de continuer.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Avertissement : SSL_set_tlsext_host_name(%p, \"%s\") a échoué (code %#lx), on essaie de continuer.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Avertissement : X509_VERIFY_PARAM_set1_host(%p, \"%s\") a échoué (code %#x), "
-"on essaie de continuer.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Avertissement : X509_VERIFY_PARAM_set1_host(%p, \"%s\") a échoué (code %#x), on essaie de continuer.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-"Le serveur a terminé la connexion prématurément pendant SSL_connect().\n"
+msgstr "Le serveur a terminé la connexion prématurément pendant SSL_connect().\n"
 
 #: socket.c:1250
 #, c-format
@@ -3453,28 +3177,20 @@ msgstr "l'échange a échoué au niveau du protocole ou de la connexion."
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"Impossible d'obtenir le chiffrement SSL/TLS actuel – pas de session "
-"établie ?\n"
+msgstr "Impossible d'obtenir le chiffrement SSL/TLS actuel – pas de session établie ?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS : utilisation du protocole %s, chiffrement %s, %d/%d bits dans le "
-"secret/traité\n"
+msgstr "SSL/TLS : utilisation du protocole %s, chiffrement %s, %d/%d bits dans le secret/traité\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La vérification du certificat ou de la signature n'a pas été faite !\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Attention: la connexion n'est pas sûre mais on continue quand même (il vaut "
-"mieux utiliser --sslcertck !).\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Attention: la connexion n'est pas sûre mais on continue quand même (il vaut mieux utiliser --sslcertck !).\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3529,9 +3245,7 @@ msgstr "adresse « %s » trouvée dans « Received »\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"ligne d'en-tête incorrecte trouvée - voyez la page man pour l'option « bad-"
-"header »\n"
+msgstr "ligne d'en-tête incorrecte trouvée - voyez la page man pour l'option « bad-header »\n"
 
 #: transact.c:615
 #, c-format
@@ -3550,9 +3264,7 @@ msgstr "Décodage des noms de la ligne « Received » « %-.*s »\n"
 
 #: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"Pas de destinataire trouvé dans l'enveloppe, on essaie de le deviner dans "
-"l'en-tête.\n"
+msgstr "Pas de destinataire trouvé dans l'enveloppe, on essaie de le deviner dans l'en-tête.\n"
 
 #: transact.c:1142
 #, c-format
@@ -3655,8 +3367,7 @@ msgstr "Erreur d'écriture du fichier fetchids %s : %s\n"
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Erreur d'écriture du fichier fetchids %s, ancien fichier laissé en place.\n"
+msgstr "Erreur d'écriture du fichier fetchids %s, ancien fichier laissé en place.\n"
 
 #: uid.c:528
 #, c-format
@@ -3688,11 +3399,8 @@ msgstr "échec de realloc\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 "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"
diff --git a/po/id.po b/po/id.po
index 882f1f3d..2bbe62ae 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,42 +6,42 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.24.1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+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: 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"
 "Language: id\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=1; plural=0;\n"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Memeriksa apakah %s memiliki node yang sama dengan %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Ya, alamat IP mereka cocok\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Tidak, alamat IP mereka tidak cocok\n"
 
-#: checkalias.c:207
+#: checkalias.c:212
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "server nama gagal ketika mencari '%s' selama penjajakan %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:237
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "server nama gagal ketika mencari `%s' selama penjajakan %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "tak dapat mengawasandi tantangan BASE64\n"
 
@@ -61,8 +61,7 @@ msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server berkata '%s']\n"
 
 #: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subjek: Peringatan pesan terlalu besar Fetchmail"
 
 #: driver.c:349
@@ -92,111 +91,102 @@ msgstr[0] "  %d pesan  %d oktet yang dilewati oleh fetchmail."
 msgid "skipping message %s@%s:%d"
 msgstr "melewati pesan %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:576
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "melewati pesan %s@%s:%d (%d oktet)"
 
-#: driver.c:593
+#: driver.c:592
 msgid " (length -1)"
 msgstr " (panjang -1)"
 
-#: driver.c:596
+#: driver.c:595
 msgid " (oversized)"
 msgstr " (terlalu besar)"
 
-#: driver.c:614
+#: driver.c:613
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "tak dapat mengambil tajuk, pesan %s@%s: %d (%d oktet)\n"
 
-#: driver.c:632
+#: driver.c:631
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "membaca pesan %s@%s:%d dari %d"
 
-#: driver.c:637
+#: driver.c:636
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktet)"
 
-#: driver.c:638
+#: driver.c:637
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktet tajuk)"
 
-#: driver.c:708
+#: driver.c:707
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktet tubuh)"
 
-#: driver.c:770
+#: driver.c:769
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"pesan %s@%s:%d bukan panjang yang diharapkan (%d sebenarnya != %d "
-"diharapkan)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "pesan %s@%s:%d bukan panjang yang diharapkan (%d sebenarnya != %d diharapkan)\n"
 
-#: driver.c:802
+#: driver.c:801
 msgid " retained\n"
 msgstr " tertahan\n"
 
-#: driver.c:812
+#: driver.c:811
 msgid " flushed\n"
 msgstr " terhapus\n"
 
-#: driver.c:824
+#: driver.c:823
 msgid " not flushed\n"
 msgstr " tak dihapus\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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "batas ambil %d tercapai; %d pesan tertinggal di server %s akun %s\n"
 
-#: driver.c:899
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "waktu habis setelah %d detik menunggu tersambung ke server %s.\n"
 
-#: driver.c:903
+#: driver.c:902
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "waktu habis setelah %d detik menunggu server %s.\n"
 
-#: driver.c:907
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "waktu habis setelah %d detik menunggu %s.\n"
 
-#: driver.c:912
+#: driver.c:911
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "waktu habis setelah %d detik menunggu hingga pendengar merespon.\n"
 
-#: driver.c:915
+#: driver.c:914
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "waktu habis setelah %d detik.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:926
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjek: fetchmail melihat waktu habis yang berulang"
 
-#: 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 melihat lebih dari %d waktu habis ketika coba mengambil surat dari"
-"%s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail melihat lebih dari %d waktu habis ketika coba mengambil surat dari%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"
@@ -210,74 +200,73 @@ msgstr ""
 "oleh galat server. Anda dapat menjalankan `fetchmail -v -v' untuk\n"
 "mendiagnosis masalah.\n"
 
-#: driver.c:960
+#: driver.c:959
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "perintah pra-koneksi dimatikan dengan sinyal %d\n"
 
-#: driver.c:963
+#: driver.c:962
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "perintah pra-koneksi gagal dengan status %d\n"
 
-#: driver.c:987
+#: driver.c:986
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "tak dapat menemukan pobox HESIOD untuk %s\n"
 
-#: driver.c:1008
+#: driver.c:1007
 msgid "Lead server has no name.\n"
 msgstr "Awalan server tak memiliki nama.\n"
 
-#: driver.c:1035
+#: driver.c:1034
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "tak dapat menemukan nama DNS kanonik dari %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1081
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "koneksi %s ke %s gagal"
 
-#: driver.c:1111
+#: driver.c:1110
 msgid "SSL connection failed.\n"
 msgstr "koneksi SSL gagal.\n"
 
-#: driver.c:1166
+#: driver.c:1165
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Galat kunci-sibuk di %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1169
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Galat server sibuk di %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1174
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Kegagalan otorisasi di %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1177
 msgid " (previously authorized)"
 msgstr " (sebelumnya telah diotorisasi)"
 
-#: driver.c:1181
+#: driver.c:1180
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Untuk bantuan, lihat http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "Untuk bantuan, lihat 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 "Subjek: otentikasi fetchmail gagal di %s@%s"
 
-#: driver.c:1206
+#: driver.c:1205
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail tak dapat mengambil surat dari %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"
@@ -291,7 +280,7 @@ msgstr ""
 "yang fetchmail tak dapat kenali karena server tidak mengirim pesan galat\n"
 "yang cukup."
 
-#: driver.c:1216
+#: driver.c:1215
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -311,7 +300,7 @@ msgstr ""
 "tiap siklus. Tak ada pemberitahuan di masa depan yang akan dikirimkan\n"
 "hingga layanan dipulihkan."
 
-#: 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"
@@ -332,179 +321,179 @@ msgstr ""
 "tiap siklus. Tak ada pemberitahuan di masa depan yang akan dikirimkan\n"
 "hingga layanan ini dipulihkan."
 
-#: driver.c:1242
+#: driver.c:1241
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Penjajakan ulang secepatnya pada %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1246
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Log masuk tak dikenal atau galat otentikasi di %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1270
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Otorisasi OK pada %s@%s\n"
 
-#: 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 "Subjek: otentikasi fetchmail OK pada %s@%s"
 
-#: driver.c:1281
+#: driver.c:1280
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail dapat log masuk ke %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1284
 msgid "Service has been restored.\n"
 msgstr "Layanan telah dikembalikan.\n"
 
-#: driver.c:1318
+#: driver.c:1317
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "memilih atau penjajakn ulang folder %s\n"
 
-#: driver.c:1320
+#: driver.c:1319
 msgid "selecting or re-polling default folder\n"
 msgstr "memilih atau penjajakan ulang folder standar\n"
 
-#: driver.c:1332
+#: driver.c:1331
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s di %s (folder %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1334 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s di %s"
 
-#: driver.c:1340
+#: driver.c:1339
 #, c-format
 msgid "Polling %s\n"
 msgstr "Penjajakan %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 pesan (%d %s) untuk %s"
 
-#: driver.c:1347
+#: driver.c:1346
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "terlihat"
 
-#: driver.c:1350
+#: driver.c:1349
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d pesan untuk %s"
 
-#: driver.c:1357
+#: driver.c:1356
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktet).\n"
 
-#: driver.c:1363
+#: driver.c:1362
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Tak ada surat untuk %s\n"
 
-#: driver.c:1396
+#: driver.c:1395
 msgid "bogus message count!"
 msgstr "pesan palsu terhitung!"
 
-#: driver.c:1448
+#: driver.c:1447
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
 msgstr "Terlalu banyak surat dilewati (%d > %d) karena galat sementara %s\n"
 
-#: driver.c:1549
+#: driver.c:1548
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1552
+#: driver.c:1551
 msgid "missing or bad RFC822 header"
 msgstr "tajuk RFC822 hilang atau rusak"
 
-#: driver.c:1555
+#: driver.c:1554
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1557
 msgid "client/server synchronization"
 msgstr "sinkronisasi klien/server"
 
-#: driver.c:1561
+#: driver.c:1560
 msgid "client/server protocol"
 msgstr "protokol klien/server"
 
-#: driver.c:1564
+#: driver.c:1563
 msgid "lock busy on server"
 msgstr "kunci sibuk di server"
 
-#: driver.c:1567
+#: driver.c:1566
 msgid "SMTP transaction"
 msgstr "transaksi SMTP"
 
-#: driver.c:1570
+#: driver.c:1569
 msgid "DNS lookup"
 msgstr "pencarian DNS"
 
-#: driver.c:1573
+#: driver.c:1572
 msgid "undefined"
 msgstr "tak dijelaskan"
 
-#: driver.c:1579
+#: driver.c:1578
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "galat %s ketika mengambil dari %s@%s dan mengirim ke host SMTP %s\n"
 
-#: driver.c:1581
+#: driver.c:1580
 msgid "unknown"
 msgstr "tak diketahui"
 
-#: driver.c:1583
+#: driver.c:1582
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "galat %s ketika mengambil dari %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1594
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "perintah pasca-koneksi dimatikan dengan sinyal %d\n"
 
-#: driver.c:1597
+#: driver.c:1596
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "perintah pasca-koneksi gagal dengan status %d\n"
 
-#: driver.c:1616
+#: driver.c:1615
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Dukungan V4 kerberos tak ditautkan.\n"
 
-#: driver.c:1624
+#: driver.c:1623
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Dukungan V5 kerberos tak ditautkan.\n"
 
-#: driver.c:1635
+#: driver.c:1634
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opsi --flush tak didukung dengan %s\n"
 
-#: driver.c:1641
+#: driver.c:1640
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opsi --all tak didukung dengan %s\n"
 
-#: driver.c:1650
+#: driver.c:1649
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opsi --limit tak didukung dengan %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -519,57 +508,44 @@ msgstr ""
 "Coba \"env QMAILINJECT=%s ARGUMEN ANDA DI SINI\"\n"
 "%s: Batalkan.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
 "%s: Variabel lingkungan NULLMAILER_FLAGS telah diatur.\n"
 "Ini berbahaya karena dapat membuat pemadat bungkus nullmailer-inject atau\n"
-"nullmailer sendmail dengan tajuk Dari:, ID-Pesan: atau Alamat-Balasan: "
-"anda.\n"
+"nullmailer sendmail dengan tajuk Dari:, ID-Pesan: atau Alamat-Balasan: anda.\n"
 "Coba \"env NULLMAILER_FLAGS=%s ARGUMEN ANDA DI SINI\"\n"
 "%s: Batalkan.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Anda tak ada.  Silakan Pergi.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: tak dapat menentukan host anda!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:172
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname gagal untuk %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Tak dapat menemukan host saya sendiri di basis data host untuk "
-"mengkualifikasikannya!\n"
+msgstr "Tak dapat menemukan host saya sendiri di basis data host untuk mengkualifikasikannya!\n"
 
-#: env.c:229
+#: 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 ""
 "Coba melanjutkan dengan nama host tak memenuhi syarat.\n"
@@ -640,14 +616,13 @@ msgstr "Opsi --folder tidak didukung dengan ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Opsi --check tidak didukung dengan ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
 "Hak Cipta (C) 2002, 2003 Eric S. Raymond\n"
 "Hak Cipta (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -655,7 +630,7 @@ msgstr ""
 "Hak Cipta (C) 2005 - 2012 Sunil Shetye\n"
 "Hak Cipta (C) 2005 - 2013 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: fetchmail.c:143
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -663,1024 +638,930 @@ msgid ""
 msgstr ""
 "Fetchmail hadir dengan TANPA GARANSI APAPUN. Ini adalah perangkat lunak,\n"
 "dan anda dipersilakan untuk mendistribusikannya di bawah kondisi tertentu.\n"
-"Untuk detail, silakan lihat berkas COPYING di sumber atau direktori "
-"dokumentasi.\n"
+"Untuk detail, silakan lihat berkas COPYING di sumber atau direktori dokumentasi.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "PERINGATAN: Menjalankan sebagai root tak disarankan.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: dijalankan dengan"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "tak dapat mendapatkan direktori kerja saat ini\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ini adalah fetchmail rilis %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
+#: fetchmail.c:313
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Opsi nodetach sedang berjalan, mengabaikan opsi berkas catatan.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:320
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Tidak berjalan di mode jurik, mengabaikan opsi berkas catatan.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:327
 #, 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:360
+#: fetchmail.c:333
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Berkas catatan \"%s\" tidak dapat ditulis, membatalkan.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:351
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"kedua opsi catatan sistem dan berkas catatan diatur, mengabaikan catatan "
-"sistem, dan mencatat ke %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "kedua opsi catatan sistem dan berkas catatan diatur, mengabaikan catatan sistem, dan mencatat ke %s"
 
-#: fetchmail.c:469
+#: fetchmail.c:439
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Mengambil opsi dari baris perintah%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:440
 msgid " and "
 msgstr " dan "
 
-#: fetchmail.c:475
+#: fetchmail.c:445
 #, 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:496
+#: fetchmail.c:466
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: tak ada server surat yang telah ditentukan.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:478
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: tak ada fetchmail lain yang berjalan\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:484
 #, 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:515 fetchmail.c:524
+#: fetchmail.c:485 fetchmail.c:494
 msgid "background"
 msgstr "latar belakang"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:485 fetchmail.c:494
 msgid "foreground"
 msgstr "latar depan"
 
-#: fetchmail.c:523
+#: fetchmail.c:493
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail di %ld dimatikan.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: tak dapat memeriksa surat jika fetchmail lain ke host yang sama "
-"juga berjalan.\n"
+#: fetchmail.c:516
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: tak dapat memeriksa surat jika fetchmail lain ke host yang sama juga berjalan.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:522
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: tak dapat menghitung host yang ditentukan dengan fetchmail lain "
-"yang berjalan di %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: tak dapat menghitung host yang ditentukan dengan fetchmail lain yang berjalan di %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:529
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: fetchmail latar depan lain berjalan di %ld.\n"
 
-#: fetchmail.c:569
-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:539
+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:581
+#: fetchmail.c:545
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail latar belakang di %ld terbangun.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:557
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: saudara tua di %ld mati secara misterius.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:572
 #, 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:612
+#: fetchmail.c:576
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Masukkan sandi lewat untuk %s@%s:"
 
-#: fetchmail.c:654
+#: fetchmail.c:618
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Tak dapat melepaskan ke latar belakang. Membatalkan.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:622
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "memulai jurik fetchmail %s\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:638 fetchmail.c:640
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "tak dapat membuka %s untuk ditambahkan data\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:659
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "Mode --check diaktifkan, tidak mengambil surat\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:681
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "tak dapat memeriksa waktu %s (galat %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:686
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "memulai ulang fetchmail (%s diubah)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:691
 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"
+msgstr "percobaan untuk menjalankan ulang mungkin akan gagal karena direktori belum dikembalikan\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:718
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "percobaan untuk menjalankan ulang fetchmail gagal\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:748
 #, 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"
+msgstr "jajak pendapat %s dilewati (gagal otentikasi atau terlalu banyak waktu habis)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:760
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval tak tercapai, tidak melemakan %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:798
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Status lema=0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:800
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Status lema=1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:802
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Status lema=2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:804
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Status lema=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:806
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Status lema=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:808
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Status lema=5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:810
 msgid "Query status=6 (IOERR)\n"
 msgstr "Status lema=6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:812
 msgid "Query status=7 (ERROR)\n"
 msgstr "Status lema=7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:814
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Status lema=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:816
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Status lema=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:818
 msgid "Query status=10 (SMTP)\n"
 msgstr "Status lema=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:820
 msgid "Query status=11 (DNS)\n"
 msgstr "Status lema=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:822
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Status lema=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:824
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Status lema=13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:826
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Status lema=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:868
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Semua koneksi tersekat. Keluar.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:876
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "tertidur di %s selama %d detik\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:900
 #, c-format
 msgid "awakened by %s\n"
 msgstr "terbangun oleh %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:903
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "terbangun oleh sinyal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:911
 #, c-format
 msgid "awakened at %s\n"
 msgstr "terbangun pada %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:916
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "penghentian normal, status %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1075
 msgid "couldn't time-check the run-control file\n"
 msgstr "tak dapat memeriksa waktu di berkas kendali jalan\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1109
 #, 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:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
+#: fetchmail.c:1148
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Galat: banyak catatan \"standar\" di berkas pengaturan.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1270
 msgid "SSL support is not compiled in.\n"
 msgstr "dukungan SSL tidak dikompilasi.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1277
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v4 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1283
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v5 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1289
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "dukungan GSSAPI dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: peringatan: tak ada DNS tersedia untuk memeriksa pengambilan "
-"multitaruh dari %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: peringatan: tak ada DNS tersedia untuk memeriksa pengambilan multitaruh dari %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1330
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "peringatan: multitaruh untuk %s memerlukan opsi amplop!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1331
 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"
+msgstr "peringatan: Jangan tanyakan dukungan jika semua surat melewati tuan pos!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1348
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: konfigurasi %s tidak sah, tentukan nomor pangkalan positif untuk "
-"layanan atau pangkalan\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: konfigurasi %s tidak sah, tentukan nomor pangkalan positif untuk layanan atau pangkalan\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1355
 #, 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"
+msgstr "fetchmail: konfigurasi %s tidak sah, RPOP memerlukan hak akses pangkalan\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1373
 #, 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"
+msgstr "%s konfigurasi tidak sah, LMTP tak dapat menggunakan pangkalan SMTP standar\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1387
 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:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1412
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "dihentikan dengan sinyal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1485
 #, 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:1566
+#: fetchmail.c:1510
 msgid "POP2 support is not configured.\n"
 msgstr "Dukungan POP2 tidak diatur.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1522
 msgid "POP3 support is not configured.\n"
 msgstr "Dukungan POP3 tidak diatur.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1532
 msgid "IMAP support is not configured.\n"
 msgstr "Dukungan IMAP tidak diatur.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1538
 msgid "ETRN support is not configured.\n"
 msgstr "Dukungan ETRN tidak diatur.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1546
 msgid "ODMR support is not configured.\n"
 msgstr "Dukungan ODMR tidak diatur.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1553
 msgid "unsupported protocol selected.\n"
 msgstr "protokol tak didukung terpilih.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1563
 #, 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:1645
+#: fetchmail.c:1580
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval jajak pendapat adalah %d detik\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1582
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Berkas catatan adalah %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1584
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile adalah %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1587
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Pesan proses akan dicatat via catatan sistem\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1590
 msgid "Fetchmail will masquerade and will not generate Received\n"
-msgstr ""
-"Fetchmail akan menyembunyikan diri dan tak akan menghasilkan Diterima\n"
+msgstr "Fetchmail akan menyembunyikan diri dan tak akan menghasilkan Diterima\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1592
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail akan menampilkan titik proses bahkan di berkas catatan.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1594
 #, 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:1663
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke tuan pos.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1600
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke pengirim.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1603
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail akan memperlakukan galat permanen sebagai permanen (taruh pesan).\n"
+msgstr "Fetchmail akan memperlakukan galat permanen sebagai permanen (taruh pesan).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1605
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail akan memperlakukan galat permanen sebagai sementara (simpan "
-"pesan).\n"
+msgstr "Fetchmail akan memperlakukan galat permanen sebagai sementara (simpan pesan).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1612
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opsi untuk menerima dari %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1616
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Surat akan diterima via %s\n"
 
-#: fetchmail.c:1684
+#: 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] "  Jajak pendapat server ini akan terjadi tiap %d interval.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1623
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Nama sebenarnya server adalah %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1626
 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:1692
+#: fetchmail.c:1627
 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:1696
+#: fetchmail.c:1631
 msgid "  Password will be prompted for.\n"
 msgstr "  Sandi lewat akan diberitahu.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1635
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Rahasia APOP = \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1638
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1641
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Sandi lewat = \"%s\".\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1650
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol adalah KPOP dengan otentikasi %s Kerberos"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1653
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol adalah %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1655
 #, c-format
 msgid " (using service %s)"
 msgstr " (menggunakan layanan %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1657
 msgid " (using default port)"
 msgstr " (menggunakan pangkalan standar)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1659
 msgid " (forcing UIDL use)"
 msgstr " (memaksa penggunaan UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1665
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Semua metode otentikasi yang tersedia akan dicoba.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1668
 msgid "  Password authentication will be forced.\n"
 msgstr "  Otentikasi sandi lewat akan dipaksa.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1671
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Otentikasi MSN akan dipaksa.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1674
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Otentikasi NTLM akan dipaksa.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1677
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Otentikasi OTP akan dipaksa.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1680
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Otentikasi CRAM-MD5 akan dipaksa.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1683
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Otentikasi GSSAPI akan dipaksa.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1686
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V4 akan dipaksa.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1689
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V5 akan dipaksa.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1692
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Enkripsi akhir-ke-akhir diasumsikan.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1696
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinsip layanan surat adalah: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1699
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesi terenkripsi SSL diaktifkan.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1701
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1703
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Pemeriksaan sertifikat server SSL diaktifkan.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Pemeriksaan sertifikat server SSL diaktifkan.\n"
-
-#: fetchmail.c:1773
+#: fetchmail.c:1706
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Berkas sertifikat terpercaya SSL: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Direktori sertifikat terpercaya SSL: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1710
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  NamaUmum server SSL: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1712
 #, 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:1782
+#: fetchmail.c:1715
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Waktu server tidak merespon adalah %d detik"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1717
 msgid " (default).\n"
 msgstr " (standar).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1724
 msgid "  Default mailbox selected.\n"
 msgstr "  Kotak surat standar terpilih.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1729
 msgid "  Selected mailboxes are:"
 msgstr "  Kotak surat terpilih adalah:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1735
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Semua pesan akan diterima (--all hidup).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1736
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Hanya pesan baru yang akan diterima (--all mati).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1738
 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:1806
+#: fetchmail.c:1739
 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:1808
+#: fetchmail.c:1741
 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:1809
-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:1742
+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:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Pesan terlalu besar akan dihapus sebelum penerimaan pesan (--limitflush "
-"hidup).\n"
+#: fetchmail.c:1744
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Pesan terlalu besar akan dihapus sebelum penerimaan pesan (--limitflush hidup).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Pesan terlalu besar tidak akan dihapus sebelum penerimaan pesan (--"
-"limitflush mati).\n"
+#: fetchmail.c:1745
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Pesan terlalu besar tidak akan dihapus sebelum penerimaan pesan (--limitflush mati).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1747
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Penulisan ulang alamat server lokal diaktifkan (--norewrite padam).\n"
+msgstr "  Penulisan ulang alamat server lokal diaktifkan (--norewrite padam).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1748
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Penulisan ulang alamat lokal dinonaktifkan (--norewrite hidup).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1750
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Penanggalan balasan-muatan diaktifkan (stripcr hidup).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1751
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Penanggalan balasan-muatan dinonaktifkan (stripcr mati).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1753
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Pemaksaan balasan-muatan diaktifkan (forcecr hidup).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1754
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Pemaksaan balasan-muatan dinonaktifkan (forcecr mati).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretasi Penyandian-Transfer-Isi dinonaktifkan (pass8bits hidup).\n"
+#: fetchmail.c:1756
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretasi Penyandian-Transfer-Isi dinonaktifkan (pass8bits hidup).\n"
 
-#: fetchmail.c:1824
-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 "  Interpretasi Penyandian-Transfer-Isi diaktifkan (pass8bits mati).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1759
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Pengawasandi MIME diaktifkan (mimedecode hidup).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1760
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Pengawasandi MIME dinonaktifkan (mimedecode mati).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1762
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Siaga setelah penjajakan diaktifkan (idle hidup).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1763
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Siaga setelah penjajakan dinonaktifkan (idle mati).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1765
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Baris Status Tidak Kosong akan diabaikan (dropstatus hidup)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1766
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Baris Status Tidak Kosong akan dijaga (dropstatus mati)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1768
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Baris Terkirim-Ke akan diabaikan (dropdelivered hidup)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1769
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Baris Terkirim-Ke akan dijaga (dropdelivered mati)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1773
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Batas ukuran pesan adalah %d oktet (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1776
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Tak ada batas ukuran pesan (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1778
 #, 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:1848
+#: fetchmail.c:1781
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Peringatan ukuran pada setiap penjajakan (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1784
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Batas Pesan-diterima adalah %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1787
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Batas pesan-diterima kosong (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1789
 #, 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:1859
+#: fetchmail.c:1792
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Batas ukuran pesan yang tidak diambil (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1796
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Lakukan penelusuran biner UID setiap kali penjajakan (--fastuidl 1).\n"
+msgstr "  Lakukan penelusuran biner UID setiap kali penjajakan (--fastuidl 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1798
 #, 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"
+msgstr "  Lakukan penelusuran biner UID selama %d dari %d penjajakan (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1801
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"  Lakukan penelusuran linear UID setiap kali penjajakan (--fastuidl 0).\n"
+msgstr "  Lakukan penelusuran linear UID setiap kali penjajakan (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1803
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Batas antrean pesan SMTP adalah %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1805
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Tak ada batas antrean pesan SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1809
 #, 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"
+msgstr "  Interval penghapusan di antara penghapusan dipaksa ke %d (--expunge %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1811
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Tak ada penghapusan yang dipaksa (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1818
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Ranah tempat dimana surat akan diambil adalah:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1823 fetchmail.c:1843
 msgid " (default)"
 msgstr " (standar)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Pesan akan ditambahkan ke %s sebagai BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1830
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Pesan akan dikirim dengan \"%s\".\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1837
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Pesan akan diteruskan-%cMTP ke:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1848
 #, 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:1918
+#: fetchmail.c:1851
 #, 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"
+msgstr "  Alamat yang akan ditaruh di baris SALN KE dikirim ke SMTP akan menjadi %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1860
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Balasan pendengar blok spam yang dikenal adalah:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1866
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blok-spam dinonaktifkan\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1869
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Koneksi server akan dinyalakan dengan \"%s\".\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1872
 msgid "  No pre-connection command.\n"
 msgstr "  Tak ada perintah pra-koneksi.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1874
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Koneksi server akan dimatikan dengan \"%s\".\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1877
 msgid "  No post-connection command.\n"
 msgstr "  Tak ada perintah pasca-koneksi.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1880
 msgid "  No localnames declared for this host.\n"
 msgstr "  Tak ada nama lokal yang dideklarasikan untuk pangkalan ini.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1890
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-taruh:"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1892
 msgid "  Single-drop mode: "
 msgstr "  Mode taruh-tunggal:"
 
-#: fetchmail.c:1961
+#: fetchmail.c:1894
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nama lokal dikenal.\n"
 
-#: fetchmail.c:1976
+#: fetchmail.c:1909
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Pencarian DNS untuk alamat multitaruh diaktifkan.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1910
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Pencarian DNS untuk alamat multitaruh dinonaktifkan.\n"
 
-#: fetchmail.c:1981
-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:1914
+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:1983
+#: fetchmail.c:1916
 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:1986
+#: fetchmail.c:1919
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Pengalihan alamat-amplop dinonaktifkan\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1922
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Tajuk amplop diasumsikan sebagai: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1925
 #, 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:1995
+#: fetchmail.c:1928
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Awalan %s akan dihapus dari id pengguna\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1931
 msgid "  No prefix stripping\n"
 msgstr "  Tak ada penanggalan awalan\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1936
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias server surat pradeklarasi:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1944
 msgid "  Local domains:"
 msgstr "  Ranah lokal:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1954
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Koneksi harus melalui antarmuka %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1956
 msgid "  No interface requirement specified.\n"
 msgstr "  Tak ada antarmuka diperlukan yang ditentukan.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1958
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Putaran penjajakan akan mengawasi %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1960
 msgid "  No monitor interface specified.\n"
 msgstr "  Tak ada antarmuka pengawasan yang ditentukan.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1964
 #, 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:2033
+#: fetchmail.c:1966
 msgid "  No plugin command specified.\n"
 msgstr "  Tak ada perintah plugin yang ditentukan.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1968
 #, 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:2037
+#: fetchmail.c:1970
 msgid "  No plugout command specified.\n"
 msgstr "  Tak ada perintah plugout yang ditentukan.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1975
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Tak ada UID tersimpan dari pangkalan ini.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1984
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID tersimpan.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1992
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Informasi jejak penjajakan akan ditambahkan ke tajuk Diterima.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:1994
 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"
+msgstr "  Tak ada informasi jejak penjajakan yang akan ditambahkan ke tajuk Diterima.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:1999
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Pesan dengan tajuk rusak akan ditolak.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2002
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Pesan dengan tajuk rusak akan diteruskan.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:2007
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Melewati properti \"%s\".\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "GALAT: tak ada dukungan untuk rutinitas getpassword()\n"
@@ -1693,90 +1574,78 @@ msgstr ""
 "\n"
 "Menangkap SIGINT... membebaskan diri.\n"
 
-#: gssapi.c:53
+#: gssapi.c:52
 #, 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:56
+#: gssapi.c:55
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Galat GSSAPI %s: %.*s\n"
 
-#: gssapi.c:91
+#: gssapi.c:90
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Tak mendapatkan nama layanan untuk [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:95
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Menggunakan nama layanan [%s]\n"
 
-#: gssapi.c:123
+#: gssapi.c:122
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "Tidak ada kredential GSSAPI. Melewati otentikasi GSSAPI.\n"
 
-#: 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:123
+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:160
+#: gssapi.c:159
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Menerima tantangan salah bentuk untuk \"%s GSSAPI\"!\n"
 
-#: gssapi.c:170
+#: gssapi.c:169
 msgid "Sending credentials\n"
 msgstr "Mengirim kredensial\n"
 
-#: gssapi.c:201
+#: gssapi.c:200
 msgid "Error exchanging credentials\n"
 msgstr "Galat menukar kredential\n"
 
-#: gssapi.c:243
+#: gssapi.c:242
 msgid "Couldn't unwrap security level data\n"
 msgstr "Tak dapat membongkar level keamanan data\n"
 
-#: gssapi.c:248
+#: gssapi.c:247
 msgid "Credential exchange complete\n"
 msgstr "Penukaran kredensial selesai\n"
 
-#: gssapi.c:252
+#: gssapi.c:251
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server memerlukan integritas dan/atau privasi\n"
 
-#: gssapi.c:261
+#: gssapi.c:260
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Bendera level keamanan terbongkar: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:264
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Ukuran token GSS maksmimum adalah %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Galat membuat permintaan level kemanan.\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "Membebaskan kredensial GSS\n"
 
-#: gssapi.c:302
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Galat membebaskan kredensial\n"
 
@@ -1785,65 +1654,64 @@ msgstr "Galat membebaskan kredensial\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread tidur selama %d detik.\n"
 
-#: imap.c:75
-#, fuzzy, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+#: imap.c:74
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
 msgstr "Menerima respon BYE dari server IMAP: %s"
 
-#: imap.c:97
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "jumlah pesan palsu di \"%s\"!"
 
-#: imap.c:144
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "jumlah EXPUNGE palsu di \"%s\"!"
 
-#: imap.c:355
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol teridentifkasi sebagai IMAP rev 1\n"
 
-#: imap.c:361
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol teridentifikasi sebagai IMAP rev 0\n"
 
-#: imap.c:368
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol teridentifkasi sebagai IMAP2 atau IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr "akan siaga setelah penjajakan\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: pemutakhiran ke TLS sukses.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: pemutakhiran ke TLS gagal.\n"
 
-#: imap.c:487
+#: imap.c:482
 #, 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:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:607
+#: imap.c:598
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Kemampuan OTP yang diperlukan tidak dikompilasi ke fetchmail\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:618 pop3.c:558
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Kemampuan NTLM yang diperlukan tidak dikompilasi ke fetchmail\n"
 
+#: imap.c:627
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Kemampuan LOGIN yang diperlukan tidak dikompilasi oleh server\n"
+
 #: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
@@ -1854,7 +1722,7 @@ msgstr "penghapusan surat tidak cocok (%d sebenarnya != %d diharapkan)\n"
 msgid "%lu is unseen\n"
 msgstr "%lu tak terlihat\n"
 
-#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u sekarang tak terlihat\n"
@@ -1893,17 +1761,14 @@ msgstr[0] "%d pesan menunggu setelah penghapusan\n"
 msgid "search for unseen messages failed\n"
 msgstr "penelusuran pesan tak terlihat gagal\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:994 pop3.c:865
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u pertama kali tak terlihat\n"
 
 #: 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"
+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:1177 imap.c:1184
 #, c-format
@@ -1992,21 +1857,21 @@ msgstr "aktivitas pada %s sebelumnya adalah %d, sekarang adalah %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "tak dapat mengawasandi tantangan awal BASE64\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "prinsipal %s di tiket tidak cocok dengan -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "instansi tidak kosong (%s) dapat menyebabkan perilaku aneh\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "tak dapat mengawasandi respon siap BASE64\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "tantangan tidak cocok\n"
 
@@ -2016,35 +1881,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: galat membaca berkas kunci \"%s\": %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: menghapus berkas kunci macet\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: galat membuka berkas kunci \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: galat membaca berkas kunci \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: galat membuka berkas kunci \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: pembuatan kunci gagal.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: galat membaca berkas kunci \"%s\": %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2055,15 +1903,6 @@ msgstr "%s:%d: peringatan: ditemukan \"%s\" sebelum nama pangkalan apapun\n"
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: peringatan: token tidak diketahui \"%s\"\n"
 
-#: ntlmsubr.c:35
-#, fuzzy
-msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr "Menerima tantangan salah bentuk untuk \"%s GSSAPI\"!\n"
-
-#: 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"
@@ -2118,491 +1957,419 @@ 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:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Tak dapat mengawasandi tantangan OTP\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Frasa sandi rahasia:"
 
-#: options.c:179 options.c:223
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Benang '%s' bukan benang nomor yang sah.\n"
 
-#: options.c:188
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Nilai benang '%s' lebih %s dari %d.\n"
 
-#: options.c:189
+#: options.c:186
 msgid "smaller"
 msgstr "kecil"
 
-#: options.c:189
+#: options.c:186
 msgid "larger"
 msgstr "besar"
 
-#: options.c:337
+#: options.c:323
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Kebijakan tajuk rusak tidak sah `%s' ditentukan.\n"
 
-#: options.c:378
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protokol `%s' tidak sah ditentukan.\n"
 
-#: options.c:425
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Otentikasi `%s' tidak sah ditentukan.\n"
 
-#: options.c:641
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "penggunaan: fetchmail [opsi] [server ...]\n"
 
-#: options.c:642
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Opsi sebagai berikut:\n"
 
-#: options.c:643
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        tampilkan opsi bantuan ini\n"
 
-#: options.c:644
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     tampilkan info versi\n"
 
-#: options.c:646
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       periksa pesan tanpa mengambilnya\n"
 
-#: options.c:647
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      bekerja diam\n"
 
-#: options.c:648
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     bekerja berisik (keluaran diagnostik)\n"
 
-#: options.c:649
+#: options.c:628
 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:650
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    jangan lepaskan proses jurik\n"
 
-#: options.c:651
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        matikan proses jurik\n"
 
-#: options.c:652
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     tentukan nama berkas catatan\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      gunakan syslog(3) untuk mayoritas pesan ketika berjalan "
-"sebagai jurik\n"
+#: options.c:632
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      gunakan syslog(3) untuk mayoritas pesan ketika berjalan sebagai jurik\n"
 
-#: options.c:654
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
-
-#: options.c:655
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   jangan tulis Diterima & aktifkan tipuan pangkalan\n"
+msgstr "      --invisible   jangan tulis Diterima & aktifkan tipuan pangkalan\n"
 
-#: options.c:656
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc tentukan berkas kendali jalan alternatif\n"
 
-#: options.c:657
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      tentukan berkas UID alternatif\n"
 
-#: options.c:658
+#: options.c:636
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     tentukan berkas PID (kunci) alternatif\n"
 
-#: options.c:659
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  tentukan penerima usaha terakhir\n"
 
-#: options.c:660
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    alihkan pantulan dari pengguna ke tuan pos.\n"
 
-#: 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:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail menghapus secara permanen pesan yang tak dapat dikirim.\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  simpan secara permanen pesan yang tak dapat dikirim pada "
-"server (standar).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  simpan secara permanen pesan yang tak dapat dikirim pada server (standar).\n"
 
-#: options.c:664
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   antarmuka memerlukan spesifikasi\n"
 
-#: options.c:665
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor antarmuka untuk aktivitas\n"
 
-#: options.c:668
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         aktifkan sesi terenkripsi ssl\n"
 
-#: options.c:669
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      berkas kunci privat ssl\n"
 
-#: options.c:670
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     sertifikat klien ssl\n"
 
-#: options.c:671
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   lakukan cek sertifikat server ketat (disarankan)\n"
 
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr "      --sslcertck   lakukan cek sertifikat server ketat (disarankan)\n"
-
-#: options.c:673
+#: options.c:650
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile alamat ke berkas sertifikat ssl terpercaya-CA\n"
 
-#: options.c:674
+#: options.c:651
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath alamat ke direktori sertifikat ssl terpercaya-CA\n"
 
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  harapkan NamaUmum ini dari server (tak disarankan)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  harapkan NamaUmum ini dari server (tak disarankan)\n"
 
-#: 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:653
+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:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:654
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    paksa protokol ssl (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      tentukan perintah eksternal untuk membuka koneksi\n"
+msgstr "      --plugin      tentukan perintah eksternal untuk membuka koneksi\n"
 
-#: options.c:680
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     tentukan perintah eksternal untuk membuka koneksi smtp\n"
+msgstr "      --plugout     tentukan perintah eksternal untuk membuka koneksi smtp\n"
 
-#: options.c:681
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    tentukan kebijakan untuk menangani pesan dengan tajuk "
-"rusak\n"
+"                    tentukan kebijakan untuk menangani pesan dengan tajuk rusak\n"
 
-#: 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:661
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
+msgstr "  -p, --protocol    tentukan penerimaan protokol (lihat halaman manual)\n"
 
-#: options.c:685
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        paksa penggunaan UIDL (hanya pop3)\n"
 
-#: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        pangkalan TCP untuk menghubungkan diri (kadaluwarsa, "
-"gunakan --service)\n"
+msgstr "      --port        pangkalan TCP untuk menghubungkan diri (kadaluwarsa, gunakan --service)\n"
 
-#: 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:664
+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:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
+#: options.c:665
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipe otentikasi (sandi/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     waktu server tidak merespon\n"
 
-#: options.c:691
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    tajuk alamat amplop\n"
 
-#: options.c:692
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    awalan untuk dihapus dari id pengguna lokal\n"
 
-#: options.c:693
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   prinsipan layanan surat\n"
 
-#: options.c:694
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  tambahkan informasi pelacakan penjajakan ke tajuk "
-"Diterima\n"
+msgstr "      --tracepolls  tambahkan informasi pelacakan penjajakan ke tajuk Diterima\n"
 
-#: options.c:696
-#, 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    tentukan log masuk pengguna di server\n"
 
-#: options.c:697
+#: options.c:673
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  terima pesan lama dan baru\n"
 
-#: options.c:698
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      hapus pesan baru setelah penerimaan\n"
 
-#: options.c:699
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        simpan pesan baru setelah penerimaan\n"
 
-#: options.c:700
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       hapus pesan lama dari server\n"
 
-#: options.c:701
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  hapus pesan kelebihan ukuran\n"
 
-#: options.c:702
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   jangan tulis ulang alamat tajuk\n"
 
-#: options.c:703
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       jangan ambil pesan yang lebih besar dari yang "
-"ditentukan\n"
+msgstr "  -l, --limit       jangan ambil pesan yang lebih besar dari yang ditentukan\n"
 
-#: options.c:704
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval antara notifikasi peringatan surat\n"
 
-#: options.c:706
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    atur host penerusan SMTP\n"
 
-#: options.c:707
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ambil surat dari ranah yang telah ditentukan\n"
 
-#: options.c:708
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress atur ranah pengiriman SMTP yang digunakan\n"
 
-#: options.c:709
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    atur nama lengkap SMTP namapengguna@ranah\n"
 
-#: options.c:710
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   atur nilai respon antispam\n"
 
-#: options.c:711
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  atur batas batch untuk koneksi SMTP\n"
 
-#: options.c:712
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  atur batas ambil untuk koneksi server\n"
 
-#: options.c:713
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit atur batas ukuran pesan yang diambil\n"
 
-#: options.c:714
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    lakukan penelusuran biner untuk UIDL\n"
 
-#: options.c:715
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     atur penghapusan maksimal di antara penghapusan\n"
 
-#: options.c:716
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         atur MDA yang digunakan untuk penerusan\n"
 
-#: options.c:717
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       atur keluaran berkas BSMTP\n"
 
-#: options.c:718
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        gunakan LMTP (RFC2033) untuk pengiriman\n"
 
-#: options.c:719
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      tentukan nama folder jarak jauh\n"
 
-#: options.c:720
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    tampilkan titik proses bahkan di berkas catatan\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
+#: pop3.c:327
+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: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:414
+#: pop3.c:411
 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"
+msgstr "TLS merupakan keharusan untuk sesi ini, tapi server menolak perintah CAPA.\n"
 
-#: pop3.c:415
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Perintah CAPA diperlukan untuk TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:494
 #, 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:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
+#: pop3.c:621
 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:637
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Stempel waktu APOP yang diperlukan tak ditemukan dalam perkenalan\n"
 
-#: pop3.c:646
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Galat sintaks stempel waktu dalam perkenalan\n"
 
-#: pop3.c:662
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr "Stempel waktu APOP tidak sah.\n"
 
-#: pop3.c:686
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Permintaan protokol tak didefinisikan di POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr "kunci sibuk! Apakah sesi lain aktif?\n"
 
-#: pop3.c:770
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Tak dapat menangani repson UIDL dari server upstream.\n"
 
-#: pop3.c:793
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server menjawab dengan UID untuk pesan salah.\n"
 
-#: pop3.c:822
+#: pop3.c:835
 #, 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:934
+#: pop3.c:941
 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:1032
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "galat protokol\n"
 
-#: pop3.c:1048
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr "galat protokol ketika mengambil UIDL\n"
 
-#: pop3.c:1079
+#: pop3.c:1086
 #, 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:1389
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opsi --folder tidak didukung dengan POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:131
 msgid "server option after user options"
 msgstr "opsi server setelah opsi pengguna"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:174
 msgid "SDPS not enabled."
 msgstr "SDPS tak diaktfikan."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: opsi antarmuka hanya didukung oleh Linux (tanpa IPv6) dan "
-"FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: opsi antarmuka hanya didukung oleh Linux (tanpa IPv6) dan FreeBSD\n"
 
-#: rcfile_y.y:225
-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:226
+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:339
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL tidak diaktifkan"
 
@@ -2618,8 +2385,7 @@ msgstr "Berkas %s harus berkas reguler.\n"
 #: rcfile_y.y:439
 #, 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"
+msgstr "Berkas %s harus memiliki hak akses tidak kurang dari -rwx------ (0700).\n"
 
 #: rcfile_y.y:451
 #, c-format
@@ -2840,141 +2606,134 @@ msgstr "Silakan tentukan layanan sebagai nomor pangkalan desimal.\n"
 msgid "forwarding to %s\n"
 msgstr "meneruskan ke %s\n"
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tubuh pesan-pantul)\n"
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "pesan dari %s dipantulkan ke %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:456
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Galat tersimpan masih %d\n"
+
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Galat %cMTP: %s\n"
 
-#: sink.c:535
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Server SMTP memerlukan STARTTLS, menyimpan pesan.\n"
 
-#: sink.c:714
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Buka berkas BSMTP gagal: %s\n"
 
-#: sink.c:760
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Penulisan preambul BSMTP gagal: %s.\n"
 
-#: sink.c:974
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Pendengar %cMTP tidak menyukai alamat penerima `%s'\n"
 
-#: sink.c:981
+#: sink.c:1002
 #, 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:1027
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr "tak ada alamat yang cocok; tak ada tuan pos yang diatur.\n"
 
-#: sink.c:1039
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "bahkan tak dapat mengirim ke %s!\n"
 
-#: sink.c:1045
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "tak ada kecocokan alamat; meneruskan ke %s.\n"
 
-#: 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
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "akan mengantarkan dengan: %s\n"
 
-#: sink.c:1222
+#: sink.c:1233
 #, 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:1234
+#: sink.c:1245
 #, 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:1241
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "Buka MDA gagal\n"
 
-#: sink.c:1280
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Sambungan %cMTP ke %s gagal\n"
 
-#: sink.c:1304
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "tak dapat menaikkan pendengar; mengembalikan ke %s"
 
-#: sink.c:1362
+#: sink.c:1373
 #, 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:1387
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Galat menulis ke MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA mati karena sinyal %d\n"
 
-#: sink.c:1393
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA mengembalikan status tidak nol %d\n"
 
-#: sink.c:1396
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Aneh: MDA pclose mengembalikan %d dan errno %d/%s, tak dapat menangani di %s:"
-"%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Aneh: MDA pclose mengembalikan %d dan errno %d/%s, tak dapat menangani di %s:%d\n"
 
-#: sink.c:1421
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "Pendengar SMTP menolak kiriman.\n"
 
-#: sink.c:1451
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "Galat kiriman LMTP pada akhir pesan\n"
 
-#: sink.c:1454
+#: sink.c:1465
 #, 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"
+msgstr "Balasan bukan-503 yang tidak diharapkan terhadap akhir pesan LMTP: %s\n"
 
 #: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "Jurik Fetchmail"
@@ -3004,84 +2763,84 @@ msgstr "Otentikasi ESMTP PLAIN...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Otentikasi ESMTP LOGIN...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "galat protokol pendengar smtp\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:110 socket.c:137
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc gagal\n"
 
-#: socket.c:173
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair gagal\n"
 
-#: socket.c:179
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork gagal\n"
 
-#: socket.c:186
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 gagal\n"
 
-#: socket.c:192
+#: socket.c:188
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "menjalankan %s (host %s layanan %s)\n"
 
-#: socket.c:197
+#: socket.c:193
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) gagal\n"
 
-#: socket.c:272
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") galat: %s\n"
 
-#: socket.c:275
+#: socket.c:271
 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:289 socket.c:292
+#: socket.c:285 socket.c:288
 #, c-format
 msgid "unknown (%s)"
 msgstr "tak diketahui (%s)"
 
-#: socket.c:295
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Coba menyambung ke %s/%s..."
 
-#: socket.c:304
+#: socket.c:300
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "tak dapat membuat soket: %s\n"
 
-#: socket.c:306
+#: socket.c:302
 #, 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:324
+#: socket.c:320
 msgid "connection failed.\n"
 msgstr "koneksi gagal.\n"
 
-#: socket.c:326
+#: socket.c:322
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "koneksi ke %s:%s [%s/%s] gagal: %s.\n"
 
-#: socket.c:327
+#: socket.c:323
 #, 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:333
+#: socket.c:329
 msgid "connected.\n"
 msgstr "tersambung.\n"
 
-#: socket.c:346
+#: socket.c:342
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3090,265 +2849,166 @@ msgstr ""
 "Galat koneksi untuk polling ini:\n"
 "%s"
 
-#: socket.c:416
+#: socket.c:387
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL melaporkan: %s\n"
 
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
+#: socket.c:622
 msgid "Server certificate:\n"
 msgstr "Sertifikat server:\n"
 
-#: socket.c:662
+#: socket.c:627
 #, 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:665
+#: socket.c:630
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Sertifikat di kedalaman %d:\n"
 
-#: socket.c:671
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organisasi Penerbit: %s\n"
 
-#: socket.c:674
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Peringatan: Nama Organisasi Penerbit terlalu panjang (kemungkinan "
-"terpotong).\n"
+msgstr "Peringatan: Nama Organisasi Penerbit terlalu panjang (kemungkinan terpotong).\n"
 
-#: socket.c:676
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr "Organisasi Tak Diketahui\n"
 
-#: socket.c:678
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "NamaUmum Penerbit: %s\n"
 
-#: socket.c:681
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Peringatan: NamaUmum Penerbit terlalu panjang (kemungkinan terpotong).\n"
+msgstr "Peringatan: NamaUmum Penerbit terlalu panjang (kemungkinan terpotong).\n"
 
-#: socket.c:683
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr "NamaUmum Penerbit Tak Diketahui\n"
 
-#: socket.c:689
+#: socket.c:654
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "NamaUmum Subjek: %s\n"
 
-#: socket.c:695
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Sertifikat buruk: NamaUmum Subjek terlalu panjang!\n"
 
-#: socket.c:701
+#: socket.c:666
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Sertifikat buruk: NamaUmum Subjek berisi NUL, membatalkan!\n"
 
-#: socket.c:729
+#: socket.c:694
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nama Alternatif Subjek: %s\n"
 
-#: socket.c:735
+#: socket.c:700
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Sertifikat buruk: Nama Alternatif Subjek berisi NUL, membatalkan!\n"
 
-#: socket.c:752
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "NamaUmum Server tidak cocok: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Nama server tak diatur, tak dapat memverifikasi sertifikat!\n"
 
-#: socket.c:764
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr "NamaUmum Server Tak Diketahui\n"
 
-#: socket.c:766
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr "Nama server tak ditentukan di sertifikat!\n"
 
-#: socket.c:778
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() gagal!\n"
 
-#: socket.c:782
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "Kehabisan memori!\n"
 
-#: socket.c:790
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr "Penyangga teks digest terlalu kecil!\n"
 
-#: socket.c:796
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s kunci sidik jari: %s\n"
 
-#: socket.c:800
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s sidik jari cocok.\n"
 
-#: socket.c:802
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s sidik jari tidak cocok!\n"
 
-#: socket.c:814
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Galat verifikasi sertifikat server: %s\n"
 
-#: socket.c:829
+#: socket.c:794
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Rantai sertifikasi rusak di: %s\n"
 
-#: socket.c:831
-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 ""
-"Ini dapat berarti server tidak menyediakan sertifikat CA perantara, yang di "
-"luar kuasa fetchmail. Untuk detail, silakan lihat dokumen README.SSL-SERVER "
-"yang disertakan dalam 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 "Ini dapat berarti server tidak menyediakan sertifikat CA perantara, yang di luar kuasa fetchmail. Untuk detail, silakan lihat dokumen README.SSL-SERVER yang disertakan dalam fetchmail.\n"
 
-#: socket.c:841
+#: socket.c:806
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Sertifikat jangkar terpercaya hilang: %s\n"
 
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Ini dapat berarti bahwa sertifikat penandatanganan root CA tidak berada di "
-"lokasi sertifikat CA yang dipercaya, atau c_rehash perlu dijalankan di "
-"direktori sertifikat. Untuk detail, silakan lihat dokumentasi --sslcertpath "
-"dan --sslcertfile di halaman manual.\n"
-
-#: socket.c:918 socket.c:996
-#, fuzzy
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
-
-#: socket.c:936 socket.c:1014
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
-
-#: socket.c:947 socket.c:1025
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
-
-#: socket.c:958 socket.c:1036
-#, fuzzy
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr "Sistem operasi anda tidak mendukung SSLv2.\n"
-
-#: socket.c:967 socket.c:1046
-#, 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: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 "Ini dapat berarti bahwa sertifikat penandatanganan root CA tidak berada di lokasi sertifikat CA yang dipercaya, atau c_rehash perlu dijalankan di direktori sertifikat. Untuk detail, silakan lihat dokumentasi --sslcertpath dan --sslcertfile di halaman manual.\n"
 
-#: socket.c:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1106
+#: socket.c:902
 msgid "File descriptor out of range for SSL"
 msgstr "Penjelas berkas di luar jangkauan untuk SSL."
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-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 "Sistem operasi anda tidak mendukung SSLv2.\n"
 
-#: socket.c:1273
+#: socket.c:923
 #, 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 "Protokol SSL tidak sah '%s' ditentukan, menggunakan standar (SSLv23).\n"
 
-#: socket.c:1280
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikasi sertifikat/sidik jari entah bagaimana terlewatkan!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Peringatan: koneksi tidak aman, tetap melanjutkan (Lebih baik gunakan --"
-"sslcertck!)\n"
+#: socket.c:1039
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Peringatan: koneksi tidak aman, tetap melanjutkan (Lebih baik gunakan --sslcertck!)\n"
 
-#: socket.c:1339
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr "Coba ulang baca soket Cygwin\n"
 
-#: socket.c:1342
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Coba ulang baca soket Cygwin gagal!\n"
 
@@ -3397,174 +3057,155 @@ msgstr "menemukan alamat Diterima `%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"baris tajuk tak benar ditemukan - lihat halaman manual untuk opsi bad-"
-"header\n"
+msgstr "baris tajuk tak benar ditemukan - lihat halaman manual untuk opsi bad-header\n"
 
 #: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "baris: %s"
 
-#: transact.c:1087 transact.c:1097
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Mengurai amplop \"%s\" nama \"%-.*s\"\n"
 
-#: transact.c:1112
+#: transact.c:1132
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Mengurai nama Diterima \"%-.*s\"\n"
 
-#: transact.c:1124
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Tidak ada penerima amplop ditemukan, mengalihkan ke menebak tajuk.\n"
 
-#: transact.c:1142
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Menebak dari tajuk \"%-.*s\".\n"
 
-#: transact.c:1157
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "tak ada lokal yang cocok, meneruskan ke %s\n"
 
-#: transact.c:1172
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "meneruskan dan menghapus ditekan karena galat DNS\n"
 
-#: transact.c:1283
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "menulis RFC822 msgblk.headers\n"
 
-#: transact.c:1302
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
-msgstr ""
-"tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
+msgstr "tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
 
-#: transact.c:1309
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "alamat penerima %s tidak cocok dengan nama lokal apapun"
 
-#: transact.c:1318
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr "pesan memiliki NUL tertanam"
 
-#: transact.c:1326
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Pendengar SMTP menolak alamat penerima lokal: "
 
-#: transact.c:1376
+#: transact.c:1493
 msgid "error writing message text\n"
 msgstr "galat menulis teks pesan\n"
 
-#: transact.c:1652
+#: transact.c:1641
 #, 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"
 
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: galat membaca berkas kunci \"%s\": %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:249
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "Senarai UID lama dari %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <kosong>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Senarai awal UID:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:325 uid.c:374
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Menggabungkan senarai UID dari %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:328
+#, c-format
+msgid "New UID list from %s:"
 msgstr "Senarai UID baru dari %s:"
 
-#: uid.c:402
+#: uid.c:355
+msgid "swapping UID lists\n"
+msgstr "menukar senarai UID\n"
+
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "tidak menukar senarai UID, tak ada UID yang terlihat di lema ini\n"
 
-#: uid.c:422
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr "mengabaikan senarai UID baru\n"
 
-#: uid.c:479
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Menghapus berkas fetchids.\n"
 
-#: uid.c:482
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Galat menghapus %s:%s\n"
 
-#: uid.c:489
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Menulis berkas fetchids.\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:439 uid.c:447
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Menulis galat di berkas fetchids %s: %s\n"
 
-#: uid.c:524
+#: uid.c:459
 #, 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"
+msgstr "Galat menulis ke berkas fetchids %s, berkas lama tertinggal di tempat.\n"
 
-#: uid.c:528
+#: uid.c:463
 #, 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:532
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Tak dapat membuka berkas fetchids %s untuk penulisan: %s\n"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc gagal\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 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"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Galat tersimpan masih %d\n"
-
-#~ msgid "swapping UID lists\n"
-#~ msgstr "menukar senarai UID\n"
-
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Subjek: peringatan server tak dapat dicapai Fetchmail."
 
 #~ msgid "Fetchmail could not reach the mail server %s:"
 #~ msgstr "Fetchmail tak dapat mencapai server surat %s:"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: Peringatan: log sistem dan berkas log telah diatur. Silakan "
-#~ "cek keduanya untuk log!\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr "fetchmail: Peringatan: log sistem dan berkas log telah diatur. Silakan cek keduanya untuk log!\n"
 
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "penerbit tak diketahui (karakter %d pertama): %s\n"
diff --git a/po/it.po b/po/it.po
index 91de29cf..5882f137 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,45 +5,41 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.19-pre1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\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"
-"Language: it\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"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Controllo se %s è veramente lo stesso nodo di %s in corso\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Sì, i loro indirizzi IP corrispondono\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "No, i loro indirizzi IP non corrispondono\n"
 
-#: checkalias.c:207
+#: checkalias.c:203
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s: "
-"%s\n"
+msgstr "errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:228
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s\n"
+msgstr "errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "impossibile decodificare la prova BASE64\n"
 
@@ -52,167 +48,146 @@ msgstr "impossibile decodificare la prova BASE64\n"
 msgid "decoded as %s\n"
 msgstr "decodificato come %s\n"
 
-#: driver.c:199
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "errore di kerberos %s\n"
 
-#: driver.c:259 driver.c:265
+#: driver.c:253 driver.c:259
 #, c-format
 msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [il server ha risposto «%s»].\n"
 
-#: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+#: driver.c:339
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Oggetto: avviso di Fetchmail per messaggi sovradimensionati"
 
-#: driver.c:349
+#: driver.c:343
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"I seguenti messaggi sovradimensionati sono stati eliminati sul server %s "
-"account %s:"
+msgstr "I seguenti messaggi sovradimensionati sono stati eliminati sul server %s account %s:"
 
-#: driver.c:353
+#: driver.c:347
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"I seguenti messaggi sovradimensionati rimangono sul server %s account %s:"
+msgstr "I seguenti messaggi sovradimensionati rimangono sul server %s account %s:"
 
-#: driver.c:372
+#: driver.c:366
 #, c-format
 msgid "  %d message  %d octets long deleted by fetchmail."
 msgid_plural "  %d messages %d octets long deleted by fetchmail."
 msgstr[0] "  %d messaggio lungo %d ottetti eliminato da Fetchmail."
 msgstr[1] "  %d messaggi lunghi %d ottetti eliminati da Fetchmail."
 
-#: driver.c:377
+#: driver.c:371
 #, c-format
 msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d messaggio lungo %d ottetti ignorato da Fetchmail."
 msgstr[1] "  %d messaggi lunghi %d ottetti ignorati da Fetchmail."
 
-#: driver.c:522
+#: driver.c:518
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "messaggio %s@%s ignorato: %d"
 
-#: driver.c:577
+#: driver.c:572
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "messaggio %s@%s ignorato: %d (%d ottetti)"
 
-#: driver.c:593
+#: driver.c:588
 msgid " (length -1)"
 msgstr " (lunghezza -1)"
 
-#: driver.c:596
+#: driver.c:591
 msgid " (oversized)"
 msgstr " (sovradimensionato)"
 
-#: driver.c:614
+#: driver.c:609
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr ""
-"impossibile recuperare le intestazioni, messaggio %s@%s: %d (%d ottetti)\n"
+msgstr "impossibile recuperare le intestazioni, messaggio %s@%s: %d (%d ottetti)\n"
 
-#: driver.c:632
+#: driver.c:626
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lettura del messaggio %s@%s in corso: %d di %d"
 
-#: driver.c:637
+#: driver.c:631
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d ottetti)"
 
-#: driver.c:638
+#: driver.c:632
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d ottetti nell'intestazione)"
 
-#: driver.c:708
+#: driver.c:699
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d ottetti nel corpo del messaggio)"
 
-#: driver.c:770
+#: driver.c:758
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"il messaggio %s@%s:%d non era della lunghezza attesa (%d effettiva != %d "
-"attesa)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "il messaggio %s@%s:%d non era della lunghezza attesa (%d effettiva != %d attesa)\n"
 
-#: driver.c:802
+#: driver.c:790
 msgid " retained\n"
 msgstr " mantenuto\n"
 
-#: driver.c:812
+#: driver.c:800
 msgid " flushed\n"
 msgstr " eliminato\n"
 
-#: driver.c:824
+#: driver.c:817
 msgid " not flushed\n"
 msgstr " non eliminato\n"
 
-#: driver.c:842
+#: driver.c:835
 #, 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 di scaricamento di Fetchmail %d raggiunto; %d messaggio lasciato sul "
-"server %s, account %s\n"
-msgstr[1] ""
-"limite di scaricamento di Fetchmail %d raggiunto; %d messaggi lasciati sul "
-"server %s, account %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limite di scaricamento di Fetchmail %d raggiunto; %d messaggio lasciato sul server %s, account %s\n"
+msgstr[1] "limite di scaricamento di Fetchmail %d raggiunto; %d messaggi lasciati sul server %s, account %s\n"
 
-#: driver.c:899
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"tempo scaduto dopo %d secondi durante l'attesa della connessione al server "
-"%s.\n"
+msgstr "tempo scaduto dopo %d secondi durante l'attesa della connessione al server %s.\n"
 
-#: driver.c:903
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo scaduto dopo %d secondi in attesa del server %s.\n"
 
-#: driver.c:907
+#: driver.c:900
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo scaduto dopo %d secondi in attesa di %s.\n"
 
-#: driver.c:912
+#: driver.c:905
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"tempo scaduto dopo %d secondi in attesa della risposta dell'ascoltatore.\n"
+msgstr "tempo scaduto dopo %d secondi in attesa della risposta dell'ascoltatore.\n"
 
-#: driver.c:915
+#: driver.c:908
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo scaduto dopo %d secondi.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:920
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Oggetto: si sono verificate ripetute situazioni di tempo scaduto"
 
-#: driver.c:930
+#: driver.c:923
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Si sono verificate più di %d situazioni di tempo scaduto durante il "
-"tentativo di ottenere la posta da %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Si sono verificate più di %d situazioni di tempo scaduto durante il tentativo di ottenere la posta da %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:927
 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,83 +196,89 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Questo potrebbe significare che il proprio server di posta è bloccato, o che "
-"il proprio server SMTP\n"
+"Questo potrebbe significare che il proprio server di posta è bloccato, o che il proprio server SMTP\n"
 "è incastrato, oppure che il file della casella di posta sul server è stato\n"
 "compromesso da un errore del server. Per diagnosticare il problema,\n"
 "eseguire «fetchmail -v -v».\n"
 "\n"
-"Questa casella di posta elettronica non sarà interrogata ulteriormente fino "
-"al prossimo riavvio del programma.\n"
+"Questa casella di posta elettronica non sarà interrogata ulteriormente fino al prossimo riavvio del programma.\n"
 
-#: driver.c:960
+#: driver.c:953
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "comando di pre-connessione è terminato con stato %d\n"
 
-#: driver.c:963
+#: driver.c:956
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "comando di pre-connessione fallito con stato %d\n"
 
-#: driver.c:987
+#: driver.c:980
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "impossibile trovare la casella di posta HESIOD per %s\n"
 
-#: driver.c:1008
+#: driver.c:1001
 msgid "Lead server has no name.\n"
 msgstr "Il server principale non ha nome.\n"
 
-#: driver.c:1035
+#: driver.c:1028
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "impossibile trovare il nome canonico DNS di %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1075
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s connessione a %s fallita"
 
-#: driver.c:1111
+#: driver.c:1091
+msgid "Subject: Fetchmail unreachable-server warning."
+msgstr "Oggetto: avviso di server irraggiungibile"
+
+#: driver.c:1093
+#, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Impossibile raggiungere il server di posta %s:"
+
+#: driver.c:1122
 msgid "SSL connection failed.\n"
 msgstr "Connessione SSL fallita.\n"
 
-#: driver.c:1166
+#: driver.c:1177
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Errore di lock-busy su %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1181
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Errore di server occupato su %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1186
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Autorizzazione fallita su %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1189
 msgid " (previously authorized)"
 msgstr " (autorizzato in precedenza)"
 
-#: driver.c:1181
+#: driver.c:1192
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Per un aiuto, consultare http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "Per un aiuto, consultare http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1213
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Oggetto: autenticazione fallita su %s@%s"
 
-#: driver.c:1206
+#: driver.c:1217
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Impossibile ottenere la posta da %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1221
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -307,13 +288,11 @@ msgid ""
 msgstr ""
 "Il tentativo di ottenere l'autorizzazione è fallito.\n"
 "Poiché in precedenza questa connessione era stata autorizzata, questa\n"
-"situazione è probabilmente dovuta ad altre cause, per esempio a server "
-"occupato,\n"
-"che non è possibile determinare in quanto il server non ha inviato un "
-"messaggio\n"
+"situazione è probabilmente dovuta ad altre cause, per esempio a server occupato,\n"
+"che non è possibile determinare in quanto il server non ha inviato un messaggio\n"
 "d'errore utile."
 
-#: driver.c:1216
+#: driver.c:1227
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -333,7 +312,7 @@ msgstr ""
 "a ogni ciclo. Nessuna ulteriore notifica sarà inviata finché il servizio\n"
 "non sarà stato ripristinato."
 
-#: driver.c:1226
+#: driver.c:1237
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -353,98 +332,93 @@ msgstr ""
 "collegarsi ad ogni ciclo. Nessuna ulteriore notifica sarà inviata finché il\n"
 "servizio non sarà stato ripristinato."
 
-#: driver.c:1242
+#: driver.c:1253
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Reinterrogazione immediata su %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1258
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Errore sconosciuto di login o di autenticazione su %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1282
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorizzazione riuscita su %s@%s\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1288
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Oggetto: autenticazione riuscita su %s@%s"
 
-#: driver.c:1281
+#: driver.c:1292
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "L'accesso a %s@%s è riuscito.\n"
 
-#: driver.c:1285
+#: driver.c:1296
 msgid "Service has been restored.\n"
 msgstr "Il servizio è stato ripristinato.\n"
 
-#: driver.c:1318
+#: driver.c:1328
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selezione o reinterrogazione della cartella %s in corso\n"
 
-#: driver.c:1320
+#: driver.c:1330
 msgid "selecting or re-polling default folder\n"
 msgstr "selezione o reinterrogazione della cartella predefinita in corso\n"
 
-#: driver.c:1332
+#: driver.c:1342
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s in %s (cartella %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1345 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s in %s"
 
-#: driver.c:1340
+#: driver.c:1350
 #, c-format
 msgid "Polling %s\n"
 msgstr "Interrogazione di %s in corso\n"
 
-#: driver.c:1344
+#: driver.c:1354
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d messaggio (%d %s) per %s"
 msgstr[1] "%d messaggi (%d %s) per %s"
 
-#: driver.c:1347
+#: driver.c:1357
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "visto"
 msgstr[1] "visti"
 
-#: driver.c:1350
+#: driver.c:1360
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d messaggio per %s"
 msgstr[1] "%d messaggi per %s"
 
-#: driver.c:1357
+#: driver.c:1367
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d ottetti).\n"
 
-#: driver.c:1363
+#: driver.c:1373
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nessun messaggio per %s\n"
 
-#: driver.c:1396
+#: driver.c:1406
 msgid "bogus message count!"
 msgstr "conteggio di messaggi errato."
 
-#: driver.c:1448
-#, c-format
-msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-
 #: driver.c:1549
 msgid "socket"
 msgstr "socket"
@@ -484,8 +458,7 @@ msgstr "indefinito"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"Errore %s durante il recupero da %s@%s e la consegna all'host SMTP %s\n"
+msgstr "Errore %s durante il recupero da %s@%s e la consegna all'host SMTP %s\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -529,7 +502,7 @@ msgstr "L'opzione «--all» non è supportata con %s\n"
 msgid "Option --limit is not supported with %s\n"
 msgstr "L'opzione «--limit» non è supportata con %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -539,73 +512,54 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: la variabile di ambiente «QMAILINJECT» è impostata.\n"
-"Questo è pericoloso, in quanto può consentire che qmail-inject o il "
-"contenitore di qmail,\n"
-"sendmail, manomettano i campi «From:» o «Message-ID» nelle intestazioni dei "
-"messaggi.\n"
+"Questo è pericoloso, in quanto può consentire che qmail-inject o il contenitore di qmail,\n"
+"sendmail, manomettano i campi «From:» o «Message-ID» nelle intestazioni dei messaggi.\n"
 "Usare «env QMAILINJECT= %s ARGOMENTI-QUI».\n"
 "%s: annullato.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
 "%s: la variabile di ambiente «NULLMAILER_FLAGS» è impostata.\n"
-"Questo è pericoloso, in quanto può consentire che qmail-inject o il "
-"contenitore di qmail, sendmail,\n"
-"manomettano i campi «From:», «Message-ID» o «Return-Path» nelle intestazioni "
-"dei messaggi.\n"
+"Questo è pericoloso, in quanto può consentire che qmail-inject o il contenitore di qmail, sendmail,\n"
+"manomettano i campi «From:», «Message-ID» o «Return-Path» nelle intestazioni dei messaggi.\n"
 "Usare «env NULLMAILER_FLAGS= %s ARGOMENTI-QUI»\n"
 "%s: annullato.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: esistenza non riscontrata. Allontanarsi.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: impossibile determinare l'host."
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:172
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fallito per %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Impossibile trovare il proprio host nel database degli host per "
-"qualificarlo.\n"
+msgstr "Impossibile trovare il proprio host nel database degli host per qualificarlo.\n"
 
-#: env.c:229
+#: 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 ""
-"Tentativo di continuare a ricevere con nome di host non qualificato in "
-"corso.\n"
-"NON si riportino intestazioni «Received:» interrotte, righe «HELO/EHLO» o "
-"problemi simili.\n"
-"Si provveda, invece, alla riparazione del proprio /etc/hosts, DNS, NIS o "
-"LDAP.\n"
+"Tentativo di continuare a ricevere con nome di host non qualificato in corso.\n"
+"NON si riportino intestazioni «Received:» interrotte, righe «HELO/EHLO» o problemi simili.\n"
+"Si provveda, invece, alla riparazione del proprio /etc/hosts, DNS, NIS o LDAP.\n"
 
 #: etrn.c:49 odmr.c:61
 #, c-format
@@ -671,14 +625,13 @@ msgstr "L'opzione «--folder» non è supportata con ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'opzione «--check» non è supportata con ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d 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"
@@ -686,1096 +639,921 @@ msgstr ""
 "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
 "Copyright (C) 2005 - 2010 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: 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 viene distribuito ASSOLUTAMENTE SENZA ALCUNA GARANZIA. Questo è "
-"software libero\n"
+"Fetchmail viene distribuito ASSOLUTAMENTE SENZA ALCUNA GARANZIA. Questo è software libero\n"
 "e la sua ridistribuzione è incoraggiata a talune condizioni. Per dettagli\n"
-"consultare il file «COPYING» nella directory del sorgente o della "
-"documentazione.\n"
+"consultare il file «COPYING» nella directory del sorgente o della documentazione.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ATTENZIONE: l'esecuzione come root è fortemente sconsigliata.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocato con"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "impossibile ottenere la directory di lavoro attuale\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Questo è Fetchmail rilascio %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:408
 #, 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:470
+#: fetchmail.c:409
 msgid " and "
 msgstr " e "
 
-#: fetchmail.c:475
+#: fetchmail.c:414
 #, 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"
+msgstr "Nessuna impostazione dei server di posta. Probabilmente questo è dovuto a %s mancante.\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:435
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nessun server di posta specificato.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:447
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nessun'altra istanza di Fetchmail in esecuzione\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:453
 #, 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"
+msgstr "fetchmail: errore in fase di arresto forzato di %s Fetchmail su %ld; uscita in corso.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:454 fetchmail.c:463
 msgid "background"
 msgstr "in secondo piano"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:454 fetchmail.c:463
 msgid "foreground"
 msgstr "in primo piano"
 
-#: fetchmail.c:523
+#: fetchmail.c:462
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s Fetchmail su %ld arrestato forzatamente.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: impossibile controllare la posta mentre un'altra istanza di "
-"Fetchmail è in esecuzione sul medesimo host.\n"
+#: fetchmail.c:485
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: impossibile controllare la posta mentre un'altra istanza di Fetchmail è in esecuzione sul medesimo host.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:491
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: impossibile interrogare gli host specificati mentre un'altra "
-"istanza di Fetchmail è in esecuzione su %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: impossibile interrogare gli host specificati mentre un'altra istanza di Fetchmail è in esecuzione su %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:498
 #, 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"
+msgstr "fetchmail: un'altra istanza di Fetchmail è in esecuzione in primo piano su %ld.\n"
 
-#: fetchmail.c:569
-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:508
+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:581
+#: fetchmail.c:514
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: Fetchmail in secondo piano ridestato su %ld.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:526
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: il fratello maggiore su %ld è morto misteriosamente.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:541
 #, 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:612
+#: fetchmail.c:545
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Inserire la password per %s@%s:"
 
-#: fetchmail.c:654
+#: fetchmail.c:587
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr ""
-"fetchmail: impossibile portare in secondo piano. Annullamento in corso.\n"
+msgstr "fetchmail: impossibile portare in secondo piano. Annullamento in corso.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:591
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "avvio del demone di Fetchmail %s in corso \n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:607 fetchmail.c:609
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "impossibile aprire %s per aggiungervi messaggi di registro \n"
 
-#: fetchmail.c:695
+#: fetchmail.c:611
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: attenzione: sono impostati sia il registro di sistema che il file di registro. Controllarli entrambi.\n"
+
+#: fetchmail.c:630
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "Modalità «--check» attivata, nessun recupero di posta in corso\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:652
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "impossibile temporizzare %s (errore %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:657
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "riavvio in corso (%s modificato)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:662
 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"
+msgstr "il tentativo di nuova esecuzione potrebbe fallire, poiché la directory non è stata ripristinata\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:689
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "tentativo di nuova esecuzione fallito\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:719
 #, 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"
+msgstr "interrogazione di %s omessa (autenticazione fallita o troppe situazioni di tempo scaduto)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:731
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervallo non raggiunto, nessuna interrogazione di %s in corso\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:769
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stato dell'interrogazione = 0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:771
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stato dell'interrogazione = 1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:773
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stato dell'interrogazione = 2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:775
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stato dell'interrogazione = 3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:777
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stato dell'interrogazione = 4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:779
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stato dell'interrogazione = 5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:781
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stato dell'interrogazione = 6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:783
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stato dell'interrogazione = 7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:785
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stato dell'interrogazione = 8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:787
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stato dell'interrogazione = 9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:789
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stato dell'interrogazione = 10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:791
 msgid "Query status=11 (DNS)\n"
 msgstr "Stato dell'interrogazione = 11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:793
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stato dell'interrogazione = 12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:795
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stato dell'interrogazione = 13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:797
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stato dell'interrogazione = %d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:839
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tutte le connessioni sono incastrate. Uscita in corso.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:847
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "pausa su %s per %d secondi\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:871
 #, c-format
 msgid "awakened by %s\n"
 msgstr "ridestato da %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:874
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "ridestato dal segnale %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:882
 #, c-format
 msgid "awakened at %s\n"
 msgstr "ridestato su %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:887
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "interruzione normale, stato %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1046
 msgid "couldn't time-check the run-control file\n"
 msgstr "impossibile temporizzare il file di controllo di esecuzione\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1080
 #, 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"
+msgstr "Attenzione: l'host %s è menzionato più volte nel file di configurazione\n"
 
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: errore: molteplici record «defaults» nel file di configurazione.\n"
+#: fetchmail.c:1119
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "fetchmail: errore: molteplici record «defaults» nel file di configurazione.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1241
 msgid "SSL support is not compiled in.\n"
 msgstr "Il supporto per SSL non è compilato.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1248
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Il supporto per KERBEROS V4 è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1254
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Il supporto per KERBEROS V5 è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1260
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Il supporto per GSSAPI è configurato, ma non compilato.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1290
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: avviso: nessun DNS disponibile per controllare recuperi "
-"«multidrop» da %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: avviso: nessun DNS disponibile per controllare recuperi «multidrop» da %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1301
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "avviso: «multidrop» per %s richiede l'opzione «envelope».\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1302
 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"
+msgstr "avviso: non richiedere supporto se tutte le mail vanno al postmaster.\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: la configurazione %s non è valida, specificare un numero di porta "
-"positivo per il servizio o la porta\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: la configurazione %s non è valida, specificare un numero di porta positivo per il servizio o la porta\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1326
 #, 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"
+msgstr "fetchmail: la configurazione %s non è valida, RPOP richiede una porta privilegiata\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1344
 #, 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"
+msgstr "La configurazione %s non è valida, LMTP non può usare la porta SMTP predefinita\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1358
 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"
+msgstr "«fetchall» e «keep on» contemporaneamente nel demone o in modalità inattiva costituiscono un errore.\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1383
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminato con segnale %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1456
 #, 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:1566
+#: fetchmail.c:1481
 msgid "POP2 support is not configured.\n"
 msgstr "Il supporto a POP2 non è configurato.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1493
 msgid "POP3 support is not configured.\n"
 msgstr "Il supporto a POP3 non è configurato.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1503
 msgid "IMAP support is not configured.\n"
 msgstr "Il supporto a IMAP non è configurato.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1509
 msgid "ETRN support is not configured.\n"
 msgstr "Il supporto a ETRN non è configurato.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1517
 msgid "ODMR support is not configured.\n"
 msgstr "Il supporto a ODMR non è configurato.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1524
 msgid "unsupported protocol selected.\n"
 msgstr "selezionato un protocollo non supportato.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1534
 #, 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:1645
+#: fetchmail.c:1551
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervallo d'interrogazione è %d secondi\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1553
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Il file di registro è %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1555
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Il file di identificazione è %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1558
 msgid "Progress messages will be logged via syslog\n"
-msgstr ""
-"I messaggi di avanzamento saranno registrati tramite il registro di sistema\n"
+msgstr "I messaggi di avanzamento saranno registrati tramite il registro di sistema\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1561
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail si maschererà e non genererà «Received»\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1563
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"I puntini di avanzamento saranno mostrati anche nei file di registro.\n"
+msgstr "I puntini di avanzamento saranno mostrati anche nei file di registro.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1565
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Tutti i messaggi «multidrop» male indirizzati saranno inoltrati a %s.\n"
+msgstr "Tutti i messaggi «multidrop» male indirizzati saranno inoltrati a %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1569
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Le mail di errore saranno indirizzate al postmaster.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1571
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Le mail di errore saranno indirizzate al mittente.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1574
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail tratterà gli errori permanenti come permanenti (scarta messaggi).\n"
+msgstr "Fetchmail tratterà gli errori permanenti come permanenti (scarta messaggi).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1576
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail tratterà gli errori permanenti come temporanei (mantieni "
-"messaggi).\n"
+msgstr "Fetchmail tratterà gli errori permanenti come temporanei (mantieni messaggi).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1583
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opzioni per il recupero da %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1587
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le mail saranno recuperate via %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1590
 #, 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] ""
-"  L'interrogazione di questo server sarà effettuata ogni %d intervallo.\n"
-msgstr[1] ""
-"  L'interrogazione di questo server sarà effettuata ogni %d intervalli.\n"
+msgstr[0] "  L'interrogazione di questo server sarà effettuata ogni %d intervallo.\n"
+msgstr[1] "  L'interrogazione di questo server sarà effettuata ogni %d intervalli.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1594
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Il vero nome del server è %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1597
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Questo host non verrà interrogato quando nessuno host è specificato.\n"
+msgstr "  Questo host non verrà interrogato quando nessuno host è specificato.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1598
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Questo host verrà interrogato quando nessuno host è specificato.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1602
 msgid "  Password will be prompted for.\n"
 msgstr "  La password verrà richiesta.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1606
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  segreto APOP = «%s».\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1609
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  identità RPOP = «%s».\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1612
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = «%s».\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1621
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Il protocollo è KPOP con autenticazione Kerberos %s"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1624
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Il protocollo è %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1626
 #, c-format
 msgid " (using service %s)"
 msgstr " (con uso del servizio %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1628
 msgid " (using default port)"
 msgstr " (con uso della porta predefinita)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1630
 msgid " (forcing UIDL use)"
 msgstr " (forzando l'uso di UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1636
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Tutti i metodi di autenticazione disponibili saranno provati.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1639
 msgid "  Password authentication will be forced.\n"
 msgstr "  L'autenticazione password sarà forzata.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1642
 msgid "  MSN authentication will be forced.\n"
 msgstr "  L'autenticazione MSN sarà forzata.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1645
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  L'autenticazione NTLM sarà forzata.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1648
 msgid "  OTP authentication will be forced.\n"
 msgstr "  L'autenticazione OTP sarà forzata.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1651
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  L'autenticazione CRAM-MD5 sarà forzata.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1654
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  L'autenticazione GSSAPI sarà forzata.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1657
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  L'autenticazione Kerberos V4 sarà forzata.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1660
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  L'autenticazione Kerberos V5 sarà forzata.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1663
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Cifratura fra le due estremità presunta.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1667
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Il principal del server di posta è: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1670
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessione cifrata SSL abilitata.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1672
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocollo SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1674
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Controllo del certificato del server SSL abilitato.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Controllo del certificato del server SSL abilitato.\n"
-
-#: fetchmail.c:1773
+#: fetchmail.c:1677
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  File del certificato SSL fidato: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1679
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directory dei certificati SSL fidati: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1681
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  NomeComune del server SSL: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1683
 #, 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:1782
+#: fetchmail.c:1686
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Il limite di tempo per mancata risposta del server è %d secondi"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1688
 msgid " (default).\n"
 msgstr " (predefinito).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1695
 msgid "  Default mailbox selected.\n"
 msgstr "  Selezionata la casella di posta predefinita.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1700
 msgid "  Selected mailboxes are:"
 msgstr "  Le caselle di posta selezionate sono:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1706
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tutti i messaggi verranno recuperati («--all» abilitato).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1707
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Verranno scaricati solo i nuovi messaggi («--all» disabilitato).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1709
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
-msgstr ""
-"  I messaggi recuperati verranno mantenuti sul server («--keep» abilitato).\n"
+msgstr "  I messaggi recuperati verranno mantenuti sul server («--keep» abilitato).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1710
 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"
+msgstr "  I messaggi recuperati non verranno mantenuti sul server («--keep» disabilitato).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1712
 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"
+msgstr "  I vecchi messaggi verranno cancellati prima dello scaricamento dei messaggi («--flush» abilitato).\n"
 
-#: fetchmail.c:1809
-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:1713
+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:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  I messaggi sovradimensionati verranno cancellati prima dello scaricamento "
-"dei messaggi («--limitflush» abilitato).\n"
+#: fetchmail.c:1715
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  I messaggi sovradimensionati verranno cancellati prima dello scaricamento dei messaggi («--limitflush» abilitato).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  I messaggi sovradimensionati non verranno cancellati prima dello "
-"scaricamento dei messaggi («--limitflush» disabilitato).\n"
+#: fetchmail.c:1716
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  I messaggi sovradimensionati non verranno cancellati prima dello scaricamento dei messaggi («--limitflush» disabilitato).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1718
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  La riscrittura degli indirizzi del server locale è abilitata («--"
-"norewrite» disabilitato).\n"
+msgstr "  La riscrittura degli indirizzi del server locale è abilitata («--norewrite» disabilitato).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1719
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  La riscrittura degli indirizzi del server locale è disabilitata («--"
-"norewrite» abilitato).\n"
+msgstr "  La riscrittura degli indirizzi del server locale è disabilitata («--norewrite» abilitato).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1721
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La rimozione dei ritorni a capo è abilitata («stripcr» abilitato).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1722
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr ""
-"  La rimozione dei ritorni a capo è disabilitata («stripcr» disabilitato).\n"
+msgstr "  La rimozione dei ritorni a capo è disabilitata («stripcr» disabilitato).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1724
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  La forzatura dei ritorni a capo è abilitata («forcecr» abilitato).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1725
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
-msgstr ""
-"  La forzatura dei ritorni a capo è disabilitata («forcecr» disabilitato).\n"
+msgstr "  La forzatura dei ritorni a capo è disabilitata («forcecr» disabilitato).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  L'interpretazione di «Content-Transfer-Econding» è disabilitata "
-"(«pass8bits» abilitato).\n"
+#: fetchmail.c:1727
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  L'interpretazione di «Content-Transfer-Econding» è disabilitata («pass8bits» abilitato).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  L'interpretazione di «Content-Transfer-Encoding» è abilitata («pass8bits» "
-"disabilitato).\n"
+#: fetchmail.c:1728
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  L'interpretazione di «Content-Transfer-Encoding» è abilitata («pass8bits» disabilitato).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1730
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodifica MIME è abilitata («mimedecode» abilitato).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1731
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodifica MIME è disabilitata («mimedecode» disabilitato).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1733
 msgid "  Idle after poll is enabled (idle on).\n"
-msgstr ""
-"  La modalità inattiva dopo lo scaricamento è abilitata («idle» abilitato).\n"
+msgstr "  La modalità inattiva dopo lo scaricamento è abilitata («idle» abilitato).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1734
 msgid "  Idle after poll is disabled (idle off).\n"
-msgstr ""
-"  La modalità inattiva dopo lo scaricamento è disabilitata («idle» "
-"disabilitato).\n"
+msgstr "  La modalità inattiva dopo lo scaricamento è disabilitata («idle» disabilitato).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1736
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
-msgstr ""
-"  Le righe di stato non vuote verranno scartate («dropstatus» abilitato)\n"
+msgstr "  Le righe di stato non vuote verranno scartate («dropstatus» abilitato)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1737
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr ""
-"  Le righe di stato non vuote verranno mantenute («dropstatus» "
-"disabilitato)\n"
+msgstr "  Le righe di stato non vuote verranno mantenute («dropstatus» disabilitato)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1739
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-"  Le righe «Delivered-To» verranno scartate («dropdelivered» abilitato)\n"
+msgstr "  Le righe «Delivered-To» verranno scartate («dropdelivered» abilitato)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1740
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-"  Le righe «Delivered-To» verranno mantenute («dropdelivered» disabilitato)\n"
+msgstr "  Le righe «Delivered-To» verranno mantenute («dropdelivered» disabilitato)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1744
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
-msgstr ""
-"  Il limite della dimensione dei messaggi è %d ottetti («--limit %d»).\n"
+msgstr "  Il limite della dimensione dei messaggi è %d ottetti («--limit %d»).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1747
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nessun limite della dimensione dei messaggi («--limit 0»).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1749
 #, 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"
+msgstr "  L'intervallo fra avvisi relativi alla dimensione dei messaggi è %d secondi («--warnings %d»).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1752
 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"
+msgstr "  Gli avvisi relativi alla dimensione dei messaggi verranno mostrati ad ogni interrogazione («--warnings 0»).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1755
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Il limite dei messaggi ricevuti è %d («--fetchlimit %d»).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1758
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nessun limite dei messaggi ricevuti («--fetchlimit 0»).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1760
 #, 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"
+msgstr "  Il limite della dimensione dei messaggi da scaricare è %d («--fetchsizelimit %d»).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1763
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
-msgstr ""
-"  Nessun limite della dimensione dei messaggi da scaricare («--"
-"fetchsizelimit 0»).\n"
+msgstr "  Nessun limite della dimensione dei messaggi da scaricare («--fetchsizelimit 0»).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1767
 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"
+msgstr "  Effettuare una ricerca binaria degli UID durante ogni interrogazione («--fastuidl 1»).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1769
 #, 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"
+msgstr "  Effettuare una ricerca binaria degli UID durante %d di %d interrogazioni («--fastuidl %d»).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1772
 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"
+msgstr "  Effettuare una ricerca binaria degli UID durante ogni interrogazione («--fastuidl 0»).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1774
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Il limite della serie di messaggi SMTP è %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1776
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nessun limite della serie di messaggi SMTP («--batchlimit 0»).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1780
 #, 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"
+msgstr "  L'intervallo di cancellazione fra ripuliture è forzato a %d («--expunge %d»).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1782
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nessuna ripulitura forzata («--expunge 0»).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1789
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  I domini per i quali le mail vengono scaricate sono:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1794 fetchmail.c:1814
 msgid " (default)"
 msgstr " (predefinito)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1799
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  I messaggi verranno aggiunti a %s come BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1801
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  I messaggi verranno consegnati con «%s».\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1808
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  I messaggi verranno inoltrati tramite %cMTP a:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1819
 #, 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:1918
+#: fetchmail.c:1822
 #, 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"
+msgstr "  L'indirizzo da inserire nelle righe «RCPT TO» inviate a SMTP sarà %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1831
 msgid "  Recognized listener spam block responses are:"
-msgstr ""
-"  Gli ascoltatori delle risposte di blocco della posta indesiderata "
-"riconosciuti sono:"
+msgstr "  Gli ascoltatori delle risposte di blocco della posta indesiderata riconosciuti sono:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1837
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blocco della posta indesiderata disabilitato\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1840
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connessione al server verrà aperta con «%s».\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1843
 msgid "  No pre-connection command.\n"
 msgstr "  Nessun comando pre-connessione.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1845
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connessione al server verrà chiusa con «%s».\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1848
 msgid "  No post-connection command.\n"
 msgstr "  Nessun comando post-connessione.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1851
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nessun nome locale dichiarato per questo host.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1861
 msgid "  Multi-drop mode: "
 msgstr "  Modalità multi-drop: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1863
 msgid "  Single-drop mode: "
 msgstr "  Modalità single-drop: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1865
 #, 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:1976
+#: fetchmail.c:1880
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La ricerca DNS per indirizzi multidrop è abilitata.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1881
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La ricerca DNS per indirizzi multidrop è disabilitata.\n"
 
-#: fetchmail.c:1981
-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:1885
+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:1983
+#: fetchmail.c:1887
 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"
+msgstr "  Gli alias del server verranno confrontati per nome con gli indirizzi multidrop.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1890
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'instradamento «envelope-address» è disabilitato\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1893
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'intestazione della busta è presunta essere: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1896
 #, 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:1995
+#: fetchmail.c:1899
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Il prefisso %s sarà rimosso dall'ID utente\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1902
 msgid "  No prefix stripping\n"
 msgstr "  Nessuna rimozione di prefissi\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1907
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predichiarati del server di posta:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1915
 msgid "  Local domains:"
 msgstr "  Domini locali:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1925
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connessione deve avvenire attraverso l'interfaccia %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1927
 msgid "  No interface requirement specified.\n"
 msgstr "  Nessun requisito specificato per l'interfaccia.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1929
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Il ciclo di interrogazione monitorerà %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1931
 msgid "  No monitor interface specified.\n"
 msgstr "  Nessuna interfaccia di monitoraggio specificata.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1935
 #, 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"
+msgstr "  Le connessioni al server verranno effettuate tramite il plugin %s («--plugin %s»).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:1937
 msgid "  No plugin command specified.\n"
 msgstr "  Nessun comando di plugin specificato.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1939
 #, 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"
+msgstr "  Le connessioni all'ascoltatore verranno effettuate tramite il plugout %s («--plugout %s»).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:1941
 msgid "  No plugout command specified.\n"
 msgstr "  Nessun comando di plugout specificato.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1946
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nessun UID salvato da questo host.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1955
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID salvati.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1963
 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"
+msgstr "  Le informazioni di tracciamento dell'interrogazione verranno aggiunte all'intestazione «Received».\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:1965
 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"
+msgstr "  Nessuna informazione di tracciamento dell'interrogazione verrà aggiunta all'intestazione «Received».\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:1970
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  I messaggi con un'intestazione non valida verranno respinti.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:1973
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  I messaggi con un'intestazione non valida verranno passati.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:1978
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Proprietà pass-through «%s».\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERRORE: nessun supporto per la funzione getpassword()\n"
@@ -1788,92 +1566,78 @@ msgstr ""
 "\n"
 "Intercettato SIGINT, uscita in corso.\n"
 
-#: gssapi.c:53
+#: gssapi.c:52
 #, 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:56
+#: gssapi.c:55
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "Errore GSSAPI %s: %.*s\n"
 
-#: gssapi.c:91
+#: gssapi.c:90
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Impossibile trovare il nome del servizio per [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:95
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Con uso del nome del servizio [%s]\n"
 
-#: gssapi.c:123
+#: gssapi.c:122
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Non è stata trovata alcuna credenziale GSSAPI adatta. L'autenticazione "
-"GSSAPI viene omessa.\n"
+msgstr "Non è stata trovata alcuna credenziale GSSAPI adatta. L'autenticazione GSSAPI viene omessa.\n"
 
-#: 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:123
+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:160
+#: gssapi.c:159
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Ricevuta prova malformata a «%s GSSAPI».\n"
 
-#: gssapi.c:170
+#: gssapi.c:169
 msgid "Sending credentials\n"
 msgstr "Invio delle credenziali in corso\n"
 
-#: gssapi.c:201
+#: gssapi.c:200
 msgid "Error exchanging credentials\n"
 msgstr "Errore in fase di scambio delle credenziali\n"
 
-#: gssapi.c:243
+#: gssapi.c:242
 msgid "Couldn't unwrap security level data\n"
 msgstr "Impossibile aprire i dati del livello di sicurezza\n"
 
-#: gssapi.c:248
+#: gssapi.c:247
 msgid "Credential exchange complete\n"
 msgstr "Scambio di credenziali completato\n"
 
-#: gssapi.c:252
+#: gssapi.c:251
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Il server richiede l'integrità, la riservatezza o entrambe\n"
 
-#: gssapi.c:261
+#: gssapi.c:260
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Contrassegni del livello di sicurezza aperti: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:264
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "La dimensione massima del gettone GSS è %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Errore durante la creazione della richiesta del livello di sicurezza\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "Rilascio delle credenziali GSS in corso\n"
 
-#: gssapi.c:302
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Errore in fase di rilascio delle credenziali\n"
 
@@ -1882,142 +1646,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:75
-#, fuzzy, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+#: imap.c:74
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
 msgstr "Ricevuta risposta BYE dal server IMAP: %s"
 
-#: imap.c:97
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "conteggio di messaggi errato in %s."
 
-#: imap.c:144
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "conteggio di EXPUNGE errato in %s."
 
-#: imap.c:355
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocollo identificato come IMAP4 rev 1\n"
 
-#: imap.c:361
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocollo identificato come IMAP4 rev 0\n"
 
-#: imap.c:368
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocollo identificato come IMAP2 o IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "Entrata in inattività dopo l'interrogazione\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:461 pop3.c:475
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: aggiornamento a TLS effettuato con successo.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:466 pop3.c:480
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: aggiornamento a TLS fallito.\n"
 
-#: imap.c:487
+#: imap.c:470
 #, 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:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
+msgstr "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in corso\n"
 
-#: imap.c:607
+#: imap.c:586
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacità OTP richiesta non è compilata nel programma\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:606 pop3.c:555
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacità NTLM richiesta non è compilata nel programma\n"
 
-#: imap.c:691
+#: imap.c:615
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "La capacità LOGIN richiesta non è supportata dal server\n"
+
+#: imap.c:679
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr ""
-"differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
+msgstr "differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
 
 #: imap.c:818
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu non è stato visto\n"
 
-#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u non è stato visto\n"
 
-#: imap.c:903 imap.c:962
+#: imap.c:917 imap.c:976
 msgid "re-poll failed\n"
 msgstr "re-interrogazione fallita\n"
 
-#: imap.c:911 imap.c:967
+#: imap.c:925 imap.c:981
 #, 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:928
+#: imap.c:942
 msgid "mailbox selection failed\n"
 msgstr "selezione della casella di posta fallita\n"
 
-#: imap.c:932
+#: imap.c:946
 #, 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:946
+#: imap.c:960
 msgid "expunge failed\n"
 msgstr "ripulitura fallita\n"
 
-#: imap.c:950
+#: imap.c:964
 #, 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:989
+#: imap.c:1003
 msgid "search for unseen messages failed\n"
 msgstr "ricerca di messaggi non visti fallita\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:1008 pop3.c:861
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u è il primo non visto\n"
 
-#: 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:1092
+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:1177 imap.c:1184
+#: imap.c:1190 imap.c:1197
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Risposta FETCH non corretta: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Impossibile aprire l'interfaccia kvm. Assicurarsi che Fetchmail sia «SGID "
-"kmem»."
+msgstr "Impossibile aprire l'interfaccia kvm. Assicurarsi che Fetchmail sia «SGID kmem»."
 
 #: interface.c:396
 #, c-format
@@ -2097,21 +1852,21 @@ msgstr "l'attività su %s era %d, ora è %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "impossibile decodificare la prova BASE64\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "il principal %s nel ticket non corrisponde a -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "l'istanza non nulla (%s) potrebbe causare strani comportamenti\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "impossibile decodificare la risposta di pronto BASE64\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "differenza nella prova\n"
 
@@ -2121,35 +1876,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: errore durante la lettura del file di blocco «%s»: %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: rimozione del vecchio file di blocco in corso\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: errore durante l'apertura del file di blocco «%s»: %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: errore durante la lettura del file di blocco «%s»: %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: errore durante l'apertura del file di blocco «%s»: %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: creazione del blocco fallita.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: errore durante la lettura del file di blocco «%s»: %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2160,15 +1898,6 @@ msgstr "%s:%d: attenzione: trovato «%s» prima di qualsiasi nome di host\n"
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: attenzione: gettone sconosciuto «%s»\n"
 
-#: ntlmsubr.c:35
-#, fuzzy
-msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr "Ricevuta prova malformata a «%s GSSAPI».\n"
-
-#: 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"
@@ -2223,530 +1952,419 @@ 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:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "server recv fatale\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossibile decodificare la prova OTP\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:582
 msgid "Secret pass phrase: "
 msgstr "Passphrase segreta: "
 
-#: options.c:179 options.c:223
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La stringa «%s» non è una stringa numerica valida.\n"
 
-#: options.c:188
+#: options.c:185
 #, 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:189
+#: options.c:186
 msgid "smaller"
 msgstr "più piccolo"
 
-#: options.c:189
+#: options.c:186
 msgid "larger"
 msgstr "più grande"
 
-#: options.c:337
+#: options.c:323
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Specificata politica «%s» relativa alle intestazioni non valide.\n"
 
-#: options.c:378
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocollo specificato «%s» non valido.\n"
 
-#: options.c:425
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Autenticazione specificata «%s» non valida.\n"
 
-#: options.c:641
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Uso: fetchmail [opzioni] [server...]\n"
 
-#: options.c:642
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Le opzioni sono come segue:\n"
 
-#: options.c:643
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help       mostra questa opzione di aiuto\n"
 
-#: options.c:644
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version    mostra le informazioni sulla versione\n"
 
-#: options.c:646
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check      controlla nuovi messaggi senza scaricarli\n"
 
-#: options.c:647
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent     lavora in modalità silenziosa\n"
 
-#: options.c:648
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose    lavora in modalità prolissa (output diagnostico)\n"
 
-#: options.c:649
+#: options.c:628
 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:650
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach   non staccare il processo demone\n"
 
-#: options.c:651
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit       termina forzatamente il processo demone\n"
 
-#: options.c:652
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile    specifica il nome del file di registro\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog          usa syslog(3) per la maggior parte dei messaggi "
-"durante l'esecuzione come demone\n"
-
-#: options.c:654
-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          usa syslog(3) per la maggior parte dei messaggi durante l'esecuzione come demone\n"
 
-#: options.c:655
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible       non scrivere «Received» e abilita lo spoofing "
-"dell'host\n"
+msgstr "      --invisible       non scrivere «Received» e abilita lo spoofing dell'host\n"
 
-#: options.c:656
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc     specifica un file di controllo dell'esecuzione "
-"alternativo\n"
+msgstr "  -f, --fetchmailrc     specifica un file di controllo dell'esecuzione alternativo\n"
 
-#: options.c:657
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile          specifica un file UID alternativo\n"
 
-#: options.c:658
+#: options.c:636
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile         specifica un file PID (blocco) alternativo\n"
 
-#: options.c:659
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
-msgstr ""
-"      --postmaster      specifica il ricevente che funge da ultima istanza\n"
+msgstr "      --postmaster      specifica il ricevente che funge da ultima istanza\n"
 
-#: options.c:660
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce        reindirizza le mail rifiutate dall'utente al "
-"postmaster.\n"
+msgstr "      --nobounce        reindirizza le mail rifiutate dall'utente al postmaster.\n"
 
-#: 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:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail elimina i messaggi non recapitabili in modo permanente.\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  mantiene sul server in modo permanente i messaggi non "
-"recapitabili (predefinito).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  mantiene sul server in modo permanente i messaggi non recapitabili (predefinito).\n"
 
-#: options.c:664
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface     specifica richiesta d'interfaccia\n"
 
-#: options.c:665
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor       monitora l'interfaccia per attività\n"
 
-#: options.c:668
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl             abilita le sessioni cifrate SSL\n"
 
-#: options.c:669
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey          file di chiave privata SSL\n"
 
-#: options.c:670
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert         certificato client SSL\n"
 
-#: options.c:671
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck       effettua un rigoroso controllo del certificato del "
-"server (raccomandato)\n"
-
-#: 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"
+msgstr "      --sslcertck       effettua un rigoroso controllo del certificato del server (raccomandato)\n"
 
-#: options.c:673
+#: options.c:650
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile     percorso del file del certificato CA SSL fidato\n"
+msgstr "      --sslcertfile     percorso del file del certificato CA SSL fidato\n"
 
-#: options.c:674
+#: options.c:651
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath     percorso della directory del certificato CA SSL "
-"fidato\n"
+msgstr "      --sslcertpath     percorso della directory del certificato CA SSL fidato\n"
 
-#: 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:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname   si aspetta questo nome comune dal server (assolutamente sconsigliato)\n"
 
-#: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint  impronta digitale che deve coincidere con quella del "
-"certificato del server.\n"
+#: options.c:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint  impronta digitale che deve coincidere con quella del certificato del server.\n"
 
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:654
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto        forza il protocollo SSL (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin          specifica il comando esterno per aprire la "
-"connessione\n"
+msgstr "      --plugin          specifica il comando esterno per aprire la connessione\n"
 
-#: options.c:680
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout         specifica il comando esterno per aprire la "
-"connessione SMTP\n"
+msgstr "      --plugout         specifica il comando esterno per aprire la connessione SMTP\n"
 
-#: options.c:681
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    specificare la politica per il trattamento di messaggi "
-"con intestazione non valida\n"
+"                    specificare la politica per il trattamento di messaggi con intestazione non valida\n"
 
-#: 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:661
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
+msgstr "  -p, --protocol    specifica il protocollo di scaricamento (vedere pagina man)\n"
 
-#: options.c:685
+#: options.c:662
 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:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port            porta TCP alla quale collegarsi (obsoleto, usare «--"
-"service» in sostituzione)\n"
+msgstr "      --port            porta TCP alla quale collegarsi (obsoleto, usare «--service» in sostituzione)\n"
 
-#: 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:664
+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:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
-msgstr ""
-"      --auth            tipo di autenticazione (password/kerberos/ssh/otp)\n"
+#: options.c:665
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
+msgstr "      --auth            tipo di autenticazione (password/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tempo massimo per mancata risposta del server\n"
 
-#: options.c:691
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    intestazione dell'indirizzo nella busta\n"
 
-#: options.c:692
+#: options.c:668
 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:693
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal       principal del server di posta\n"
 
-#: options.c:694
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls      aggiunge le informazioni di tracciamento "
-"dell'interrogazione all'intestazione «Received»\n"
+msgstr "      --tracepolls      aggiunge le informazioni di tracciamento dell'interrogazione all'intestazione «Received»\n"
 
-#: options.c:696
-#, 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    specifica il login dell'utente sul server\n"
 
-#: options.c:697
+#: options.c:673
 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:698
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      elimina i nuovi messaggi dopo lo scaricamento\n"
 
-#: options.c:699
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        conserva i nuovi messaggi dopo lo scaricamento\n"
 
-#: options.c:700
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       elimina i vecchi messaggi dal server\n"
 
-#: options.c:701
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush      elimina i messaggi sovradimensionati\n"
 
-#: options.c:702
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   non riscrivere gli indirizzi dell'intestazione\n"
 
-#: options.c:703
+#: options.c:679
 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"
+msgstr "  -l, --limit       non scaricare i messaggi al di sopra della dimensione data\n"
 
-#: options.c:704
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr ""
-"  -w, --warnings    intervallo fra le notifiche degli avvisi di posta\n"
+msgstr "  -w, --warnings    intervallo fra le notifiche degli avvisi di posta\n"
 
-#: options.c:706
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    imposta l'host di inoltro SMTP\n"
 
-#: options.c:707
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains    scarica la posta per i domini specificati\n"
 
-#: options.c:708
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress imposta il dominio di consegna SMTP da usare\n"
 
-#: options.c:709
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr ""
-"      --smtpname        imposta il nome completo SMTP nomeutente@dominio\n"
+msgstr "      --smtpname        imposta il nome completo SMTP nomeutente@dominio\n"
 
-#: options.c:710
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    imposta i valori della risposta antispam\n"
 
-#: options.c:711
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  imposta il limite batch per connessioni SMTP\n"
 
-#: options.c:712
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  imposta il limite di scaricamento per connessioni a "
-"server\n"
+msgstr "  -B, --fetchlimit  imposta il limite di scaricamento per connessioni a server\n"
 
-#: options.c:713
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit  imposta il limite delle dimensioni dei messaggi da "
-"scaricare\n"
+msgstr "      --fetchsizelimit  imposta il limite delle dimensioni dei messaggi da scaricare\n"
 
-#: options.c:714
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl        effettua una ricerca binaria degli UIDL\n"
 
-#: options.c:715
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     imposta il numero massimo di cancellazioni fra "
-"ripuliture\n"
+msgstr "  -e, --expunge     imposta il numero massimo di cancellazioni fra ripuliture\n"
 
-#: options.c:716
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         imposta l'MDA da usare per l'inoltro\n"
 
-#: options.c:717
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp           imposta il file di output BSMTP\n"
 
-#: options.c:718
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp            usa LMTP (RFC2033) per la consegna\n"
 
-#: options.c:719
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specifica il nome della cartella remota\n"
 
-#: options.c:720
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots        mostra i puntini di avanziamento anche nei file di "
-"registro\n"
-
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
+msgstr "      --showdots        mostra i puntini di avanziamento anche nei file di registro\n"
 
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
-
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, "
-"anziché di TOP, in corso.\n"
+#: pop3.c:327
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, anziché di TOP, in corso.\n"
 
-#: pop3.c:414
+#: pop3.c:411
 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"
+msgstr "TLS è obbligatorio per questa sessione, ma il server rifiuta il comando CAPA.\n"
 
-#: pop3.c:415
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Il comando CAPA è comunque necessario per TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:491
 #, 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:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
+msgstr "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in corso.\n"
 
-#: pop3.c:623
+#: pop3.c:618
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
+msgstr "Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
 
-#: pop3.c:637
+#: pop3.c:632
 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"
+msgstr "Data e ora APOP sono richieste, ma non sono state trovate nel messaggio di benvenuto\n"
 
-#: pop3.c:646
+#: pop3.c:641
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Errore di sintassi di data e ora nel messaggio di benvenuto\n"
 
-#: pop3.c:662
+#: pop3.c:657
 msgid "Invalid APOP timestamp.\n"
 msgstr "Data e ora APOP non valide.\n"
 
-#: pop3.c:686
+#: pop3.c:681
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Richiesto un protocollo non definito in POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:702
 msgid "lock busy!  Is another session active?\n"
 msgstr "Il blocco è occupato. Controllare se un'altra sessione è attiva.\n"
 
-#: pop3.c:770
+#: pop3.c:781
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Impossibile gestire la risposta UIDL dal server upstream.\n"
 
-#: pop3.c:793
+#: pop3.c:804
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Il server ha risposto con UID per messaggio errato.\n"
 
-#: pop3.c:822
+#: pop3.c:831
 #, 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:934
+#: pop3.c:937
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"Messaggi inseriti nell'elenco sul server. Impossibile gestire questa "
-"situazione.\n"
+msgstr "Messaggi inseriti nell'elenco sul server. Impossibile gestire questa situazione.\n"
 
-#: pop3.c:1032
+#: pop3.c:1033
 msgid "protocol error\n"
 msgstr "errore di protocollo\n"
 
-#: pop3.c:1048
+#: pop3.c:1049
 msgid "protocol error while fetching UIDLs\n"
 msgstr "errore di protocollo durante lo scaricamento degli UIDL\n"
 
-#: pop3.c:1079
+#: pop3.c:1081
 #, 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:1389
+#: pop3.c:1419
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opzione «--folder» non è supportata con POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:131
 msgid "server option after user options"
 msgstr "opzione del server dopo le opzioni dell'utente"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:174
 msgid "SDPS not enabled."
 msgstr "SDPS non abilitato."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opzione di interfaccia è supportata solo in Linux (senza IPv6) "
-"e FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opzione di interfaccia è supportata solo in Linux (senza IPv6) e FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opzione di monitoraggio è supportata solo in Linux (senza IPv6) "
-"e FreeBSD\n"
+#: rcfile_y.y:226
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opzione di monitoraggio è supportata solo in Linux (senza IPv6) e FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL non è abilitato"
 
@@ -2934,8 +2552,7 @@ msgstr "Unicode:\n"
 
 #: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
-msgstr ""
-"RPA ha fallito l'apertura di «/dev/urandom». Questo non dovrebbe accadere\n"
+msgstr "RPA ha fallito l'apertura di «/dev/urandom». Questo non dovrebbe accadere\n"
 
 #: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
@@ -2984,144 +2601,134 @@ msgstr "Specificare il servizio come numero intero di porta.\n"
 msgid "forwarding to %s\n"
 msgstr "inoltro a %s in corso\n"
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (corpo del messaggio respinto)\n"
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "posta da %s respinta a %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:456
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "L'errore salvato è ancora %d\n"
+
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Errore %cMTP: %s\n"
 
-#: sink.c:535
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Il server SMTP richiede STARTTLS, il messaggio viene mantenuto.\n"
 
-#: sink.c:714
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Apertura del file BSMTP fallita: %s\n"
 
-#: sink.c:760
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Scrittura del preambolo BSMTP fallita: %s.\n"
 
-#: sink.c:974
+#: sink.c:995
 #, 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:981
+#: sink.c:1002
 #, 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"
+msgstr "L'ascoltatore %cMTP non gradisce assolutamente l'indirizzo di destinatario «%s»\n"
 
-#: sink.c:1027
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
-msgstr ""
-"nessun indirizzo corrispondente; nessun postmaster è stato impostato.\n"
+msgstr "nessun indirizzo corrispondente; nessun postmaster è stato impostato.\n"
 
-#: sink.c:1039
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "impossibile anche inviare a %s.\n"
 
-#: sink.c:1045
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "nessun indirizzo corrispondente, inoltro a %s in corso.\n"
 
-#: 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
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "in procinto di consegnare con: %s\n"
 
-#: sink.c:1222
+#: sink.c:1233
 #, 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:1234
+#: sink.c:1245
 #, 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"
+msgstr "Impossibile riportare l'id dell'utente effettivo all'originale %ld: %s\n"
 
-#: sink.c:1241
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "Apertura di MDA fallita\n"
 
-#: sink.c:1280
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Connessione di %cMTP a %s fallita\n"
 
-#: sink.c:1304
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "impossibile raggiungere l'ascoltatore, ritorno su %s in corso"
 
-#: sink.c:1362
+#: sink.c:1373
 #, 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:1387
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Errore durante la scrittura su MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA terminato da segnale %d\n"
 
-#: sink.c:1393
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ha ritornato uno stato %d diverso da zero\n"
 
-#: sink.c:1396
+#: sink.c:1407
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile "
-"trattare a %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile trattare a %s:%d\n"
 
-#: sink.c:1421
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "L'ascoltatore SMTP ha rifiutato la consegna\n"
 
-#: sink.c:1451
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "Errore di consegna LMTP su EOM\n"
 
-#: sink.c:1454
+#: sink.c:1465
 #, 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:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "Il demone di Fetchmail"
@@ -3151,86 +2758,84 @@ msgstr "Autenticazione ESMPT PLAIN in corso\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticazione ESMTP LOGIN in corso\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "errore di protocollo dell'ascoltatore SMTP\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc fallita\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair fallita\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork fallita\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 fallita\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "esecuzione di %s (host %s servizio %s) in corso\n"
 
-#: socket.c:197
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) fallita\n"
 
-#: socket.c:272
+#: socket.c:283
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") errore: %s\n"
 
-#: socket.c:275
+#: socket.c:286
 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"
+msgstr "Provare ad aggiungere l'opzione «--service» (vedere anche le FAQ, paragrafo R12).\n"
 
-#: socket.c:289 socket.c:292
+#: socket.c:300 socket.c:303
 #, c-format
 msgid "unknown (%s)"
 msgstr "sconosciuto (%s)"
 
-#: socket.c:295
+#: socket.c:306
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Tentativo di connessione a %s/%s in corso"
 
-#: socket.c:304
+#: socket.c:315
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: socket.c:306
+#: socket.c:317
 #, 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:324
+#: socket.c:333
 msgid "connection failed.\n"
 msgstr "connessione fallita.\n"
 
-#: socket.c:326
+#: socket.c:335
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connessione a %s:%s [%s/%s] fallita: %s.\n"
 
-#: socket.c:327
+#: socket.c:336
 #, 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:333
+#: socket.c:342
 msgid "connected.\n"
 msgstr "connesso.\n"
 
-#: socket.c:346
+#: socket.c:355
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3239,289 +2844,172 @@ msgstr ""
 "Errori di connessione per questa interrogazione:\n"
 "%s"
 
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
+#: socket.c:621
 msgid "Server certificate:\n"
 msgstr "Certificato del server:\n"
 
-#: socket.c:662
+#: socket.c:626
 #, 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"
+msgstr "Catena del certificato, dalla radice al nodo, che inizia in profondità %d:\n"
 
-#: socket.c:665
+#: socket.c:629
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certificato in profondità %d:\n"
 
-#: socket.c:671
+#: socket.c:635
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizzazione emittente: %s\n"
 
-#: socket.c:674
+#: socket.c:638
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Attenzione: nome dell'organizzazione emittente troppo lungo (possibile "
-"troncatura).\n"
+msgstr "Attenzione: nome dell'organizzazione emittente troppo lungo (possibile troncatura).\n"
 
-#: socket.c:676
+#: socket.c:640
 msgid "Unknown Organization\n"
 msgstr "Organizzazione sconosciuta\n"
 
-#: socket.c:678
+#: socket.c:642
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nome comune dell'emittente: %s\n"
 
-#: socket.c:681
+#: socket.c:645
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Attenzione: nome comune dell'emittente troppo lungo (possibile troncatura).\n"
+msgstr "Attenzione: nome comune dell'emittente troppo lungo (possibile troncatura).\n"
 
-#: socket.c:683
+#: socket.c:647
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nome comune dell'emittente sconosciuto\n"
 
-#: socket.c:689
+#: socket.c:653
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Nome comune dell'oggetto: %s\n"
 
-#: socket.c:695
+#: socket.c:659
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificato non valido: il nome comune del «Subject» è troppo lungo.\n"
 
-#: socket.c:701
+#: socket.c:665
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr ""
-"Certificato non valido: il nome comune del «Subject» contiene NUL, "
-"interruzione in corso.\n"
+msgstr "Certificato non valido: il nome comune del «Subject» contiene NUL, interruzione in corso.\n"
 
-#: socket.c:729
+#: socket.c:693
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nome alternativo del «Subject»: %s\n"
 
-#: socket.c:735
+#: socket.c:699
 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"
+msgstr "Certificato non valido: il nome alternativo del «Subject» contiene NUL, interruzione in corso.\n"
 
-#: socket.c:752
+#: socket.c:716
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Errore di corrispondenza del nome comune del server: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:723
 msgid "Server name not set, could not verify certificate!\n"
-msgstr ""
-"Nome del server non impostato, impossibile verificare il certificato.\n"
+msgstr "Nome del server non impostato, impossibile verificare il certificato.\n"
 
-#: socket.c:764
+#: socket.c:728
 msgid "Unknown Server CommonName\n"
 msgstr "Nome comune del server sconosciuto\n"
 
-#: socket.c:766
+#: socket.c:730
 msgid "Server name not specified in certificate!\n"
 msgstr "Nome del server non specificato nel certificato.\n"
 
-#: socket.c:778
+#: socket.c:742
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() fallito.\n"
 
-#: socket.c:782
+#: socket.c:746
 msgid "Out of memory!\n"
 msgstr "Memoria esaurita.\n"
 
-#: socket.c:790
+#: socket.c:754
 msgid "Digest text buffer too small!\n"
 msgstr "Buffer del testo digest troppo piccolo.\n"
 
-#: socket.c:796
+#: socket.c:760
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Chiave %s impronta digitale: %s\n"
 
-#: socket.c:800
+#: socket.c:764
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Impronte digitali %s corrispondenti.\n"
 
-#: socket.c:802
+#: socket.c:766
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Impronte digitali %s non corrispondenti.\n"
 
-#: socket.c:814
+#: socket.c:776
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Errore di verifica del certificato del server: %s\n"
 
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Errore di verifica del certificato del server: %s\n"
-
-#: socket.c:831
-#, fuzzy
-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 ""
-"Normalmente questo errore si verifica quando il server fornisce una catena "
-"di certificati incompleta, e in tal caso fetchmail non può farci nulla. Per "
-"maggiori dettagli leggere il documento «README.SSL-SERVER» che è fornito con "
-"fetchmail.\n"
-
-#: socket.c:841
-#, fuzzy, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr "  File del certificato SSL fidato: %s\n"
-
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Questo significa che la radice che firma il certificato (emesso per %s) non "
-"è nella posizione dei certificati CA fidati o che c_rehash deve essere "
-"eseguito sulla directory del certificato. Per maggiori dettagli consultare "
-"le pagine man a proposito di --sslcertpath e di --sslcertfile.\n"
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, 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:1081
+#: socket.c:783
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "emittente sconosciuto (primi %d caratteri): %s\n"
+
+#: socket.c:784
+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 "Normalmente questo errore si verifica quando il server fornisce una catena di certificati incompleta, e in tal caso fetchmail non può farci nulla. Per maggiori dettagli leggere il documento «README.SSL-SERVER» che è fornito con fetchmail.\n"
 
-#: socket.c:1086
+#: socket.c:793
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
+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 "Questo significa che la radice che firma il certificato (emesso per %s) non è nella posizione dei certificati CA fidati o che c_rehash deve essere eseguito sulla directory del certificato. Per maggiori dettagli consultare le pagine man a proposito di --sslcertpath e di --sslcertfile.\n"
 
-#: socket.c:1106
+#: socket.c:885
 msgid "File descriptor out of range for SSL"
 msgstr "Descrittore del file fuori tolleranza per SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
-#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1273
+#: socket.c:901
 #, 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 "Specificato un protocollo SSL «%s» non valido, utilizzo di quello predefinito (SSLv23) in corso.\n"
 
-#: socket.c:1280
+#: socket.c:994
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifica del certificato o dell'impronta digitale ignorata.\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Attenzione: si continua malgrado la connessione non sia sicura (si "
-"raccomanda l'utilizzo di --sslcertck)\n"
+#: socket.c:1011
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Attenzione: si continua malgrado la connessione non sia sicura (si raccomanda l'utilizzo di --sslcertck)\n"
 
-#: socket.c:1339
+#: socket.c:1077
 msgid "Cygwin socket read retry\n"
 msgstr "Nuovo tentativo di lettura del socket Cygwin\n"
 
-#: socket.c:1342
+#: socket.c:1080
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Lettura del socket Cygwin fallita.\n"
 
-#: transact.c:79
+#: transact.c:71
 #, c-format
 msgid "mapped address %s to local %s\n"
 msgstr "indirizzo %s collegato a %s locale\n"
 
-#: transact.c:101
+#: transact.c:93
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s collegato a %s locale\n"
 
-#: transact.c:168
+#: transact.c:160
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "attraversamento di %s corrispondente a %s\n"
 
-#: transact.c:240
+#: transact.c:230
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -3530,204 +3018,163 @@ msgstr ""
 "analisi della riga «Received» in corso:\n"
 "%s"
 
-#: transact.c:279
+#: transact.c:269
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "riga accettata, %s è un alias del server di posta\n"
 
-#: transact.c:285
+#: transact.c:275
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "riga rifiutata, %s non è un alias del server di posta\n"
 
-#: transact.c:359
+#: transact.c:349
 msgid "no Received address found\n"
 msgstr "nessuno indirizzo «Received» trovato\n"
 
-#: transact.c:368
+#: transact.c:358
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "trovato indirizzo «Received» «%s»\n"
 
-#: transact.c:613
+#: transact.c:601
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"trovata riga d'intestazione non corretta. Consultare le pagine del manuale "
-"per opzioni dell'intestazione non corrette\n"
+msgstr "trovata riga d'intestazione non corretta. Consultare le pagine del manuale per opzioni dell'intestazione non corrette\n"
 
-#: transact.c:615
+#: transact.c:603
 #, c-format
 msgid "line: %s"
 msgstr "riga: %s"
 
-#: transact.c:1087 transact.c:1097
+#: transact.c:1095 transact.c:1105
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Analisi della busta «%s» nomi «%- *s» in corso\n"
 
-#: transact.c:1112
+#: transact.c:1120
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Analisi dei nomi di Received «%- *s» in corso\n"
 
-#: transact.c:1124
+#: transact.c:1132
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"Non è stato trovato alcun destinatario, ritorno all'intestazione in corso.\n"
+msgstr "Non è stato trovato alcun destinatario, ritorno all'intestazione in corso.\n"
 
-#: transact.c:1142
+#: transact.c:1150
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Tentativo in corso di indovinare dall'intestazione «%- *s».\n"
 
-#: transact.c:1157
+#: transact.c:1165
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "nessuna corrispondenza locale, inoltro a %s in corso\n"
 
-#: transact.c:1172
+#: transact.c:1180
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "inoltro e cancellazione soppressi a causa di errori DNS\n"
 
-#: transact.c:1283
+#: transact.c:1291
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "scrittura di intestazioni msgblk RFC822 in corso\n"
 
-#: transact.c:1302
+#: transact.c:1310
 msgid "no recipient addresses matched declared local names"
 msgstr "nessun indirizzo di destinatario corrisponde ai nomi locali dichiarati"
 
-#: transact.c:1309
+#: transact.c:1317
 #, 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:1318
+#: transact.c:1326
 msgid "message has embedded NULs"
 msgstr "il messaggio incorpora dei NUL"
 
-#: transact.c:1326
+#: transact.c:1334
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "L'ascoltatore SMTP ha rifiutato gli indirizzi dei destinatari locali: "
 
-#: transact.c:1376
+#: transact.c:1473
 msgid "error writing message text\n"
 msgstr "errore durante la scrittura del testo del messaggio\n"
 
-#: transact.c:1652
+#: uid.c:249
 #, 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 "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: errore durante la lettura del file di blocco «%s»: %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr "Vecchio elenco UID da %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <vuoto>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Elenco grezzo degli UID:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:325 uid.c:374
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Unito l'elenco degli UID da %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:328
+#, c-format
+msgid "New UID list from %s:"
 msgstr "Nuovo elenco degli UID da %s:"
 
-#: uid.c:402
+#: uid.c:355
+msgid "swapping UID lists\n"
+msgstr "scambio di elenchi degli UID in corso\n"
+
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr ""
-"nessuno scambio di elenchi degli UID in corso, nessun UID trovato durante "
-"l'interrogazione\n"
+msgstr "nessuno scambio di elenchi degli UID in corso, nessun UID trovato durante l'interrogazione\n"
 
-#: uid.c:422
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr "il nuovo elenco degli UID viene scartato\n"
 
-#: uid.c:479
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Eliminazione del file fetchids in corso.\n"
 
-#: uid.c:482
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Errore durante l'eliminazione di %s: %s\n"
 
-#: uid.c:489
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Scrittura del file fetchids in corso.\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:439 uid.c:447
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Errore durante la scrittura nel file fetchids: %s %s\n"
 
-#: uid.c:524
+#: uid.c:459
 #, 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"
+msgstr "Errore durante la scrittura del file fetchids %s, lasciato il vecchio file al suo posto.\n"
 
-#: uid.c:528
+#: uid.c:463
 #, 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:532
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Impossibile aprire il file fetchids %s per la scrittura: %s\n"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc fallita\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc fallita\n"
 
-#~ msgid "Subject: Fetchmail unreachable-server warning."
-#~ msgstr "Oggetto: avviso di server irraggiungibile"
-
-#, c-format
-#~ msgid "Fetchmail could not reach the mail server %s:"
-#~ msgstr "Impossibile raggiungere il server di posta %s:"
-
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "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"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "L'errore salvato è ancora %d\n"
-
-#, c-format
-#~ 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)"
 
@@ -3738,5 +3185,4 @@ msgstr "realloc fallita\n"
 #~ msgstr "Nome comune del server: %s\n"
 
 #~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr ""
-#~ "trovato delimitatore di messaggio durante la scansione dell'intestazione\n"
+#~ msgstr "trovato delimitatore di messaggio durante la scansione dell'intestazione\n"
diff --git a/po/ja.po b/po/ja.po
index 5d1cf199..c5bf9539 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-14 22:20+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -72,31 +72,24 @@ msgstr "Fetchmail サイズ超�メッセージ 警告"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �削除�れ"
-"��� :"
+msgstr "以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �削除�れ��� :"
 
 #: driver.c:353
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �残���"
-"�� :"
+msgstr "以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �残����� :"
 
 #: driver.c:372
 #, c-format
 msgid "  %d message  %d octets long deleted by fetchmail."
 msgid_plural "  %d messages %d octets long deleted by fetchmail."
-msgstr[0] ""
-"  fetchmail � %d 通�メッセージ(%d bytes �長���り��)を削除����。"
+msgstr[0] "  fetchmail � %d 通�メッセージ(%d bytes �長���り��)を削除����。"
 
 #: driver.c:377
 #, c-format
 msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
-msgstr[0] ""
-"  fetchmail � %d 通�メッセージ(%d �イト �長���り��)を読�飛����"
-"�。"
+msgstr[0] "  fetchmail � %d 通�メッセージ(%d �イト �長���り��)を読�飛�����。"
 
 #: driver.c:522
 #, c-format
@@ -106,8 +99,7 @@ msgstr "%s@%s å®›ã�«å±Šã�„ã�Ÿ %d 番目ã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’読ã�¿é£›ã�°ã�—ã�¦ã�
 #: driver.c:577
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
-msgstr ""
-"%s@%s 宛�届�� %d 番目�メッセージ (%d �イト) を読�飛������。"
+msgstr "%s@%s 宛�届�� %d 番目�メッセージ (%d �イト) を読�飛������。"
 
 #: driver.c:593
 msgid " (length -1)"
@@ -120,9 +112,7 @@ msgstr " (容�超�)"
 #: driver.c:614
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr ""
-"%s@%s 宛�届�� %d 番目�メッセージ(%d �イト) �ヘッダを読�出���ん��"
-"�。\n"
+msgstr "%s@%s 宛�届�� %d 番目�メッセージ(%d �イト) �ヘッダを読�出���ん���。\n"
 
 #: driver.c:632
 #, c-format
@@ -146,11 +136,8 @@ msgstr " (本文 %d オクテット)"
 
 #: driver.c:770
 #, 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
 msgid " retained\n"
@@ -167,11 +154,8 @@ msgstr " サー��らメッセージを削除���ん���。\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] ""
-"最大�り込�数��る %d 通������; メッセージ� %d 通�サー� %s �アカ"
-"ウント %s 宛�残�れ����。\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "最大�り込�数��る %d 通������; メッセージ� %d 通�サー� %s �アカウント %s 宛�残�れ����。\n"
 
 #: driver.c:899
 #, c-format
@@ -191,8 +175,7 @@ msgstr "%d 秒間 %s ã�®å¿œç­”ã‚’å¾…ã�¡ã�¾ã�—ã�Ÿã�Œåˆ¶é™�時間を超é�Žã�—ã�¾ã�
 #: driver.c:912
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"転�先�プログラム�応答を %d 秒間待�����制�時間を超�����。\n"
+msgstr "転�先�プログラム�応答を %d 秒間待�����制�時間を超�����。\n"
 
 #: driver.c:915
 #, c-format
@@ -205,12 +188,8 @@ msgstr "fetchmail 実行中ã�«åˆ¶é™�時間ã�®è¶…é�Žã�Œç¹°ã‚Šè¿”ã�—発生ã�—ã�¾ã�
 
 #: driver.c:930
 #, 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
 msgid ""
@@ -236,9 +215,7 @@ msgstr "サー���接続開始��実行��コマンド�シグナル
 #: driver.c:963
 #, c-format
 msgid "pre-connection command failed with status %d\n"
-msgstr ""
-"サー���接続開始��実行��コマンド�ステータス %d を返��終了���"
-"�。\n"
+msgstr "サー���接続開始��実行��コマンド�ステータス %d を返��終了����。\n"
 
 #: driver.c:987
 #, c-format
@@ -284,9 +261,7 @@ msgstr " (以���証�れ���)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"�れ�����ヘルプ� http://www.fetchmail.info/fetchmail-FAQ.html#R15 を見"
-"�����\n"
+msgstr "�れ�����ヘルプ� http://www.fetchmail.info/fetchmail-FAQ.html#R15 を見�����\n"
 
 #: driver.c:1202
 #, c-format
@@ -342,10 +317,8 @@ msgid ""
 "is restored."
 msgstr ""
 "�証�失敗����。\n"
-"�れ��ら��貴方�パスワード�有効��������。����サー��よ��"
-"�何故 login �失敗����サー��ら有益�情報��信�れ�����\n"
-"fetchmail ��サー��何�障害�発生���る場�� 区別��������り�"
-"�。\n"
+"�れ��ら��貴方�パスワード�有効��������。����サー��よ���何故 login �失敗����サー��ら有益�情報��信�れ�����\n"
+"fetchmail ��サー��何�障害�発生���る場�� 区別��������り��。\n"
 "\n"
 "fetchmail デーモン�引続�接続を試���。\n"
 "サービス�復旧����り何も通知�出�れ����を了承願���。"
@@ -373,8 +346,7 @@ msgstr "fetchmail %s@%s �証完了"
 #: driver.c:1281
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
-msgstr ""
-"%s@%s �ログイン�完了� fetchmail �よるアクセス��能��り���。\n"
+msgstr "%s@%s �ログイン�完了� fetchmail �よるアクセス��能��り���。\n"
 
 #: driver.c:1285
 msgid "Service has been restored.\n"
@@ -383,14 +355,11 @@ msgstr "サービス�復帰����。\n"
 #: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
-msgstr ""
-"�択を��下��。�択�れ��場��フォルダ %s ��度アクセス���。\n"
+msgstr "�択を��下��。�択�れ��場��フォルダ %s ��度アクセス���。\n"
 
 #: driver.c:1320
 msgid "selecting or re-polling default folder\n"
-msgstr ""
-"�択を��下��。�択�れ��場��デフォルト�フォルダ��度アクセス��"
-"�。\n"
+msgstr "�択を��下��。�択�れ��場��デフォルト�フォルダ��度アクセス���。\n"
 
 #: driver.c:1332
 #, c-format
@@ -441,8 +410,7 @@ msgstr "メッセージ数��造�れ����!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"多��メール�スキップ�れ���(%d > %d) %s �よる一時的�エラー�����\n"
+msgstr "多��メール�スキップ�れ���(%d > %d) %s �よる一時的�エラー�����\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -483,9 +451,7 @@ msgstr "�明�エラー"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"%sエラー�発生����。%s@%s�らメールを�信� SMTP サー� %s ��信���る"
-"������。\n"
+msgstr "%sエラー�発生����。%s@%s�らメールを�信� SMTP サー� %s ��信���る������。\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -549,24 +515,20 @@ 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 環境変数�設定�れ����。\n"
 "nullmailer-inject や nullmailer � sendmail wrapper �よ��\n"
-"ヘッダ� From: や Message-ID:�Return-Path: �改謬�行�れる�れ��り��険"
-"��。\n"
-"\"env NULLMAILER_FLAGS= %s (����利用���るエージェント)\" ���下�"
-"�。\n"
+"ヘッダ� From: や Message-ID:�Return-Path: �改謬�行�れる�れ��り��険��。\n"
+"\"env NULLMAILER_FLAGS= %s (����利用���るエージェント)\" ���下��。\n"
 "%s: 終了���。\n"
 
 #: env.c:82
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
-msgstr ""
-"%s: 貴様�アカウント�存在���。����立�去り二度�戻���る�。\n"
+msgstr "%s: 貴様�アカウント�存在���。����立�去り二度�戻���る�。\n"
 
 #: env.c:143
 msgid "Cannot find absolute path for user's home directory.\n"
@@ -593,13 +555,11 @@ msgstr "hosts データベース���ホスト自身を確�����ん
 #: env.c:229
 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 ""
 "ホスト�未確����続行���。\n"
-"Received: ヘッダ, HELO/EHLO 行���異常�出る�も�れ��ん。�れら����"
-"�グ報告を��������。\n"
+"Received: ヘッダ, HELO/EHLO 行���異常�出る�も�れ��ん。�れら�����グ報告を��������。\n"
 "/etc/hosts, DNS, NIS ��� LDAP ��題を修正������。\n"
 
 #: etrn.c:49 odmr.c:61
@@ -710,15 +670,11 @@ msgstr "fetchmail リリース %s "
 
 #: fetchmail.c:308
 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-"警告: 使用中� SSL/TLS ライブラリー� TLS v1.3 をサ�ート�����ん。\n"
+msgstr "警告: 使用中� SSL/TLS ライブラリー� TLS v1.3 をサ�ート�����ん。\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"警告: LibreSSLを使用��コンパイル�れ����。サ�ート�れ�構����り�"
-"�ん。\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "警告: LibreSSLを使用��コンパイル�れ����。サ�ート�れ�構����り��ん。\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
@@ -735,8 +691,7 @@ msgstr "デーモンモードã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã�®ã�§ã€�logfile オプショã
 #: fetchmail.c:354
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-"ログファイル \"%s\" �存在���ん�� logfile オプションを無視���。\n"
+msgstr "ログファイル \"%s\" �存在���ん�� logfile オプションを無視���。\n"
 
 #: fetchmail.c:360
 #, c-format
@@ -745,11 +700,8 @@ msgstr "ログファイル \"%s\" ã�«ã�¯æ›¸ã��è¾¼ã�¿ã�§ã��ã�¾ã�›ã‚“ã€�中止ã�—ã
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"syslog � logfile オプション�両方�も設定�れ��る�� syslog を無視��%s "
-"�ログを書�込���"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "syslog � logfile オプション�両方�も設定�れ��る�� syslog を無視��%s �ログを書�込���"
 
 #: fetchmail.c:469
 #, c-format
@@ -792,21 +744,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail (PID=%ld) を終了����。\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: ��ホスト�対��別� fetchmail �交信���る��メール�確��"
-"出���ん。\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: ��ホスト�対��別� fetchmail �交信���る��メール�確��出���ん。\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: 他� fetchmail (PID=%ld) �実行中���指定�れ�ホスト�接続��"
-"��ん。\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: 他� fetchmail (PID=%ld) �実行中���指定�れ�ホスト�接続����ん。\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -814,23 +758,18 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: 他� fetchmail (PID=%ld) �フォアグラウンド動作中��。\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: �ックグラウンド� fetchmail �動作中���オプション���付�ら"
-"れ��ん。\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: �ックグラウンド� fetchmail �動作中���オプション���付�られ��ん。\n"
 
 #: fetchmail.c:581
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
-msgstr ""
-"fetchmail: �ックグラウンド� fetchmail (PID=%ld) �動作を�開����。\n"
+msgstr "fetchmail: �ックグラウンド� fetchmail (PID=%ld) �動作を�開����。\n"
 
 #: fetchmail.c:593
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: �時�動作���� fetchmail (PID=%ld) ��然消滅����。\n"
+msgstr "fetchmail: �時�動作���� fetchmail (PID=%ld) ��然消滅����。\n"
 
 #: fetchmail.c:608
 #, c-format
@@ -988,12 +927,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告 : 設定ファイル中�ホスト %s を複数回記述�����\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: エラー : 設定ファイル中� \"defaults\" を複数回記述���る"
-"��\"defaults\" �最��レコード���り��ん。\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: エラー : 設定ファイル中� \"defaults\" を複数回記述���る��\"defaults\" �最��レコード���り��ん。\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -1001,76 +936,52 @@ msgstr "SSL 対応ã�Œã‚³ãƒ³ãƒ‘イルã�®æ™‚点ã�§æœ‰åŠ¹ã�«ã�•ã‚Œã�¦ã�Šã‚Šã�¾ã�›ã‚
 
 #: fetchmail.c:1324
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr ""
-"KERBEROS v4 対応�設定�れ�����コンパイル�時点�有効��れ��り��"
-"ん。\n"
+msgstr "KERBEROS v4 対応�設定�れ�����コンパイル�時点�有効��れ��り��ん。\n"
 
 #: fetchmail.c:1330
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr ""
-"KERBEROS v5 対応�設定�れ�����コンパイル�時点�有効��れ��り��"
-"ん。\n"
+msgstr "KERBEROS v5 対応�設定�れ�����コンパイル�時点�有効��れ��り��ん。\n"
 
 #: fetchmail.c:1336
 msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr ""
-"GSSAPI 対応�設定�れ�����コンパイル�時点�有効��れ��り��ん。\n"
+msgstr "GSSAPI 対応�設定�れ�����コンパイル�時点�有効��れ��り��ん。\n"
 
 #: fetchmail.c:1366
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: 警告 : %s より multidrop fetch を確��る��� DNS �有効��り�"
-"�ん。\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: 警告 : %s より multidrop fetch を確��る��� DNS �有効��り��ん。\n"
 
 #: fetchmail.c:1377
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
-msgstr ""
-"警告: %s ��マル�ドロップを行���エンベロープオプション�必���!\n"
+msgstr "警告: %s ��マル�ドロップを行���エンベロープオプション�必���!\n"
 
 #: fetchmail.c:1378
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"警告: ����メール� postmaster 宛�フォワード�れ�����能性��り�"
-"�!\n"
+msgstr "警告: ����メール� postmaster 宛�フォワード�れ�����能性��り��!\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: サー� %s �設定�無効��。サービス番���ート番��負�数���"
-"���ん。\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: サー� %s �設定�無効��。サービス番���ート番��負�数������ん。\n"
 
 #: fetchmail.c:1402
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: サー� %s �設定�無効��。 RPOP �� privileged port を利用�る"
-"必���り��。\n"
+msgstr "fetchmail: サー� %s �設定�無効��。 RPOP �� privileged port を利用�る必���り��。\n"
 
 #: fetchmail.c:1420
 #, 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:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"fetchall � keep オプション�デーモンモード�休止モード���時�指定����"
-"ん。\n"
+msgstr "fetchall � keep オプション�デーモンモード�休止モード���時�指定����ん。\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: エラー: アイドルモード�複数�フォルダ���アカウント�対���動"
-"作���ん!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: エラー: アイドルモード�複数�フォルダ���アカウント�対���動作���ん!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1080,9 +991,7 @@ msgstr "シグナル %d �終了����。\n"
 #: fetchmail.c:1541
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
-msgstr ""
-"%s � %s �プロトコル %s を用�� %s �交信�����。交信�開始�れ��"
-"�。\n"
+msgstr "%s � %s �プロトコル %s を用�� %s �交信�����。交信�開始�れ���。\n"
 
 #: fetchmail.c:1566
 msgid "POP2 support is not configured.\n"
@@ -1111,8 +1020,7 @@ msgstr "対応�����プロトコル��択�れ���。\n"
 #: fetchmail.c:1620
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
-msgstr ""
-"%s � %s �プロトコル %s を用�� %s �交信�����。交信�終了����。\n"
+msgstr "%s � %s �プロトコル %s を用�� %s �交信�����。交信�終了����。\n"
 
 #: fetchmail.c:1645
 #, c-format
@@ -1156,15 +1064,11 @@ msgstr "Fetchmail ��り主�エラーメッセージを�信���。\n
 
 #: fetchmail.c:1668
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail ��久的�エラーを�久的�も����扱���（メッセージを破"
-"棄）。\n"
+msgstr "Fetchmail ��久的�エラーを�久的�も����扱���（メッセージを破棄）。\n"
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail ��久的�エラーを一時的�も����扱���（メッセージを�"
-"存）。\n"
+msgstr "Fetchmail ��久的�エラーを一時的�も����扱���（メッセージを�存）。\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1357,23 +1261,16 @@ msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  ��メッセージ��得���消去�れ��。 (--flush on)\n"
 
 #: fetchmail.c:1809
-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 "  メッセージ�得�����メッセージを消去���ん。 (--flush off)\n"
 
 #: fetchmail.c:1811
-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 "  容�超���メッセージ��得���消去�れ��。 (--limitflush on)\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  メッセージ�得���容�超���メッセージを消去���ん。 (--limitflush "
-"off)\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  メッセージ�得���容�超���メッセージを消去���ん。 (--limitflush off)\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
@@ -1400,13 +1297,11 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  改行記��追加を行���ん。 (forcecr off)\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding �変�を行���ん。 (pass8bits on)\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding �変�を行���。 (pass8bits off)\n"
 
 #: fetchmail.c:1826
@@ -1453,30 +1348,25 @@ msgstr "  メッセージ�大���制���り��ん。 (--limit 0)\
 #: fetchmail.c:1845
 #, 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:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-"  サー�アクセス�度�メッセージ�大���警告を行���。 (--warnings 0)\n"
+msgstr "  サー�アクセス�度�メッセージ�大���警告を行���。 (--warnings 0)\n"
 
 #: fetchmail.c:1851
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
-msgstr ""
-"  一回�接続��得��るメッセージ� %d 通�制��れ��。(--fetchlimit %d)\n"
+msgstr "  一回�接続��得��るメッセージ� %d 通�制��れ��。(--fetchlimit %d)\n"
 
 #: fetchmail.c:1854
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr ""
-"  一回�接続��得��るメッセージ�数�制���り��ん。 (--fetchlimit 0)\n"
+msgstr "  一回�接続��得��るメッセージ�数�制���り��ん。 (--fetchlimit 0)\n"
 
 #: fetchmail.c:1856
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-"  �得��るメッセージ�サイズ� %d �制��れ��。(--fetchsizelimit %d)\n"
+msgstr "  �得��るメッセージ�サイズ� %d �制��れ��。(--fetchsizelimit %d)\n"
 
 #: fetchmail.c:1859
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
@@ -1502,8 +1392,7 @@ msgstr "  一回�接続�転���るメッセージ� %d 通�制��
 
 #: fetchmail.c:1872
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr ""
-"  一回�接続�転���るメッセージ�数�制���り��ん。 (--batchlimit 0)\n"
+msgstr "  一回�接続�転���るメッセージ�数�制���り��ん。 (--batchlimit 0)\n"
 
 #: fetchmail.c:1876
 #, c-format
@@ -1600,8 +1489,7 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  multidrop アドレスを検索�る DNS �無効��。\n"
 
 #: fetchmail.c:1981
-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 "  サー��別�� multidrop アドレス� IP アドレス�比較�れ��。\n"
 
 #: fetchmail.c:1983
@@ -1669,9 +1557,7 @@ msgstr "  サーãƒ�ã�¨ã�®æŽ¥ç¶šã�«åˆ©ç”¨ã�™ã‚‹ãƒ—ラグインã�®æŒ‡å®šã�¯ã�‚ã‚Šã
 #: fetchmail.c:2035
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  アプリケーション��接続��プラグアウト\"%s\"を利用���。(--plugout "
-"%s)\n"
+msgstr "  アプリケーション��接続��プラグアウト\"%s\"を利用���。(--plugout %s)\n"
 
 #: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
@@ -1713,12 +1599,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "シグナルマスクを変更����ん: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"オペレーティングシステム� PATH_MAX �定義�れ��ら��realpath(f, NULL) も"
-"��付�られ��ん。中断���。\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "オペレーティングシステム� PATH_MAX �定義�れ��ら��realpath(f, NULL) も��付�られ��ん。中断���。\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1735,8 +1617,7 @@ msgstr ""
 #: gssapi.c:53
 #, c-format
 msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-"gss_display_status � GSSAPI エラー�発生����。呼�出�元� <%s> ��\n"
+msgstr "gss_display_status � GSSAPI エラー�発生����。呼�出�元� <%s> ��\n"
 
 #: gssapi.c:56
 #, c-format
@@ -1758,10 +1639,8 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "�切� GSSAPI 証明書�見��り��ん。GSSAPI �証をスキップ���。\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"GSSAPI を使������証明書�必���。kinit �助���る�も�れ��ん。\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "GSSAPI を使������証明書�必���。kinit �助���る�も�れ��ん。\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1873,14 +1752,11 @@ msgstr "%s: TLS ã�¸ã�®é�©å�ˆçš„アップグレードã�«å¤±æ•—ã€�継続å�¯èƒ½ã�‹è
 #: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-"%s: 警告: サー�ー� STARTTLS を�案����� sslproto '' ��示�れ��"
-"�。\n"
+msgstr "%s: 警告: サー�ー� STARTTLS を�案����� sslproto '' ��示�れ���。\n"
 
 #: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
-msgstr ""
-"OTP ��求�れ�����fetchmail � OTP 対応�コンパイル�れ����ん。\n"
+msgstr "OTP ��求�れ�����fetchmail � OTP 対応�コンパイル�れ����ん。\n"
 
 #: imap.c:627 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
@@ -1941,11 +1817,8 @@ msgid "%u is first unseen\n"
 msgstr "%u �最��未読メッセージ��。\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"警告: サー��らメッセージサイズ���報告�れ�数値���切�����無視�"
-"��。\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "警告: サー��らメッセージサイズ���報告�れ�数値���切�����無視���。\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1954,9 +1827,7 @@ msgstr "正����FETCH応答�返������: %s\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"kvm インターフェイスを開���ん���。fetchmail � SGID kmem ��る�確��"
-"�����。"
+msgstr "kvm インターフェイスを開���ん���。fetchmail � SGID kmem ��る�確�������。"
 
 #: interface.c:396
 #, c-format
@@ -2039,8 +1910,7 @@ msgstr "Initial BASE64 challenge をデコード����ん���\n"
 #: kerberos.c:137
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
-msgstr ""
-"Ticket 中��る本人 %s � -u オプション�指定�れ� %s �一致���ん\n"
+msgstr "Ticket 中��る本人 %s � -u オプション�指定�れ� %s �一致���ん\n"
 
 #: kerberos.c:145
 #, c-format
@@ -2068,16 +1938,12 @@ msgstr "fetchmail: ��ロックファイル \"%s\" を削除���。\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: ロックファイル \"%s\" を unlink ����ん。: （%s）�書�込ん��"
-"��\n"
+msgstr "fetchmail: ロックファイル \"%s\" を unlink ����ん。: （%s）�書�込ん����\n"
 
 #: lock.c:116
 #, c-format
 msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr ""
-"fetchmail: ロックファイル \"%s\" ��書�込��失敗����。(%s)� 終了��"
-"�。\n"
+msgstr "fetchmail: ロックファイル \"%s\" ��書�込��失敗����。(%s)� 終了���。\n"
 
 #: lock.c:126
 #, c-format
@@ -2087,14 +1953,12 @@ msgstr "fetchmail: ロックファイル \"%s\" を開���ん。: %s\n"
 #: lock.c:176
 #, c-format
 msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
-msgstr ""
-"fetchmail: ロックファイル�生��失敗����。PIDファイル \"%s\": %s\n"
+msgstr "fetchmail: ロックファイル�生��失敗����。PIDファイル \"%s\": %s\n"
 
 #: lock.c:187
 #, c-format
 msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr ""
-"fetchmail: PIDファイル \"%s\" �削除���切り詰������ん���。: %s\n"
+msgstr "fetchmail: PIDファイル \"%s\" �削除���切り詰������ん���。: %s\n"
 
 #: netrc.c:220
 #, c-format
@@ -2231,8 +2095,7 @@ msgstr "  -V, --version     �ージョン情報を表示���\n"
 
 #: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
-msgstr ""
-"  -c, --check       メッセージ�有無を調���(データ��り出���ん)\n"
+msgstr "  -c, --check       メッセージ�有無を調���(データ��り出���ん)\n"
 
 #: options.c:647
 msgid "  -s, --silent      work silently\n"
@@ -2259,9 +2122,7 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ログを書�出�ファイルを指定���\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr ""
 "      --syslog      デーモン���動作��る場�� syslog(3) を通��\n"
 "                    大��メッセージを書�出���\n"
@@ -2295,19 +2156,12 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    ユーザ���� postmaster �エラー通知を行���\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail ��久的�������メッセージを削除��"
-"�。\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail ��久的�������メッセージを削除���。\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce   �久的�������メッセージをサー���存���。(デ"
-"フォルト).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce   �久的�������メッセージをサー���存���。(デフォルト).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2335,8 +2189,7 @@ msgstr "      --sslcertck   厳密ã�ªã‚µãƒ¼ãƒ�証明書ãƒ�ェックを行ã�„ã�¾ã
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck 厳密�サー�証明書�ェックをスキップ���(安全���)\n"
+msgstr "      --nosslcertck 厳密�サー�証明書�ェックをスキップ���(安全���)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
@@ -2347,22 +2200,16 @@ msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath 信頼�るCA SSL証明書ディレクトリ�パス\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  サー�� CommonName ��れ��る�仮定���(�勧��"
-"���ん)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  サー�� CommonName ��れ��る�仮定���(�勧�����ん)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr "      --sslfingerprint サー��証明書�一致�る�� fingerprint\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
-msgstr ""
-"      --sslproto    SSL プロトコル�使用を強制��� (マニュアルを�照)\n"
+msgstr "      --sslproto    SSL プロトコル�使用を強制��� (マニュアルを�照)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
@@ -2370,8 +2217,7 @@ msgstr "      --plugin      接続用�外部コマンドを指定���\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     SMTP �よる交信を行����外部コマンドを指定���\n"
+msgstr "      --plugout     SMTP �よる交信を行����外部コマンドを指定���\n"
 
 #: options.c:681
 msgid ""
@@ -2383,32 +2229,23 @@ msgstr ""
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]    �り出��プロトコルを指定���。(詳細� man page �"
-"ç…§)\n"
+msgstr "  -p, --proto[col]    �り出��プロトコルを指定���。(詳細� man page �照)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        UIDL を強制的�利用��� (POP3 ��有効��)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        IMAP サー�ー�新��メッセージを�るよ�����\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        IMAP サー�ー�新��メッセージを�るよ�����\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        接続�利用�る TCP �ートを指定��� (��オプション�"
-"�。--service を使������)\n"
+msgstr "      --port        接続�利用�る TCP �ートを指定��� (��オプション��。--service を使������)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     接続�る TCP サービス� (数字� TCP �ートを指定�る��"
-"も����)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     接続�る TCP サービス� (数字� TCP �ートを指定�る��も����)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2468,8 +2305,7 @@ msgstr "  -l, --limit       指定ã�•ã‚Œã�Ÿå¤§ã��ã�•ä»¥ä¸Šã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr ""
-"  -w, --warnings    容�超��メール����警告を発�る間隔を指定���\n"
+msgstr "  -w, --warnings    容�超��メール����警告を発�る間隔を指定���\n"
 
 #: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
@@ -2477,8 +2313,7 @@ msgstr "  -S, --smtphost    転�先� SMTP ホストを指定���\n"
 
 #: options.c:707
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr ""
-"      --fetchdomains 一回�接続�メールを�得���ドメイン�を指定���\n"
+msgstr "      --fetchdomains 一回�接続�メールを�得���ドメイン�を指定���\n"
 
 #: options.c:708
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
@@ -2486,9 +2321,7 @@ msgstr "  -D, --smtpaddress SMTP ã�«ã‚ˆã‚‹è»¢é€�ã�§åˆ©ç”¨ã�™ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³å��ã‚
 
 #: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr ""
-"      --smtpname    SMTP 転��利用�るフル�ーム username@domain を指定��"
-"�\n"
+msgstr "      --smtpname    SMTP 転��利用�るフル�ーム username@domain を指定���\n"
 
 #: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
@@ -2496,19 +2329,15 @@ msgstr "  -Z, --antispam    スパムメール対策ã�®å¿œç­”を指定ã�—ã�¾ã�™ã
 
 #: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  一回� SMTP 転���信�れるメール�最大数を設定���\n"
+msgstr "  -b, --batchlimit  一回� SMTP 転���信�れるメール�最大数を設定���\n"
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  一回�サー���交信��得��るメール�最大数を設定��"
-"�。\n"
+msgstr "  -B, --fetchlimit  一回�サー���交信��得��るメール�最大数を設定���。\n"
 
 #: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit �得��るメッセージ�サイズ�上�を指定���\n"
+msgstr "      --fetchsizelimit �得��るメッセージ�サイズ�上�を指定���\n"
 
 #: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2524,8 +2353,7 @@ msgstr "  -m, --mda         メール�信プログラムを指定���\n"
 
 #: options.c:717
 msgid "      --bsmtp       set output BSMTP file\n"
-msgstr ""
-"      --bsmtp       �り込ん�メールを書�出� BSMTP ファイルを指定���。\n"
+msgstr "      --bsmtp       �り込ん�メールを書�出� BSMTP ファイルを指定���。\n"
 
 #: options.c:718
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
@@ -2548,16 +2376,12 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 �パスワード�よる�証��サ�ート���。断念���。\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"警告: \"Maillennium POP3\"サー���。TOP �代�り� RETR コマンドを使用��"
-"�。\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "警告: \"Maillennium POP3\"サー���。TOP �代�り� RETR コマンドを使用���。\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"��セッション�� TLS �必�����サー�� CAPA コマンドを拒�����。\n"
+msgstr "��セッション�� TLS �必�����サー�� CAPA コマンドを拒�����。\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2571,14 +2395,11 @@ msgstr "%s: TLS ã�¸ã�®é�©å�ˆçš„アップグレードã�«å¤±æ•—ã€�継続å�¯èƒ½ã�‹è
 #: pop3.c:498
 #, c-format
 msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-"%s: 警告: サー�ー� STLS を�案����� sslproto '' ��示�れ���。\n"
+msgstr "%s: 警告: サー�ー� STLS を�案����� sslproto '' ��示�れ���。\n"
 
 #: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"使用を許��れ������証手段を試���������失敗����。実行を継"
-"続����ん。\n"
+msgstr "使用を許��れ������証手段を試���������失敗����。実行を継続����ん。\n"
 
 #: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2615,8 +2436,7 @@ msgstr "id=%s (num=%u) �削除�れ�������存在�����
 
 #: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"サー�リスト�メッセージ�挿入�れ����。�り扱��������ん。\n"
+msgstr "サー�リスト�メッセージ�挿入�れ����。�り扱��������ん。\n"
 
 #: pop3.c:1032
 msgid "protocol error\n"
@@ -2644,20 +2464,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS �利用����ん。"
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: interface オプション� Linux (IPv6 �利用����ん) �FreeBSD �"
-"��利用�能��。\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: interface オプション� Linux (IPv6 �利用����ん) �FreeBSD ���利用�能��。\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: monitor オプション� Linux (IPv6 �利用����ん) �FreeBSD ��"
-"�利用�能��。\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: monitor オプション� Linux (IPv6 �利用����ん) �FreeBSD ���利用�能��。\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2670,15 +2482,12 @@ msgstr "入力�終端"
 #: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
-msgstr ""
-"%s �通常ファイル��る必���り��（シンボリックリンク���������"
-"ん）。\n"
+msgstr "%s �通常ファイル��る必���り��（シンボリックリンク���������ん）。\n"
 
 #: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr ""
-"ファイル %s �パーミッション� -rwx------ (0700) ��������ん。\n"
+msgstr "ファイル %s �パーミッション� -rwx------ (0700) ��������ん。\n"
 
 #: rcfile_y.y:451
 #, c-format
@@ -2930,16 +2739,12 @@ msgstr "BSMTP プリアンブル�書�込��失敗����: %s\n"
 #: sink.c:974
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
-msgstr ""
-"%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���"
-"ん。\n"
+msgstr "%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���ん。\n"
 
 #: sink.c:981
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr ""
-"%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���"
-"ん。\n"
+msgstr "%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���ん。\n"
 
 #: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
@@ -2962,8 +2767,7 @@ msgstr "MDAオプション�引用符付�� %%%c 拡張を�ん����
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-"�信を拒����。マニュアルを確���MDAオプションを修正������。\n"
+msgstr "�信を拒����。マニュアルを確���MDAオプションを修正������。\n"
 
 #: sink.c:1211
 #, c-format
@@ -3016,11 +2820,8 @@ msgstr "MDA � 0 以外�ステータス %d を返��終了����。\
 
 #: 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 を返����。エラー番�%d/%s ����������"
-"り��ん。ファイル %s:%d 行\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "異常: MDA � pclose � %d を返����。エラー番�%d/%s ����������り��ん。ファイル %s:%d 行\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3101,8 +2902,7 @@ msgstr "getaddrinfo(\"%s\",\"%s\") エラー: %s\n"
 
 #: socket.c:275
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"オプション --service を足��試������(FAQ � R12 も�照���)。\n"
+msgstr "オプション --service を足��試������(FAQ � R12 も�照���)。\n"
 
 #: socket.c:289 socket.c:292
 #, c-format
@@ -3195,8 +2995,7 @@ msgstr "発行元� CommonName: %s\n"
 
 #: socket.c:681
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"警告 : 発行元� CommonName �長����。 (�造�れ��能性��り��)\n"
+msgstr "警告 : 発行元� CommonName �長����。 (�造�れ��能性��り��)\n"
 
 #: socket.c:683
 msgid "Unknown Issuer CommonName\n"
@@ -3279,15 +3078,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "証明パス� %s �壊れ����\n"
 
 #: socket.c:831
-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 ""
-"��エラー��サー��中間CA�証明書を�供�������を�味��fetchmail "
-"����る��も����ん。詳��� fetchmail ��梱�れ��るドキュメント "
-"README.SSL-SERVER を�照������。\n"
+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 "��エラー��サー��中間CA�証明書を�供�������を�味��fetchmail ����る��も����ん。詳��� fetchmail ��梱�れ��るドキュメント README.SSL-SERVER を�照������。\n"
 
 #: socket.c:841
 #, c-format
@@ -3295,16 +3087,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "トラストアンカー証明書��り��ん: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"�れ��root CA �署���証明書� 信頼�れる CA 証明書��管場所�����証"
-"明書��るディレクトリ� c_rehash を走ら�る必���る��を示�����。詳"
-"����マニュアルページ� --sslcertpath � --sslcertfile �����記述を�"
-"照������。README.SSL も必��応���照������。\n"
+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. See README.SSL for details.\n"
+msgstr "�れ��root CA �署���証明書� 信頼�れる CA 証明書��管場所�����証明書��るディレクトリ� c_rehash を走ら�る必���る��を示�����。詳����マニュアルページ� --sslcertpath � --sslcertfile �����記述を�照������。README.SSL も必��応���照������。\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3329,55 +3113,35 @@ msgstr "使用中ã�® OpenSSL ãƒ�ージョンã�¯ TLS v1.3 をサãƒ�ートã�—ã�¦ã�
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"無効� SSL プロトコル `%s' �指定�れ����デフォルト�自動�択 (auto)を利"
-"用���。\n"
+msgstr "無効� SSL プロトコル `%s' �指定�れ����デフォルト�自動�択 (auto)を利用���。\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"読�込ん� OpenSSL ライブラリ %#lx �ヘッダー� %#lx より���動作���"
-"ん。\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "読�込ん� OpenSSL ライブラリ %#lx �ヘッダー� %#lx より���動作���ん。\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"読�込ん� OpenSSL ライブラリ %#lx �ヘッダー� %#lx より新�����続��"
-"�。\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "読�込ん� OpenSSL ライブラリ %#lx �ヘッダー� %#lx より新�����続���。\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "ファイル識別�� SSL ����長����"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"��プロトコル�ージョンを�����方法�無効��るディストリビューションも"
-"�り��。新��プロトコル�ージョンを試������。\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "��プロトコル�ージョンを�����方法�無効��るディストリビューションも�り��。新��プロトコル�ージョンを試������。\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"警告: SSL_set_tlsext_host_name(%p, \"%s\") �失敗���� (code %#lx), 続��"
-"�。\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "警告: SSL_set_tlsext_host_name(%p, \"%s\") �失敗���� (code %#lx), 続���。\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"警告: X509_VERIFY_PARAM_set1_host(%p, \"%s\") �失敗���� (code %#x), 続�"
-"��。\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "警告: X509_VERIFY_PARAM_set1_host(%p, \"%s\") �失敗���� (code %#x), 続���。\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3390,31 +3154,24 @@ msgstr "SSL_connect() �実行中�システムエラー�発生 : %s\n"
 
 #: socket.c:1250
 msgid "handshake failed at protocol or connection level."
-msgstr ""
-"�ンドシェイク�プロトコルレベル���コ�クションレベル�失敗����。"
+msgstr "�ンドシェイク�プロトコルレベル���コ�クションレベル�失敗����。"
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"�在� SSL/TLS 暗�を�得�る�������ん - セッション�確立�れ���"
-"�?\n"
+msgstr "�在� SSL/TLS 暗�を�得�る�������ん - セッション�確立�れ����?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: プロトコル %s 暗� %s を使用中� %d/%d 秘密/処�済� ビット数\n"
+msgstr "SSL/TLS: プロトコル %s 暗� %s を使用中� %d/%d 秘密/処�済� ビット数\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "証明書/fingerprint 検証�幾��飛��れ���。\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"警告:接続��護�れ����ん�続���。(--sslcertck�使用を�勧����!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "警告:接続��護�れ����ん�続���。(--sslcertck�使用を�勧����!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3469,9 +3226,7 @@ msgstr "Received �アドレス� `%s' ��。\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"ヘッダを解�中�エラー��る行を見����� - man ページ� bad-header オプ"
-"ションを読ん�����\n"
+msgstr "ヘッダを解�中�エラー��る行を見����� - man ページ� bad-header オプションを読ん�����\n"
 
 #: transact.c:615
 #, c-format
@@ -3593,9 +3348,7 @@ msgstr "fetchids ファイル %s を書ã��è¾¼ã�¿ä¸­ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"fetchids ファイル %s �書込��エラー�発生����。��ファイル�残����"
-"�。\n"
+msgstr "fetchids ファイル %s �書込��エラー�発生����。��ファイル�残�����。\n"
 
 #: uid.c:528
 #, c-format
@@ -3605,8 +3358,7 @@ msgstr "fetchids ファイル���を変更����ん。%s �ら %s�
 #: uid.c:532
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
-msgstr ""
-"fetchids ファイル %s を書込�����開������������ん���: %s\n"
+msgstr "fetchids ファイル %s を書込�����開������������ん���: %s\n"
 
 #: xmalloc.c:28
 msgid "malloc failed\n"
@@ -3628,11 +3380,8 @@ msgstr "realloc ����ん���。\n"
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "�明�発行者 (���� %d 文字): %s\n"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: 警告 : syslog �ログファイル�設定�れ���。ログ���らを見"
-#~ "�����。\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr "fetchmail: 警告 : syslog �ログファイル�設定�れ���。ログ���らを見�����。\n"
 
 #~ msgid "setsockopt(%d, SOL_SOCKET) failed: %s\n"
 #~ msgstr "setsockopt(%d, SOL_SOCKET) �失敗����: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 57837dd9..93c84439 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,42 +8,42 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.20-rc3\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2011-05-29 20:19+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"
 "Language: nl\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"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Controle of %s echt dezelfde machine is als %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Ja, hun IP-adressen zijn hetzelfde\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "Nee, hun IP-adressen verschillen\n"
 
-#: checkalias.c:207
+#: checkalias.c:203
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "DNS-serverfout bij het zoeken naar '%s' tijdens polsen van %s: %s\n"
 
-#: checkalias.c:230
+#: checkalias.c:228
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "DNS-serverfout bij het zoeken naar `%s' tijdens polsen van %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "kan 'BASE64-challenge' niet decoderen\n"
 
@@ -63,15 +63,13 @@ msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth(): %s [server zegt '%s']\n"
 
 #: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: fetchmail-waarschuwing -- te grote berichten"
 
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"De volgende te grote berichten werden verwijderd van server %s, account %s:"
+msgstr "De volgende te grote berichten werden verwijderd van server %s, account %s:"
 
 #: driver.c:353
 #, c-format
@@ -92,119 +90,108 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d bericht, %d bytes lang, overgeslagen door fetchmail."
 msgstr[1] "  %d berichten, %d bytes lang, overgeslagen door fetchmail."
 
-#: driver.c:522
+#: driver.c:521
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "overgeslagen bericht: %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:575
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "overgeslagen bericht: %s@%s:%d (%d bytes)"
 
-#: driver.c:593
+#: driver.c:591
 msgid " (length -1)"
 msgstr " (lengte -1)"
 
-#: driver.c:596
+#: driver.c:594
 msgid " (oversized)"
 msgstr " (te groot)"
 
-#: driver.c:614
+#: driver.c:612
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "kan kopregels niet ophalen, bericht %s@%s:%d (%d bytes)\n"
 
-#: driver.c:632
+#: driver.c:629
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lezen van bericht %s@%s:%d van %d"
 
-#: driver.c:637
+#: driver.c:634
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d bytes)"
 
-#: driver.c:638
+#: driver.c:635
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d bytes in kopregels) "
 
-#: driver.c:708
+#: driver.c:702
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d bytes in berichttekst) "
 
-#: driver.c:770
+#: driver.c:761
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"bericht %s@%s:%d had niet de verwachte lengte (feitelijk %d, verwachtte %d)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "bericht %s@%s:%d had niet de verwachte lengte (feitelijk %d, verwachtte %d)\n"
 
-#: driver.c:802
+#: driver.c:793
 msgid " retained\n"
 msgstr " laten staan\n"
 
-#: driver.c:812
+#: driver.c:803
 msgid " flushed\n"
 msgstr " verwijderd\n"
 
-#: driver.c:824
+#: driver.c:815
 msgid " not flushed\n"
 msgstr " niet verwijderd\n"
 
-#: driver.c:842
+#: driver.c:833
 #, 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] ""
-"ophaallimiet %d is bereikt; nog %d bericht op server %s, account %s\n"
-msgstr[1] ""
-"ophaallimiet %d is bereikt; nog %d berichten op server %s, account %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "ophaallimiet %d is bereikt; nog %d bericht op server %s, account %s\n"
+msgstr[1] "ophaallimiet %d is bereikt; nog %d berichten op server %s, account %s\n"
 
-#: driver.c:899
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "verbinden met server %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:903
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "wachten op server %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:907
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "wachten op %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:912
+#: driver.c:903
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"wachten op reactie van luisteraar duurde te lang -- gestopt na %d seconden\n"
+msgstr "wachten op reactie van luisteraar duurde te lang -- gestopt na %d seconden\n"
 
-#: driver.c:915
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "duurde te lang -- gestopt na %d seconden\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:918
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ziet herhaaldelijk tijdslimietoverschrijdingen"
 
-#: 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 zag meer dan %d tijdslimietoverschrijdingen tijdens pogingen om "
-"mail op te halen voor %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail zag meer dan %d tijdslimietoverschrijdingen tijdens pogingen om mail op te halen voor %s@%s.\n"
 
-#: driver.c:934
+#: driver.c:925
 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"
@@ -220,74 +207,73 @@ msgstr ""
 "\n"
 "Fetchmail blijft van deze mailbox af tot u het programma herstart.\n"
 
-#: driver.c:960
+#: driver.c:951
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "pre-verbindingscommando is mislukt met afsluitwaarde %d\n"
 
-#: driver.c:963
+#: driver.c:954
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-verbindingscommando is mislukt met afsluitwaarde %d\n"
 
-#: driver.c:987
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kan geen HESIOD-pobox vinden voor %s\n"
 
-#: driver.c:1008
+#: driver.c:999
 msgid "Lead server has no name.\n"
 msgstr "Hoofdserver heeft geen naam.\n"
 
-#: driver.c:1035
+#: driver.c:1026
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "kan canonieke DNS-naam niet vinden van %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1073
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-verbinding met %s is mislukt"
 
-#: driver.c:1111
+#: driver.c:1102
 msgid "SSL connection failed.\n"
 msgstr "SSL-verbinding is mislukt.\n"
 
-#: driver.c:1166
+#: driver.c:1157
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Vergrendelingsfout op %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1161
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server is bezet op %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1166
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Aanmeldingsfout op %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1169
 msgid " (previously authorized)"
 msgstr " (eerder al aangemeld)"
 
-#: driver.c:1181
+#: driver.c:1172
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Hulp is te vinden op http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "Hulp is te vinden op http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1193
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail-aanmelding is mislukt voor %s@%s"
 
-#: driver.c:1206
+#: driver.c:1197
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kon geen mail ophalen voor %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1201
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -299,7 +285,7 @@ msgstr ""
 "Aangezien dit eerder wel gelukt is, is de oorzaak waarschijnlijk een\n"
 "overbelaste server, maar deze gaf daar geen bruikbare foutmelding voor."
 
-#: driver.c:1216
+#: driver.c:1207
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -318,7 +304,7 @@ msgstr ""
 "Fetchmail blijft draaien en probeert de aanmelding elke ronde opnieuw.\n"
 "Er volgt pas weer bericht als het aanmelden lukt."
 
-#: driver.c:1226
+#: driver.c:1217
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -337,182 +323,177 @@ msgstr ""
 "Fetchmail blijft draaien en probeert de aanmelding elke ronde opnieuw.\n"
 "Er volgt pas weer bericht als het aanmelden lukt."
 
-#: driver.c:1242
+#: driver.c:1233
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Onmiddelijk opnieuw ophalen voor %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1238
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Onbekende gebruikersnaam of ongeldig wachtwoord voor %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1262
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Aanmelden is gelukt voor %s@%s\n"
 
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1268
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail-aanmelding is geslaagd voor %s@%s"
 
-#: driver.c:1281
+#: driver.c:1272
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail kon inloggen op %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1276
 msgid "Service has been restored.\n"
 msgstr "De dienstverlening is hersteld.\n"
 
-#: driver.c:1318
+#: driver.c:1308
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "map %s wordt geselecteerd of opnieuw opgehaald\n"
 
-#: driver.c:1320
+#: driver.c:1310
 msgid "selecting or re-polling default folder\n"
 msgstr "standaardmap wordt geselecteerd of opnieuw opgehaald\n"
 
-#: driver.c:1332
+#: driver.c:1322
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s op %s (map %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1325 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s op %s"
 
-#: driver.c:1340
+#: driver.c:1330
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polsen van %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"
 msgstr[0] "%d bericht (%d %s) voor %s"
 msgstr[1] "%d berichten (%d %s) voor %s"
 
-#: driver.c:1347
+#: driver.c:1337
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gelezen"
 msgstr[1] "gelezen"
 
-#: driver.c:1350
+#: driver.c:1340
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d bericht voor %s"
 msgstr[1] "%d berichten voor %s"
 
-#: driver.c:1357
+#: driver.c:1347
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d bytes).\n"
 
-#: driver.c:1363
+#: driver.c:1353
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Geen mail voor %s\n"
 
-#: driver.c:1396
+#: driver.c:1386
 msgid "bogus message count!"
 msgstr "onjuist berichtenaantal!"
 
-#: 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 "socket"
 
-#: driver.c:1552
+#: driver.c:1532
 msgid "missing or bad RFC822 header"
 msgstr "RFC822-kopregels zijn onjuist of ontbreken"
 
-#: driver.c:1555
+#: driver.c:1535
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1538
 msgid "client/server synchronization"
 msgstr "client/server-synchronisatie"
 
-#: driver.c:1561
+#: driver.c:1541
 msgid "client/server protocol"
 msgstr "client/server-protocol"
 
-#: driver.c:1564
+#: driver.c:1544
 msgid "lock busy on server"
 msgstr "vergrendeling nog actief op server"
 
-#: driver.c:1567
+#: driver.c:1547
 msgid "SMTP transaction"
 msgstr "SMTP-transactie"
 
-#: driver.c:1570
+#: driver.c:1550
 msgid "DNS lookup"
 msgstr "DNS-opzoekvraag"
 
-#: driver.c:1573
+#: driver.c:1553
 msgid "undefined"
 msgstr "ongedefinieerde"
 
-#: driver.c:1579
+#: driver.c:1559
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s fout tijdens ophalen van %s@%s en bezorgen op SMTP-host %s\n"
 
-#: driver.c:1581
+#: driver.c:1561
 msgid "unknown"
 msgstr "onbekende"
 
-#: driver.c:1583
+#: driver.c:1563
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s fout tijdens het ophalen van %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1575
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "na-verbindingscommando is mislukt met afsluitwaarde %d\n"
 
-#: driver.c:1597
+#: driver.c:1577
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "na-verbindingscommando is mislukt met afsluitwaarde %d\n"
 
-#: driver.c:1616
+#: driver.c:1596
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4-ondersteuning is niet ingebouwd.\n"
 
-#: driver.c:1624
+#: driver.c:1604
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5-ondersteuning is niet ingebouwd.\n"
 
-#: driver.c:1635
+#: driver.c:1615
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Optie '--flush' is niet mogelijk met %s\n"
 
-#: driver.c:1641
+#: driver.c:1621
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Optie '--all' is niet mogelijk met %s\n"
 
-#: driver.c:1650
+#: driver.c:1630
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Optie '--limit' is niet mogelijk met %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -527,62 +508,48 @@ msgstr ""
 "Probeer \"env QMAILINJECT= %s UW PARAMETERS HIER\"\n"
 "%s: Stoppen.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
 "%s: De NULLMAILER_FLAGS shell-variable is toegekend.\n"
-"Dit is gevaarlijk, nullmailer-inject of de sendmail-wrapper van nullmailer "
-"zouden\n"
+"Dit is gevaarlijk, nullmailer-inject of de sendmail-wrapper van nullmailer zouden\n"
 "je From: en/of Message-ID: headers kunnen verpesten.\n"
 "Probeer \"env NULLMAILER_FLAGS= %s UW PARAMETERS HIER\"\n"
 "%s: Stoppen.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: U bestaat niet. Ga weg.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: ik kan uw host niet bepalen!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:172
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname() is mislukt voor %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Kan mijn eigen host niet in de hostsdatabase vinden om deze te "
-"kwalificeren!\n"
+msgstr "Kan mijn eigen host niet in de hostsdatabase vinden om deze te kwalificeren!\n"
 
-#: env.c:229
+#: 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 ""
 "Probeert door te gaan met een niet gekwalificeerde hostname.\n"
-"Rapporteer GEEN misvormde berichten: koppen, HELO/EHLO-regels of "
-"soortgelijke problemen!\n"
+"Rapporteer GEEN misvormde berichten: koppen, HELO/EHLO-regels of soortgelijke problemen!\n"
 "Repareer in plaats daarvan uw /etc/hosts, NDS, NIS of LDAP.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -649,14 +616,13 @@ msgstr "Optie '--folder' is niet mogelijk met ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Optie '--check' is niet mogelijk met ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2005 - 2006, 2010 - 2011 Sunil Shetye\n"
+"Copyright (C) 2005 - 2011 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -664,7 +630,7 @@ msgstr ""
 "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
 "Copyright (C) 2005 - 2011 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: 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"
@@ -674,1042 +640,913 @@ msgstr ""
 "onder bepaalde voorwaarden verder verspreiden.  Zie voor de details het\n"
 "bestand genaamd COPYING in de programmatekst of documentatiemap.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WAARSCHUWING: Als root draaien wordt ontraden.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: opgestart met"
 
-#: fetchmail.c:223
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "kan huidige werkmap niet bepalen\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dit is fetchmail versie %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:408
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Deze opties van opdrachtregel gehaald%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:409
 msgid " and "
 msgstr " en "
 
-#: fetchmail.c:475
+#: fetchmail.c:414
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Geen mailservers ingesteld -- misschien ontbreekt %s?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:435
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: geen mailservers opgegeven.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:447
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: er draait geen andere fetchmail\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:453
 #, 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:515 fetchmail.c:524
+#: fetchmail.c:454 fetchmail.c:463
 msgid "background"
 msgstr "achtergrond"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:454 fetchmail.c:463
 msgid "foreground"
 msgstr "voorgrond"
 
-#: fetchmail.c:523
+#: fetchmail.c:462
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail op %ld geëlimineerd.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+#: fetchmail.c:485
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
 msgstr ""
 "fetchmail: kan mail niet controleren terwijl er een andere fetchmail\n"
 "naar dezelfde host actief is.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:491
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: kan opgegeven hosts niet contacteren terwijl een andere fetchmail "
-"draait op %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: kan opgegeven hosts niet contacteren terwijl een andere fetchmail draait op %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:498
 #, 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:569
-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:508
+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:581
+#: fetchmail.c:514
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmail-service in de achtergrond op %ld wakkergeschud.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:526
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: ouder zusterproces op %ld is om onbekende redenen afgebroken.\n"
+msgstr "fetchmail: ouder zusterproces op %ld is om onbekende redenen afgebroken.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:541
 #, 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:612
+#: fetchmail.c:545
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Geef wachtwoord voor %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:587
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: kan niet naar de achtergrond gaan. Gestopt.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:591
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starten van fetchmail %s-service\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:607 fetchmail.c:609
 #, 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:695
+#: fetchmail.c:611
+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"
+
+#: fetchmail.c:630
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "--controlemodus ingeschakeld, geen e-mailontvangst\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:652
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kan geen tijdcontrole op %s uitvoeren (fout %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:657
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail wordt herstart (%s is gewijzigd)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:662
 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:752
+#: fetchmail.c:689
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "poging tot herstarten van fetchmail is mislukt\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:719
 #, 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"
+msgstr "mail ophalen van %s wordt overgeslagen (aanmelden is mislukt of duurt te lang)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:731
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval niet bereikt, %s wordt niet gecontroleerd\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:769
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Resultaatcode = 0 (GELUKT)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:771
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Resultaatcode=1 (GEEN MAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:773
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Resultaatcode=2 (SOCKETFOUT)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:775
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Resultaatcode=3 (AANMELDEN MISLUKT)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:777
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Resultaatcode=4 (PROTOCOLFOUT)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:779
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Resultaatcode=5 (SYNTAXFOUT)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:781
 msgid "Query status=6 (IOERR)\n"
 msgstr "Resultaatcode=6 (I/O-fout)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:783
 msgid "Query status=7 (ERROR)\n"
 msgstr "Resultaatcode=7 (ALGEMENE FOUT)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:785
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Resultaatcode=8 (UITGESLOTEN)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:787
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Resultaatcode=9 (VERGRENDELING ACTIEF)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:789
 msgid "Query status=10 (SMTP)\n"
 msgstr "Resultaatcode=10 (SMTP-fout)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:791
 msgid "Query status=11 (DNS)\n"
 msgstr "Resultaatcode=11 (DNS-fout)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:793
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Resultaatcode=12 (BSMTP-fout)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:795
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Resultaatcode=13 (OPHAALLIMIET BEREIKT)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:797
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Resultaatcode=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:839
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle verbindingen zijn vastgelopen.  Gestopt.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:847
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "slapen om %s gedurende %d seconden\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:871
 #, c-format
 msgid "awakened by %s\n"
 msgstr "gewekt door %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:874
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "gewekt door signaal %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:882
 #, c-format
 msgid "awakened at %s\n"
 msgstr "gewekt op %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:887
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normale afsluiting, afsluitwaarde %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1046
 msgid "couldn't time-check the run-control file\n"
 msgstr "kan geen tijdcontrole uitvoeren op het run-control-bestand\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1080
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Waarschuwing: host %s is meerdere malen vermeld in configuratiebestand\n"
+msgstr "Waarschuwing: host %s is meerdere malen vermeld in configuratiebestand\n"
 
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Fout: meerder \"defaults\"-secties in configuratiebestand.\n"
+#: fetchmail.c:1119
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "fetchmail: Fout: meerder \"defaults\"-secties in configuratiebestand.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1241
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-ondersteuning is niet ingebouwd.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1248
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Kerberos V4-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1254
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Kerberos V5-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1260
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1290
 #, 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: Waarschuwing: geen DNS beschikbaar voor multidrop van %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1301
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "waarschuwing: multidrop van %s vereist envelopoptie!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1302
 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"
+msgstr "waarschuwing: vraag niet om ondersteuning als alle e-mail naar postmaster gaat!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1319
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: configuratie van %s is ongeldig -- poortnummer kan niet negatief "
-"zijn\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: configuratie van %s is ongeldig -- poortnummer kan niet negatief zijn\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1326
 #, 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"
+msgstr "fetchmail: configuratie voor %s is ongeldig -- RPOP vereist een speciale poort\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1344
 #, 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"
+msgstr "configuratie voor %s is ongeldig -- LMTP kan niet de standaard SMTP-poort gebruiken\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1358
 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:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1383
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beëindigd door signaal %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1456
 #, 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:1566
+#: fetchmail.c:1481
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1493
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1503
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1509
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1517
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1524
 msgid "unsupported protocol selected.\n"
 msgstr "een niet-ondersteund protocol is geselecteerd.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1534
 #, 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:1645
+#: fetchmail.c:1551
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Polslinterval is %d seconden\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1553
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logbestand is %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1555
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-bestand is %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1558
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Voortgangsberichten worden via syslog opgeslagen\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1561
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail verstopt zich en maakt geen 'Received'-kopregels aan\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1563
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail toont voortgangspuntjes ook in logbestanden.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1565
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail zal onjuist geadresseerde multidrop-berichten doorsturen naar %s.\n"
+msgstr "Fetchmail zal onjuist geadresseerde multidrop-berichten doorsturen naar %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1569
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail zal foutmeldingen naar de postmaster sturen.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1571
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail zal foutmeldingen naar de afzender sturen.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1574
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail zal permanente foutmeldingen als permanent afhandelen (berichten "
-"verwijderen).\n"
+msgstr "Fetchmail zal permanente foutmeldingen als permanent afhandelen (berichten verwijderen).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1576
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail zal permanente foutmeldingen als tijdelijk afhandelen (berichten "
-"behouden).\n"
+msgstr "Fetchmail zal permanente foutmeldingen als tijdelijk afhandelen (berichten behouden).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1583
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opties voor het ophalen van %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1587
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail wordt opgehaald via %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1590
 #, 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:1688
+#: fetchmail.c:1594
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Werkelijke naam van server is %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1597
 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:1692
+#: fetchmail.c:1598
 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:1696
+#: fetchmail.c:1602
 msgid "  Password will be prompted for.\n"
 msgstr "  Wachtwoord wordt aan gebruiker gevraagd.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1606
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-geheim = \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1609
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-ID = \"%s\".\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1612
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Wachtwoord = \"%s\".\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1621
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP met Kerberos %s-authenticatie"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1624
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1626
 #, c-format
 msgid " (using service %s)"
 msgstr " (gebruikmakend van service %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1628
 msgid " (using default port)"
 msgstr " (gebruikmakend van de standaard poort)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1630
 msgid " (forcing UIDL use)"
 msgstr " (gebruik van UIDL wordt afgedwongen)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1636
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle beschikbare authenticatiemethoden worden geprobeerd.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1639
 msgid "  Password authentication will be forced.\n"
 msgstr "  Wachtwoordauthenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1642
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1645
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1648
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1651
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1654
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1657
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1660
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1663
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Versleuteling van-eindpunt-tot-eindpunt wordt aangenomen.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1667
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Belangrijkste mailservice is: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1670
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-versleutelde sessies zijn ingeschakeld.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1672
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protocol: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1674
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Certificaat-controle voor SSL-server is ingeschakeld.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Certificaat-controle voor SSL-server is ingeschakeld.\n"
-
-#: fetchmail.c:1773
+#: fetchmail.c:1677
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Vertrouwd-SSL-certificaatbestand: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1679
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Map voor vertrouwde SSL-certificaten: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1681
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  CommonName SLL-server: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1683
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-sleutelafdruk (geverifieerd tegenover serversleutel): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1686
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server-timeout voor geen respons is %d seconden"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1688
 msgid " (default).\n"
 msgstr " (standaard).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1695
 msgid "  Default mailbox selected.\n"
 msgstr "  Standaard mailbox geselecteerd.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1700
 msgid "  Selected mailboxes are:"
 msgstr "  Geselecteerde mailboxen zijn:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1706
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle berichten zullen worden opgehaald ('--all on').\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1707
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Alleen nieuwe berichten zullen worden opgehaald ('--all off').\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1709
 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"
+msgstr "  Van opgehaalde berichten worden kopieën op de server bewaard ('--keep on').\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1710
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Opgehaalde berichten worden van de server verwijderd ('--keep off').\n"
+msgstr "  Opgehaalde berichten worden van de server verwijderd ('--keep off').\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1712
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
+msgstr "  Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
 
-#: fetchmail.c:1809
-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:1713
+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:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Te grote berichten worden verwijderd voor het ophalen begint ('--"
-"limitflush on').\n"
+#: fetchmail.c:1715
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Te grote berichten worden verwijderd voor het ophalen begint ('--limitflush on').\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Te grote berichten worden niet verwijderd voor het ophalen begint ('--"
-"limitflush off').\n"
+#: fetchmail.c:1716
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Te grote berichten worden niet verwijderd voor het ophalen begint ('--limitflush off').\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1718
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Herschrijven van lokale serveradressen is ingeschakeld ('--norewrite "
-"off').\n"
+msgstr "  Herschrijven van lokale serveradressen is ingeschakeld ('--norewrite off').\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1719
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Herschrijven van lokale serveradressen is uitgeschakeld ('--norewrite "
-"on').\n"
+msgstr "  Herschrijven van lokale serveradressen is uitgeschakeld ('--norewrite on').\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1721
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Verwijderen van CR-tekens is ingeschakeld ('stripcr on').\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1722
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Verwijderen van CR-tekens is uitgeschakeld ('stripcr off').\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1724
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Afdwingen van CR-tekens is ingeschakeld ('forcecr on').\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1725
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Afdwingen van CR-tekens is uitgeschakeld ('forcecr off').\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits "
-"on').\n"
+#: fetchmail.c:1727
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits on').\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits "
-"off').\n"
+#: fetchmail.c:1728
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits off').\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1730
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoderen is ingeschakeld ('mimedecode on').\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1731
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoderen is uitgeschakeld ('mimedecode off').\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1733
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nietsdoen na ophalen is ingeschakeld ('idle on').\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1734
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nietsdoen na ophalen is uitgeschakeld ('idle off').\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1736
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niet-lege Status-regels worden weggegooid ('dropstatus on')\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1737
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niet-lege Status-regels worden behouden ('dropstatus off')\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1739
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-regels worden weggegooid ('dropdelivered on')\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1740
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-regels worden behouden ('dropdelivered off')\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1744
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Berichtgrootte-limiet is %d tekens ('--limit %d').\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1747
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Berichtgrootte is onbegrensd ('--limit 0').\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1749
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Waarschuwingsinterval voor berichtgrootte is %d seconden ('--warnings "
-"%d').\n"
+msgstr "  Waarschuwingsinterval voor berichtgrootte is %d seconden ('--warnings %d').\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1752
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-"  Waarschuwingen voor grootte tijdens elke ophaalronde ('--warnings 0').\n"
+msgstr "  Waarschuwingen voor grootte tijdens elke ophaalronde ('--warnings 0').\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1755
 #, 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:1854
+#: fetchmail.c:1758
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr ""
-"  Het aantal per keer opgehaalde berichten is onbeperkt ('--fetchlimit 0').\n"
+msgstr "  Het aantal per keer opgehaalde berichten is onbeperkt ('--fetchlimit 0').\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1760
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maximale berichtgrootte is %d ('--fetchsizelimit %d').\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1763
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Geen beperking op berichtgrootte ('--fetchsizelimit 0').\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1767
 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"
+msgstr "  Er wordt binair naar UID's gezocht tijdens het ophalen ('--fastuidl 1').\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1769
 #, 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"
+msgstr "  Er wordt binair naar UID's gezocht tijdens %d van de %d ophaalacties ('--fastuidl %d').\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1772
 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"
+msgstr "  Er wordt lineair naar UID's gezocht tijdens elke ophaalactie ('--fastuidl 0').\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1774
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limiet SMTP-berichtenbatch is %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1776
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Er is geen limiet voor SMTP-berichtenbatch (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1780
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Verwijderinterval tussen expunge-operaties geforceerd op %d (--expunge "
-"%d).\n"
+msgstr "  Verwijderinterval tussen expunge-operaties geforceerd op %d (--expunge %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1782
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Geen geforceerde expunges (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1789
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Er wordt mail opgehaald voor de volgende domeinen:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1794 fetchmail.c:1814
 msgid " (default)"
 msgstr " (standaard)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1799
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Berichten worden toegevoegd aan %s als BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1801
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Berichten worden bezorgd met \"%s\".\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1808
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Berichten worden %cMTP-geforward naar:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1819
 #, 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:1918
+#: fetchmail.c:1822
 #, 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:1927
+#: fetchmail.c:1831
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Herkende foutcodes van spam-blokkades zijn:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1837
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blokkades uitgeschakeld\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1840
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serververbinding wordt tot stand gebracht met \"%s\".\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1843
 msgid "  No pre-connection command.\n"
 msgstr "  Geen voor-verbindingscommando.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1845
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serververbinding wordt verbroken met \"%s\".\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1848
 msgid "  No post-connection command.\n"
 msgstr "  Geen na-verbindingscommando.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1851
 msgid "  No localnames declared for this host.\n"
 msgstr "  Geen lokale namen gedeclareerd voor deze host.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1861
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop modus: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1863
 msgid "  Single-drop mode: "
 msgstr "  Single-drop modus: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1865
 #, 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:1976
+#: fetchmail.c:1880
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is ingeschakeld.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1881
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is uitgeschakeld.\n"
 
-#: fetchmail.c:1981
-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:1885
+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:1983
+#: fetchmail.c:1887
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Server-aliassen worden vergeleken met multidrop-adressen via de naam.\n"
+msgstr "  Server-aliassen worden vergeleken met multidrop-adressen via de naam.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1890
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelopadres-routering is uitgeschakeld\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1893
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelopkoppen is aangenomen als zijnde: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1896
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Aantal over te slaan envelopkoppen: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1899
 #, 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:1998
+#: fetchmail.c:1902
 msgid "  No prefix stripping\n"
 msgstr "  Geen prefix-verwijdering\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1907
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Voorgedefinieerde mailserver-aliassen:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1915
 msgid "  Local domains:"
 msgstr "  Lokale domeinen:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1925
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connectie moet door interface %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1927
 msgid "  No interface requirement specified.\n"
 msgstr "  Geen interface-eisen opgegeven.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1929
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polslus monitort %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1931
 msgid "  No monitor interface specified.\n"
 msgstr "  Geen monitor-interface opgegeven.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1935
 #, 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:2033
+#: fetchmail.c:1937
 msgid "  No plugin command specified.\n"
 msgstr "  Geen plugin-commando opgegeven.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1939
 #, 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"
+msgstr "  Luisterende connecties worden gelegd via plugout %s ('--plugout %s').\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:1941
 msgid "  No plugout command specified.\n"
 msgstr "  Geen plugout-commando opgegeven.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1946
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Geen UID's opgeslagen voor deze host.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1955
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID's opgeslagen.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1963
 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:2055
+#: fetchmail.c:1965
 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"
+msgstr "  Er wordt geen pols-trace-informatie aan de Received-header toegevoegd.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:1970
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Berichten met ongeldige kopregels worden afgewezen.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:1973
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Berichten met een ongeldige kopregels worden doorgegeven.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:1978
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Doorvoereigenschappen \"%s\".\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "FOUT: geen ondersteuning voor getpassword()-routine\n"
@@ -1722,92 +1559,78 @@ msgstr ""
 "\n"
 "SIGINT ontvangen -- gestopt\n"
 
-#: gssapi.c:53
+#: gssapi.c:52
 #, 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:56
+#: gssapi.c:55
 #, c-format
 msgid "GSSAPI error %s: %.*s\n"
 msgstr "GSSAPI-fout %s: %.*s\n"
 
-#: gssapi.c:91
+#: gssapi.c:90
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kan geen servicenaam vinden voor [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:95
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Servicenaam [%s] wordt gebruikt\n"
 
-#: gssapi.c:123
+#: gssapi.c:122
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Geen geschikte authenticatiegegevens van GSSAPI gevonden, SGGAPI-"
-"authenticatie overslaan.\n"
+msgstr "Geen geschikte authenticatiegegevens van GSSAPI gevonden, SGGAPI-authenticatie overslaan.\n"
 
-#: 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:123
+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:160
+#: gssapi.c:159
 #, c-format
 msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr "Misvormde 'challenge' gestuurd aan \"%s GSSAPI\" ontvangen!\n"
 
-#: gssapi.c:170
+#: gssapi.c:169
 msgid "Sending credentials\n"
 msgstr "Versturen van logingegevens\n"
 
-#: gssapi.c:201
+#: gssapi.c:200
 msgid "Error exchanging credentials\n"
 msgstr "Fout bij uitwisselen van login-gegevens\n"
 
-#: gssapi.c:243
+#: gssapi.c:242
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kan beveiligingstunnel niet uitvouwen\n"
 
-#: gssapi.c:248
+#: gssapi.c:247
 msgid "Credential exchange complete\n"
 msgstr "Login-gegevens succesvol uitgewisseld\n"
 
-#: gssapi.c:252
+#: gssapi.c:251
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server vereist integriteit en/of privacy\n"
 
-#: gssapi.c:261
+#: gssapi.c:260
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Eigenschappen van uitgevouwen beveiligingstunnel: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:264
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximale grootte van GSS-token is %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Fout bij het doen van beveiligingsverzoek\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "GSS-login-gegevens worden afgegeven\n"
 
-#: gssapi.c:302
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Fout bij het afgeven van gegevens\n"
 
@@ -1816,65 +1639,64 @@ 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:75
-#, fuzzy, c-format
-msgid "Received BYE response from IMAP server: %s\n"
+#: imap.c:74
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
 msgstr "BYE-reactie ontvangen van IMAP-server: %s"
 
-#: imap.c:97
+#: imap.c:92
 #, c-format
 msgid "bogus message count in \"%s\"!"
 msgstr "onjuist berichtenaantal in \"%s\"!"
 
-#: imap.c:144
+#: imap.c:139
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "onjuist EXPUNGE-aantal in \"%s\"!"
 
-#: imap.c:355
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol herkend als IMAP4 revisie 1\n"
 
-#: imap.c:361
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol herkend als IMAP4 revisie 0\n"
 
-#: imap.c:368
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol herkend als IMAP2 of IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr "zal nietsdoen na verzoek\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:471 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opwaardering naar TLS is geslaagd.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:477 pop3.c:482
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opwaardering naar TLS is mislukt.\n"
 
-#: imap.c:487
+#: imap.c:482
 #, 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:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:607
+#: imap.c:598
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benodigde OTP-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:618 pop3.c:558
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benodigde NTLM-ondersteuning is niet in fetchmail gecompileerd\n"
 
+#: imap.c:627
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
+
 #: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
@@ -1885,7 +1707,7 @@ msgstr "bericht-expunge komt niet overeen (is %d, waar %d verwacht)\n"
 msgid "%lu is unseen\n"
 msgstr "%lu is ongelezen\n"
 
-#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is ongelezen\n"
@@ -1927,17 +1749,16 @@ msgstr[1] "%d berichten in wachtrij na expunge\n"
 msgid "search for unseen messages failed\n"
 msgstr "zoeken naar ongelezen berichten is mislukt\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:994 pop3.c:865
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is als eerste nog niet gelezen\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Waarschuwing: server geeft onzinnige berichtgrootten terug.\n"
 
-#: imap.c:1177 imap.c:1184
+#: imap.c:1176 imap.c:1183
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Onjuist FETCH-antwoord: %s.\n"
@@ -2024,21 +1845,21 @@ msgstr "activiteit op %s was %d, is %d\n"
 msgid "could not decode initial BASE64 challenge\n"
 msgstr "kan initiële 'BASE64-challenge' niet decoderen\n"
 
-#: kerberos.c:137
+#: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
 msgstr "principal %s in ticket komt niet overeen -u %s\n"
 
-#: kerberos.c:145
+#: kerberos.c:147
 #, c-format
 msgid "non-null instance (%s) might cause strange behavior\n"
 msgstr "niet-nul instantie (%s) zou vreemd gedrag kunnen veroorzaken\n"
 
-#: kerberos.c:211
+#: kerberos.c:213
 msgid "could not decode BASE64 ready response\n"
 msgstr "kan 'BASE64 ready'-respons niet decoderen\n"
 
-#: kerberos.c:218
+#: kerberos.c:220
 msgid "challenge mismatch\n"
 msgstr "'challenge' klopt niet\n"
 
@@ -2048,35 +1869,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: fout bij lezen van vergrendelingsbestand \"%s\": %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: verwijderen van verouderde vergrendeling\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: fout bij openen van vergrendelingsbestand \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: fout bij lezen van vergrendelingsbestand \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: fout bij openen van vergrendelingsbestand \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: aanmaken van vergrendeling is mislukt.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: fout bij lezen van vergrendelingsbestand \"%s\": %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2087,15 +1891,6 @@ msgstr "%s:%d: waarschuwing: \"%s\" aangetroffen voor enige hostnamen\n"
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: waarschuwing: onbekend token \"%s\"\n"
 
-#: ntlmsubr.c:35
-#, fuzzy
-msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr "Misvormde 'challenge' gestuurd aan \"%s GSSAPI\" ontvangen!\n"
-
-#: 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"
@@ -2150,499 +1945,423 @@ 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:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "server recv is mislukt\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Kan 'OTP-challenge' niet decoderen\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Geheime wachtwoordzin: "
 
-#: options.c:179 options.c:223
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is geen geldige numerieke tekenreeks.\n"
 
-#: options.c:188
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Waarde van string '%s' is %s dan %d.\n"
 
-#: options.c:189
+#: options.c:186
 msgid "smaller"
 msgstr "kleiner"
 
-#: options.c:189
+#: options.c:186
 msgid "larger"
 msgstr "groter"
 
-#: options.c:337
+#: options.c:323
 #, c-format
 msgid "Invalid bad-header policy `%s' specified.\n"
 msgstr "Ongeldig protocol voor slechte-kopregel `%s' opgegeven.\n"
 
-#: options.c:378
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ongeldig protocol `%s' opgegeven.\n"
 
-#: options.c:425
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ongeldige authenticatie `%s' opgegeven.\n"
 
-#: options.c:641
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Gebruik:  fetchmail [opties] [server ...]\n"
 
-#: options.c:642
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Mogelijke opties zijn:\n"
 
-#: options.c:643
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        deze hulptekst tonen\n"
 
-#: options.c:644
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     programmaversie tonen\n"
 
-#: options.c:646
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       op berichten controleren, maar deze niet ophalen\n"
 
-#: options.c:647
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      in stilte functioneren\n"
 
-#: options.c:648
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr ""
-"  -v, --verbose     gedetailleerde uitvoer produceren (diagnostische "
-"gegevens)\n"
+msgstr "  -v, --verbose     gedetailleerde uitvoer produceren (diagnostische gegevens)\n"
 
-#: options.c:649
+#: options.c:628
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      als systeemservice elke N seconden draaien\n"
 
-#: options.c:650
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
-msgstr ""
-"  -N, --nodetach    wel systeemservice, maar terminal niet teruggeven\n"
+msgstr "  -N, --nodetach    wel systeemservice, maar terminal niet teruggeven\n"
 
-#: options.c:651
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        systeemserviceproces elimineren\n"
 
-#: options.c:652
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     te gebruiken logbestand\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      syslog(3) gebruiken voor berichtgeving als "
-"systeemservice\n"
-
-#: options.c:654
-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      syslog(3) gebruiken voor berichtgeving als systeemservice\n"
 
-#: options.c:655
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   onzichtbaar; geen Received-headers aanmaken\n"
 
-#: options.c:656
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc   te gebruiken run-control-bestand \n"
 
-#: options.c:657
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      te gebruiken bestand met UID's\n"
 
-#: options.c:658
+#: options.c:636
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     te gebruiken PID-/vergrendelingsbestand\n"
 
-#: options.c:659
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  mail-ontvanger indien alles faalt\n"
 
-#: options.c:660
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    geen bounces naar gebruikers sturen, alles naar "
-"postmaster\n"
+msgstr "      --nobounce    geen bounces naar gebruikers sturen, alles naar postmaster\n"
 
-#: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail verwijdert permanent niet-bestelbare "
-"berichten.\n"
+#: options.c:639
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail verwijdert permanent niet-bestelbare berichten.\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  permanent onbestelbare berichten op de server behouden "
-"(standaard).\n"
+#: options.c:640
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  permanent onbestelbare berichten op de server behouden (standaard).\n"
 
-#: options.c:664
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   vereiste interface\n"
 
-#: options.c:665
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     deze interface op activiteit monitoren\n"
 
-#: options.c:668
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         SSL-beveiligde sessies inschakelen\n"
 
-#: options.c:669
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      bestand met SSL-privésleutels\n"
 
-#: options.c:670
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL-cliëntcertificaat\n"
 
-#: options.c:671
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
+msgstr "      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
 
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
-
-#: options.c:673
+#: options.c:650
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertfile   pad naar vertrouwd SSL-certificaatbestand\n"
 
-#: options.c:674
+#: options.c:651
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath pad naar vertrouwd-CA SSL-certificaatmap\n"
 
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  verwacht deze CommonName van server (afgeraden)\n"
+#: options.c:652
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  verwacht deze CommonName van server (afgeraden)\n"
 
-#: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint fingerprint dat overeen moet komen met het "
-"servercertificaat.\n"
+#: options.c:653
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint fingerprint dat overeen moet komen met het servercertificaat.\n"
 
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
+#: options.c:654
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    SSL-protocol afdwingen (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      extern commando om verbinding te openen\n"
 
-#: options.c:680
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     extern commando om SMTP-verbinding te openen\n"
 
-#: options.c:681
+#: options.c:658
 msgid ""
 "      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    protocol instellen voor afhandeling berichten met "
-"onjuiste kopregels\n"
+"                    protocol instellen voor afhandeling berichten met onjuiste kopregels\n"
 
-#: options.c:684
-#, 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    ophaal-protocol (zie man-pagina)\n"
 
-#: options.c:685
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        gebruik van UIDL's afdwingen (alleen POP3)\n"
 
-#: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        met deze TCP-poort verbinden (verouderd; gebruik --"
-"service)\n"
+msgstr "      --port        met deze TCP-poort verbinden (verouderd; gebruik --service)\n"
 
-#: options.c:688
-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 "  -P, --service     met deze TCP-poort verbinden (mag numeriek zijn)\n"
 
-#: options.c:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
+#: options.c:665
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        authenticatietype (password/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server-timeout voor geen respons\n"
 
-#: options.c:691
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelopadreskop\n"
 
-#: options.c:692
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix te verwijderen van lokaal user-ID\n"
 
-#: options.c:693
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal voor mail service\n"
 
-#: options.c:694
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  poll-tracing information toevoegen aan de Received-"
-"header\n"
+msgstr "      --tracepolls  poll-tracing information toevoegen aan de Received-header\n"
 
-#: options.c:696
-#, 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    loginnaam voor gebruiker op server\n"
 
-#: options.c:697
+#: options.c:673
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  zowel oude als nieuwe berichten ophalen\n"
 
-#: options.c:698
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      nieuwe berichten verwijderen na het ophalen\n"
 
-#: options.c:699
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr ""
-"  -k, --keep        kopie van nieuwe berichten achterlaten op de server\n"
+msgstr "  -k, --keep        kopie van nieuwe berichten achterlaten op de server\n"
 
-#: options.c:700
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       oude berichten van de server verwijderen\n"
 
-#: options.c:701
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  te grote berichten verwijderen\n"
 
-#: options.c:702
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   header-adressen niet herschrijven\n"
 
-#: options.c:703
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       berichten boven de genoemde grootte niet ophalen\n"
 
-#: options.c:704
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval tussen waarschuwingsmails\n"
 
-#: options.c:706
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    SMTP forwarding host\n"
 
-#: options.c:707
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains   mail voor deze domeinen ophalen\n"
 
-#: options.c:708
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress   te gebruiken SMTP-afleverdomein\n"
 
-#: options.c:709
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    SMTP volledige naam gebruikersnaam@domein\n"
 
-#: options.c:710
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam-responswaarden\n"
 
-#: options.c:711
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  stapel-limiet voor SMTP-connecties instellen\n"
 
-#: options.c:712
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  maximum aantal berichten per ophaalsessie\n"
 
-#: options.c:713
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit maximumgrootte van op te halen berichten\n"
 
-#: options.c:714
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL's binair zoeken\n"
 
-#: options.c:715
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     maximaal aantal verwijderingen tussen expunges\n"
 
-#: options.c:716
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         MDA voor forwarding\n"
 
-#: options.c:717
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP-uitvoerbestand\n"
 
-#: options.c:718
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) gebruiken voor bezorging\n"
 
-#: options.c:719
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      te gebruiken map op server\n"
 
-#: options.c:720
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    voortgangspuntjes ook in logbestanden tonen\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
+#: pop3.c:327
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-commando in plaats van TOP.\n"
 
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-"
-"commando in plaats van TOP.\n"
-
-#: pop3.c:414
+#: pop3.c:411
 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"
+msgstr "TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
 
-#: pop3.c:415
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "De CAPA-opdracht is echter nodig voor TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:494
 #, 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:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
+#: pop3.c:621
 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"
+msgstr "Het maximum aantal toegestane authenticators is bereikt, kan niet verder gaan.\n"
 
-#: pop3.c:637
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Vereiste APOP tijdstempel niet aangetroffen in begroeting\n"
 
-#: pop3.c:646
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tijdstempel syntaxfout in begroeting\n"
 
-#: pop3.c:662
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ongeldig APOP-tijdsstempel.\n"
 
-#: pop3.c:686
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ongedefinieerd protocol-verzoek in POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr "Vergrendeling actief!  Draait er nog een sessie?\n"
 
-#: pop3.c:770
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "UIDL-respons van upstreamserver kan niet worden verwerkt.\n"
 
-#: pop3.c:793
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server reageerde met UID voor verkeerd bericht.\n"
 
-#: pop3.c:822
+#: pop3.c:835
 #, 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:934
+#: pop3.c:941
 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"
+msgstr "Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
 
-#: pop3.c:1032
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "protocolfout\n"
 
-#: pop3.c:1048
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocolfout tijdens het ophalen van UIDLs\n"
 
-#: pop3.c:1079
+#: pop3.c:1086
 #, 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:1389
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Optie '--folder' is niet mogelijk met POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:131
 msgid "server option after user options"
 msgstr "serveroptie na gebruikersopties"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:174
 msgid "SDPS not enabled."
 msgstr "SPDS niet ingeschakeld."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
-"fetchmail: de interface-optie wordt alleen ondersteund onder Linux (zonder "
-"IPv6) \n"
+"fetchmail: de interface-optie wordt alleen ondersteund onder Linux (zonder IPv6) \n"
 "en FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:226
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr ""
-"fetchmail: de monitor-optie wordt alleen ondersteund onder Linux (zonder "
-"IPv6) \n"
+"fetchmail: de monitor-optie wordt alleen ondersteund onder Linux (zonder IPv6) \n"
 "en FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL is niet ingeschakeld"
 
@@ -2658,9 +2377,7 @@ msgstr "Bestand %s moet een regulier bestand zijn.\n"
 #: rcfile_y.y:439
 #, 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"
+msgstr "Bestandspermissies op %s mogen niet minder stringent zijn dan -rwx------ (0700).\n"
 
 #: rcfile_y.y:451
 #, c-format
@@ -2881,142 +2598,136 @@ msgstr "Geef de service op als een tientallig poortnummer.\n"
 msgid "forwarding to %s\n"
 msgstr "doorsturen naar %s\n"
 
-#: sink.c:319
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message-body)\n"
 
-#: sink.c:322
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "mail van %s gebounced naar %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:456
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Opgeslagen fout is nog steeds %d\n"
+
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fout: %s\n"
 
-#: sink.c:535
+#: sink.c:552
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP-server vereist STARTTLS, bericht behouden.\n"
 
-#: sink.c:714
+#: sink.c:735
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Openen van BSMTP-bestand is mislukt: %s\n"
 
-#: sink.c:760
+#: sink.c:781
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Schrijven van BSMTP-voorwoord is mislukt: %s.\n"
 
-#: sink.c:974
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-programma wijst ontvangeradres '%s' af\n"
 
-#: sink.c:981
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-programma vindt ontvangeradres '%s' maar zozo\n"
 
-#: sink.c:1027
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr "geen adres komt overeen, geen postmaster ingesteld.\n"
 
-#: sink.c:1039
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan niet eens naar %s zenden!\n"
 
-#: sink.c:1045
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "geen adres komt overeen; doorsturen naar %s.\n"
 
-#: 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
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "Staat op het punt te bezorgen met: %s\n"
 
-#: sink.c:1222
+#: sink.c:1233
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Kan geldig gebruikersid niet veranderen in %ld: %s\n"
 
-#: sink.c:1234
+#: sink.c:1245
 #, 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"
+msgstr "Kan geldig gebruikersid niet terug veranderen naar het oorspronkelijke %ld: %s\n"
 
-#: sink.c:1241
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "Openen van MDA mislukt\n"
 
-#: sink.c:1280
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-verbinding met %s is mislukt\n"
 
-#: sink.c:1304
+#: sink.c:1315
 #, 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:1362
+#: sink.c:1373
 #, 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:1387
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fout bij schrijven naar MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA is geëlimineerd door signaal %d\n"
 
-#: sink.c:1393
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "afsluitwaarde van MDA is niet nul: %d\n"
 
-#: sink.c:1396
+#: 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 ""
 "Vreemd: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
 "kan dit niet verwerken, op %s:%d\n"
 
-#: sink.c:1421
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-programma weigert te bezorgen\n"
 
-#: sink.c:1451
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-bezorgfout op EOM\n"
 
-#: sink.c:1454
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Onverwachte respons (niet 503) op LMTP-EOM: %s\n"
 
 #: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "-- \n"
 "De Fetchmail-service"
@@ -3046,84 +2757,84 @@ msgstr "ESMTP-PLAIN-authenticatie...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP-LOGIN-authenticatie...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "SMTP-programma geeft protocolfout aan\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: onvoldoende geheugen beschikbaar\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair() is mislukt\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: kan geen nieuw proces starten\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "fetchmail: dup2() is mislukt\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "draait %s (host %s service %s)\n"
 
-#: socket.c:197
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) is mislukt\n"
 
-#: socket.c:272
+#: socket.c:265
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "Fout in getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:275
+#: socket.c:268
 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:289 socket.c:292
+#: socket.c:282 socket.c:285
 #, c-format
 msgid "unknown (%s)"
 msgstr "onbekend (%s)"
 
-#: socket.c:295
+#: socket.c:288
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Verbinding maken met %s/%s..."
 
-#: socket.c:304
+#: socket.c:297
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kan geen socket aanmaken: %s\n"
 
-#: socket.c:306
+#: socket.c:299
 #, 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:324
+#: socket.c:317
 msgid "connection failed.\n"
 msgstr "verbinding is mislukt.\n"
 
-#: socket.c:326
+#: socket.c:319
 #, 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:327
+#: socket.c:320
 #, 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:333
+#: socket.c:326
 msgid "connected.\n"
 msgstr "verbonden.\n"
 
-#: socket.c:346
+#: socket.c:339
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3132,263 +2843,153 @@ msgstr ""
 "Verbindingsfouten voor deze polsing:\n"
 "%s"
 
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
+#: socket.c:605
 msgid "Server certificate:\n"
 msgstr "Servercertificaat:\n"
 
-#: socket.c:662
+#: socket.c:610
 #, 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:665
+#: socket.c:613
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Certificeren op diepte %d:\n"
 
-#: socket.c:671
+#: socket.c:619
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Uitgevende organisatie: %s\n"
 
-#: socket.c:674
+#: socket.c:622
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Waarschuwing: naam van uitgevende organisatie is te lang (mogelijk "
-"afgebroken).\n"
+msgstr "Waarschuwing: naam van uitgevende organisatie is te lang (mogelijk afgebroken).\n"
 
-#: socket.c:676
+#: socket.c:624
 msgid "Unknown Organization\n"
 msgstr "Onbekende organisatie\n"
 
-#: socket.c:678
+#: socket.c:626
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Gewone uitgeversnaam: %s\n"
 
-#: socket.c:681
+#: socket.c:629
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Waarschuwing: gewone uitgeversnaam is te lang (mogelijk afgebroken).\n"
 
-#: socket.c:683
+#: socket.c:631
 msgid "Unknown Issuer CommonName\n"
 msgstr "Onbekende gewone uitgeversnaam\n"
 
-#: socket.c:689
+#: socket.c:637
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Onderwerp gewone-naam: %s\n"
 
-#: socket.c:695
+#: socket.c:643
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Ongeldig certificaat: Subject CN is te lang!\n"
 
-#: socket.c:701
+#: socket.c:649
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Ongeldig certificaat: Subject CommonName bevat NUL, afbreken!\n"
 
-#: socket.c:729
+#: socket.c:677
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Subject Alternative Name: %s\n"
 
-#: socket.c:735
+#: socket.c:683
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Ongeldig certificaat: Subject Alternative Name bevat NUL, afbreken!\n"
 
-#: socket.c:752
+#: socket.c:700
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Gewone naam (CN) van server klopt niet: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:707
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernaam is niet ingesteld; kan certificaat niet verifiëren!\n"
 
-#: socket.c:764
+#: socket.c:712
 msgid "Unknown Server CommonName\n"
 msgstr "Onbekende gewone naam (CN) van server\n"
 
-#: socket.c:766
+#: socket.c:714
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernaam is niet opgegeven in certificaat!\n"
 
-#: socket.c:778
+#: socket.c:726
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() is mislukt!\n"
 
-#: socket.c:782
+#: socket.c:730
 msgid "Out of memory!\n"
 msgstr "Onvoldoende geheugen beschikbaar!\n"
 
-#: socket.c:790
+#: socket.c:738
 msgid "Digest text buffer too small!\n"
 msgstr "Tekstbuffer voor controlegetal is te klein!\n"
 
-#: socket.c:796
+#: socket.c:744
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s-sleutel-vingerafdruk: %s\n"
 
-#: socket.c:800
+#: socket.c:748
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s-vingerafdrukken komen overeen.\n"
 
-#: socket.c:802
+#: socket.c:750
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s-vingerafdrukken komen niet overeen!\n"
 
-#: socket.c:814
+#: socket.c:760
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fout bij verificatie van servercertificaat: %s\n"
 
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Fout bij verificatie van servercertificaat: %s\n"
-
-#: socket.c:831
-#, fuzzy
-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 ""
-"Deze fout treedt meestal op als de server een incomplete certificatieketen "
-"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:841
-#, fuzzy, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr "  Vertrouwd-SSL-certificaatbestand: %s\n"
-
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Dit betekent dat het hoofd-ondertekencertificaat (uitgegeven voor %s) niet "
-"in de vertrouwde CA-certificatielocaties voorkomt, of dat c_rehash op de "
-"certificatiemap uitgevoerd moet worden. Meer informatie is te vinden bij de "
-"documentatie van --sslcertpath en --sslcertfile in de manpagina.\n"
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, 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:1081
+#: socket.c:767
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "onbekende uitgever (eerste %d tekens): %s\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 "Deze fout treedt meestal op als de server een incomplete certificatieketen 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:1086
+#: socket.c:777
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
+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 "Dit betekent dat het hoofd-ondertekencertificaat (uitgegeven voor %s) niet in de vertrouwde CA-certificatielocaties voorkomt, of dat c_rehash op de certificatiemap uitgevoerd moet worden. Meer informatie is te vinden bij de documentatie van --sslcertpath en --sslcertfile in de manpagina.\n"
 
-#: socket.c:1106
+#: socket.c:869
 msgid "File descriptor out of range for SSL"
 msgstr "Bestandsdescriptor valt buiten bereik voor SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
+#: socket.c:885
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "Ongeldig SSL-protocol '%s' opgegeven; standaard (SSLv23) wordt gebruikt.\n"
 
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1273
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-
-#: socket.c:1280
+#: socket.c:978
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
-msgstr ""
-"Verificatie van certificaat/vingerafdruk is op een of andere manier "
-"overslagen!\n"
+msgstr "Verificatie van certificaat/vingerafdruk is op een of andere manier overslagen!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Waarschuwing: de verbinding is niet beveiligd, er wordt wel verder gegaan. "
-"(Gebruik bijvoorkeur --sslcertck!)\n"
+#: socket.c:995
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Waarschuwing: de verbinding is niet beveiligd, er wordt wel verder gegaan. (Gebruik bijvoorkeur --sslcertck!)\n"
 
-#: socket.c:1339
+#: socket.c:1037
 msgid "Cygwin socket read retry\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen\n"
 
-#: socket.c:1342
+#: socket.c:1040
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen is mislukt!\n"
 
@@ -3437,173 +3038,147 @@ msgstr "Received-adres gevonden: '%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"onjuiste kopregel gevonden - zie manpagina voor slechte-kopregeloptie\n"
+msgstr "onjuiste kopregel gevonden - zie manpagina voor slechte-kopregeloptie\n"
 
 #: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "regel: %s"
 
-#: transact.c:1087 transact.c:1097
+#: transact.c:1107 transact.c:1117
 #, c-format
 msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
 msgstr "Ontleden van envelop \"%s\"-namen \"%-.*s\"\n"
 
-#: transact.c:1112
+#: transact.c:1132
 #, c-format
 msgid "Parsing Received names \"%-.*s\"\n"
 msgstr "Received-namen \"%-.*s\" ontleden\n"
 
-#: transact.c:1124
+#: transact.c:1144
 msgid "No envelope recipient found, resorting to header guessing.\n"
 msgstr "Geen envelopontvanger gevonden, terugvallen naar gissing van de kop.\n"
 
-#: transact.c:1142
+#: transact.c:1162
 #, c-format
 msgid "Guessing from header \"%-.*s\".\n"
 msgstr "Gissing vanuit kop \"%-.*s\".\n"
 
-#: transact.c:1157
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "geen lokale overeenkomsten; doorsturen naar %s\n"
 
-#: transact.c:1172
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "doorsturen en verwijderen is onderdrukt vanwege DNS-fouten\n"
 
-#: transact.c:1283
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "schrijven van RFC822 msgblk.headers\n"
 
-#: transact.c:1302
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
-msgstr ""
-"geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
+msgstr "geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
 
-#: transact.c:1309
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "ontvangeradres %s komt niet overeen met een lokale naam"
 
-#: transact.c:1318
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr "bericht bevat NUL-tekens"
 
-#: transact.c:1326
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-programma heeft de volgende lokale ontvangers geweigerd: "
 
-#: transact.c:1376
+#: transact.c:1485
 msgid "error writing message text\n"
 msgstr "fout bij schrijven van berichttekst\n"
 
-#: transact.c:1652
+#: transact.c:1633
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-"Buffer is te klein. Dit is een fout in de aanroepende routine van %s:%lu.\n"
-
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: fout bij lezen van vergrendelingsbestand \"%s\": %s\n"
+msgstr "Buffer is te klein. Dit is een fout in de aanroepende routine van %s:%lu.\n"
 
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+#: uid.c:249
+#, c-format
+msgid "Old UID list from %s:"
 msgstr "Oude UID-lijst van %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <leeg>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Kladlijst van UID's:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:325 uid.c:374
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Samengevoegde UID-lijst van %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:328
+#, c-format
+msgid "New UID list from %s:"
 msgstr "Nieuwe UID-lijst van %s:"
 
-#: uid.c:402
+#: uid.c:355
+msgid "swapping UID lists\n"
+msgstr "omwisselen van UID-lijsten\n"
+
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID-lijsten worden niet gewisseld; geen UID's in deze aanvraag\n"
 
-#: uid.c:422
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr "nieuwe UID-lijst wordt weggegooid\n"
 
-#: uid.c:479
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Verwijderen van fetchids-bestand.\n"
 
-#: uid.c:482
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fout bij verwijderen van %s: %s\n"
 
-#: uid.c:489
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Schrijven van fetchids-bestand.\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:439 uid.c:447
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Schrijven van fetchids-bestand %s is mislukt: %s\n"
 
-#: uid.c:524
+#: uid.c:459
 #, 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"
+msgstr "Fout bij schrijven van fetchids-bestand %s; oude bestand is blijven staan.\n"
 
-#: uid.c:528
+#: uid.c:463
 #, 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:532
+#: uid.c:467
 #, 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"
 
-#: xmalloc.c:28
+#: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc() is mislukt\n"
 
-#: xmalloc.c:42
+#: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc() is mislukt\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"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Opgeslagen fout is nog steeds %d\n"
-
-#, c-format
-#~ 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 473dc8ef..a34066fa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-14 19:02+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,8 +18,7 @@ msgstr ""
 "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=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: checkalias.c:174
 #, c-format
@@ -70,15 +69,12 @@ msgstr "Ostrzeżenie fetchmaila o zbyt dużych listach"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Następujące zbyt duże listy zostały usunięte z konta %2$s na serwerze poczty "
-"%1$s:"
+msgstr "Następujące zbyt duże listy zostały usunięte z konta %2$s na serwerze poczty %1$s:"
 
 #: driver.c:353
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"Następujące zbyt duże listy pozostały na koncie %2$s na serwerze poczty %1$s:"
+msgstr "Następujące zbyt duże listy pozostały na koncie %2$s na serwerze poczty %1$s:"
 
 #: driver.c:372
 #, c-format
@@ -141,11 +137,8 @@ msgstr " (%d bajtów treści)"
 
 #: driver.c:770
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"długość listu %s@%s:%d nie odpowiada długości zgłoszonej przez serwer (%d != "
-"%d)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "długość listu %s@%s:%d nie odpowiada długości zgłoszonej przez serwer (%d != %d)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -162,23 +155,15 @@ msgstr " nie został skasowany\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] ""
-"limit pobranych listów %d osiągnięty: %d pozostał na serwerze %s na koncie "
-"%s\n"
-msgstr[1] ""
-"limit pobranych listów %d osiągnięty: %d pozostały na serwerze %s na koncie "
-"%s\n"
-msgstr[2] ""
-"limit pobranych listów %d osiągnięty: %d pozostało na serwerze %s na koncie "
-"%s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limit pobranych listów %d osiągnięty: %d pozostał na serwerze %s na koncie %s\n"
+msgstr[1] "limit pobranych listów %d osiągnięty: %d pozostały na serwerze %s na koncie %s\n"
+msgstr[2] "limit pobranych listów %d osiągnięty: %d pozostało na serwerze %s na koncie %s\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"limit czasu %d sekund przekroczony podczas oczekiwania na połączenie z %s.\n"
+msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na połączenie z %s.\n"
 
 #: driver.c:903
 #, c-format
@@ -206,9 +191,7 @@ msgstr "fetchmail zgłasza wielokrotne przekroczenie czasu oczekiwania"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
 msgstr "Po %d timeoutach fetchmail nie mógł pobrać poczty z %s@%s.\n"
 
 #: driver.c:934
@@ -281,9 +264,7 @@ msgstr " (poprzednio zautoryzowano)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Wskazówki można znaleźć pod http://www.fetchmail.info/fetchmail-FAQ."
-"html#R15\n"
+msgstr "Wskazówki można znaleźć pod http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
 #: driver.c:1202
 #, c-format
@@ -440,8 +421,7 @@ msgstr "błędna liczba listów!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"Z powodu chwilowych błędów pominięto zbyt dużo listów (%d > %d) dla %s\n"
+msgstr "Z powodu chwilowych błędów pominięto zbyt dużo listów (%d > %d) dla %s\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -536,8 +516,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Zmienna środowiskowa QMAILINJECT jest ustawiona.\n"
-"Jest to niebezpieczne, ponieważ może spowodować, że qmail-inject lub "
-"qmailowy\n"
+"Jest to niebezpieczne, ponieważ może spowodować, że qmail-inject lub qmailowy\n"
 "zastępnik sendmaila namiesza z nagłówkami From: lub Message-ID:.\n"
 "Proszę spróbować \"env QMAILINJECT= %s W�ASNE PARAMETRY\"\n"
 "%s: Przerwano.\n"
@@ -547,8 +526,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 ""
@@ -589,8 +567,7 @@ msgstr "Nie można odnaleźć własnej nazwy hosta w bazie danych hosts!\n"
 #: env.c:229
 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 ""
 "Próba kontynuacji z nierozwiązaną nazwą hosta.\n"
@@ -683,8 +660,7 @@ msgid ""
 "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 jest dostarczany BEZ JAKIEJKOLWIEK GWARANCJI. Jest to "
-"oprogramowanie\n"
+"Fetchmail jest dostarczany BEZ JAKIEJKOLWIEK GWARANCJI. Jest to oprogramowanie\n"
 "darmowe i można je rozpowszechniać pod pewnymi warunkami. Szczegóły można\n"
 "znaleźć w pliku COPYING w źródłach lub katalogu z dokumentacją.\n"
 
@@ -710,10 +686,8 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "UWAGA: ta wersja biblioteki SSL/TLS nie obsługuje TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"UWAGA: skompilowano z LibreSSL, co nie jest obsługiwaną konfiguracją.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "UWAGA: skompilowano z LibreSSL, co nie jest obsługiwaną konfiguracją.\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
@@ -739,11 +713,8 @@ msgstr "Plik logu \"%s\" nie można zapisywać, przerwano.\n"
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"Ustawiono jednocześnie opcje syslog i logfile; zignorowano syslog, logowanie "
-"do %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "Ustawiono jednocześnie opcje syslog i logfile; zignorowano syslog, logowanie do %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -770,9 +741,7 @@ msgstr "fetchmail: nie działa żaden inny proces fetchmaila\n"
 #: fetchmail.c:514
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
-msgstr ""
-"fetchmail: wystąpił błąd podczas próby zabicia %s fetchmaila, PID %ld; "
-"przerwano.\n"
+msgstr "fetchmail: wystąpił błąd podczas próby zabicia %s fetchmaila, PID %ld; przerwano.\n"
 
 #: fetchmail.c:515 fetchmail.c:524
 msgid "background"
@@ -788,46 +757,32 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: zabito %s fetchmaila o numerze procesu %ld.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: nie mogę sprawdzić poczty, bo działa inny fetchmail do tego "
-"serwera\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: nie mogę sprawdzić poczty, bo działa inny fetchmail do tego serwera\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: nie mogę połączyć się z podanymi hostami, bo działa inny "
-"fetchmail (proces %ld).\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: nie mogę połączyć się z podanymi hostami, bo działa inny fetchmail (proces %ld).\n"
 
 #: fetchmail.c:559
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
-msgstr ""
-"fetchmail: działa inny fetchmail uruchomiony na terminalu (proces %ld).\n"
+msgstr "fetchmail: działa inny fetchmail uruchomiony na terminalu (proces %ld).\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: nie mogę przyjmować opcji, ponieważ inny fetchmail działa już w "
-"tle.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: nie mogę przyjmować opcji, ponieważ inny fetchmail działa już w tle.\n"
 
 #: fetchmail.c:581
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
-msgstr ""
-"fetchmail: działający w tle fetchmail (proces %ld) został uaktywniony.\n"
+msgstr "fetchmail: działający w tle fetchmail (proces %ld) został uaktywniony.\n"
 
 #: fetchmail.c:593
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: starszy proces %ld zginął w niewyjaśnionych okolicznościach.\n"
+msgstr "fetchmail: starszy proces %ld zginął w niewyjaśnionych okolicznościach.\n"
 
 #: fetchmail.c:608
 #, c-format
@@ -869,8 +824,7 @@ msgstr "restart fetchmaila (zmieniono %s)\n"
 
 #: fetchmail.c:726
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"próba restartu może się nie udać, ponieważ katalog nie został odtworzony\n"
+msgstr "próba restartu może się nie udać, ponieważ katalog nie został odtworzony\n"
 
 #: fetchmail.c:752
 msgid "attempt to re-exec fetchmail failed\n"
@@ -986,12 +940,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Uwaga: host %s występuje wielokrotnie w pliku konfiguracyjnym\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Błąd: wiele rekordów \"defaults\" w pliku konfiguracyjnym lub "
-"\"defaults\" nie jest pierwszym rekordem.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Błąd: wiele rekordów \"defaults\" w pliku konfiguracyjnym lub \"defaults\" nie jest pierwszym rekordem.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -999,13 +949,11 @@ msgstr "obsługa SSL nie została wkompilowana.\n"
 
 #: fetchmail.c:1324
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr ""
-"obsługa KERBEROSA v4 jest skonfigurowana, ale nie została wkompilowana.\n"
+msgstr "obsługa KERBEROSA v4 jest skonfigurowana, ale nie została wkompilowana.\n"
 
 #: fetchmail.c:1330
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr ""
-"obsługa KERBEROSA v5 jest skonfigurowana, ale nie została wkompilowana.\n"
+msgstr "obsługa KERBEROSA v5 jest skonfigurowana, ale nie została wkompilowana.\n"
 
 #: fetchmail.c:1336
 msgid "GSSAPI support is configured, but not compiled in.\n"
@@ -1013,8 +961,7 @@ msgstr "obsługa GSSAPI jest skonfigurowana, ale nie została wkompilowana.\n"
 
 #: fetchmail.c:1366
 #, 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: uwaga: brak serwera DNS potrzebnego do sprawdzenia %s\n"
 
 #: fetchmail.c:1377
@@ -1028,37 +975,26 @@ msgstr "uwaga: Nie proś o pomoc jeśli cała poczta pójdzie do postmastera!\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: konfiguracja dla %s jest błędna - należy podać dodatni numer "
-"portu\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: konfiguracja dla %s jest błędna - należy podać dodatni numer portu\n"
 
 #: fetchmail.c:1402
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: konfiguracja dla %s jest błędna - RPOP wymaga uprzywilejowanego "
-"portu\n"
+msgstr "fetchmail: konfiguracja dla %s jest błędna - RPOP wymaga uprzywilejowanego portu\n"
 
 #: fetchmail.c:1420
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"konfiguracja dla %s jest błędna - LMTP nie używa domyślnego portu SMTP\n"
+msgstr "konfiguracja dla %s jest błędna - LMTP nie używa domyślnego portu SMTP\n"
 
 #: fetchmail.c:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Jednoczesne fetchall i keep w trybie demona lub bezczynności to błąd!\n"
+msgstr "Jednoczesne fetchall i keep w trybie demona lub bezczynności to błąd!\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Błąd: tryb bezczynny nie działa z wieloma skrzynkami lub "
-"kontami!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Błąd: tryb bezczynny nie działa z wieloma skrzynkami lub kontami!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1068,8 +1004,7 @@ msgstr "przerwany sygnałem %d\n"
 #: fetchmail.c:1541
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
-msgstr ""
-"%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie rozpoczęte\n"
+msgstr "%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie rozpoczęte\n"
 
 #: fetchmail.c:1566
 msgid "POP2 support is not configured.\n"
@@ -1098,8 +1033,7 @@ msgstr "Wybrany protokół nie jest obsługiwany przez fetchmaila.\n"
 #: fetchmail.c:1620
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
-msgstr ""
-"%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie zakończone\n"
+msgstr "%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie zakończone\n"
 
 #: fetchmail.c:1645
 #, c-format
@@ -1147,8 +1081,7 @@ msgstr "Fetchmail będzie traktował trwałe błędy jako trwałe (usunie listy)
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail będzie traktował trwałe błędy jako tymczasowe (zachowa listy).\n"
+msgstr "Fetchmail będzie traktował trwałe błędy jako tymczasowe (zachowa listy).\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1175,15 +1108,11 @@ msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
 #: fetchmail.c:1691
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Z tym serwerem nie będę się łączył jeśli nie zostanie podany żaden inny "
-"serwer.\n"
+msgstr "  Z tym serwerem nie będę się łączył jeśli nie zostanie podany żaden inny serwer.\n"
 
 #: fetchmail.c:1692
 msgid "  This host will be queried when no host is specified.\n"
-msgstr ""
-"  Z tym serwerem będę się łączył jeśli nie zostanie podany żaden inny "
-"serwer.\n"
+msgstr "  Z tym serwerem będę się łączył jeśli nie zostanie podany żaden inny serwer.\n"
 
 #: fetchmail.c:1696
 msgid "  Password will be prompted for.\n"
@@ -1341,81 +1270,55 @@ msgstr "  Pobrane listy będą pozostawione na serwerze (--keep włączone).\n"
 
 #: fetchmail.c:1806
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Pobrane listy nie będą pozostawione na serwerze (--keep wyłączone).\n"
+msgstr "  Pobrane listy nie będą pozostawione na serwerze (--keep wyłączone).\n"
 
 #: fetchmail.c:1808
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Stare listy będą kasowane przed pobraniem poczty (--flush włączone).\n"
+msgstr "  Stare listy będą kasowane przed pobraniem poczty (--flush włączone).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Stare listy nie będą kasowane przed pobraniem poczty (--flush wyłączone).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Stare listy nie będą kasowane przed pobraniem poczty (--flush wyłączone).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Zbyt duże listy będą kasowane przed pobraniem poczty (--limitflush "
-"włączone).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Zbyt duże listy będą kasowane przed pobraniem poczty (--limitflush włączone).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Zbyt duże listy nie będą kasowane przed pobraniem poczty (--limitflush "
-"wyłączone).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Zbyt duże listy nie będą kasowane przed pobraniem poczty (--limitflush wyłączone).\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Przepisywanie adresów na postać lokalną jest włączone (--norewrite "
-"wyłączone).\n"
+msgstr "  Przepisywanie adresów na postać lokalną jest włączone (--norewrite wyłączone).\n"
 
 #: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Przepisywanie adresów na postać lokalną jest wyłączone (--norewrite "
-"włączone).\n"
+msgstr "  Przepisywanie adresów na postać lokalną jest wyłączone (--norewrite włączone).\n"
 
 #: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr ""
-"  Usuwanie znaków CR z końców linii jest włączone (stripcr włączone).\n"
+msgstr "  Usuwanie znaków CR z końców linii jest włączone (stripcr włączone).\n"
 
 #: fetchmail.c:1818
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr ""
-"  Usuwanie znaków CR z końców linii jest wyłączone (stripcr wyłączone).\n"
+msgstr "  Usuwanie znaków CR z końców linii jest wyłączone (stripcr wyłączone).\n"
 
 #: fetchmail.c:1820
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
-msgstr ""
-"  Dodawanie znaków CR na końcach linii jest włączone (forcecr włączone).\n"
+msgstr "  Dodawanie znaków CR na końcach linii jest włączone (forcecr włączone).\n"
 
 #: fetchmail.c:1821
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
-msgstr ""
-"  Dodawanie znaków CR na końcach linii jest wyłączone (forcecr wyłączone).\n"
+msgstr "  Dodawanie znaków CR na końcach linii jest wyłączone (forcecr wyłączone).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretowanie nagłówka Content-Transfer-Encoding jest wyłączone "
-"(pass8bits włączone).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretowanie nagłówka Content-Transfer-Encoding jest wyłączone (pass8bits włączone).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretowanie nagłówka Content-Transfer-Encoding jest włączone "
-"(pass8bits wyłączone).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretowanie nagłówka Content-Transfer-Encoding jest włączone (pass8bits wyłączone).\n"
 
 #: fetchmail.c:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
@@ -1461,15 +1364,11 @@ msgstr "  Limit wielkości listu nie jest ustawiony (--limit 0).\n"
 #: fetchmail.c:1845
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Ostrzeżenia o wielkości listu będą wyświetlane co %d sekund (--warnings "
-"%d).\n"
+msgstr "  Ostrzeżenia o wielkości listu będą wyświetlane co %d sekund (--warnings %d).\n"
 
 #: fetchmail.c:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-"  Ostrzeżenia o wielkości będą wyświetlane przy każdym łączeniu (--warnings "
-"0).\n"
+msgstr "  Ostrzeżenia o wielkości będą wyświetlane przy każdym łączeniu (--warnings 0).\n"
 
 #: fetchmail.c:1851
 #, c-format
@@ -1478,8 +1377,7 @@ msgstr "  Limit liczby otrzymanych listów wynosi %d (--fetchlimit %d).\n"
 
 #: fetchmail.c:1854
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr ""
-"  Limit liczby otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
+msgstr "  Limit liczby otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
 
 #: fetchmail.c:1856
 #, c-format
@@ -1492,19 +1390,16 @@ msgstr "  Limit wielkości listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
 #: fetchmail.c:1863
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Binarne przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 1).\n"
+msgstr "  Binarne przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 1).\n"
 
 #: fetchmail.c:1865
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Binarne przeszukiwanie UID-ów przy %d z %d ściągań (--fastuidl %d).\n"
+msgstr "  Binarne przeszukiwanie UID-ów przy %d z %d ściągań (--fastuidl %d).\n"
 
 #: fetchmail.c:1868
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Liniowe przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 0).\n"
+msgstr "   Liniowe przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 0).\n"
 
 #: fetchmail.c:1870
 #, c-format
@@ -1513,8 +1408,7 @@ msgstr "  Listy będą wysyłane przez SMTP w grupach po %d.\n"
 
 #: fetchmail.c:1872
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr ""
-"  Limit ilości listów wysyłanych przez SMTP nie ustawiony (--batchlimit 0).\n"
+msgstr "  Limit ilości listów wysyłanych przez SMTP nie ustawiony (--batchlimit 0).\n"
 
 #: fetchmail.c:1876
 #, c-format
@@ -1556,8 +1450,7 @@ msgstr "  Nazwa hosta w MAIL FROM jest ustawiona na %s\n"
 #: fetchmail.c:1918
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP będzie %s\n"
+msgstr "  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP będzie %s\n"
 
 #: fetchmail.c:1927
 msgid "  Recognized listener spam block responses are:"
@@ -1583,8 +1476,7 @@ msgstr "  Połączenie z serwerem zostanie zamknięte przy pomocy \"%s\".\n"
 
 #: fetchmail.c:1944
 msgid "  No post-connection command.\n"
-msgstr ""
-"  Po zamknięciu połączenia nie będzie wykonywane żadne dodatkowe polecenie.\n"
+msgstr "  Po zamknięciu połączenia nie będzie wykonywane żadne dodatkowe polecenie.\n"
 
 #: fetchmail.c:1947
 msgid "  No localnames declared for this host.\n"
@@ -1615,8 +1507,7 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest wyłączone.\n"
 
 #: fetchmail.c:1981
-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 "  Aliasy serwera będą porównywane z adresami skrzynek po adresie IP.\n"
 
 #: fetchmail.c:1983
@@ -1675,8 +1566,7 @@ msgstr "  Żaden interfejs nie będzie monitorowany.\n"
 #: fetchmail.c:2031
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Połączenia z serwerem będą nawiązywane przez wtyczkę %s (--plugin %s).\n"
+msgstr "  Połączenia z serwerem będą nawiązywane przez wtyczkę %s (--plugin %s).\n"
 
 #: fetchmail.c:2033
 msgid "  No plugin command specified.\n"
@@ -1685,9 +1575,7 @@ msgstr "  Nie jest skonfigurowane żadne polecenie nawiązujące połączenie\n"
 #: fetchmail.c:2035
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Połączenie z serwerem odbiorcy zostanie nawiązane programem %s (--plugout "
-"%s).\n"
+msgstr "  Połączenie z serwerem odbiorcy zostanie nawiązane programem %s (--plugout %s).\n"
 
 #: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
@@ -1704,13 +1592,11 @@ msgstr "  Zachowano %d UID-ów.\n"
 
 #: fetchmail.c:2053
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Informacje o śledzeniu połączenia będą dodane do nagłówka Received.\n"
+msgstr "  Informacje o śledzeniu połączenia będą dodane do nagłówka Received.\n"
 
 #: fetchmail.c:2055
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Informacje o śledzeniu połączenia nie będą dodane do nagłówka Received.\n"
+msgstr "  Informacje o śledzeniu połączenia nie będą dodane do nagłówka Received.\n"
 
 #: fetchmail.c:2060
 msgid "  Messages with bad headers will be rejected.\n"
@@ -1731,12 +1617,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Nie można zmodyfikować maski sygnałów: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"System operacyjny nie definiuje PATH_MAX, ani nie przyjmuje realpath(f, "
-"NULL). Przerwano.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "System operacyjny nie definiuje PATH_MAX, ani nie przyjmuje realpath(f, NULL). Przerwano.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1772,16 +1654,11 @@ msgstr "Używam nazwy usługi [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Nie znaleziono odpowiednich danych uwierzytelniających GSSAPI. Pominięto "
-"uwierzytelnienie GSSAPI.\n"
+msgstr "Nie znaleziono odpowiednich danych uwierzytelniających GSSAPI. Pominięto uwierzytelnienie GSSAPI.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Aby użyć GSSAPI, potrzebne są dane uwierzytelniające - prawdopodobnie z "
-"kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Aby użyć GSSAPI, potrzebne są dane uwierzytelniające - prawdopodobnie z kinit.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1829,9 +1706,7 @@ msgstr "Wystąpił błąd podczas budowania zapytania o poziom bezpieczeństwa\n
 #: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-"Wartość GSSAPI send_token zbyt duża (%lu) podczas wysyłania nazwy "
-"użytkownika.\n"
+msgstr "Wartość GSSAPI send_token zbyt duża (%lu) podczas wysyłania nazwy użytkownika.\n"
 
 #: gssapi.c:298
 msgid "Releasing GSS credentials\n"
@@ -1966,11 +1841,8 @@ msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nieprzeczytanym\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Uwaga: zignorowano nieprawdziwe dane o rozmiarze wiadomości zwrócone przez "
-"serwer.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Uwaga: zignorowano nieprawdziwe dane o rozmiarze wiadomości zwrócone przez serwer.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1979,8 +1851,7 @@ msgstr "Niepoprawna odpowiedź na FETCH: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Nie można otworzyć interfejsu kvm. Być może fetchmail nie jest SGID kmem."
+msgstr "Nie można otworzyć interfejsu kvm. Być może fetchmail nie jest SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2093,9 +1964,7 @@ msgstr "fetchmail: usuwam nieważny plik blokady \"%s\"\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: nie można usunąć pliku blokady \"%s\" (%s), próba zapisu do "
-"niego\n"
+msgstr "fetchmail: nie można usunąć pliku blokady \"%s\" (%s), próba zapisu do niego\n"
 
 #: lock.c:116
 #, c-format
@@ -2252,8 +2121,7 @@ msgstr "  -V, --version     wyświetlenie informacji o wersji\n"
 
 #: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
-msgstr ""
-"  -c, --check       sprawdzenie istnienia nowych listów bez ich pobierania\n"
+msgstr "  -c, --check       sprawdzenie istnienia nowych listów bez ich pobierania\n"
 
 #: options.c:647
 msgid "  -s, --silent      work silently\n"
@@ -2280,12 +2148,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     podanie nazwy pliku logu\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      zapis większości komunikatów przez syslog(3) w trybie "
-"demona\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      zapis większości komunikatów przez syslog(3) w trybie demona\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2313,23 +2177,15 @@ msgstr "      --postmaster  adres, na który będą wysyłane błędne listy\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    przekierowanie odbitej poczty użytkowników do "
-"postmastera.\n"
+msgstr "      --nobounce    przekierowanie odbitej poczty użytkowników do postmastera.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce usuwanie listów trwale niemożliwych do dostarczenia.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce usuwanie listów trwale niemożliwych do dostarczenia.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  zachowywanie listów trwale niemożliwych do dostarczenia "
-"(domyślne).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  zachowywanie listów trwale niemożliwych do dostarczenia (domyślne).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2353,14 +2209,11 @@ msgstr "      --sslcert     certyfikat klienta SSL\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   dokładne sprawdzanie certyfikatu serwera (zalecane)\n"
+msgstr "      --sslcertck   dokładne sprawdzanie certyfikatu serwera (zalecane)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck pominięcie dokładnego sprawdzania certyfikatu serwera "
-"(niebezpieczne)\n"
+msgstr "      --nosslcertck pominięcie dokładnego sprawdzania certyfikatu serwera (niebezpieczne)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
@@ -2368,23 +2221,15 @@ msgstr "      --sslcertfile ścieżka do pliku certyfikatów SSL zaufanych CA\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath ścieżka do katalogów certyfikatów SSL zaufanych CA\n"
+msgstr "      --sslcertpath ścieżka do katalogów certyfikatów SSL zaufanych CA\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  oczekiwanie od serwera danego CommonName "
-"(niezalecane)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  oczekiwanie od serwera danego CommonName (niezalecane)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint odcisk, który musi pasować do odcisku certyfikatu "
-"serwera\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint odcisk, który musi pasować do odcisku certyfikatu serwera\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2392,15 +2237,11 @@ msgstr "      --sslproto    wymuszenie protokołu SSL (p. podręcznik)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      ścieżka do zewnętrznego polecenia otwierającego "
-"połączenie\n"
+msgstr "      --plugin      ścieżka do zewnętrznego polecenia otwierającego połączenie\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     ścieżka do zewn. polecenia otwierającego połączenie "
-"SMTP\n"
+msgstr "      --plugout     ścieżka do zewn. polecenia otwierającego połączenie SMTP\n"
 
 #: options.c:681
 msgid ""
@@ -2408,38 +2249,27 @@ msgid ""
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    określenie polityki obsługi listów z błędnymi "
-"nagłówkami\n"
+"                    określenie polityki obsługi listów z błędnymi nagłówkami\n"
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]  określenie protokołu pobierania listów (p. strona "
-"podręcznika)\n"
+msgstr "  -p, --proto[col]  określenie protokołu pobierania listów (p. strona podręcznika)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        wymuszenie używania UIDL-i (tylko POP3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        poinformowanie serwera IMAP o wysłaniu powiadomienia o "
-"nowych listach\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        poinformowanie serwera IMAP o wysłaniu powiadomienia o nowych listach\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        łączenie z portem TCP (przestarzałe, należy używać --"
-"service)\n"
+msgstr "      --port        łączenie z portem TCP (przestarzałe, należy używać --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     łączenie z podaną usługą TCP (może być numerem portu "
-"TCP)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     łączenie z podaną usługą TCP (może być numerem portu TCP)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2455,9 +2285,7 @@ msgstr "  -E, --envelope    nazwa nagłówka zawierającego adres z koperty\n"
 
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual    przedrostek, który będzie usuwany z nazwy użytkownika "
-"lokalnego\n"
+msgstr "  -Q, --qvirtual    przedrostek, który będzie usuwany z nazwy użytkownika lokalnego\n"
 
 #: options.c:693
 msgid "      --principal   mail service principal\n"
@@ -2465,9 +2293,7 @@ msgstr "      --principal   zarządca usługi pocztowej\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  dodanie informacji o śledzeniu połączenia do nagłówka "
-"Received\n"
+msgstr "      --tracepolls  dodanie informacji o śledzeniu połączenia do nagłówka Received\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
@@ -2483,8 +2309,7 @@ msgstr "  -K, --nokeep      usunięcie nowych listów po pobraniu\n"
 
 #: options.c:699
 msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr ""
-"  -k, --keep        pozostawienie nowych listów na serwerze po pobraniu\n"
+msgstr "  -k, --keep        pozostawienie nowych listów na serwerze po pobraniu\n"
 
 #: options.c:700
 msgid "  -F, --flush       delete old messages from server\n"
@@ -2500,8 +2325,7 @@ msgstr "  -n, --norewrite   bez przepisywania adresów w nagłówkach\n"
 
 #: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       bez pobierania listów większych niż podany rozmiar\n"
+msgstr "  -l, --limit       bez pobierania listów większych niż podany rozmiar\n"
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
@@ -2525,8 +2349,7 @@ msgstr "      --smtpname    ustawienie pełnej nazwy SMTP username@domain\n"
 
 #: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr ""
-"  -Z, --antispam    ustawienie wartości odpowiedzi blokad antyspamowych\n"
+msgstr "  -Z, --antispam    ustawienie wartości odpowiedzi blokad antyspamowych\n"
 
 #: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
@@ -2546,8 +2369,7 @@ msgstr "      --fastuidl    wykonanie binarnego poszukiwania UIDL-i\n"
 
 #: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     liczba skasowanych listów między czyszczeniem skrzynki\n"
+msgstr "  -e, --expunge     liczba skasowanych listów między czyszczeniem skrzynki\n"
 
 #: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2578,11 +2400,8 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 obsługuje tylko uwierzytelnienie hasłem. Poddaję się.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Uwaga: Odkryto serwer \"Maillennium POP3\", użycie polecenia RETR zamiast "
-"TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Uwaga: Odkryto serwer \"Maillennium POP3\", użycie polecenia RETR zamiast TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2604,8 +2423,7 @@ msgstr "%s: UWAGA: serwer oferował STLS, ale podano sslproto ''.\n"
 
 #: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Wyczerpano dozwolone sposoby uwierzytelnienia, nie można kontynuować.\n"
+msgstr "Wyczerpano dozwolone sposoby uwierzytelnienia, nie można kontynuować.\n"
 
 #: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2642,8 +2460,7 @@ msgstr "id=%s (num=%u) został skasowany, ale nadal istnieje!\n"
 
 #: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"Przesyłki zostały dodane do listy na serwerze. Nie mogę tego obsłużyć.\n"
+msgstr "Przesyłki zostały dodane do listy na serwerze. Nie mogę tego obsłużyć.\n"
 
 #: pop3.c:1032
 msgid "protocol error\n"
@@ -2671,20 +2488,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS nie włączone."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: opcja interface jest obsługiwana tylko pod Linuksem (bez IPv6) i "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: opcja interface jest obsługiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: opcja monitor jest obsługiwana tylko pod Linuksem (bez IPv6) i "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: opcja monitor jest obsługiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2982,8 +2791,7 @@ msgstr "Opcja MDA zawiera rozwinięcie %%%c cytowane znakiem \"'\".\n"
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-"Odmowa dostarczenia. Proszę zajrzeć do podręcznika i naprawić opcję mda.\n"
+msgstr "Odmowa dostarczenia. Proszę zajrzeć do podręcznika i naprawić opcję mda.\n"
 
 #: sink.c:1211
 #, c-format
@@ -2998,9 +2806,7 @@ msgstr "Nie można zmienić efektywnego identyfikatora użytkownika na %ld: %s\n
 #: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-"Nie można zmienić efektywnego identyfikatora użytkownika z powrotem na %ld: "
-"%s\n"
+msgstr "Nie można zmienić efektywnego identyfikatora użytkownika z powrotem na %ld: %s\n"
 
 #: sink.c:1241
 msgid "MDA open failed\n"
@@ -3039,10 +2845,8 @@ msgstr "MDA zwrócił niezerowy kod błędu %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Dziwne: MDA pclose zwróciło %d a errno %d/%s, nie można obsłużyć w %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Dziwne: MDA pclose zwróciło %d a errno %d/%s, nie można obsłużyć w %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3180,9 +2984,7 @@ msgstr "OpenSSL zgłosił: %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"Głębokość wywołania wstecznego weryfikacji SSL %d: preverify_ok == %d, err = "
-"%d, %s\n"
+msgstr "Głębokość wywołania wstecznego weryfikacji SSL %d: preverify_ok == %d, err = %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3191,8 +2993,7 @@ msgstr "Certyfikat serwera:\n"
 #: socket.c:662
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-"�ańcuch certyfikatów od korzenia do serwera, począwszy od głębokości %d:\n"
+msgstr "�ańcuch certyfikatów od korzenia do serwera, począwszy od głębokości %d:\n"
 
 #: socket.c:665
 #, c-format
@@ -3245,8 +3046,7 @@ msgstr "Alternatywna nazwa podmiotu: %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Błędny certyfikat: alternatywna nazwa podmiotu zawiera NUL, przerwano!\n"
+msgstr "Błędny certyfikat: alternatywna nazwa podmiotu zawiera NUL, przerwano!\n"
 
 #: socket.c:752
 #, c-format
@@ -3303,15 +3103,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Przerwany łańcuch certyfikatów przy: %s\n"
 
 #: socket.c:831
-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 ""
-"Może to oznaczać, że serwer nie zapewnia certyfikatów CA pośrednich, z czym "
-"fetchmail nie jest w stanie nic zrobić. Szczegółowe informacje można znaleźć "
-"w dokumencie README.SSL-SERVER dostarczonym z fetchmailem.\n"
+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 "Może to oznaczać, że serwer nie zapewnia certyfikatów CA pośrednich, z czym fetchmail nie jest w stanie nic zrobić. Szczegółowe informacje można znaleźć w dokumencie README.SSL-SERVER dostarczonym z fetchmailem.\n"
 
 #: socket.c:841
 #, c-format
@@ -3319,17 +3112,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Brak certyfikatu poczÄ…tkowego zaufania: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Może to oznaczać, że certyfikat podpisujący początkowego CA nie znajduje się "
-"w zbiorze zaufanych certyfikatów CA, albo w katalogu certyfikatów trzeba "
-"uruchomić c_rehash. Szczegółowe informacje można znaleźć na stronie "
-"podręcznika dla opcji --sslcertpath i --sslcertfile oraz w pliku README."
-"SSL.\n"
+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. See README.SSL for details.\n"
+msgstr "Może to oznaczać, że certyfikat podpisujący początkowego CA nie znajduje się w zbiorze zaufanych certyfikatów CA, albo w katalogu certyfikatów trzeba uruchomić c_rehash. Szczegółowe informacje można znaleźć na stronie podręcznika dla opcji --sslcertpath i --sslcertfile oraz w pliku README.SSL.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3350,55 +3134,35 @@ msgstr "Ta wersja OpenSSL nie obsługuje TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Podano błędny protokół SSL '%s', użycie domyślnego automatycznego wyboru "
-"(auto).\n"
+msgstr "Podano błędny protokół SSL '%s', użycie domyślnego automatycznego wyboru (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Załadowana biblioteka OpenSSL %#lx starsza niż nagłówki %#lx, odmowa "
-"działania.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Załadowana biblioteka OpenSSL %#lx starsza niż nagłówki %#lx, odmowa działania.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Załadowana biblioteka OpenSSL %#lx nowsza niż nagłówki %#lx, próba "
-"kontynuacji.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Załadowana biblioteka OpenSSL %#lx nowsza niż nagłówki %#lx, próba kontynuacji.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Deskryptor pliku poza zakresem dla SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Uwaga: niektóre dystrybucje wyłączają starsze wersje protokołów w "
-"niestandardowy sposób. Próba nowszej wersji protokołu.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Uwaga: niektóre dystrybucje wyłączają starsze wersje protokołów w niestandardowy sposób. Próba nowszej wersji protokołu.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Uwaga: SSL_set_tlsext_host_name(%p, \"%s\") nie powiodło się (kod %#lx), "
-"próba kontynuacji.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Uwaga: SSL_set_tlsext_host_name(%p, \"%s\") nie powiodło się (kod %#lx), próba kontynuacji.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Uwaga: X509_VERIFY_PARAM_set1_host(%p, \"%s\") nie powiodło się (kod %#x), "
-"próba kontynuacji.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Uwaga: X509_VERIFY_PARAM_set1_host(%p, \"%s\") nie powiodło się (kod %#x), próba kontynuacji.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3420,20 +3184,15 @@ msgstr "Nie można utrzymać obecnego szyfru SSL/TLS - nie nawiązano sesji?\n"
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: użycie protokołu %s, szyfr %s, %d/%d bitów tajnych/przetworzonych\n"
+msgstr "SSL/TLS: użycie protokołu %s, szyfr %s, %d/%d bitów tajnych/przetworzonych\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiegoś powodu pominięta!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Uwaga: połączenie nie jest bezpieczne, kontynuacja mimo to (lepiej używać --"
-"sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Uwaga: połączenie nie jest bezpieczne, kontynuacja mimo to (lepiej używać --sslcertck!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3488,9 +3247,7 @@ msgstr "znalazłem adres Received `%s'\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"znaleziono błędną linię nagłówka - szczegóły na stronie man w opisie opcji "
-"bad-header\n"
+msgstr "znaleziono błędną linię nagłówka - szczegóły na stronie man w opisie opcji bad-header\n"
 
 #: transact.c:615
 #, c-format
@@ -3613,8 +3370,7 @@ msgstr "BÅ‚Ä…d zapisu pliku fetchids %s: %s\n"
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"BÅ‚Ä…d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
+msgstr "BÅ‚Ä…d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
 
 #: uid.c:528
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 80e09a41..c755a2b5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.5-rc2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-05-04 12:30+0200\n"
 "PO-Revision-Date: 2020-07-04 13:39+0300\n"
 "Last-Translator: Florentina Mușat <florentina.musat.28@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "Language: ro\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=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n"
-"%100<=19) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n%100<=19) ? 1 : 2);\n"
 "X-Generator: Poedit 2.3.1\n"
 
 #: checkalias.c:174
@@ -36,16 +35,12 @@ msgstr "Nu, adresele lor IP nu se potrivesc\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"eșec la serverul de nume în timpul căutării pentru „%s� în timpul sondării a "
-"%s: %s\n"
+msgstr "eșec la serverul de nume în timpul căutării pentru „%s� în timpul sondării a %s: %s\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"eșec la serverul de nume în timpul căutării după „%s� în timpul sondării a "
-"%s.\n"
+msgstr "eșec la serverul de nume în timpul căutării după „%s� în timpul sondării a %s.\n"
 
 #: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
@@ -73,9 +68,7 @@ msgstr "Avertisment de mesaje supradimensionate fetchmail"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Următoarele mesaje supradimensionate au fost șterse de pe serverul %s contul "
-"%s:"
+msgstr "Următoarele mesaje supradimensionate au fost șterse de pe serverul %s contul %s:"
 
 #: driver.c:353
 #, c-format
@@ -143,10 +136,8 @@ msgstr " (%d octeți de corp)"
 
 #: driver.c:770
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"mesajul %s@%s:%d nu a fost de lungimea așteptată (%d actual != %d așteptat)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "mesajul %s@%s:%d nu a fost de lungimea așteptată (%d actual != %d așteptat)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -163,20 +154,15 @@ msgstr " negolit\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] ""
-"limita de aducere %d ajunsă; %d mesaj rămas pe serverul %s contul %s\n"
-msgstr[1] ""
-"limita de aducere %d ajunsă; %d mesaje rămase pe serverul %s contul %s\n"
-msgstr[2] ""
-"limita de aducere %d ajunsă; %d de mesaje rămase pe serverul %s contul %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limita de aducere %d ajunsă; %d mesaj rămas pe serverul %s contul %s\n"
+msgstr[1] "limita de aducere %d ajunsă; %d mesaje rămase pe serverul %s contul %s\n"
+msgstr[2] "limita de aducere %d ajunsă; %d de mesaje rămase pe serverul %s contul %s\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"limită de timp după %d secunde așteptând să se conecteze la serverul %s.\n"
+msgstr "limită de timp după %d secunde așteptând să se conecteze la serverul %s.\n"
 
 #: driver.c:903
 #, c-format
@@ -191,9 +177,7 @@ msgstr "limită de timp după %d secunde așteptând pentru %s.\n"
 #: driver.c:912
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"limită de timp după %d secunde așteptând pentru ca ascultătorul să "
-"răspundă.\n"
+msgstr "limită de timp după %d secunde așteptând pentru ca ascultătorul să răspundă.\n"
 
 #: driver.c:915
 #, c-format
@@ -206,12 +190,8 @@ msgstr "fetchmail vede limitele de timp repetate"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail a văzut mai multe de %d limite de timp în timp ce încerca să "
-"obțină mail de la %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail a văzut mai multe de %d limite de timp în timp ce încerca să obțină mail de la %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -227,8 +207,7 @@ msgstr ""
 "coruptă de o eroare de server.  Puteți rula „fetchmail -v -v� pentru a\n"
 "diagnostica problema.\n"
 "\n"
-"Fetchmail nu va sonda această cutie de mail din nou până ce nu îl "
-"reporniți.\n"
+"Fetchmail nu va sonda această cutie de mail din nou până ce nu îl reporniți.\n"
 
 #: driver.c:960
 #, c-format
@@ -284,8 +263,7 @@ msgstr " (autorizat anterior)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"Pentru ajutor, consultați http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "Pentru ajutor, consultați http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
 #: driver.c:1202
 #, c-format
@@ -308,8 +286,7 @@ msgstr ""
 "Încercarea de a obține autorizare a eșuat.\n"
 "De vreme ce am reușit deja în obținerea autorizării pentru această\n"
 "conexiune, este probabil un alt mod de eșuare (precum un server ocupat)\n"
-"pe care fetchmail nu îl poate distinge pentru că serverul nu a trimis un "
-"mesaj\n"
+"pe care fetchmail nu îl poate distinge pentru că serverul nu a trimis un mesaj\n"
 "de eroare util."
 
 #: driver.c:1216
@@ -325,13 +302,11 @@ msgid ""
 msgstr ""
 "\n"
 "În orice caz, dacă AȚI schimbat detaliile contului de la pornirea\n"
-"serviciului fetchmail, trebuie să opriți serviciul, să modificați "
-"configurarea\n"
+"serviciului fetchmail, trebuie să opriți serviciul, să modificați configurarea\n"
 "lui fetchmail, și apoi să reporniți serviciul.\n"
 "\n"
 "Serviciul fetchmail va continua să ruleze și să încerce să se conecteze\n"
-"la fiecare ciclu.  Nu se vor trimite înștiințări viitoare până când "
-"serviciul\n"
+"la fiecare ciclu.  Nu se vor trimite înștiințări viitoare până când serviciul\n"
 "este restaurat."
 
 #: driver.c:1226
@@ -346,14 +321,12 @@ msgid ""
 "is restored."
 msgstr ""
 "Încercarea de a obține autorizare a eșuat.\n"
-"Acest lucru probabil înseamnă că parola nu este validă, dar unele servere "
-"au\n"
+"Acest lucru probabil înseamnă că parola nu este validă, dar unele servere au\n"
 "alte moduri de eșuare pe care fetchmail nu le poate distinge de acesta\n"
 "pentru că ele nu trimit mesaje de eroare utile la eșecul de autentificare.\n"
 "\n"
 "Serviciul fetchmail va continua să ruleze și să încerce să se conecteze\n"
-"la fiecare ciclu.  Nu se vor trimite înștiințări viitoare până când "
-"serviciul\n"
+"la fiecare ciclu.  Nu se vor trimite înștiințări viitoare până când serviciul\n"
 "este restaurat."
 
 #: driver.c:1242
@@ -449,8 +422,7 @@ msgstr "număr de mesaje fals!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"Prea multe mailuri omise (%d > %d) din cauza erorilor tranzitorii pentru %s\n"
+msgstr "Prea multe mailuri omise (%d > %d) din cauza erorilor tranzitorii pentru %s\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -491,8 +463,7 @@ msgstr "nedefinit"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"eroare %s în timpul aducerii de la %s@%s și livrării la gazda SMTP %s\n"
+msgstr "eroare %s în timpul aducerii de la %s@%s și livrării la gazda SMTP %s\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -546,8 +517,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Variabila de mediu QMAILINJECT este stabilită.\n"
-"Acest lucru este periculos pentru că poate face wrapperul lui qmail-inject "
-"sau al lui qmail\n"
+"Acest lucru este periculos pentru că poate face wrapperul lui qmail-inject sau al lui qmail\n"
 "să manipuleze antetele De la: sau ID-mesaj:.\n"
 "Încercați „env QMAILINJECT= %s ARGUMENTELE AICI�\n"
 "%s: Renunțați.\n"
@@ -557,15 +527,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: Variabila de mediu NULLMAILER_FLAGS este stabilită.\n"
 "Acest lucru este periculod pentru că poate face wrapperul sendmail lui\n"
-"nullmailer-inject sau al lui nullmailer să manipuleze antetele De la:, ID-"
-"mesaj: sau Cale-ÃŽntoarcere:.\n"
+"nullmailer-inject sau al lui nullmailer să manipuleze antetele De la:, ID-mesaj: sau Cale-Întoarcere:.\n"
 "Încercați „env NULLMAILER_FLAGS= %s ARGUMENTELE AICI�\n"
 "%s: Renunțați.\n"
 
@@ -576,14 +544,11 @@ msgstr "%s: Nu existați.  Plecați.\n"
 
 #: env.c:143
 msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-"Nu se poate găsi calea absolută pentru directorul personal al "
-"utilizatorului.\n"
+msgstr "Nu se poate găsi calea absolută pentru directorul personal al utilizatorului.\n"
 
 #: env.c:167
 msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-"Nu se poate găsi calea absolută pentru directorul personal al fetchmail.\n"
+msgstr "Nu se poate găsi calea absolută pentru directorul personal al fetchmail.\n"
 
 #: env.c:200
 #, c-format
@@ -597,20 +562,16 @@ msgstr "getaddrinfo a eșuat pentru %s\n"
 
 #: env.c:225
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Nu se poate găsit propria gazdă în baza de date de gazde pentru a o "
-"califica!\n"
+msgstr "Nu se poate găsit propria gazdă în baza de date de gazde pentru a o califica!\n"
 
 #: env.c:229
 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 ""
 "Se încearcă să se continue cu un nume de gazdă necalificat.\n"
-"NU raportați antetele Primit: nevalide, liniile HELO/EHLO sau problemele "
-"similare!\n"
+"NU raportați antetele Primit: nevalide, liniile HELO/EHLO sau problemele similare!\n"
 "REPARAȚI, în schimb, /etc/hosts, DNS, NIS sau LDAP.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -698,8 +659,7 @@ msgid ""
 "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 vine cu ABSOLUT NICIO GARANȚIE. Acesta este software liber, și "
-"sunteți\n"
+"Fetchmail vine cu ABSOLUT NICIO GARANȚIE. Acesta este software liber, și sunteți\n"
 "binevenit să îl redistribuiți sub anumite condiții. Pentru detalii,\n"
 "consultați fișierul COPYING în directorul sursă sau documentație.\n"
 
@@ -725,893 +685,812 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "AVERTISMENT: Biblioteca SSL/TLS nu suportă TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"AVERTISMENT: Compilat împotriva LibreSSL, care nu este o configurare "
-"suportată.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "AVERTISMENT: Compilat împotriva LibreSSL, care nu este o configurare suportată.\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
 msgstr "AVERTISMENT: Compilat fără SSL/TLS.\n"
 
-#: fetchmail.c:340
+#: fetchmail.c:339
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Opțiunea nodetach este în efect, se ignoră opțiunea logfile.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:346
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Nu se rulează în modul daemon, se ignoră opțiune logfile.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:353
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "Fișierul de înregistrare „%s� nu există, se ignoră opțiunea logfile.\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:359
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Fișierul de înregistrare „%s� nu este inscriptibil, se renunță.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:377
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"opțiunile syslog și logfile sunt amândouă stabilite, se ignoră syslog, și se "
-"înregistrează la %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "opțiunile syslog și logfile sunt amândouă stabilite, se ignoră syslog, și se înregistrează la %s"
 
-#: fetchmail.c:469
+#: fetchmail.c:468
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Se preiau opțiunile de la linia de comandă%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:469
 msgid " and "
 msgstr " și "
 
-#: fetchmail.c:475
+#: fetchmail.c:474
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nu există serverele de mail stabilite -- poate că %s lipsește?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:495
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nu au fost specificate servere de mail.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:507
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nu rulează niciun alt fetchmail\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: eroare la omorârea lui %s fetchmail la %ld; se salvează.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:514 fetchmail.c:523
 msgid "background"
 msgstr "fundal"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:514 fetchmail.c:523
 msgid "foreground"
 msgstr "prim plan"
 
-#: fetchmail.c:523
+#: fetchmail.c:522
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail la %ld terminat.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: nu se poate verifica mailul în timp ce rulează alt fetchmail la "
-"aceeași gazdă.\n"
+#: fetchmail.c:545
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: nu se poate verifica mailul în timp ce rulează alt fetchmail la aceeași gazdă.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:551
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: nu se pot sonda gazdele specificate cu alt fetchmail care rulează "
-"la %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: nu se pot sonda gazdele specificate cu alt fetchmail care rulează la %ld.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:558
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: alt fetchmail de prim plan rulează la %ld.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: nu se pot accepta opțiunile în timp ce fetchmailul de fundal "
-"rulează.\n"
+#: fetchmail.c:568
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: nu se pot accepta opțiunile în timp ce fetchmailul de fundal rulează.\n"
 
-#: fetchmail.c:581
+#: fetchmail.c:580
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: fetchmailul de fundal la %ld s-a trezit.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:592
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: fratele mai mare la %ld a murit misterios.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:607
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nu se poate găsi o parolă pentru %s@%s.\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:611
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduce parola pentru %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:653
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Nu se poate detașa în fundal. Se renunță.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:657
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "se pornește serviciul %s fetchmail\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:673 fetchmail.c:675
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "nu s-a putut deschide %s pentru a adăuga înregistrările la\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:694
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "modul --check este activat, nu se aduce mail\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:716
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nu s-a putut verifica timpul %s (eroarea %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:721
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "se repornește fetchmail (s-a modificat %s)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:725
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"încercarea de a re-executa poate eșua pentru că directorul nu a fost "
-"restaurat\n"
+msgstr "încercarea de a re-executa poate eșua pentru că directorul nu a fost restaurat\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:751
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "încercarea de a re-executa fetchmail a eșuat\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:781
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"sondarea a %s omisă (a eșuat autentificarea sau au fost prea multe limite de "
-"timp)\n"
+msgstr "sondarea a %s omisă (a eșuat autentificarea sau au fost prea multe limite de timp)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:793
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalul nu este atins, nu se interoghează %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:831
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stare interogare=0 (SUCCES)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:833
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stare interogare=1 (FÄ‚RÄ‚ MAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:835
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stare interogare=2 (SOCLU)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:837
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stare interogare=3 (EȘEC DE AUTENTIFICARE)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:839
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stare interogare=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:841
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stare interogare=5 (SINTAXÄ‚)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:843
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stare interogare=6 (EROARE IO)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:845
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stare interogare=7 (EROARE)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:847
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stare interogare=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:849
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stare interogare=9 (BLOCARE OCUPATÄ‚)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:851
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stare interogare=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:853
 msgid "Query status=11 (DNS)\n"
 msgstr "Stare interogare=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:855
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stare interogare=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:857
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stare interogare=13 (ADUCERE MAXIMÄ‚)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:859
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stare interogare=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:901
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Toate conexiunile sunt înțepenite.  Se iese.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:909
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "se doarme la %s pentru %d secunde\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:933
 #, c-format
 msgid "awakened by %s\n"
 msgstr "trezit de %s\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:936
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "trezit de semnalul %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:944
 #, c-format
 msgid "awakened at %s\n"
 msgstr "trezit la %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:949
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminare normală, stare %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1113
 msgid "couldn't time-check the run-control file\n"
 msgstr ""
 "nu s-a putut verifica timpul fișierului de rulare a controlului\n"
 "\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1147
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Avertisment: mențiuni multiple a gazdei %s în fișierul de configurare\n"
+msgstr "Avertisment: mențiuni multiple a gazdei %s în fișierul de configurare\n"
 
-#: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Eroare: multiple înregistrări „implicite� în fișierul de "
-"configurare sau „implicite� nu este prima înregistrare.\n"
+#: fetchmail.c:1186
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Eroare: multiple înregistrări „implicite� în fișierul de configurare sau „implicite� nu este prima înregistrare.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1316
 msgid "SSL support is not compiled in.\n"
 msgstr "Suportul SSL nu este compilat.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1323
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Suportul v4 KERBEROS este configurat, dar nu este compilat.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1329
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Suportul v5 KERBEROS este configurat, dar nu este compilat.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1335
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Suportul GSSAPI este configurat, dar nu este compilat.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1365
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: avertisment: niciun DNS disponibil pentru a verifica aducerile de "
-"căderi multiple de la %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: avertisment: niciun DNS disponibil pentru a verifica aducerile de căderi multiple de la %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1376
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "avertisment: căderea multiplă pentru %s necesită opțiunea plic!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1377
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"avertisment: Nu întrebați pentru suport dacă tot mailul merge la masterul de "
-"poștă!\n"
+msgstr "avertisment: Nu întrebați pentru suport dacă tot mailul merge la masterul de poștă!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1394
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: configurarea %s nevalidă, specificați un număr de port pozitiv "
-"pentru serviciu sau port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: configurarea %s nevalidă, specificați un număr de port pozitiv pentru serviciu sau port\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1401
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: configurarea %s nevalidă, RPOP necesită un port privilegiat\n"
+msgstr "fetchmail: configurarea %s nevalidă, RPOP necesită un port privilegiat\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1419
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "configurarea %s nevalidă, LMTP nu poate utiliza portul SMTP implicit\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1433
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Amândouă modurile aduce toate sau păstrează în serviciu sau în așteptare "
-"sunt o greșeală!\n"
+msgstr "Amândouă modurile aduce toate sau păstrează în serviciu sau în așteptare sunt o greșeală!\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Eroare: modul în așteptare nu funcționează pentru dosare sau "
-"conturi multiple!\n"
+#: fetchmail.c:1443
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Eroare: modul în așteptare nu funcționează pentru dosare sau conturi multiple!\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1467
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminat cu semnalul %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interogarea a %s (protocol %s) la %s: sondarea a început\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1565
 msgid "POP2 support is not configured.\n"
 msgstr "Suportul POP2 nu este configurat.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1577
 msgid "POP3 support is not configured.\n"
 msgstr "Suportul POP3 nu este configurat.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1587
 msgid "IMAP support is not configured.\n"
 msgstr "Suportul IMAP nu este configurat.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1593
 msgid "ETRN support is not configured.\n"
 msgstr "Suportul ETRN nu este configurat.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid "ODMR support is not configured.\n"
 msgstr "Suportul ODMR nu este configurat.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1608
 msgid "unsupported protocol selected.\n"
 msgstr "protocol nesuportat selectat.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interogare a %s (protocol %s) la %s: sondarea este completată\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1644
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervalul sondării este %d secunde\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Fișierul de înregistrare este %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Fișierul id este %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesajele de progres vor fi înregistrate via syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1654
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se va masca și nu va genera Primite\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1656
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Fetchmail va arăta punctele de progres chiar și în fișierele de "
-"înregistrare.\n"
+msgstr "Fetchmail va arăta punctele de progres chiar și în fișierele de înregistrare.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1658
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail va transmite mesajele de cădere multiplă adresate incorect la %s.\n"
+msgstr "Fetchmail va transmite mesajele de cădere multiplă adresate incorect la %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail va direcționa mailul de eroare la masterul poștei.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail va direcționa mailul de eroare la expeditor.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1667
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail va trata erorile permanente ca permanente (mesaje de cădere).\n"
+msgstr "Fetchmail va trata erorile permanente ca permanente (mesaje de cădere).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1669
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail va trata erorile permanente ca temporare (păstrează mesajele).\n"
+msgstr "Fetchmail va trata erorile permanente ca temporare (păstrează mesajele).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1676
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opțiunile pentru preluarea de la %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1680
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mailul va fi preluat via %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1683
 #, 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] "  Sondarea acestui server se va întâmpla la fiecare %d interval.\n"
 msgstr[1] "  Sondarea acestui server se va întâmpla la fiecare %d intervale.\n"
-msgstr[2] ""
-"  Sondarea acestui server se va întâmpla la fiecare %d de intervale.\n"
+msgstr[2] "  Sondarea acestui server se va întâmpla la fiecare %d de intervale.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Numele adevărat al serverului este %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1690
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr ""
-"  Această gazdă nu va fi interogată când nicio gazdă nu este specificată.\n"
+msgstr "  Această gazdă nu va fi interogată când nicio gazdă nu este specificată.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1691
 msgid "  This host will be queried when no host is specified.\n"
-msgstr ""
-"  Această gazdă va fi interogată când nicio gazdă nu este specificată.\n"
+msgstr "  Această gazdă va fi interogată când nicio gazdă nu este specificată.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1695
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola va fi solicitată.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1699
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = „%s�.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1702
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  ID RPOP = „%s�.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1705
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parolă = „%s�.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1714
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocolul este KPOP cu autentificare %s Kerberos"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1717
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocolul este %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 #, c-format
 msgid " (using service %s)"
 msgstr " (se utilizează serviciul %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1721
 msgid " (using default port)"
 msgstr " (se utilizează portul implicit)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1723
 msgid " (forcing UIDL use)"
 msgstr " (se forțează utilizarea UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1729
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Toate metodele de autentificare disponibile vor fi încercate.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1732
 msgid "  Password authentication will be forced.\n"
 msgstr "  Autentificarea parolei va fi forțată.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1735
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Autentificarea MSN va fi forțată.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1738
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Autentificarea NTLM va fi forțată.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1741
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Autentificarea OTP va fi forțată.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1744
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Autentificarea CRAM-MD5 va fi forțată.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1747
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Autentificarea GSSAPI va fi forțată.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1750
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Autentificarea V4 Kerberos va fi forțată.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Autentificarea V5 Kerberos va fi forțată.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1756
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Criptarea capăt la capăt este asumată.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1760
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principalul serviciului de mail este: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1763
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiunile criptate SSL activate.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1765
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolul SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1767
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Verificarea certificatului serverului SSL activată.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Verificarea certificatului serverului SSL dezactivată.\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1772
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Fișier de certificat de încredere SSL: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1774
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Director de certificat de încredere SSL: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1776
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  NumeComun de server SSL: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Amprentă de cheie SSL (verificată împotriva cheii de server): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limita de timp de non-răspuns a serverului este %d secunde"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1783
 msgid " (default).\n"
 msgstr " (implicit).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  Default mailbox selected.\n"
 msgstr "  Cutia de mail implicită selectată.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1795
 msgid "  Selected mailboxes are:"
 msgstr "  Cutiile de mail selectate sunt:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1801
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Toate mesajele vor fi descărcate (--all pornit).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1802
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Doar mesajele noi vor fi descărcate (--all oprit).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1804
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesajele aduse vor fi păstrate pe server (--keep pornit).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1805
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesajele aduse nu vor fi păstrate pe server (--keep oprit).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1807
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Mesajele vechi vor fi golite înaintea descărcării mesajelor (--flush "
-"pornit).\n"
+msgstr "  Mesajele vechi vor fi golite înaintea descărcării mesajelor (--flush pornit).\n"
 
-#: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Mesajele vechi nu vor fi golite înaintea descărcării mesajelor (--flush "
-"oprit).\n"
+#: fetchmail.c:1808
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Mesajele vechi nu vor fi golite înaintea descărcării mesajelor (--flush oprit).\n"
 
-#: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Mesajele supradimensionate vor fi golite înaintea descărcării mesajelor (--"
-"limitflush pornit).\n"
+#: fetchmail.c:1810
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Mesajele supradimensionate vor fi golite înaintea descărcării mesajelor (--limitflush pornit).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Mesajele supradimensionate nu vor fi golite înaintea descărcării mesajelor "
-"(--limitflush oprit).\n"
+#: fetchmail.c:1811
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Mesajele supradimensionate nu vor fi golite înaintea descărcării mesajelor (--limitflush oprit).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1813
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Rescrierea adreselor locale de server este activată (--norewrite oprit).\n"
+msgstr "  Rescrierea adreselor locale de server este activată (--norewrite oprit).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Rescrierea de adrese locale de server nu este activată (--norewrite "
-"pornit).\n"
+msgstr "  Rescrierea de adrese locale de server nu este activată (--norewrite pornit).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Dezactivarea transportului-retur este activată (stripcr pornit).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1817
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Dezactivarea transportului-retur nu este activată (stripcr oprit).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1819
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Forțarea transportului-retur este activată (forcecr pornit).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Forțarea transportului-retur nu este activată (forcecr oprit).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Interpretarea de codare-transfer-conținut nu este activată (pass8bits "
-"pornit).\n"
+#: fetchmail.c:1822
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Interpretarea de codare-transfer-conținut nu este activată (pass8bits pornit).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Interpretarea de codare-transfer-conținut este activată (pass8bits "
-"oprit).\n"
+#: fetchmail.c:1823
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretarea de codare-transfer-conținut este activată (pass8bits oprit).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1825
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Decodarea MIME este activată (mimedecode pornit).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Decodarea MIME nu este activată (mimedecode oprit).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  În așteptare după sondare este activată (idle pornit).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1829
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  În așteptare după sondare nu este activată (idle oprit).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1831
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Liniile de stare non-goale vor fi eliminate (dropstatus pornit)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Liniile de stare non-goale vor fi păstrate (dropstatus oprit)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1834
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Liniile livrat-la vor fi eliminate (dropdelivered pornit)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1835
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Liniile livrat-la vor fi păstrate (dropdelivered oprit)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1839
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limita dimensiunii mesajului este %d octeți (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1842
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nicio limită de dimensiune de mesaj (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1844
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Intervalul de avertisment de dimensiune a mesajului este %d secunde (--"
-"warnings %d).\n"
+msgstr "  Intervalul de avertisment de dimensiune a mesajului este %d secunde (--warnings %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1847
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avertismentele dimensiunii la fiecare sondare (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1850
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limita de mesaje-primite este %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1853
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nu există limită de mesaje-primite (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1855
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-"  Limita dimensiunii mesajului de aducere este %d (--fetchsizelimit %d).\n"
+msgstr "  Limita dimensiunii mesajului de aducere este %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1858
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
-msgstr ""
-"  Nu există limită de dimensiune de mesaj de aducere (--fetchsizelimit 0).\n"
+msgstr "  Nu există limită de dimensiune de mesaj de aducere (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1862
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Face căutare binară a UID-urilor în timpul fiecărei sondări (--fastuidl "
-"1).\n"
+msgstr "  Face căutare binară a UID-urilor în timpul fiecărei sondări (--fastuidl 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1864
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Face căutare binară a UID-urilor în timpul a %d din %d sondări (--fastuidl "
-"%d).\n"
+msgstr "  Face căutare binară a UID-urilor în timpul a %d din %d sondări (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1867
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Face căutări liniare a UID-urilor în timpul fiecărei sondări (--fastuidl "
-"0).\n"
+msgstr "   Face căutări liniare a UID-urilor în timpul fiecărei sondări (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1869
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limita lotului de mesaj SMTP este %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1871
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nu există limită de lot de mesaj SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1875
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Intervalul de ștergere între ștergeri forțat la %d (--expunge %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1877
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nicio ștergere forțată (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1884
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeniile pentru care mailul va fi adus sunt:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1889 fetchmail.c:1909
 msgid " (default)"
 msgstr " (implicit)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1894
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesajele vor fi adăugate la %s ca BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1896
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesajele vor fi livrate cu „%s�.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1903
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesajele vor fi trimise %cMTP la:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1914
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Partea gazdei a liniei MAIL DE LA va fi %s\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1917
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adresa de plasat în liniile RCPT LA trimise la SMTP va fi %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1926
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Răspunsurile de blocare de spam de ascultător recunoscute sunt:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1932
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blocarea spam nu este activată\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1935
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Conexiunea serverului va fi adusă cu „%s�.\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1938
 msgid "  No pre-connection command.\n"
 msgstr "  Nicio comandă de pre-conexiune.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1940
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Conexiunea serverului va fi dată jos cu „%s�.\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1943
 msgid "  No post-connection command.\n"
 msgstr "  Nicio comandă de post-conexiune.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1946
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nu există nume locale declarate pentru această gazdă.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1956
 msgid "  Multi-drop mode: "
 msgstr "  Modul cădere multiplă: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1958
 msgid "  Single-drop mode: "
 msgstr "  Modul cădere singură: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1960
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1619,126 +1498,115 @@ msgstr[0] "%d nume local recunoscut.\n"
 msgstr[1] "%d nume locale recunoscute.\n"
 msgstr[2] "%d de nume locale recunoscute.\n"
 
-#: fetchmail.c:1976
+#: fetchmail.c:1975
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Căutarea DNS pentru adresele de cădere multiplă este activată.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1976
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Căutarea DNS pentru adresele de cădere multiplă nu este activată.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Aliasurile de server vor fi comparate cu adresele de cădere multiplă după "
-"adresa IP.\n"
+#: fetchmail.c:1980
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Aliasurile de server vor fi comparate cu adresele de cădere multiplă după adresa IP.\n"
 
-#: fetchmail.c:1983
+#: fetchmail.c:1982
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-"  Aliasurile serverului vor fi comparate cu adresele de cădere multiplă după "
-"nume.\n"
+msgstr "  Aliasurile serverului vor fi comparate cu adresele de cădere multiplă după nume.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1985
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Rutarea adresei plic nu este activată\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1988
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Antetul plicului este asumat să fie: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1991
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numărul de antete de plic care se omit: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1994
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefixul %s va fi eliminat de la id-ul utilizatorului\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1997
 msgid "  No prefix stripping\n"
 msgstr "  Nu există dezactivarea prefixului\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2002
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliasuri de server de mail pre-declarate:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:2010
 msgid "  Local domains:"
 msgstr "  Domenii locale:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:2020
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Conexiunea trebuie să fie printr-o interfață %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2022
 msgid "  No interface requirement specified.\n"
 msgstr "  Nu s-a specificat nicio cerință de interfață.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2024
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Bucla de sondare va monitoriza %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:2026
 msgid "  No monitor interface specified.\n"
 msgstr "  Nu există o interfață de monitorizare specificată.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:2030
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Conexiunile serverului vor fi făcute via modulul %s (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2032
 msgid "  No plugin command specified.\n"
 msgstr "  Nu este specificată nicio comandă de modul.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:2034
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Conexiunile de ascultător vor fi făcute via modul dezactivat %s (--plugout "
-"%s).\n"
+msgstr "  Conexiunile de ascultător vor fi făcute via modul dezactivat %s (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:2036
 msgid "  No plugout command specified.\n"
 msgstr "  Nu este specificată nicio comandă de modul dezactivat.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:2043
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nu sunt UID-uri salvate de la această gazdă.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:2046
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID-uri salvate.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:2052
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Informație de urmărire a sondării vor fi adăugate la antetul "
-"Recepționate.\n"
+msgstr "  Informație de urmărire a sondării vor fi adăugate la antetul Recepționate.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:2054
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Nicio informație de urmărire a sondării nu va fi adăugată la antetul "
-"Recepționate.\n"
+msgstr "  Nicio informație de urmărire a sondării nu va fi adăugată la antetul Recepționate.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:2059
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Mesajele cu antete defecte vor fi respinse.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2062
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Mesajele cu antete defecte vor fi transmise mai departe.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:2067
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Proprietăți de trecere „%s�.\n"
@@ -1749,12 +1617,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Nu se poate modifica masca de semnal: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Sistemul de operare nu definește nici PATH_MAX nici nu va accepta "
-"realpath(f, NULL). Se renunță.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Sistemul de operare nu definește nici PATH_MAX nici nu va accepta realpath(f, NULL). Se renunță.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1790,15 +1654,11 @@ msgstr "Se utilizează numele de serviciu [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Nu s-au găsit certificări GSSAPI potrivite. Se omite autentificarea GSSAPI.\n"
+msgstr "Nu s-au găsit certificări GSSAPI potrivite. Se omite autentificarea GSSAPI.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Dacă doriți să utilizați GSSAPI, aveți nevoie mai întâi de certificări, "
-"posibil de la kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Dacă doriți să utilizați GSSAPI, aveți nevoie mai întâi de certificări, posibil de la kinit.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1837,8 +1697,7 @@ msgstr "Dimensiunea de jeton GSS maximă este %ld\n"
 
 #: gssapi.c:274
 msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-"Numele de utilizator GSSAPI este prea lung pentru preîncărcarea statică.\n"
+msgstr "Numele de utilizator GSSAPI este prea lung pentru preîncărcarea statică.\n"
 
 #: gssapi.c:283
 msgid "Error creating security level request\n"
@@ -1847,9 +1706,7 @@ msgstr "Eroare la crearea cererii de nivel de securitate\n"
 #: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-"Send_token GSSAPI este prea mare (%lu) în timpul trimiterii numelui de "
-"utilizator.\n"
+msgstr "Send_token GSSAPI este prea mare (%lu) în timpul trimiterii numelui de utilizator.\n"
 
 #: gssapi.c:298
 msgid "Releasing GSS credentials\n"
@@ -1986,11 +1843,8 @@ msgid "%u is first unseen\n"
 msgstr "%u este primul nevăzut\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Avertisment: se ignoră datele false pentru dimensiunile de mesaj întoarse de "
-"la server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Avertisment: se ignoră datele false pentru dimensiunile de mesaj întoarse de la server.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1999,8 +1853,7 @@ msgstr "Răspuns de ADUCERE incorect: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Nu se poate deschide interfața kvm. Asigurați-vă că fetchmail este kmem SGID."
+msgstr "Nu se poate deschide interfața kvm. Asigurați-vă că fetchmail este kmem SGID."
 
 #: interface.c:396
 #, c-format
@@ -2104,40 +1957,22 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: eroare la citirea fișierului de blocare „%s�: %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: se elimină fișierul de blocare vechi\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: eroare la deschiderea fișierului de blocare „%s�: %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: eroare la citirea fișierului de blocare „%s�: %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: eroare la deschiderea fișierului de blocare „%s�: %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: crearea blocării a eșuat.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: eroare la citirea fișierului de blocare „%s�: %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
-msgstr ""
-"%s:%d: avertisment: s-a găsit „%s� înaintea de oricare alte nume de gazdă\n"
+msgstr "%s:%d: avertisment: s-a găsit „%s� înaintea de oricare alte nume de gazdă\n"
 
 #: netrc.c:258
 #, c-format
@@ -2146,8 +1981,7 @@ msgstr "%s:%d: avertisment: jeton necunoscut „%s�\n"
 
 #: ntlmsubr.c:35
 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr ""
-"Avertisment: s-a primit provocarea deteriorată la „AUT(ENTIFICĂ) NTLM�!\n"
+msgstr "Avertisment: s-a primit provocarea deteriorată la „AUT(ENTIFICĂ) NTLM�!\n"
 
 #: ntlmsubr.c:84
 msgid "NTLM challenge contains invalid data.\n"
@@ -2297,12 +2131,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specifică numele fișierului de înregistrare\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      utilizează syslog(3) pentru majoritatea mesajelor în "
-"timpul rulării ca un serviciu\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      utilizează syslog(3) pentru majoritatea mesajelor în timpul rulării ca un serviciu\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2310,13 +2140,11 @@ msgstr "      --nosyslog    oprește utilizarea a syslog(3)\n"
 
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   nu scrie Primite și activează spoofing-ul de gazdă\n"
+msgstr "      --invisible   nu scrie Primite și activează spoofing-ul de gazdă\n"
 
 #: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc specifică fișierul de control de rulare alternativ\n"
+msgstr "  -f, --fetchmailrc specifică fișierul de control de rulare alternativ\n"
 
 #: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
@@ -2332,24 +2160,15 @@ msgstr "      --postmaster  specifică destinatarul ultimului recurs\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    redirecționează respingerile de la utilizator la "
-"masterul poștei.\n"
+msgstr "      --nobounce    redirecționează respingerile de la utilizator la masterul poștei.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail șterge permanent mesajele care nu se pot "
-"livra.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail șterge permanent mesajele care nu se pot livra.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  păstrează permanent mesajele care nu se pot livra pe "
-"server (implicit).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  păstrează permanent mesajele care nu se pot livra pe server (implicit).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2373,39 +2192,27 @@ msgstr "      --sslcert     certificat de client ssl\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   face o verificare de certificat de server strictă "
-"(recomandat)\n"
+msgstr "      --sslcertck   face o verificare de certificat de server strictă (recomandat)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck omite verificarea de certificat de server strictă "
-"(nesigur)\n"
+msgstr "      --nosslcertck omite verificarea de certificat de server strictă (nesigur)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile cale către fișierul de certificat ssl de încredere CA\n"
+msgstr "      --sslcertfile cale către fișierul de certificat ssl de încredere CA\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath cale către directorul de certificat ssl de încredere CA\n"
+msgstr "      --sslcertpath cale către directorul de certificat ssl de încredere CA\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  așteaptă acest NumeComun de la server (descurajat)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  așteaptă acest NumeComun de la server (descurajat)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint amprentă care trebuie să se potrivească aceleia a "
-"certificatului serverului.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint amprentă care trebuie să se potrivească aceleia a certificatului serverului.\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2413,14 +2220,11 @@ msgstr "      --sslproto    forțează protocolul ssl (consultați manualul)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      specifică comanda externă pentru a deschide conexiunea\n"
+msgstr "      --plugin      specifică comanda externă pentru a deschide conexiunea\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     specifică comanda externă pentru a deschide conexiunea "
-"smtp\n"
+msgstr "      --plugout     specifică comanda externă pentru a deschide conexiunea smtp\n"
 
 #: options.c:681
 msgid ""
@@ -2428,38 +2232,27 @@ msgid ""
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    specifică politica pentru a manipula mesajele cu antete "
-"deteriorate\n"
+"                    specifică politica pentru a manipula mesajele cu antete deteriorate\n"
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]  specifică protocolul de recuperare (consultați pagina "
-"man)\n"
+msgstr "  -p, --proto[col]  specifică protocolul de recuperare (consultați pagina man)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forțează utilizarea de UIDL-uri (doar pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        îi spune serverului IMAP să trimită înștiințare de "
-"mesaje noi\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        îi spune serverului IMAP să trimită înștiințare de mesaje noi\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        portul TCP la care să se conecteze (învechit, utilizați "
-"--service)\n"
+msgstr "      --port        portul TCP la care să se conecteze (învechit, utilizați --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     serviciul TCP la care să se conecteze (poate fi un port "
-"TCP numeric)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     serviciul TCP la care să se conecteze (poate fi un port TCP numeric)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2475,8 +2268,7 @@ msgstr "  -E, --envelope    înfășoară antetul adresei\n"
 
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual    prefix pentru a elimina de la id-ul de utilizator local\n"
+msgstr "  -Q, --qvirtual    prefix pentru a elimina de la id-ul de utilizator local\n"
 
 #: options.c:693
 msgid "      --principal   mail service principal\n"
@@ -2484,14 +2276,11 @@ msgstr "      --principal   principalul serviciu de mail\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  adaugă informații de urmărire a sondării la antetul "
-"Primite\n"
+msgstr "      --tracepolls  adaugă informații de urmărire a sondării la antetul Primite\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
-msgstr ""
-"  -u, --user[name]  specifică autentificarea utilizatorului pe server\n"
+msgstr "  -u, --user[name]  specifică autentificarea utilizatorului pe server\n"
 
 #: options.c:697
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
@@ -2523,8 +2312,7 @@ msgstr "  -l, --limit       nu aduce mesaje peste dimensiunea dată\n"
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr ""
-"  -w, --warnings    intervalul între înștiințările de mail de avertisment\n"
+msgstr "  -w, --warnings    intervalul între înștiințările de mail de avertisment\n"
 
 #: options.c:706
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
@@ -2540,8 +2328,7 @@ msgstr "  -D, --smtpaddress stabilește domeniul de livrare SMTP de utilizat\n"
 
 #: options.c:709
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr ""
-"      --smtpname    stabilește numele complet SMTP numeutilizator@domeniu\n"
+msgstr "      --smtpname    stabilește numele complet SMTP numeutilizator@domeniu\n"
 
 #: options.c:710
 msgid "  -Z, --antispam,   set antispam response values\n"
@@ -2549,18 +2336,15 @@ msgstr "  -Z, --antispam,   stabilește valorile de răspuns anti-spam\n"
 
 #: options.c:711
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  stabilește limita lotului pentru conexiunile SMTP\n"
+msgstr "  -b, --batchlimit  stabilește limita lotului pentru conexiunile SMTP\n"
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  stabilește limita aducerii pentru conexiunile de server\n"
+msgstr "  -B, --fetchlimit  stabilește limita aducerii pentru conexiunile de server\n"
 
 #: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit stabilește limita dimensiunii mesajului de aducere\n"
+msgstr "      --fetchsizelimit stabilește limita dimensiunii mesajului de aducere\n"
 
 #: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2588,9 +2372,7 @@ msgstr "  -r, --folder      specifică numele de dosar de la distanță\n"
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    arată punctele de progres chiar în fișierele de "
-"înregistrare\n"
+msgstr "      --showdots    arată punctele de progres chiar în fișierele de înregistrare\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2601,17 +2383,12 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 suportă doar autentificarea prin parolă. Se renunță.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Avertisment: „Maillennium POP3� a fost găsit, se utilizează comanda RETR în "
-"locul a TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Avertisment: „Maillennium POP3� a fost găsit, se utilizează comanda RETR în locul a TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"TLS este obligatoriu pentru această sesiune, dar serverul a refuzat comanda "
-"CAPA.\n"
+msgstr "TLS este obligatoriu pentru această sesiune, dar serverul a refuzat comanda CAPA.\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2694,20 +2471,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS nu este activat."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: opțiunea de interfață este suportată doar sub Linux (fără IPv6) "
-"și FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: opțiunea de interfață este suportată doar sub Linux (fără IPv6) și FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: opțiunea de monitorizare este suportată doar sub Linux (fără "
-"IPv6) și FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: opțiunea de monitorizare este suportată doar sub Linux (fără IPv6) și FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2725,8 +2494,7 @@ msgstr "Fișierul %s trebuie să fie un fișier obișnuit.\n"
 #: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr ""
-"Fișierul %s trebuie să nu aibă mai multe de -rwx------ (0700) permisiuni.\n"
+msgstr "Fișierul %s trebuie să nu aibă mai multe de -rwx------ (0700) permisiuni.\n"
 
 #: rcfile_y.y:451
 #, c-format
@@ -2987,8 +2755,7 @@ msgstr "Ascultătorului %cMTP nu prea îi place adresa de recipient „%s�\n"
 
 #: sink.c:1027
 msgid "no address matches; no postmaster set.\n"
-msgstr ""
-"nu sunt potriviri de adresă; nu este stabilit niciun master de poștă.\n"
+msgstr "nu sunt potriviri de adresă; nu este stabilit niciun master de poștă.\n"
 
 #: sink.c:1039
 #, c-format
@@ -3022,9 +2789,7 @@ msgstr "Nu se poate comuta id-ul de utilizator efectiv la %ld: %s\n"
 #: sink.c:1234
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-"Nu se poate comuta id-ul utilizatorului efectiv înapoi la originalul %ld: "
-"%s\n"
+msgstr "Nu se poate comuta id-ul utilizatorului efectiv înapoi la originalul %ld: %s\n"
 
 #: sink.c:1241
 msgid "MDA open failed\n"
@@ -3062,10 +2827,8 @@ msgstr "MDA a întors starea nonzero %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Ciudat: pclose MDA a întors %d și errno %d/%s nu poate manipula la %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Ciudat: pclose MDA a întors %d și errno %d/%s nu poate manipula la %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3146,9 +2909,7 @@ msgstr "eroare getaddrinfo(\"%s\",\"%s\"): %s\n"
 
 #: socket.c:275
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"Încercați să adăugați opțiunea --service (consultați, de asemenea, elementul "
-"de FAQ R12).\n"
+msgstr "Încercați să adăugați opțiunea --service (consultați, de asemenea, elementul de FAQ R12).\n"
 
 #: socket.c:289 socket.c:292
 #, c-format
@@ -3205,8 +2966,7 @@ msgstr "OpenSSL a raportat: %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"SSL verifică adâncimea callback-ului %d: preverify_ok == %d, err = %d, %s\n"
+msgstr "SSL verifică adâncimea callback-ului %d: preverify_ok == %d, err = %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3215,8 +2975,7 @@ msgstr "Certificat de server:\n"
 #: socket.c:662
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-"Lanț de certificate, de la root la peer, începând de la adâncimea %d:\n"
+msgstr "Lanț de certificate, de la root la peer, începând de la adâncimea %d:\n"
 
 #: socket.c:665
 #, c-format
@@ -3230,9 +2989,7 @@ msgstr "Organizație emitentă: %s\n"
 
 #: socket.c:674
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Avertisment: Numele organizației emitente este prea mare (posibil "
-"trunchiat).\n"
+msgstr "Avertisment: Numele organizației emitente este prea mare (posibil trunchiat).\n"
 
 #: socket.c:676
 msgid "Unknown Organization\n"
@@ -3271,8 +3028,7 @@ msgstr "Nume alternativ subiect: %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Certificat deteriorat: Nume alternativ subiect conține NUL, se renunță!\n"
+msgstr "Certificat deteriorat: Nume alternativ subiect conține NUL, se renunță!\n"
 
 #: socket.c:752
 #, c-format
@@ -3281,8 +3037,7 @@ msgstr "Nepotrivire de NumeComun server: %s != %s\n"
 
 #: socket.c:759
 msgid "Server name not set, could not verify certificate!\n"
-msgstr ""
-"Numele serverului nu este stabilit, nu s-a putut verifica certificatul!\n"
+msgstr "Numele serverului nu este stabilit, nu s-a putut verifica certificatul!\n"
 
 #: socket.c:764
 msgid "Unknown Server CommonName\n"
@@ -3330,15 +3085,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "LanÈ› de certificare rupt la: %s\n"
 
 #: socket.c:831
-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 ""
-"Acest lucru poate să însemne că serverul nu a furnizat certificatul(ele) CA-"
-"ului intermediar, care nu este nimic fetchmail ar putea face ceva.  Pentru "
-"detalii, consultați documentul README.SSL-SERVER care vine cu fetchmail.\n"
+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 "Acest lucru poate să însemne că serverul nu a furnizat certificatul(ele) CA-ului intermediar, care nu este nimic fetchmail ar putea face ceva.  Pentru detalii, consultați documentul README.SSL-SERVER care vine cu fetchmail.\n"
 
 #: socket.c:841
 #, c-format
@@ -3346,17 +3094,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Lipsește certificatul de ancoră de încredere: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Acest lucru poate să însemne că certificatul semnatar al CA-ului root nu "
-"este în locația certificatului CA de încredere, sau că c_rehash are nevoie "
-"să fie rulat în directorul certificatului. Pentru detalii, consultați "
-"documentația a --sslcertpath și --sslcertfile în pagina manualului. "
-"Consultați README.SSL pentru detalii.\n"
+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. See README.SSL for details.\n"
+msgstr "Acest lucru poate să însemne că certificatul semnatar al CA-ului root nu este în locația certificatului CA de încredere, sau că c_rehash are nevoie să fie rulat în directorul certificatului. Pentru detalii, consultați documentația a --sslcertpath și --sslcertfile în pagina manualului. Consultați README.SSL pentru detalii.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3377,55 +3116,35 @@ msgstr "Versiunea OpenSSL nu suportă TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Protocol SSL nevalid „%s� specificat, se utilizează selectarea automată "
-"(auto) implicită.\n"
+msgstr "Protocol SSL nevalid „%s� specificat, se utilizează selectarea automată (auto) implicită.\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"S-a încărcat biblioteca OpenSSL %#lx mai veche decât antetele %#lx, refuză "
-"să funcționeze.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "S-a încărcat biblioteca OpenSSL %#lx mai veche decât antetele %#lx, refuză să funcționeze.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"S-a încărcat biblioteca OpenSSL %#lx mai nouă decât antetele %#lx, se "
-"încearcă să se continue.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "S-a încărcat biblioteca OpenSSL %#lx mai nouă decât antetele %#lx, se încearcă să se continue.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptorul fișierului este în afara intervalului pentru SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Observați că unele distribuții dezactivează versiunile de protocol mai vechi "
-"în moduri non-standard ciudate. Încercați o versiune de protocol nouă.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Observați că unele distribuții dezactivează versiunile de protocol mai vechi în moduri non-standard ciudate. Încercați o versiune de protocol nouă.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Avertisment: SSL_set_tlsext_host_name(%p, \"%s\") a eșuat (codul %#lx), se "
-"încearcă să se continue.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Avertisment: SSL_set_tlsext_host_name(%p, \"%s\") a eșuat (codul %#lx), se încearcă să se continue.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Avertisment: X509_VERIFY_PARAM_set1_host(%p, \"%s\") a eșuat (codul %#x), se "
-"încearcă să se continue.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Avertisment: X509_VERIFY_PARAM_set1_host(%p, \"%s\") a eșuat (codul %#x), se încearcă să se continue.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3442,28 +3161,20 @@ msgstr "strângerea de mână a eșuat la nivelul de conexiune sau de protocol."
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"Nu se poate obține cifrul SSL/TLS curent - nu există nicio sesiune "
-"stabilită?\n"
+msgstr "Nu se poate obține cifrul SSL/TLS curent - nu există nicio sesiune stabilită?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: se utilizează protocolul %s, cifrul %s, biții secreți/procesați %d/"
-"%d\n"
+msgstr "SSL/TLS: se utilizează protocolul %s, cifrul %s, biții secreți/procesați %d/%d\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verificarea certificatului/amprentei a fost cumva omisă!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Avertisment: conexiunea nu este sigură, se continuă oricum. (Utilizați mai "
-"bine --sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Avertisment: conexiunea nu este sigură, se continuă oricum. (Utilizați mai bine --sslcertck!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3518,9 +3229,7 @@ msgstr "s-a găsit adresa Primite „%s�\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"s-a găsit linia de antet incorectă - consultați pagina de manual pentru "
-"opțiunea de antet deteriorat\n"
+msgstr "s-a găsit linia de antet incorectă - consultați pagina de manual pentru opțiunea de antet deteriorat\n"
 
 #: transact.c:615
 #, c-format
@@ -3539,8 +3248,7 @@ msgstr "Parsarea numelor Primite „%-.*s�\n"
 
 #: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"Nu s-a găsit niciun recipient de plic, se resortează la ghicirea antetului.\n"
+msgstr "Nu s-a găsit niciun recipient de plic, se resortează la ghicirea antetului.\n"
 
 #: transact.c:1142
 #, c-format
@@ -3562,8 +3270,7 @@ msgstr "scrierea RFC822 msgblk.headers\n"
 
 #: transact.c:1302
 msgid "no recipient addresses matched declared local names"
-msgstr ""
-"nu există adrese de recipient care se potrivesc cu numele locale declarate"
+msgstr "nu există adrese de recipient care se potrivesc cu numele locale declarate"
 
 #: transact.c:1309
 #, c-format
@@ -3585,15 +3292,12 @@ msgstr "eroare la scrierea textului mesajului\n"
 #: transact.c:1652
 #, c-format
 msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-"Preîncărcarea este prea mică. Aceasta este o defecțiune în apelantul lui %s:"
-"%lu.\n"
+msgstr "Preîncărcarea este prea mică. Aceasta este o defecțiune în apelantul lui %s:%lu.\n"
 
 #: uid.c:262
 #, c-format
 msgid "Open or read error while reading idfile %s: %s\n"
-msgstr ""
-"Eroare de deschidere sau citire în timpul citirii fișierului id %s: %s\n"
+msgstr "Eroare de deschidere sau citire în timpul citirii fișierului id %s: %s\n"
 
 #: uid.c:273
 #, c-format
@@ -3620,9 +3324,7 @@ msgstr "Listă de UID nouă de la %s:\n"
 
 #: uid.c:402
 msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr ""
-"nu se comută listele UID, nu există UID-uri care au văzut această "
-"interogare\n"
+msgstr "nu se comută listele UID, nu există UID-uri care au văzut această interogare\n"
 
 #: uid.c:422
 msgid "discarding new UID list\n"
@@ -3649,9 +3351,7 @@ msgstr "Eroare de scriere la fișierul fetchids %s: %s\n"
 #: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Eroare la scrierea la fișierul fetchids %s, fișierul vechi este lăsat pe "
-"loc.\n"
+msgstr "Eroare la scrierea la fișierul fetchids %s, fișierul vechi este lăsat pe loc.\n"
 
 #: uid.c:528
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index c061c27f..3944f2e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,43 +6,41 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre1\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2009-05-25 23:50+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"
-"Language: ru\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"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Провер�ет��, е�ли %s дей�твительно такой же узел, как и %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Да, их IP-адре�а �овпадают\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "�ет, их IP-адре�а не �овпадают\n"
 
-#: checkalias.c:207
+#: checkalias.c:203
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"Выполн�� пои�к `%s', nameserver возвратил ошибку во врем� опро�а %s: %s.\n"
+msgstr "Выполн�� пои�к `%s', nameserver возвратил ошибку во врем� опро�а %s: %s.\n"
 
-#: checkalias.c:230
+#: checkalias.c:228
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "Выполн�� пои�к `%s', nameserver возвратил ошибку во врем� опро�а %s.\n"
 
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
 msgid "could not decode BASE64 challenge\n"
 msgstr "невозможно было декодировать запро� BASE64\n"
 
@@ -51,164 +49,146 @@ msgstr "невозможно было декодировать запро� BASE
 msgid "decoded as %s\n"
 msgstr "декодирован как %s\n"
 
-#: driver.c:199
+#: driver.c:191
 #, 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:249 driver.c:254
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [�ервер �ообщил '%*s'] \n"
 
-#: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+#: driver.c:335
+msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Тема: Предупреждение Fetchmail о превышении размера �ообщений"
 
-#: driver.c:349
+#: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Следующие �ообщени� завышенного размера были удалены � почтового �ервера %s, "
-"учётна� запи�ь %s:"
+msgstr "Следующие �ообщени� завышенного размера были удалены � почтового �ервера %s, учётна� запи�ь %s:"
 
-#: driver.c:353
+#: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"Следующие �ообщени� завышенного размера наход�т�� на почтовом �ервере %s, "
-"учётна� запи�ь %s:"
+msgstr "Следующие �ообщени� завышенного размера наход�т�� на почтовом �ервере %s, учётна� запи�ь %s:"
 
-#: driver.c:372
+#: driver.c:362
 #, c-format
 msgid "  %d message  %d octets long deleted by fetchmail."
 msgid_plural "  %d messages %d octets long deleted by fetchmail."
 msgstr[0] "  fetchmail удалил %d �ообщение длиной %d октетов."
 msgstr[1] "  fetchmail удалил %d �ообщений длиной %d октетов."
 
-#: driver.c:377
+#: driver.c:367
 #, c-format
 msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  fetchmail пропу�тил %d �ообщение длиной %d октетов."
 msgstr[1] "  fetchmail пропу�тил %d �ообщений длиной %d октетов."
 
-#: driver.c:522
+#: driver.c:511
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "пропу�кает�� �ообщение %s@%s:%d"
 
-#: driver.c:577
+#: driver.c:565
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "пропу�кает�� �ообщение %s@%s:%d (%d октетов)"
 
-#: driver.c:593
+#: driver.c:581
 msgid " (length -1)"
 msgstr " (длина -1)"
 
-#: driver.c:596
+#: driver.c:584
 msgid " (oversized)"
 msgstr " (завышенного размера)"
 
-#: driver.c:614
+#: driver.c:602
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "невозможно было извлечь заголовки, �ообщение %s@%s:%d (%d октетов)\n"
 
-#: driver.c:632
+#: driver.c:619
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "�читывает�� �ообщение %s@%s:%d из %d"
 
-#: driver.c:637
+#: driver.c:624
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d октетов)"
 
-#: driver.c:638
+#: driver.c:625
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d октетов в заголовке)"
 
-#: driver.c:708
+#: driver.c:692
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d октетов в теле)"
 
-#: driver.c:770
+#: driver.c:751
 #, 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:783
 msgid " retained\n"
 msgstr " задержано\n"
 
-#: driver.c:812
+#: driver.c:793
 msgid " flushed\n"
 msgstr " очищено\n"
 
-#: driver.c:824
+#: driver.c:810
 msgid " not flushed\n"
 msgstr " не очищено\n"
 
-#: driver.c:842
+#: driver.c:828
 #, 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"
+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:899
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� подключени� к �ерверу %s.\n"
 
-#: driver.c:903
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� �ервера %s.\n"
 
-#: driver.c:907
+#: driver.c:893
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� %s.\n"
 
-#: driver.c:912
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� ответа от �лушател�.\n"
 
-#: driver.c:915
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "таймаут по�ле %d �екунд.\n"
 
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:913
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Тема: fetchmail наблюдает повтор�ющие�� тайм-ауты"
 
-#: driver.c:930
+#: driver.c:916
 #, 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:920
 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"
@@ -226,73 +206,78 @@ msgstr ""
 "Fetchmail не будет опрашивать �тот почтовый �щик до тех\n"
 "пор, пока вы его не перезапу�тите.\n"
 
-#: driver.c:960
+#: driver.c:946
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "выполн�ема� до �оединени� команда завершена � �игналом %d\n"
 
-#: driver.c:963
+#: driver.c:949
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "�бой команды, выполн�емой до �оединени�; �тату�: %d\n"
 
-#: driver.c:987
+#: driver.c:973
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "невозможно было найти HESIOD pobox дл� %s\n"
 
-#: driver.c:1008
+#: driver.c:994
 msgid "Lead server has no name.\n"
 msgstr "Ведущий �ервер без имени.\n"
 
-#: driver.c:1035
+#: driver.c:1018
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "невозможно было найти канониче�кое им� DNS %s (%s): %s\n"
 
-#: driver.c:1082
+#: driver.c:1065
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "�бой %s-подключени� к %s"
 
+#: driver.c:1081
+msgid "Subject: Fetchmail unreachable-server warning."
+msgstr "Тема: Предупреждение Fetchmail о недо�тупно�ти �ервера."
+
+#: driver.c:1083
+#, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail не �мог у�тановить �в�зь � почтовым �ервером %s:"
+
 #: driver.c:1111
 msgid "SSL connection failed.\n"
 msgstr "Сбой подключени� через SSL.\n"
 
-#: driver.c:1166
+#: driver.c:1164
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Ошибка блокировки зан�то�ти дл� %s@%s\n"
 
-#: driver.c:1170
+#: driver.c:1168
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Ошибка зан�то�ти �ервера дл� %s@%s\n"
 
-#: driver.c:1175
+#: driver.c:1173
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Ошибка авторизации дл� %s@%s%s\n"
 
-#: driver.c:1178
+#: driver.c:1176
 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:1197
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Тема: Ошибка аутентификации fetchmail дл� %s@%s"
 
-#: driver.c:1206
+#: driver.c:1201
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail не �мог получить почту из %s@%s.\n"
 
-#: driver.c:1210
+#: driver.c:1205
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -306,7 +291,7 @@ msgstr ""
 "fetchmail не �мог ра�познать из-за того, что �ервер не отправил\n"
 "�ообщение об ошибке."
 
-#: driver.c:1216
+#: driver.c:1211
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -326,7 +311,7 @@ msgstr ""
 "подключить��. В дальнейшем уведомлени� отправл�ть�� не будут до тех\n"
 "пор, пока �лужба не будет во��тановлена."
 
-#: driver.c:1226
+#: driver.c:1221
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -349,182 +334,177 @@ msgstr ""
 "отправл�ть�� не будут до тех пор, пока �лужба не будет\n"
 "во��тановлена."
 
-#: driver.c:1242
+#: driver.c:1237
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "�емедленно повторить опро� дл� %s@%s\n"
 
-#: driver.c:1247
+#: driver.c:1242
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "�еизве�тный логин или ошибка аутентификации дл� %s@%s\n"
 
-#: driver.c:1271
+#: driver.c:1266
 #, 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:1272
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Тема: Выполнена авторизаци� fetchmail дл� %s@%s"
 
-#: driver.c:1281
+#: driver.c:1276
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail вошел в �и�тему %s@%s.\n"
 
-#: driver.c:1285
+#: driver.c:1280
 msgid "Service has been restored.\n"
 msgstr "Служба была во��тановлена.\n"
 
-#: driver.c:1318
+#: driver.c:1312
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "выбирает�� или повтор�ет�� опро� каталога %s\n"
 
-#: driver.c:1320
+#: driver.c:1314
 msgid "selecting or re-polling default folder\n"
 msgstr "выбирает�� или повтор�ет�� опро� каталога по умолчанию\n"
 
-#: driver.c:1332
+#: driver.c:1326
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s на %s (каталог %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1329 rcfile_y.y:384
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: driver.c:1340
+#: driver.c:1334
 #, c-format
 msgid "Polling %s\n"
 msgstr "Опрашивает�� %s\n"
 
-#: driver.c:1344
+#: driver.c:1338
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d �ообщение (%d %s) дл� %s"
 msgstr[1] "%d �ообщений (%d %s) дл� %s"
 
-#: driver.c:1347
+#: driver.c:1341
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "про�мотрено"
 msgstr[1] "про�мотрено"
 
-#: driver.c:1350
+#: driver.c:1344
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d �ообщение дл� %s"
 msgstr[1] "%d �ообщений дл� %s"
 
-#: driver.c:1357
+#: driver.c:1351
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d октетов).\n"
 
-#: driver.c:1363
+#: driver.c:1357
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Дл� %s почты нет\n"
 
-#: driver.c:1396
+#: driver.c:1390 imap.c:90
 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:1534
 msgid "socket"
 msgstr "�окет"
 
-#: driver.c:1552
+#: driver.c:1537
 msgid "missing or bad RFC822 header"
 msgstr "от�ут�твует или неверный заголовок RFC822"
 
-#: driver.c:1555
+#: driver.c:1540
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1558
+#: driver.c:1543
 msgid "client/server synchronization"
 msgstr "�инхронизаци� клиент/�ервер"
 
-#: driver.c:1561
+#: driver.c:1546
 msgid "client/server protocol"
 msgstr "протокол клиент/�ервер"
 
-#: driver.c:1564
+#: driver.c:1549
 msgid "lock busy on server"
 msgstr "блокировка зан�то�ти на �ервере"
 
-#: driver.c:1567
+#: driver.c:1552
 msgid "SMTP transaction"
 msgstr "SMTP-транзакци�"
 
-#: driver.c:1570
+#: driver.c:1555
 msgid "DNS lookup"
 msgstr "DNS-запро�"
 
-#: driver.c:1573
+#: driver.c:1558
 msgid "undefined"
 msgstr "неопределённый"
 
-#: driver.c:1579
+#: driver.c:1564
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Ошибка %s при выборке из %s@%s и до�тавке на хо�т SMTP %s\n"
 
-#: driver.c:1581
+#: driver.c:1566
 msgid "unknown"
 msgstr "неизв."
 
-#: driver.c:1583
+#: driver.c:1568
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Ошибка %s при выборке из %s@%s\n"
 
-#: driver.c:1595
+#: driver.c:1580
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "выполн�ема� по�ле �оединени� команда завершена � �игналом %d\n"
 
-#: driver.c:1597
+#: driver.c:1582
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "�бой команды, выполн�емой по�ле �оединени�; �тату�: %d\n"
 
-#: driver.c:1616
+#: driver.c:1601
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Поддержка Kerberos V4 не �в�зана.\n"
 
-#: driver.c:1624
+#: driver.c:1609
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Поддержка Kerberos V5 не �в�зана.\n"
 
-#: driver.c:1635
+#: driver.c:1620
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Опци� --flush не поддерживает�� � %s\n"
 
-#: driver.c:1641
+#: driver.c:1626
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Опци� --all не поддерживает�� � %s\n"
 
-#: driver.c:1650
+#: driver.c:1635
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Опци� --limit не поддерживает�� � %s\n"
 
-#: env.c:58
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -540,13 +520,12 @@ msgstr ""
 "Попробуйте \"env QMAILINJECT= %s СВОИ �РГУМЕ�ТЫ\"\n"
 "%s: Сбро�.\n"
 
-#: env.c:70
+#: env.c:71
 #, 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 ""
@@ -557,48 +536,36 @@ msgstr ""
 "Попробуйте \"env NULLMAILER_FLAGS= %s СВОИ �РГУМЕ�ТЫ\"\n"
 "%s: Сбро�.\n"
 
-#: env.c:82
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Ты �уще�твуешь.  Вали от�юда.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: невозможно определить ваш хо�т!"
 
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:168
+#, c-format
+msgid "gethostbyname failed for %s\n"
 msgstr "�бой gethostbyname дл� %s\n"
 
-#: env.c:225
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"�евозможно найти �вой �об�твенный хо�т в базе данных хо�тов, чтобы "
-"определить его!\n"
+msgstr "�евозможно найти �вой �об�твенный хо�т в базе данных хо�тов, чтобы определить его!\n"
 
-#: env.c:229
+#: env.c:174
 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 ""
 "Пытаем�� продолжить � неопределённым именем хо�та.\n"
-"�Е СООБЩ�ЙТЕ о нарушенных заголовках Received:, �троках HELO/EHLO или "
-"подобных проблемах!\n"
+"�Е СООБЩ�ЙТЕ о нарушенных заголовках Received:, �троках HELO/EHLO или подобных проблемах!\n"
 "Вме�то �того ИСПР�ВЬТЕ �вой /etc/hosts, DNS, NIS или LDAP.\n"
 
-#: etrn.c:49 odmr.c:61
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "SMTP-приемник %s не поддерживает ESMTP\n"
@@ -662,22 +629,19 @@ msgstr "Опци� --folder не поддерживает�� � ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Опци� --check не поддерживает�� � ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2009 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
-"Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
 "Copyright (C) 2005 - 2006 Sunil Shetye\n"
 "Copyright (C) 2005 - 2009 Matthias Andree\n"
 
-#: fetchmail.c:148
+#: fetchmail.c:142
 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"
@@ -688,1037 +652,902 @@ msgstr ""
 "�облюдении определённых у�ловий. Подробно�ти �мотрите в файле COPYING\n"
 "в каталоге � документацией или и�ходными тек�тами.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ. Запу�к под root'ом не рекомендует��.\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: запущен �"
 
-#: fetchmail.c:223
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "невозможно было получить текущий рабочий каталог\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:283
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Это fetchmail вер�ии %s"
 
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:398
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Опции берут�� из командной �троки %s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:399
 msgid " and "
 msgstr " и "
 
-#: fetchmail.c:475
+#: fetchmail.c:404
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "�ет на�троенных почтовых �ерверов -- может от�ут�твует %s?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:425
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: не были указаны почтовые �ерверы.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:437
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: другие запущенные fetchmail от�ут�твуют\n"
 
-#: fetchmail.c:514
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
-msgstr ""
-"fetchmail: ошибка о�тановки %s fetchmail на %d; вынужденное завершение.\n"
+#: fetchmail.c:443
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
+msgstr "fetchmail: ошибка о�тановки %s fetchmail на %d; вынужденное завершение.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:444 fetchmail.c:453
 msgid "background"
 msgstr "фоновый режим"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:444 fetchmail.c:453
 msgid "foreground"
 msgstr "приоритетный режим"
 
-#: fetchmail.c:523
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:452
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail на %d о�тановлен.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: невозможно проверить почту, пока на том же хо�те запущен другой "
-"fetchmail.\n"
+#: fetchmail.c:475
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: невозможно проверить почту, пока на том же хо�те запущен другой fetchmail.\n"
 
-#: fetchmail.c:552
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: невозможно опро�ить указанные хо�ты из-за другого fetchmail, "
-"запущенного на %d.\n"
+#: fetchmail.c:481
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: невозможно опро�ить указанные хо�ты из-за другого fetchmail, запущенного на %d.\n"
 
-#: fetchmail.c:559
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:488
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: на %d запущен другой приоритетный fetchmail.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
+#: fetchmail.c:498
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
 
-#: fetchmail.c:581
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:504
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: на %d из фонового режима вернул��  fetchmail.\n"
 
-#: fetchmail.c:593
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: на %d неожиданно завершил�� более �тарший проце�� того же "
-"уровн�.\n"
+#: fetchmail.c:516
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
+msgstr "fetchmail: на %d неожиданно завершил�� более �тарший проце�� того же уровн�.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:531
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: невозможно найти пароль дл� %s@%s.\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:535
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Введите пароль дл� %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:560 fetchmail.c:596
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: Предупреждение: на�троено и�пользование syslog и logfile. Провер�йте оба журнала!\n"
+
+#: fetchmail.c:572
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n"
 
-#: fetchmail.c:658
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:576
+#, c-format
+msgid "starting fetchmail %s daemon \n"
 msgstr "запу�кает�� демон fetchmail %s\n"
 
-#: fetchmail.c:674 fetchmail.c:676
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:592 fetchmail.c:594
+#, c-format
+msgid "could not open %s to append logs to \n"
 msgstr "невозможно было открыть %s дл� добавлени� запи�ей\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:615
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "влючен режим --check, выборка почты не выполн�ет��\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:637
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "невозможно было проверить врем� %s (ошибка %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:642
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail перезапу�кает�� (%s изменен)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:647
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "возможен �бой при перезапу�ке, т.к. каталог не был во��тановлен\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:674
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "�бой перезапу�ка fetchmail\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:704
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"опро� %s пропущен (ошибка аутентификации или �лишком много тайм-аутов)\n"
+msgstr "опро� %s пропущен (ошибка аутентификации или �лишком много тайм-аутов)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:716
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "интервал не до�тигнут, %s не запрашивает��\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:754
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Стату� запро�а=0 (SUCCESS)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:756
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Стату� запро�а=1 (NOMAIL)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:758
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Стату� запро�а=2 (SOCKET)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:760
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Стату� запро�а=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:762
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Стату� запро�а=4 (PROTOCOL)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:764
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Стату� запро�а=5 (SYNTAX)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:766
 msgid "Query status=6 (IOERR)\n"
 msgstr "Стату� запро�а=6 (IOERR)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:768
 msgid "Query status=7 (ERROR)\n"
 msgstr "Стату� запро�а=7 (ERROR)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:770
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Стату� запро�а=8 (EXCLUDE)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:772
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Стату� запро�а=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:774
 msgid "Query status=10 (SMTP)\n"
 msgstr "Стату� запро�а=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:776
 msgid "Query status=11 (DNS)\n"
 msgstr "Стату� запро�а=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:778
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Стату� запро�а=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:780
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Стату� запро�а=13 (MAXFETCH)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:782
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Стату� запро�а=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:824
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "В�е �оединени� перегружены.  Завершение работы.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:831
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "в �п�щем режиме в %s на %d �екунд\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by %s\n"
 msgstr "разбужен %s'ом\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:858
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "разбужен по �игналу %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:865
 #, c-format
 msgid "awakened at %s\n"
 msgstr "разбужен на %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:871
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "нормальное завершение, �тату� %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1025
 msgid "couldn't time-check the run-control file\n"
 msgstr "невозможно было проверить врем� файла контрол� запу�ка\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1058
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Предупреждение: многократные ��ылки на хо�т %s в файле на�тройки\n"
 
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Ошибка: многократные запи�и \"defaults\" в файле на�тройки.\n"
+#: fetchmail.c:1091
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "fetchmail: Ошибка: многократные запи�и \"defaults\" в файле на�тройки.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1213
 msgid "SSL support is not compiled in.\n"
 msgstr "Поддержка SSL не была включена при компил�ции.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1220
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v4 на�троена, но не была включена при компил�ции.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1226
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v5 на�троена, но не была включена при компил�ции.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1232
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Поддержка GSSAPI на�троена, но не была включена при компил�ции.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1262
 #, 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:1377
+#: fetchmail.c:1273
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "предупреждение: multidrop дл� %s требует опцию envelope!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1274
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"предупреждение: �е про�ите техниче�кой поддержки, е�ли в�е �ообщени� "
-"отправл�ют�� по�тма�теру!\n"
+msgstr "предупреждение: �е про�ите техниче�кой поддержки, е�ли в�е �ообщени� отправл�ют�� по�тма�теру!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1291
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: конфигураци� %s не верна, укажите положительный номер порта дл� "
-"�лужбы\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: конфигураци� %s не верна, укажите положительный номер порта дл� �лужбы\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1298
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: конфигураци� %s не верна, дл� RPOP требует�� привилегированный "
-"порт\n"
+msgstr "fetchmail: конфигураци� %s не верна, дл� RPOP требует�� привилегированный порт\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1316
 #, 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:1434
+#: fetchmail.c:1330
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Запу�кать fetchall, о�тавл�� его при �том в режиме демона или про�то�, "
-"нельз�!\n"
+msgstr "Запу�кать fetchall, о�тавл�� его при �том в режиме демона или про�то�, нельз�!\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1355
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "завершен по �игналу %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1428
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опро� начат\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1453
 msgid "POP2 support is not configured.\n"
 msgstr "Поддержка POP2 не на�троена.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1465
 msgid "POP3 support is not configured.\n"
 msgstr "Поддержка POP3 не на�троена.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1475
 msgid "IMAP support is not configured.\n"
 msgstr "Поддержка IMAP не на�троена.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1481
 msgid "ETRN support is not configured.\n"
 msgstr "Поддержка ETRN не на�троена.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1489
 msgid "ODMR support is not configured.\n"
 msgstr "Поддержка ODMR не на�троена.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1496
 msgid "unsupported protocol selected.\n"
 msgstr "выбран неподдерживаемый протокол.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1506
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опро� завершен\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1523
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал опро�а - %d �екунд\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1525
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Лог-файл - %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1527
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-файл - %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1530
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Обработка �ообщений будет реги�трировать�� через syslog\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1533
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail включит ма�кировку и не �озда�т поле Received\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1535
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Fetchmail будет отображать точечную �троку прогре��а даже в log-файлах.\n"
+msgstr "Fetchmail будет отображать точечную �троку прогре��а даже в log-файлах.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1537
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail будет пере�ылать многоканальные �ообщени� без адре�а на %s.\n"
+msgstr "Fetchmail будет пере�ылать многоканальные �ообщени� без адре�а на %s.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1541
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail направит ошибочное пи�ьмо по�тма�теру.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1543
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail направит ошибочное пи�ьмо отправителю.\n"
 
-#: fetchmail.c:1668
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail будет �читать по�то�нные ошибки по�то�нными (удалит �ообщени�).\n"
+#: fetchmail.c:1546
+msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n"
+msgstr "Fetchmail будет �читать по�то�нные ошибки по�то�нными (удалит �ообщени�).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1548
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail будет �читать по�то�нные ошибки временными (�охранит �ообщени�).\n"
+msgstr "Fetchmail будет �читать по�то�нные ошибки временными (�охранит �ообщени�).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1555
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Параметры дл� получени� из %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Почта будет получена через %s\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1562
 #, 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:1688
+#: fetchmail.c:1566
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  �а�то�щее им� �евера - %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1569
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Когда хо�т не указан, �тот хо�т не будет запрошен.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1570
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Когда хо�т не указан, будет запрошен �тот хо�т.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1574
 msgid "  Password will be prompted for.\n"
 msgstr "  Будет затребован пароль.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1578
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Секрет APOP = \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1581
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1584
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Пароль = \"%s\".\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1593
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол - KPOP � аутентификацией Kerberos %s"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол - %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1598
 #, c-format
 msgid " (using service %s)"
 msgstr " (и�пользует�� �лужба %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1600
 msgid " (using default port)"
 msgstr " (и�пользует�� порт по умолчанию)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1602
 msgid " (forcing UIDL use)"
 msgstr " (принудительно и�пользует�� UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1608
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Будут и�пробованы в�е до�тупные �по�обы аутентификации.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1611
 msgid "  Password authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� � паролем.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1614
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� MSN.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1617
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� NTLM.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1620
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� OTP.\n"
 
-#: fetchmail.c:1745
-#, fuzzy
-msgid "  CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1623
+msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� CRAM-Md5.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1626
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� GSSAPI.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1629
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� Kerberos V4.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1632
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� Kerberos V5.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1635
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Допу�кает�� оперативное шифрование.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1639
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Принципал почтовой �лужбы: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1642
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Включены �е��ии, зашифрованные SSL.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Протокол SSL: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1646
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Включена проверка �ертификата �ервера SSL.\n"
 
-#: fetchmail.c:1770
-#, fuzzy
-msgid "  SSL server certificate checking disabled.\n"
-msgstr "  Включена проверка �ертификата �ервера SSL.\n"
-
-#: fetchmail.c:1773
-#, fuzzy, c-format
-msgid "  SSL trusted certificate file: %s\n"
-msgstr "  Каталог доверенных �ертификатов SSL: %s\n"
-
-#: fetchmail.c:1775
+#: fetchmail.c:1648
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Каталог доверенных �ертификатов SSL: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Общеприн�тое им� SSL-�ервера: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1653
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Отпечаток ключа SSL (�веренный � ключом �ервера): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1656
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Таймаут молчани� �ервера - %d �екунд"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1658
 msgid " (default).\n"
 msgstr " (по умолчанию).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1665
 msgid "  Default mailbox selected.\n"
 msgstr "  Выбран почтовый �щик по умолчанию.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1670
 msgid "  Selected mailboxes are:"
 msgstr "  Выбранные почтовые �щики:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1676
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Будут получены в�е �ообщени� (--all on).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1677
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Будут получены только новые �ообщени� (--all off).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1679
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Выбранные �ообщени� будут о�тавлены на �ервере (--keep on).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1680
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Выбранные �ообщени� будут удалены � �ервера (--keep off).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1682
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Старые �ообщени� будут удалены перед получением �ообщени� (--flush on).\n"
+msgstr "  Старые �ообщени� будут удалены перед получением �ообщени� (--flush on).\n"
 
-#: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Старые �ообщени� не будут удалены перед получением �ообщени� (--flush "
-"off).\n"
+#: fetchmail.c:1683
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Старые �ообщени� не будут удалены перед получением �ообщени� (--flush off).\n"
 
-#: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Сообщени� завышенного размера будут удалены перед получением �ообщени� (--"
-"limitflush on).\n"
+#: fetchmail.c:1685
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Сообщени� завышенного размера будут удалены перед получением �ообщени� (--limitflush on).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Сообщени� завышенного размера не будут удалены перед получением �ообщени� "
-"(--limitflush  off).\n"
+#: fetchmail.c:1686
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Сообщени� завышенного размера не будут удалены перед получением �ообщени� (--limitflush  off).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1688
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Перезапи�ь локальных адре�ов �ервера включена (--norewrite off).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Перезапи�ь локальных адре�ов �ервера выключена (--norewrite on).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1691
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Удаление возврата каретки включено (stripcr on).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Удаление возврата каретки выключено (stripcr off).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1694
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Принудительный возврат каретки включен (forcecr on).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Принудительный возврат каретки выключен (forcecr off).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Интерпретаци� кодировки передаваемого контента выключена (pass8bits on).\n"
+#: fetchmail.c:1697
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Интерпретаци� кодировки передаваемого контента выключена (pass8bits on).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Интерпретаци� кодировки передаваемого контента включена (pass8bits off).\n"
+#: fetchmail.c:1698
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Интерпретаци� кодировки передаваемого контента включена (pass8bits off).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1700
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-декодирование включено (mimedecode on).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1701
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-декодирование выключено (mimedecode off).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1703
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Про�той по�ле опро�а включен (idle on).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1704
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Про�той по�ле опро�а выключен (idle off).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1706
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  �епу�тые �троки �о�то�ни� будут удалены (dropstatus on)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  �епу�тые �троки �о�то�ни� будут �охранены (dropstatus off)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1709
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Строки Delivered-To будут удалены (dropdelivered on)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Строки Delivered-To будут �охранены (dropdelivered off)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1714
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничение на размер �ообщени� - %d октетов (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1717
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �ет ограничени� на размер �ообщени� (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1719
 #, 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:1848
+#: fetchmail.c:1722
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Предупреждени� о размере при каждом опро�е (--warnings 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1725
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничение на полученные �ообщени� - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1728
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  �ет ограничени� на полученные �ообщени� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1730
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-"  Ограничение на размер выборки �ообщений - %d (--fetchsizelimit %d).\n"
+msgstr "  Ограничение на размер выборки �ообщений - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1733
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  �ет ограничени� на размер выборки �ообщений (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1737
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Выполн�ть двоичный пои�к UID'ов во врем� каждого опро�а (--fastuidl -1).\n"
+msgstr "  Выполн�ть двоичный пои�к UID'ов во врем� каждого опро�а (--fastuidl -1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1739
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Выполн�ть двоичный пои�к UID'ов во врем� %d из %d опро�ов (--fastuidl "
-"%d).\n"
+msgstr "  Выполн�ть двоичный пои�к UID'ов во врем� %d из %d опро�ов (--fastuidl %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1742
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Выполн�ть линейный пои�к UID'ов во врем� каждого опро�а (--fastuidl 0).\n"
+msgstr "   Выполн�ть линейный пои�к UID'ов во врем� каждого опро�а (--fastuidl 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1744
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничение на пакет SMTP-�ообщений - %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1746
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  �ет ограничени� на пакет SMTP-�ообщений (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1750
 #, 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:1878
+#: fetchmail.c:1752
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  �ет принудительных удалений (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1759
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домены, дл� которых будет выполн�ть�� выборка почты:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1764 fetchmail.c:1784
 msgid " (default)"
 msgstr " (по умолчанию)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Сообщени� будут прикреплены к %s как BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1771
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Сообщени� будут до�тавлены � \"%s\".\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1778
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Сообщени� будут переадре�ованы по %cMTP на:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1789
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Ча�ть хо�та из �троки MAIL FROM будет %s\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1792
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  �дре�, в�тавл�емый в �троки RCPT TO, отправл�емые по SMTP, будет %s\n"
+msgstr "  �дре�, в�тавл�емый в �троки RCPT TO, отправл�емые по SMTP, будет %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1801
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Ответные дей�тви� на ра�познанные �лушателем �пам-блоки:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1807
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокировка �пама отключена\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1810
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Подключение к �ерверу будет у�тановлено � \"%s\".\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1813
 msgid "  No pre-connection command.\n"
 msgstr "  �ет команды, выполн�емой до �оединени�.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1815
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Подключение к �ерверу будет разорвано � \"%s\".\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1818
 msgid "  No post-connection command.\n"
 msgstr "  �ет команды, выполн�емой по�ле �оединени�.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1821
 msgid "  No localnames declared for this host.\n"
 msgstr "  �ет локальных имен, объ�вленных дл� �того хо�та.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1831
 msgid "  Multi-drop mode: "
 msgstr "  Многоканальный режим:"
 
-#: fetchmail.c:1959
+#: fetchmail.c:1833
 msgid "  Single-drop mode: "
 msgstr "  Одноканальный режим: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1835
 #, 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:1976
+#: fetchmail.c:1850
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-запро� дл� многоканальных адре�ов включен.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-запро� дл� многоканальных адре�ов выключен.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  �ли�ы �ервера будут �равнены � многоканальными адре�ами по IP-адре�у.\n"
+#: fetchmail.c:1855
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  �ли�ы �ервера будут �равнены � многоканальными адре�ами по IP-адре�у.\n"
 
-#: fetchmail.c:1983
+#: fetchmail.c:1857
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  �ли�ы �ервера будут �равнены � многоканальными адре�ами по имени.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1860
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Маршрутизаци� охватывающего адре�а отключена\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1863
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Охватывающий заголовок должен быть: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1866
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Количе�тво пропу�каемых охватывающих заголовков: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1869
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префик� %s будет удален из id пользовател�\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1872
 msgid "  No prefix stripping\n"
 msgstr "  �ет разборки префик�а\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1879
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Ранее объ�вленные алиа�ы почтового �ервера:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1888
 msgid "  Local domains:"
 msgstr "  Локальные домены:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1898
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Подключение должно быть через интерфей� %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1900
 msgid "  No interface requirement specified.\n"
 msgstr "  �е указаны требовани� интерфей�а.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1902
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Цикл опро�а будет наблюдать за %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1904
 msgid "  No monitor interface specified.\n"
 msgstr "  �е указан интерфей� монитора.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Подключени� к �ерверу будут выполн�ть�� по�ред�твом плагина %s (--plugin "
-"%s).\n"
+msgstr "  Подключени� к �ерверу будут выполн�ть�� по�ред�твом плагина %s (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:1910
 msgid "  No plugin command specified.\n"
 msgstr "  �е указана команда плагина.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:1912
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Подключени� �лушател� будут выполн�ть�� через plugout %s (--plugout %s).\n"
+msgstr "  Подключени� �лушател� будут выполн�ть�� через plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:1914
 msgid "  No plugout command specified.\n"
 msgstr "  �е указана команда plugout'а.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:1919
 msgid "  No UIDs saved from this host.\n"
 msgstr "  С �того хо�та нет �охраненных UID'ов.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:1928
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Сохранено %d UID'ов.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:1936
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Информаци� � тра��ировкой опро�а будет добавлена в заголовок Received.\n"
+msgstr "  Информаци� � тра��ировкой опро�а будет добавлена в заголовок Received.\n"
 
-#: fetchmail.c:2055
-#, fuzzy
-msgid "  No poll trace information will be added to the Received header.\n"
+#: fetchmail.c:1938
+msgid ""
+"  No poll trace information will be added to the Received header.\n"
+".\n"
 msgstr ""
 "  Информаци� � тра��ировкой опро�а не будет добавлена в заголовок Received.\n"
 ".\n"
 
-#: fetchmail.c:2060
-msgid "  Messages with bad headers will be rejected.\n"
-msgstr ""
-
-#: fetchmail.c:2063
-msgid "  Messages with bad headers will be passed on.\n"
-msgstr ""
-
-#: fetchmail.c:2068
+#: fetchmail.c:1941
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свой�тва ретран�л�ции \"%s\".\n"
 
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ОШИБК�: от�ут�твует поддержка процедуры getpassword()\n"
@@ -1731,88 +1560,55 @@ msgstr ""
 "\n"
 "Получен SIGINT... завершение работы.\n"
 
-#: gssapi.c:53
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:56
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "Ошибка %cMTP: %s\n"
-
-#: gssapi.c:91
+#: gssapi.c:66
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "�евозможно было получить им� �лужбы дл� [%s]\n"
 
-#: gssapi.c:96
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "И�пользует�� им� �лужбы [%s]\n"
 
-#: gssapi.c:123
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:160
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:170
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Отправл�ют�� идентификационные данные\n"
 
-#: gssapi.c:201
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Ошибка обмена идентификационными данными\n"
 
-#: gssapi.c:243
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "�евозможно было развернуть данные уровн� безопа�но�ти\n"
 
-#: gssapi.c:248
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Обмен идентификационными данными завершен\n"
 
-#: gssapi.c:252
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Серверу требуют�� цело�тно�ть и/или конфиденциально�ть\n"
 
-#: gssapi.c:261
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Флаги развернутого уровн� безопа�но�ти: %s%s%s\n"
 
-#: gssapi.c:265
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Мак�имальный размер маркера GSS - %ld\n"
 
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Ошибка �оздани� запро�а уровн� безопа�но�ти\n"
 
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Создают�� идентификационные данные GSS\n"
 
-#: gssapi.c:302
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Ошибка �оздани� идентификационных данных\n"
 
@@ -1821,141 +1617,108 @@ msgstr "Ошибка Ñ�озданиÑ� идентификационных данÐ
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: поток прио�тановлен в течение %d �екунд.\n"
 
-#: imap.c:75
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:97
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "фиктивное количе�тво �ообщений!"
-
-#: imap.c:144
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:355
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 1\n"
 
-#: imap.c:361
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 0\n"
 
-#: imap.c:368
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Протокол идентифицирован как IMAP2 или IMAP2BIS\n"
 
-#: imap.c:385
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "будет прио�тановлен по�ле опро�а\n"
 
-#: imap.c:476 pop3.c:474
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: обновление до TLS выполнено у�пешно.\n"
 
-#: imap.c:482 pop3.c:480
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: �бой обновлени� до TLS.\n"
 
-#: imap.c:487
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-"%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
-"работу\n"
+msgstr "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить работу\n"
 
-#: imap.c:502
-#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-
-#: imap.c:607
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки OTP\n"
 
-#: imap.c:627 pop3.c:560
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки NTLM\n"
 
-#: imap.c:691
+#: imap.c:601
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Требуема� опци� LOGIN не поддерживает�� �ервером\n"
+
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "разногла�ие при удалении пи�ем (%d на �амом деле != %d ожидало�ь)\n"
 
-#: imap.c:818
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu не про�мотрено\n"
-
-#: 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:903 imap.c:962
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "не удало�ь повторить опро�\n"
 
-#: imap.c:911 imap.c:967
+#: imap.c:781 imap.c:837
 #, 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:928
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "не удало�ь выбрать почтовый �щик\n"
 
-#: imap.c:932
+#: imap.c:802
 #, 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:946
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "не удало�ь удалить\n"
 
-#: imap.c:950
+#: imap.c:820
 #, 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:989
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "�бой пои�ка непро�мотренных �ообщений\n"
 
-#: imap.c:994 pop3.c:852
+#: imap.c:890
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu не про�мотрено\n"
+
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u первое не про�мотренное\n"
 
-#: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Предупреждение: игнорируют�� некорректные данные о размерах �ообщений, "
-"возвращённые �ервером.\n"
-
-#: imap.c:1177 imap.c:1184
-#, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+#: imap.c:993
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Предупреждение: игнорируют�� некорректные данные о размерах �ообщений, возвращённые �ервером.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"�евозможно открыть интерфей� kvm. Убедите�ь, что fetchmail �вл�ет�� SGID "
-"kmem."
+msgstr "�евозможно открыть интерфей� kvm. Убедите�ь, что fetchmail �вл�ет�� SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1989,44 +1752,44 @@ msgstr "�е найден интерфей� � именем %s"
 msgid "No IP address found for %s"
 msgstr "�е найден IP-адре� дл� %s"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "от�ут�твует адре� IP-интерфей�а\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "неверный адре� IP-интерфей�а\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "неверна� ма�ка IP-интерфей�а\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "активно�ть на %s -отмечена- как %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "пропу�кает�� опро� %s, %s отключен\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "пропу�кает�� опро� %s, %s IP-адре� и�ключен\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "активно�ть на %s проверена как %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "пропу�кает�� опро� %s, %s отключен\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "активно�ть на %s была %d, %d\n"
@@ -2035,651 +1798,520 @@ 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 "ненулева� копи� (%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
+#: lock.c:86
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: ошибка чтени� файла блокировки \"%s\": %s\n"
 
-#: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+#: lock.c:97
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: удал�ет�� �тарый файл блокировки\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: ошибка открыти� файла блокировки \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: ошибка чтени� файла блокировки \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:121
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: ошибка открыти� файла блокировки \"%s\": %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:168
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: не удало�ь у�тановить блокировку.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: ошибка чтени� файла блокировки \"%s\": %s\n"
-
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: предупреждение: перед в�еми именами хо�тов найден \"%s\"\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: предупреждение: неизве�тный маркер \"%s\"\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
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "SMTP-приемник %s не поддерживает ATRN\n"
 
-#: odmr.c:105
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "Ревер�ирование передачи...\n"
 
-#: odmr.c:110
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "Запро� ATRN отклонен.\n"
 
-#: odmr.c:114
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "�евозможно �ейча� обработать запро� ATRN\n"
 
-#: odmr.c:119
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "Дл� ва� почты нет.\n"
 
-#: odmr.c:123
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Команда не выполнена\n"
 
-#: odmr.c:127
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Требует�� аутентификаци�.\n"
 
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:130
+#, c-format
+msgid "Unknown ODMR error %d\n"
 msgstr "�еизве�тна� ошибка ODMR %d\n"
 
-#: odmr.c:192
+#: odmr.c:189
 msgid "receiving message data\n"
 msgstr "принимают�� данные �ообщени�\n"
 
-#: odmr.c:245
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Опци� --keep не поддерживает�� � ODMR\n"
 
-#: odmr.c:249
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Опци� --flush не поддерживает�� � ODMR\n"
 
-#: odmr.c:253
+#: odmr.c:250
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "Опци� --folder не поддерживает�� � ODMR\n"
 
-#: odmr.c:257
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Опци� --check не поддерживает�� � ODMR\n"
 
-#: opie.c:43
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "�ервер прекратил получение\n"
 
-#: opie.c:57
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "�евозможно было декодировать запро� OTP\n"
 
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Секретна� идентификационна� фраза:"
 
-#: options.c:179 options.c:223
+#: options.c:172 options.c:216
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Строка '%s' не �вл�ет�� верной чи�ловой �трокой.\n"
 
-#: options.c:188
+#: options.c:181
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Значение �троки '%s' - %s, чем %d.\n"
 
-#: options.c:189
+#: options.c:182
 msgid "smaller"
 msgstr "меньше"
 
-#: options.c:189
+#: options.c:182
 msgid "larger"
 msgstr "больше"
 
-#: options.c:337
-#, fuzzy, c-format
-msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr "Указан неверный протокол `%s'.\n"
-
-#: options.c:378
+#: options.c:349
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Указан неверный протокол `%s'.\n"
 
-#: options.c:425
+#: options.c:396
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Указана неверна� аутентификаци� `%s'.\n"
 
-#: options.c:641
+#: options.c:601
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "и�пользование:  fetchmail [опции] [�ервер ...]\n"
 
-#: options.c:642
+#: options.c:602
 msgid "  Options are as follows:\n"
 msgstr "  И�пользуемые опции:\n"
 
-#: options.c:643
+#: options.c:603
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        вывод �той �правки\n"
 
-#: options.c:644
+#: options.c:604
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     вывод информации о вер�ии\n"
 
-#: options.c:646
+#: options.c:606
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       проверка �ообщений без выборки\n"
 
-#: options.c:647
+#: options.c:607
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      работа без лишней информации\n"
 
-#: options.c:648
+#: options.c:608
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr ""
-"  -v, --verbose     работа � подробным выводом диагно�тиче�ких данных\n"
+msgstr "  -v, --verbose     работа � подробным выводом диагно�тиче�ких данных\n"
 
-#: options.c:649
+#: options.c:609
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      запу�к в виде демона каждые n �екунд\n"
 
-#: options.c:650
+#: options.c:610
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    не от�оедин�ть проце�� демона\n"
 
-#: options.c:651
+#: options.c:611
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        о�танов проце��а демона\n"
 
-#: options.c:652
+#: options.c:612
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     указание имени log-файла\n"
 
-#: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      и�пользование syslog(3) дл� большин�тва �ообщений, когда "
-"запущен как демон\n"
-
-#: options.c:654
-msgid "      --nosyslog    turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:613
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      и�пользование syslog(3) дл� большин�тва �ообщений, когда запущен как демон\n"
 
-#: options.c:655
+#: options.c:614
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   не запи�ывать Received и включить �пуфинг хо�та\n"
 
-#: options.c:656
+#: options.c:615
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc указание другого файла контрол� запу�ка\n"
 
-#: options.c:657
+#: options.c:616
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      указание других UID'ов файла\n"
 
-#: options.c:658
+#: options.c:617
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     указание другого файла � PID'ом\n"
 
-#: options.c:659
+#: options.c:618
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  указать получател� на крайний �лучай\n"
 
-#: options.c:660
+#: options.c:619
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    перенаправл�ть рикошеты пользователей по�тма�теру\n"
+msgstr "      --nobounce    перенаправл�ть рикошеты пользователей по�тма�теру\n"
 
-#: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail удал�ет по�то�нно недо�тавл�емые �ообщени�\n"
+#: options.c:620
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail удал�ет по�то�нно недо�тавл�емые �ообщени�\n"
 
-#: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  �охран�ть на �ервере по�то�нно недо�тавл�емые �ообщени� "
-"(по умолчанию)\n"
+#: options.c:621
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  �охран�ть на �ервере по�то�нно недо�тавл�емые �ообщени� (по умолчанию)\n"
 
-#: options.c:664
+#: options.c:623
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   требуема� дл� интерфей�а �пецификаци�\n"
 
-#: options.c:665
+#: options.c:624
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     наблюдение за активно�тью интерфей�а\n"
 
-#: options.c:668
+#: options.c:627
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         включение �е��ии, зашифрованной ssl\n"
 
-#: options.c:669
+#: options.c:628
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      файл �екретного ключа ssl\n"
 
-#: options.c:670
+#: options.c:629
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     �ертификат клиента ssl\n"
 
-#: options.c:671
+#: options.c:630
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   �трога� проверка �ертификата �евера (рекомендует��)\n"
+msgstr "      --sslcertck   �трога� проверка �ертификата �евера (рекомендует��)\n"
 
-#: options.c:672
-#, fuzzy
-msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --sslcertck   �трога� проверка �ертификата �евера (рекомендует��)\n"
-
-#: options.c:673
-#, fuzzy
-msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
+#: options.c:631
+msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath путь к �ертификатам ssl\n"
 
-#: options.c:674
-#, fuzzy
-msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr "      --sslcertpath путь к �ертификатам ssl\n"
+#: options.c:632
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  ожидать �то общеприн�тое им� от �ервера (не рекомендует��)\n"
 
-#: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  ожидать �то общеприн�тое им� от �ервера (не "
-"рекомендует��)\n"
+#: options.c:633
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint отпечаток, который должен �оответ�твовать �ертификату �ервера.\n"
 
-#: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint отпечаток, который должен �оответ�твовать �ертификату "
-"�ервера.\n"
-
-#: options.c:677
-#, fuzzy
-msgid "      --sslproto    force ssl protocol (see manual)\n"
-msgstr ""
-"      --sslproto    принудительное и�пользование протокола ssl (SSL2/SSL3/"
-"TLS1)\n"
+#: options.c:634
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
+msgstr "      --sslproto    принудительное и�пользование протокола ssl (SSL2/SSL3/TLS1)\n"
 
-#: options.c:679
+#: options.c:636
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      указание внешней команды дл� у�тановки �оединени�\n"
+msgstr "      --plugin      указание внешней команды дл� у�тановки �оединени�\n"
 
-#: options.c:680
+#: options.c:637
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     указание внешней команды дл� у�тановки �оединени� smtp\n"
+msgstr "      --plugout     указание внешней команды дл� у�тановки �оединени� smtp\n"
 
-#: options.c:681
-msgid ""
-"      --bad-header {reject|accept}\n"
-"                    specify policy for handling messages with bad headers\n"
-msgstr ""
-
-#: options.c:684
-#, fuzzy
-msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
+#: options.c:639
+msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    указание протокола пои�ка (�м. man page)\n"
 
-#: options.c:685
+#: options.c:640
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr ""
-"  -U, --uidl        принудительное и�пользование UIDL'ов (только pop3)\n"
+msgstr "  -U, --uidl        принудительное и�пользование UIDL'ов (только pop3)\n"
 
-#: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:641
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        TCP-порт дл� подключени� (у�тарел, и�пользуйте --"
-"service)\n"
+msgstr "      --port        TCP-порт дл� подключени� (у�тарел, и�пользуйте --service)\n"
 
-#: 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:642
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     �лужба TCP дл� подключени� (может быть чи�ловым TCP-портом)\n"
 
-#: options.c:689
-#, fuzzy
-msgid "      --auth        authentication type (see manual)\n"
+#: options.c:643
+msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        тип аутентификации (password/kerberos/ssh/otp)\n"
 
-#: options.c:690
+#: options.c:644
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     таймаут молчани� �ервера\n"
 
-#: options.c:691
+#: options.c:645
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    заголовок охватывающего адре�а\n"
 
-#: options.c:692
+#: options.c:646
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    префик�, удал�емый из id локального пользовател�\n"
 
-#: options.c:693
+#: options.c:647
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   принципал почтовой �лужбы\n"
 
-#: options.c:694
+#: options.c:648
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  добавление информации тра��ировки опро�а в заголовок "
-"Received\n"
+msgstr "      --tracepolls  добавление информации тра��ировки опро�а в заголовок Received\n"
 
-#: options.c:696
-#, fuzzy
-msgid "  -u, --user[name]  specify users's login on server\n"
+#: options.c:650
+msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    указание логина пользовател� на �ервере\n"
 
-#: options.c:697
+#: options.c:651
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  получение �тарых и новых �ообщений\n"
 
-#: options.c:698
+#: options.c:652
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      удаление новых �ообщений по�ле получени�\n"
 
-#: options.c:699
+#: options.c:653
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        �охранение новых �ообщений по�ле получени�\n"
 
-#: options.c:700
+#: options.c:654
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       удаление �тарых �ообщений � �ервера\n"
 
-#: options.c:701
+#: options.c:655
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  удаление �ообщений завышенного размера\n"
 
-#: options.c:702
+#: options.c:656
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   не перезапи�ывать адре�а заголовка\n"
 
-#: options.c:703
+#: options.c:657
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       не делать выборку �ообщений больше заданного размера\n"
+msgstr "  -l, --limit       не делать выборку �ообщений больше заданного размера\n"
 
-#: options.c:704
+#: options.c:658
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr ""
-"  -w, --warnings    промежутки между предупреждающими почтовыми "
-"уведомлени�ми\n"
+msgstr "  -w, --warnings    промежутки между предупреждающими почтовыми уведомлени�ми\n"
 
-#: options.c:706
+#: options.c:660
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    у�тановка хо�та переадре�ации SMTP\n"
 
-#: options.c:707
+#: options.c:661
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains выборка почты дл� указанных доменов\n"
 
-#: options.c:708
+#: options.c:662
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr ""
-"  -D, --smtpaddress у�тановка домена, и�пользуемого дл� до�тавки SMTP\n"
+msgstr "  -D, --smtpaddress у�тановка домена, и�пользуемого дл� до�тавки SMTP\n"
 
-#: options.c:709
+#: options.c:663
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr ""
-"      --smtpname    у�тановка полного (пользователь@домен) имени SMTP\n"
+msgstr "      --smtpname    у�тановка полного (пользователь@домен) имени SMTP\n"
 
-#: options.c:710
+#: options.c:664
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr ""
-"  -Z, --antispam,   у�тановка значений анти�памер�ких ответных дей�твий\n"
+msgstr "  -Z, --antispam,   у�тановка значений анти�памер�ких ответных дей�твий\n"
 
-#: options.c:711
+#: options.c:665
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-"  -b, --batchlimit  у�тановка ограничени� на пакет дл� SMTP-�оединений\n"
+msgstr "  -b, --batchlimit  у�тановка ограничени� на пакет дл� SMTP-�оединений\n"
 
-#: options.c:712
+#: options.c:666
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  у�тановка ограничени� на выборку дл� �оединений �ервера\n"
+msgstr "  -B, --fetchlimit  у�тановка ограничени� на выборку дл� �оединений �ервера\n"
 
-#: options.c:713
+#: options.c:667
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit у�тановка ограничени� на размер выборки �ообщений\n"
+msgstr "      --fetchsizelimit у�тановка ограничени� на размер выборки �ообщений\n"
 
-#: options.c:714
+#: options.c:668
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    выполнить двоичный пои�к UIDL'ов\n"
 
-#: options.c:715
+#: options.c:669
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     у�тановка мак�имального количе�тва удалений\n"
 
-#: options.c:716
+#: options.c:670
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         у�тановка MDA, и�пользуемого дл� переадре�ации\n"
 
-#: options.c:717
+#: options.c:671
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       у�тановка файла вывода BSMTP\n"
 
-#: options.c:718
+#: options.c:672
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        и�пользование дл� до�тавки LMTP (RFC2033)\n"
 
-#: options.c:719
+#: options.c:673
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      указание имени удаленного каталога\n"
 
-#: options.c:720
+#: options.c:674
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    отображение точечной �троки прогре��а даже в log-файлах\n"
+msgstr "      --showdots    отображение точечной �троки прогре��а даже в log-файлах\n"
 
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
+#: pop3.c:355
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Предупреждение: найден POP3/PROXY-�ервер Maillennium; вме�то TOP и�пользует�� команда RETR.\n"
 
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Предупреждение: найден POP3/PROXY-�ервер Maillennium; вме�то TOP "
-"и�пользует�� команда RETR.\n"
-
-#: pop3.c:414
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"Дл� �того �еан�а требует�� и�пользовать TLS, однако �ервер отклонил команду "
-"CAPA.\n"
+msgstr "Дл� �того �еан�а требует�� и�пользовать TLS, однако �ервер отклонил команду CAPA.\n"
 
-#: pop3.c:415
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Команда CAPA необходима дл� TLS.\n"
 
-#: pop3.c:492
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-"%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
-"работу.\n"
+msgstr "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить работу.\n"
 
-#: pop3.c:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Закончили�ь допу�тимые аутентификаторы, продолжение невозможно.\n"
 
-#: pop3.c:637
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В привет�твии не найдена требуема� временна� метка APOP\n"
 
-#: pop3.c:646
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "В привет�твии ошибка �интак�и�а временной метки\n"
 
-#: pop3.c:662
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "�едопу�тима� временна� метка APOP.\n"
 
-#: pop3.c:686
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�еопределённый запро� протокола в POP3_auth\n"
 
-#: pop3.c:707
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "блокировка зан�то�ти!  Может активен другой �еан�?\n"
 
-#: pop3.c:770
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "�евозможно обработать UIDL-ответ upstream-�ервера.\n"
 
-#: pop3.c:793
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Сервер возвратил ответ � UID дл� неверного �ообщени�.\n"
 
-#: pop3.c:822
-#, fuzzy, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
+#: pop3.c:859 pop3.c:1105
+#, c-format
+msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но в�е еще при�ут�твует!\n"
 
-#: pop3.c:934
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u не про�мотрено\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Сообщени� добавлены в �пи�ок на �ервере. Обработка невозможна.\n"
 
-#: pop3.c:1032
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "ошибка протокола\n"
 
-#: pop3.c:1048
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ошибка протокола при выборке UIDL'ов\n"
 
-#: pop3.c:1079
-#, c-format
-msgid "id=%s (num=%d) was deleted, but is still present!\n"
-msgstr "id=%s (номер=%d) было удалено, но в�е еще при�ут�твует!\n"
-
-#: pop3.c:1389
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опци� --folder не поддерживает�� � POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:126
 msgid "server option after user options"
 msgstr "опци� �ервера по�ле опций пользовател�"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:169
 msgid "SDPS not enabled."
 msgstr "SDPS не включен."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: опци� interface поддерживает�� только в Linux (без IPv6) и "
-"FreeBSD\n"
+#: rcfile_y.y:215
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: опци� interface поддерживает�� только в Linux (без IPv6) и FreeBSD\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: опци� monitor поддерживает�� только в Linux (без IPv6) и FreeBSD\n"
+#: rcfile_y.y:222
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: опци� monitor поддерживает�� только в Linux (без IPv6) и FreeBSD\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:335
 msgid "SSL is not enabled"
 msgstr "SSL не включен"
 
-#: rcfile_y.y:391
+#: rcfile_y.y:385
 msgid "end of input"
 msgstr "конец ввода"
 
-#: rcfile_y.y:429
+#: rcfile_y.y:423
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Файл %s должен быть обычным файлом.\n"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:433
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Файл %s должен иметь прав до�тупа не более -rwx------ (0700).\n"
 
-#: rcfile_y.y:451
+#: rcfile_y.y:445
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Владельцем файла %s должны быть вы.\n"
@@ -2693,191 +2325,190 @@ msgstr "�еизве�тна� �и�темна� ошибка"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (неполное �ообщение журнала)\n"
 
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: rfc822.c:76
+#, c-format
+msgid "About to rewrite %s"
 msgstr "Будет перезапи�ан %s"
 
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:212
+#, c-format
+msgid "Rewritten version is %s\n"
 msgstr "Перепи�анна� вер�и� %s\n"
 
-#: rpa.c:118
+#: rpa.c:117
 msgid "Success"
 msgstr "У�пешно"
 
-#: rpa.c:119
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Ограниченный пользователь (что-то не так � учетной запи�ью)"
 
-#: rpa.c:120
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "�еверный id пользовател� или идентификационна� фраза"
 
-#: rpa.c:121
+#: rpa.c:120
 msgid "Deity error"
 msgstr "Боже�твенна� ошибка"
 
-#: rpa.c:174
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: ошибка декодировани� Base64\n"
 
-#: rpa.c:185
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Служба выбрала RPA вер�ии %d.%d\n"
 
-#: rpa.c:191
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Запро� �лужбы (l=%d):\n"
 
-#: rpa.c:200
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Временна� метка �лужбы %s\n"
 
-#: rpa.c:205
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "Ошибка длины RPA token 2\n"
 
-#: rpa.c:209
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Спи�ок обла�ти: %s\n"
 
-#: rpa.c:213
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "Ошибка RPA в �троке �лужба@обла�ть\n"
 
-#: rpa.c:250
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: ошибка декодировани� Base64\n"
 
-#: rpa.c:261
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "�утентификаци� пользовател� (l=%d):\n"
 
-#: rpa.c:275
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Стату� RPA: %02X\n"
 
-#: rpa.c:281
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "Ошибка длины RPA token 4\n"
 
-#: rpa.c:288
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA отверг ва�: %s\n"
 
-#: rpa.c:290
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA отверг ва�, причина неизве�тна\n"
 
-#: rpa.c:298
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Ошибка продолжительно�ти аутентификации пользовател� RPA: %d\n"
 
-#: rpa.c:303
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Ошибка длины ключа �еан�а RPA: %d\n"
 
-#: rpa.c:309
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Сбой RPA _service_ auth. Ложный �ервер?\n"
 
-#: rpa.c:314
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Сеан�овый ключ признан:\n"
 
-#: rpa.c:345
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "�вторизаци� RPA завершена\n"
 
-#: rpa.c:372
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "Получение ответа\n"
 
-#: rpa.c:402
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Получение обратного ответа %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Заголовок не 60\n"
 
-#: rpa.c:484
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Ошибка длины маркера\n"
 
-#: rpa.c:489
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Длина маркера %d не �овпадает � rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "Поле механизма неверно\n"
 
-#: rpa.c:531
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "Ошибка dec64 в �имволе %d: %x\n"
 
-#: rpa.c:546
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Вход�щие двоичные данные:\n"
 
-#: rpa.c:582
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "И�ход�щие данные:\n"
 
-#: rpa.c:645
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "Строка RPA �лишком длинна�\n"
 
-#: rpa.c:650
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Уникод:\n"
 
-#: rpa.c:709
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA не �мог открыть /dev/urandom. Это не должно было\n"
 
-#: rpa.c:710
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    помешать вам войти в �и�тему, но означает, что вы\n"
 
-#: rpa.c:711
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    не можете быть уверены в том, что общаете�ь �о\n"
 
-#: rpa.c:712
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    �лужбой, в которой, как вы думаете, вы е�ть (возможны\n"
 
-#: rpa.c:713
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    во�произведени� атак подложной �лужбы.)\n"
 
-#: rpa.c:724
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Запро� пользовател�:\n"
 
-#: rpa.c:874
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 примен�ет�� к блоку данных:\n"
 
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:886
+msgid "MD5 result is: \n"
 msgstr "Результат MD5: \n"
 
 #: servport.c:53
@@ -2894,158 +2525,140 @@ msgstr "�евозможно определить тип �лужбы %s по н
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Укажите �лужбу в виде де��тичного номера порта.\n"
 
-#: sink.c:231
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "переадре�овывает�� на %s\n"
 
-#: sink.c:319
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (тело �ообщени�-рикошета)\n"
 
-#: sink.c:322
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "пи�ьмо от %s отправлено рикошетом на %s\n"
 
-#: sink.c:497 sink.c:590
+#: sink.c:446
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Сохраненна� ошибка в�е еще %d\n"
+
+#: sink.c:506 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Ошибка %cMTP: %s\n"
 
-#: sink.c:535
+#: sink.c:550
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Дл� SMTP-�ервера требует�� STARTTLS; �ообщение �охранено.\n"
 
-#: sink.c:714
+#: sink.c:730
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "�е удало�ь открыть файл BSMTP: %s\n"
 
-#: sink.c:760
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
+#: sink.c:776
+msgid "BSMTP preamble write failed.\n"
 msgstr "�е удало�ь запи�ать начальную ча�ть BSMTP.\n"
 
-#: sink.c:974
+#: sink.c:990
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Слушателю %cMTP не понравил�� адре� получател� `%s'\n"
 
-#: sink.c:981
+#: sink.c:997
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Слушателю %cMTP в �амом деле не понравил�� адре� получател� `%s'\n"
 
-#: sink.c:1027
+#: sink.c:1043
 msgid "no address matches; no postmaster set.\n"
 msgstr "нет �опо�тавленных адре�ов; по�тма�тер не у�тановлен.\n"
 
-#: sink.c:1039
+#: sink.c:1055
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "даже невозможно отправить на %s!\n"
 
-#: sink.c:1045
+#: sink.c:1061
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "нет �опо�тавленных адре�ов; переадре�овывает�� на %s.\n"
 
-#: 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
+#: sink.c:1217
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "будет отправлен �: %s\n"
 
-#: sink.c:1222
-#, fuzzy, c-format
-msgid "Cannot switch effective user id to %ld: %s\n"
-msgstr "�евозможно переименовать fetchids-файл %s в %s: %s\n"
-
-#: sink.c:1234
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
 #: sink.c:1241
 msgid "MDA open failed\n"
 msgstr "�е удало�ь открыть MDA\n"
 
-#: sink.c:1280
+#: sink.c:1278
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Сбой %cMTP-подключени� к %s\n"
 
-#: sink.c:1304
+#: sink.c:1302
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "невозможно запу�тить �лушател�; откат на %s"
 
-#: sink.c:1362
-#, fuzzy, c-format
-msgid "Message termination or close of BSMTP file failed: %s\n"
-msgstr "�е удало�ь удалить �ообщение или закрыть файл BSMTP\n"
-
-#: sink.c:1387
+#: sink.c:1364
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Ошибка запи�и в MDA: %s\n"
 
-#: sink.c:1390
+#: sink.c:1367
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA завершен по �игналу %d\n"
 
-#: sink.c:1393
+#: sink.c:1370
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA возвратил ненулевой �тату� %d\n"
 
-#: sink.c:1396
+#: sink.c:1373
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Странно: MDA pclose возвратил %d и ошибку � номером %d/%s, невозможно "
-"обработать в %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Странно: MDA pclose возвратил %d и ошибку � номером %d/%s, невозможно обработать в %s:%d\n"
+
+#: sink.c:1395
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "�е удало�ь удалить �ообщение или закрыть файл BSMTP\n"
 
-#: sink.c:1421
+#: sink.c:1417
 msgid "SMTP listener refused delivery\n"
 msgstr "Слушатель SMTP отказал в до�тавке\n"
 
-#: sink.c:1451
+#: sink.c:1447
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ошибка до�тавки LMTP на EOM\n"
 
-#: sink.c:1454
+#: sink.c:1450
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�еожиданный не-503 ответ дл� LMTP EOM: %s\n"
 
-#: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1605
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "Демон Fetchmail"
 
-#: smtp.c:81
+#: smtp.c:80
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "�утентификаци� ESMTP CRAM-MD5...\n"
 
-#: smtp.c:87 smtp.c:137
+#: smtp.c:87 smtp.c:138
 msgid "Server rejected the AUTH command.\n"
 msgstr "Сервер отверг команду AUTH.\n"
 
-#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
+#: smtp.c:95 smtp.c:145 smtp.c:155 smtp.c:161
 msgid "Bad base64 reply from server.\n"
 msgstr "�еверный ответ base64 � �ервера.\n"
 
@@ -3062,358 +2675,199 @@ msgstr "�утентификаци� ESMTP PLAIN...\n"
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "�утентификаци� ESMTP LOGIN...\n"
 
-#: smtp.c:348 smtp.c:376
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "ошибка протокола �лушател� smtp\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: �бой malloc\n"
 
-#: socket.c:173
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: �бой socketpair\n"
 
-#: socket.c:179
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: не удало�ь �оздать дочерний проце��\n"
 
-#: socket.c:186
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "�бой dup2\n"
 
-#: socket.c:192
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "запущен %s (хо�т %s �лужба %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "�бой execvp(%s)\n"
 
-#: socket.c:272
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "ошибка getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:275
+#: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Попробуйте добавить опцию --service (�м. FAQ, пункт R12).\n"
 
-#: socket.c:289 socket.c:292
+#: socket.c:296 socket.c:299
 #, c-format
 msgid "unknown (%s)"
 msgstr "неизв. (%s)"
 
-#: socket.c:295
+#: socket.c:302
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Попытка подключени� к %s/%s..."
 
-#: socket.c:304
+#: socket.c:310
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "невозможно �оздать �окет: %s\n"
 
-#: socket.c:306
-#, fuzzy, c-format
-msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr "невозможно �оздать �окет: %s\n"
-
-#: socket.c:324
+#: socket.c:326
 msgid "connection failed.\n"
 msgstr "не удало�ь подключить��.\n"
 
-#: socket.c:326
+#: socket.c:328
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "�бой подключени� к %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:327
-#, fuzzy, c-format
-msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "�бой подключени� к %s:%s [%s/%s]: %s.\n"
-
-#: socket.c:333
+#: socket.c:334
 msgid "connected.\n"
 msgstr "�оединение у�тановлено.\n"
 
-#: socket.c:346
-#, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
-
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "Ошибка проверки �ертификата �ервера: %s\n"
-
-#: socket.c:662
-#, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-
-#: socket.c:665
-#, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
-
-#: socket.c:671
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Запрашивающа� организаци�: %s\n"
 
-#: socket.c:674
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Предупреждение: им� запрашивающей организации �лишком длинное (возможно "
-"укорочено).\n"
+msgstr "Предупреждение: им� запрашивающей организации �лишком длинное (возможно укорочено).\n"
 
-#: socket.c:676
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "�еизве�тна� организаци�\n"
 
-#: socket.c:678
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Общеприн�тое им�: %s\n"
 
-#: socket.c:681
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Предупреждение: общеприн�тое им� �лишком длинное (возможно укорочено).\n"
+msgstr "Предупреждение: общеприн�тое им� �лишком длинное (возможно укорочено).\n"
 
-#: socket.c:683
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "�еизве�тное общеприн�тое им�\n"
 
-#: socket.c:689
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "Общеприн�тое им�: %s\n"
-
-#: socket.c:695
-msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "�еправильный �ертификат: общее название Темы �лишком длинное!\n"
-
-#: socket.c:701
-#, fuzzy
-msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "�еправильный �ертификат: общее название Темы �лишком длинное!\n"
-
-#: socket.c:729
+#: socket.c:625
 #, c-format
-msgid "Subject Alternative Name: %s\n"
-msgstr ""
+msgid "Server CommonName: %s\n"
+msgstr "Общеприн�тое им� �ервера: %s\n"
 
-#: socket.c:735
-#, fuzzy
-msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+#: socket.c:629
+msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "�еправильный �ертификат: общее название Темы �лишком длинное!\n"
 
-#: socket.c:752
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "�е�овпадение общеприн�того имени �ервера: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Им� �ервера не у�тановлено, невозможно проверить �ертификат!\n"
 
-#: socket.c:764
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "�еизве�тное общеприн�тое им� �ервера\n"
 
-#: socket.c:766
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Им� �ервера не указано в �ертификате!\n"
 
-#: socket.c:778
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "�бой EVP_md5()!\n"
 
-#: socket.c:782
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "�ехватка пам�ти!\n"
 
-#: socket.c:790
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Буфер тек�тового журнала �лишком мал!\n"
 
-#: socket.c:796
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Отпечаток ключа %s: %s\n"
 
-#: socket.c:800
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Отпечатки %s �овпадают.\n"
 
-#: socket.c:802
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Отпечатки %s не �овпадают!\n"
 
-#: socket.c:814
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ошибка проверки �ертификата �ервера: %s\n"
 
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Ошибка проверки �ертификата �ервера: %s\n"
-
-#: socket.c:831
-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:841
+#: socket.c:739
 #, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "неизве�тна� запрашивающа� �торона (первые %d �имволов): %s\n"
 
-#: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
-
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Указан неверный протокол SSL '%s', и�пользует�� протокол по умолчанию "
-"(SSLv23).\n"
-
-#: socket.c:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1106
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Де�криптор файла вне диапазона SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
+#: socket.c:842
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "Указан неверный протокол SSL '%s', и�пользует�� протокол по умолчанию (SSLv23).\n"
 
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1273
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-
-#: socket.c:1280
+#: socket.c:918
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Проверка �ертификата/отпечатка была как-то пропущена!\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-
-#: socket.c:1339
+#: socket.c:996
 msgid "Cygwin socket read retry\n"
 msgstr "Повторна� попытка чтени� �окета Cygwin\n"
 
-#: socket.c:1342
+#: socket.c:999
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Сбой повторного чтени� �окета Cygwin!\n"
 
-#: transact.c:79
+#: transact.c:65
 #, c-format
 msgid "mapped address %s to local %s\n"
 msgstr "у�тановлено �оответ�твие адре�а %s локальному %s\n"
 
-#: transact.c:101
+#: transact.c:87
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "у�тановлено �оответ�твие %s локальному %s\n"
 
-#: transact.c:168
+#: transact.c:154
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "пройден через %s �оответ�твующий %s\n"
 
-#: transact.c:240
+#: transact.c:224
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -3422,207 +2876,143 @@ msgstr ""
 "анализирует�� �трока Received:\n"
 "%s"
 
-#: transact.c:279
+#: transact.c:263
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "�трока прин�та, %s �вл�ет�� алиа�ом почтового �ервера\n"
 
-#: transact.c:285
+#: transact.c:269
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "�трока отвергнута, %s не �вл�ет�� алиа�ом почтового �ервера\n"
 
-#: transact.c:359
+#: transact.c:343
 msgid "no Received address found\n"
 msgstr "адре� Received не найден\n"
 
-#: transact.c:368
+#: transact.c:352
 #, 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:566
+msgid "message delimiter found while scanning headers\n"
+msgstr "при �канировании заголовков найден разделитель �ообщени�\n"
+
+#: transact.c:597
+msgid "incorrect header line found while scanning headers\n"
 msgstr "при �канировании заголовков найдена неверна� �трока\n"
 
-#: transact.c:615
+#: transact.c:599
 #, c-format
 msgid "line: %s"
 msgstr "�трока: %s"
 
-#: transact.c:1087 transact.c:1097
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1112
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr ""
-"анализирует�� �трока Received:\n"
-"%s"
-
-#: transact.c:1124
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1142
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1157
+#: transact.c:1138
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "нет локальных �овпадений, переадре�овывает�� на %s\n"
 
-#: transact.c:1172
+#: transact.c:1153
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "переадре�аци� и удаление прио�тановлены из-за ошибок DNS\n"
 
-#: transact.c:1283
+#: transact.c:1263
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "запи�ывают�� заголовки RFC822 msgblk\n"
 
-#: transact.c:1302
+#: transact.c:1282
 msgid "no recipient addresses matched declared local names"
 msgstr "нет адре�ов получателей, �оответ�твующих объ�вленным локальным именам"
 
-#: transact.c:1309
+#: transact.c:1289
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "адре� получател� %s не �оответ�твует ни одному локальному имени"
 
-#: transact.c:1318
+#: transact.c:1298
 msgid "message has embedded NULs"
 msgstr "�ообщение �одержит вложенные NUL"
 
-#: transact.c:1326
+#: transact.c:1306
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Слушатель SMTP отверг адре�а локальных получателей: "
 
-#: transact.c:1376
+#: transact.c:1445
 msgid "error writing message text\n"
 msgstr "ошибка запи�и тек�та �ообщени�\n"
 
-#: transact.c:1652
+#: uid.c:250
 #, 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 "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: ошибка чтени� файла блокировки \"%s\": %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
 msgstr "Старый �пи�ок UID из %s:"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <пу�то>"
 
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
 msgstr "Временный �пи�ок UID'ов:"
 
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:517 uid.c:569
+#, c-format
+msgid "Merged UID list from %s:"
 msgstr "Объединенный �пи�ок UID из %s:"
 
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:519
+#, c-format
+msgid "New UID list from %s:"
 msgstr "�овый �пи�ок UID из %s:"
 
-#: uid.c:402
+#: uid.c:548
+msgid "swapping UID lists\n"
+msgstr "обменивают�� �пи�ки UID\n"
+
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "�пи�ки UID не обменивают��, в �том запро�е нет UID'ов\n"
 
-#: uid.c:422
+#: uid.c:581
 msgid "discarding new UID list\n"
 msgstr "отбра�ывает�� новый �пи�ок UID\n"
 
-#: uid.c:479
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Удал�ет�� файл fetchids.\n"
 
-#: uid.c:482
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Ошибка удалени� %s: %s\n"
 
-#: uid.c:489
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Запи�ывает�� файл fetchids.\n"
 
-#: uid.c:503 uid.c:512
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "Запи�ывает�� файл fetchids.\n"
-
-#: uid.c:524
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Ошибка запи�и в fetchids-файл %s, �тарый файл о�тал�� на ме�те.\n"
 
-#: uid.c:528
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "�евозможно переименовать fetchids-файл %s в %s: %s\n"
 
-#: uid.c:532
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "�евозможно открыть fetchids-файл %s дл� запи�и: %s\n"
 
-#: 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 "Subject: Fetchmail unreachable-server warning."
-#~ msgstr "Тема: Предупреждение Fetchmail о недо�тупно�ти �ервера."
-
-#, c-format
-#~ msgid "Fetchmail could not reach the mail server %s:"
-#~ msgstr "Fetchmail не �мог у�тановить �в�зь � почтовым �ервером %s:"
-
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: Предупреждение: на�троено и�пользование syslog и logfile. "
-#~ "Провер�йте оба журнала!\n"
-
-#~ msgid "Required LOGIN capability not supported by server\n"
-#~ msgstr "Требуема� опци� LOGIN не поддерживает�� �ервером\n"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Сохраненна� ошибка в�е еще %d\n"
-
-#, c-format
-#~ msgid "Server CommonName: %s\n"
-#~ msgstr "Общеприн�тое им� �ервера: %s\n"
-
-#, c-format
-#~ msgid "unknown issuer (first %d characters): %s\n"
-#~ msgstr "неизве�тна� запрашивающа� �торона (первые %d �имволов): %s\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/sq.po b/po/sq.po
index 2d70aed6..865c9a7a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-14 12:24+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -33,8 +33,7 @@ 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
@@ -67,15 +66,12 @@ msgstr "Sinjalizim Fetchamil për mesazhe 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 u fshinë prej shërbyesit të postës %s "
-"llogaria %s:"
+msgstr "Mesazhet vijues të stërmëdhenj 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
@@ -136,10 +132,8 @@ 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 s’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 s’pati gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -156,18 +150,14 @@ 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
@@ -195,12 +185,8 @@ msgstr "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 ""
@@ -272,8 +258,7 @@ 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
 #, c-format
@@ -295,8 +280,7 @@ msgid ""
 msgstr ""
 "Orvatja për të marrë autorizim dështoi.\n"
 "Ngaqë kemi pasur tashmë sukses në marrje autorizimi për këtë lidhje, ka\n"
-"gjasa që kjo të jetë një tjetër mënyrë dështimi (fjala vjen, shërbyes i "
-"zënë)\n"
+"gjasa që kjo të jetë një tjetër mënyrë dështimi (fjala vjen, shërbyes i zënë)\n"
 "të cilën fetchmail-i s’e dallon dot nga të tjerat, ngaqë shërbyesi s’dërgoi\n"
 "mesazh të dobishëm gabimi."
 
@@ -431,8 +415,7 @@ 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"
@@ -473,8 +456,7 @@ 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"
@@ -529,8 +511,7 @@ msgid ""
 msgstr ""
 "%s: Ndryshorja e mjedisit QMAILINJECT u ujdis.\n"
 "Kjo është e rrezikshme, ngaqë mund të bëjë që qmail-inject ose\n"
-"mbështjellësi sendmail i qmail-it të përzihet me kryet Prej: ose ID "
-"Mesazhi:.\n"
+"mbështjellësi 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"
 
@@ -539,8 +520,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 ""
@@ -581,13 +561,11 @@ msgstr "S’gjendet dot streha ime te bazë të dhënash strehësh për ta shqua
 #: env.c:229
 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"
 "Në vend të kësaj, NDREQNI /etc/hosts, DNS, NIS apo LDAP tuajt.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -701,8 +679,7 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "KUJDES: Libraria juaj SSL/TLS s’mbulon TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
 msgstr "KUJDES: Përpiluar kundrejt LibreSSL, çka s’është formësim i mbuluar.\n"
 
 #: fetchmail.c:314
@@ -711,22 +688,16 @@ msgstr "KUJDES: Përpiluar pa SSL/TLS.\n"
 
 #: fetchmail.c:340
 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:347
 msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-"S’po xhirohet nën mënyrën demon, po shpërfillet mundësia mbi kartelë "
-"regjistrimi.\n"
+msgstr "S’po xhirohet nën mënyrën demon, po shpërfillet mundësia mbi kartelë regjistrimi.\n"
 
 #: fetchmail.c:354
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-"Kartela regjistër \"%s\" s’ekziston, po shpërfillet mundësia mbi kartelë "
-"regjistrimi.\n"
+msgstr "Kartela regjistër \"%s\" s’ekziston, po shpërfillet mundësia mbi kartelë regjistrimi.\n"
 
 #: fetchmail.c:360
 #, c-format
@@ -735,11 +706,8 @@ msgstr "Kartela e regjistrimit \"%s\" s’është e shkrueshme, po ndërpritet.\
 
 #: fetchmail.c:378
 #, 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 shpërfillet "
-"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 shpërfillet syslog, dhe po regjistrohet te %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -782,21 +750,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail te %ld u asgjësua.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: s’kontrollohet dot për postë, kur te e njëjta strehë xhiron një "
-"tjetër fetchmail.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: s’kontrollohet dot për postë, kur te e njëjta strehë xhiron një tjetër fetchmail.\n"
 
 #: fetchmail.c:552
 #, 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:559
 #, c-format
@@ -804,10 +764,8 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: një tjetër fetchmail po xhiron në paraskenë te %ld.\n"
 
 #: fetchmail.c:569
-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"
+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:581
 #, c-format
@@ -859,8 +817,7 @@ msgstr "po riniset fetchmail (%s ndryshoi)\n"
 
 #: fetchmail.c:726
 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 s’është rikthyer\n"
+msgstr "përpjekja për rinisje mund të dështojë, ngaqë drejtoria s’është rikthyer\n"
 
 #: fetchmail.c:752
 msgid "attempt to re-exec fetchmail failed\n"
@@ -869,8 +826,7 @@ msgstr "përpjekja për rinisje të fetchmail-it dështoi\n"
 #: fetchmail.c:782
 #, 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:794
 #, c-format
@@ -974,16 +930,11 @@ msgstr "s’u kontrollua dot koha për kartelën run-control\n"
 #: fetchmail.c:1148
 #, 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:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Gabim: zëra të shumëfishtë për \"parazgjedhje\" te kartela "
-"formësim, ose \"parazgjedhje\" s’është zëri i parë.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Gabim: zëra të shumëfishtë për \"parazgjedhje\" te kartela formësim, ose \"parazgjedhje\" s’është zëri i parë.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -1003,11 +954,8 @@ msgstr "Mbulimi për GSSAPI-n është formësuar, por jo përpiluar.\n"
 
 #: fetchmail.c:1366
 #, 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:1377
 #, c-format
@@ -1016,43 +964,30 @@ msgstr "kujdes: shpërndarja e shumëfishtë për %s lyp mundësinë zarf!\n"
 
 #: fetchmail.c:1378
 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:1395
 #, 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:1402
 #, 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:1420
 #, 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:1434
 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:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Gabim: mënyra plogështi s’funksionon për shumë dosje ose llogari "
-"njëherësh!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Gabim: mënyra plogështi s’funksionon për shumë dosje ose llogari njëherësh!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1123,9 +1058,7 @@ msgstr "Fetchmail-i do të tregojë pika ecurie edhe në kartela regjistrimesh.\
 #: fetchmail.c:1659
 #, 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:1663
 msgid "Fetchmail will direct error mail to the postmaster.\n"
@@ -1137,15 +1070,11 @@ msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
 #: fetchmail.c:1668
 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:1670
 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:1677
 #, c-format
@@ -1336,43 +1265,27 @@ msgstr "  Mesazhet e sjellë s’do të mbahen në shërbyes (--keep off).\n"
 
 #: fetchmail.c:1808
 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:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Mesazhet e vjetër s’do të zbrazen para marrjes së mesazheve (--flush "
-"off).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Mesazhet e vjetër s’do të zbrazen para marrjes së mesazheve (--flush off).\n"
 
 #: fetchmail.c:1811
-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"
+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:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Mesazhet stërmëdhenj s’do të zbrazen para marrjes së mesazheve (--"
-"limitflush off).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Mesazhet stërmëdhenj s’do të zbrazen para marrjes së mesazheve (--limitflush off).\n"
 
 #: fetchmail.c:1814
 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:1815
 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:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
@@ -1391,18 +1304,12 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Detyrimi i carriage-return-it është i çaktivizuar (forcecr off).\n"
 
 #: fetchmail.c:1823
-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"
+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:1824
-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"
+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:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
@@ -1448,9 +1355,7 @@ msgstr "  Pa cak madhësie mesazhesh (--limit 0).\n"
 #: fetchmail.c:1845
 #, 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:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
@@ -1468,8 +1373,7 @@ msgstr "  Pa cak për mesazhe të marrë (--fetchlimit 0).\n"
 #: fetchmail.c:1856
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-"  Caku i madhësisë së mesazheve që sillen është %d (--fetchsizelimit %d).\n"
+msgstr "  Caku i madhësisë së mesazheve që sillen është %d (--fetchsizelimit %d).\n"
 
 #: fetchmail.c:1859
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
@@ -1482,8 +1386,7 @@ msgstr "  Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n"
 #: fetchmail.c:1865
 #, 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:1868
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
@@ -1501,9 +1404,7 @@ msgstr "  Pa cak për tufë mesazhe SMTP (--batchlimit 0).\n"
 #: fetchmail.c:1876
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Intervali i fshirjesh ndërmjet spastrimesh është vënë me detyrim %d (--"
-"expunge %d).\n"
+msgstr "  Intervali i fshirjesh ndërmjet spastrimesh është vënë me detyrim %d (--expunge %d).\n"
 
 #: fetchmail.c:1878
 msgid "  No forced expunges (--expunge 0).\n"
@@ -1540,14 +1441,11 @@ msgstr "  Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n"
 #: fetchmail.c:1918
 #, 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:1927
 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:1933
 msgid "  Spam-blocking disabled\n"
@@ -1592,26 +1490,19 @@ msgstr[1] "U njohën %d emra vendorë.\n"
 
 #: fetchmail.c:1976
 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:1977
 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:1981
-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"
+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:1983
 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:1986
 msgid "  Envelope-address routing is disabled\n"
@@ -1665,8 +1556,7 @@ msgstr "  Pa ndërfaqe mbikëqyrjeje të përcaktuar.\n"
 #: fetchmail.c:2031
 #, 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:2033
 msgid "  No plugin command specified.\n"
@@ -1675,9 +1565,7 @@ msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 #: fetchmail.c:2035
 #, 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:2037
 msgid "  No plugout command specified.\n"
@@ -1719,12 +1607,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "S’ndryshohet dot maskë sinjali: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Sistemi juaj operativ as përcakton PATH_MAX, as do të pranojë realpath(f, "
-"NULL). Po ndërpritet.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Sistemi juaj operativ as përcakton PATH_MAX, as do të pranojë realpath(f, NULL). Po ndërpritet.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1760,16 +1644,11 @@ msgstr "Po përdoret emër shërbimi [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"S’u gjetën kredenciale GSSAPI të përshtatshme. Mirëfilltësimi GSSAPI po "
-"anashkalohet.\n"
+msgstr "S’u gjetën kredenciale GSSAPI të përshtatshme. Mirëfilltësimi GSSAPI po anashkalohet.\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"
+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:160
 #, c-format
@@ -1949,11 +1828,8 @@ msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\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"
+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:1177 imap.c:1184
 #, c-format
@@ -1962,8 +1838,7 @@ msgstr "Përgjigje FETCH e pasaktë: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"S’arrihet të hapet ndërfaqe kvm. Sigurohuni se fetchmail-i është SGID kmem."
+msgstr "S’arrihet të hapet ndërfaqe kvm. Sigurohuni se fetchmail-i është SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -2074,9 +1949,7 @@ msgstr "fetchmail: po hiqet lockfile-i i ndenjur \"%s\"\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: s’hiqet dot lidhja e lockfile-it \"%s\" (%s), po provohet të "
-"shkruhet në të\n"
+msgstr "fetchmail: s’hiqet dot lidhja e lockfile-it \"%s\" (%s), po provohet të shkruhet në të\n"
 
 #: lock.c:116
 #, c-format
@@ -2260,12 +2133,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     përcakto emër kartele regjistrimi\n"
 
 #: options.c:653
-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"
+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 "      --nosyslog    turns off use of syslog(3)\n"
@@ -2273,8 +2142,7 @@ msgstr "      --nosyslog    e ndërpret përdorimin e syslog(3)\n"
 
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible   mos shkruaj Të Marrë & dhe aktivizo \"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"
@@ -2294,22 +2162,15 @@ msgstr "      --postmaster  përcaktoni marrës për provën e fundit\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
+msgstr "      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail fshin përgjithmonë mesazhe të padërgueshëm.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail fshin përgjithmonë mesazhe të padërgueshëm.\n"
 
 #: 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"
+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"
@@ -2333,15 +2194,11 @@ msgstr "      --sslcert     dëshmi ssl klienti\n"
 
 #: 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:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck anashkalo kontroll strikt të dëshmive të shërbyesve (e "
-"pasigurt)\n"
+msgstr "      --nosslcertck anashkalo kontroll strikt të dëshmive të shërbyesve (e pasigurt)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
@@ -2352,24 +2209,16 @@ 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:675
-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"
+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 ""
-"      --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 "      --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
 msgid "      --sslproto    force ssl protocol (see manual)\n"
-msgstr ""
-"      --sslproto    detyro përdorim protokolli ssl (shihni doracakun)\n"
+msgstr "      --sslproto    detyro përdorim protokolli ssl (shihni doracakun)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
@@ -2377,8 +2226,7 @@ msgstr "      --plugin      përcakto urdhër të jashtëm për hapje lidhjesh\n
 
 #: 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:681
 msgid ""
@@ -2386,8 +2234,7 @@ msgid ""
 "                    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:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
@@ -2398,23 +2245,16 @@ 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:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        i thotë shërbyesit IMAP të dërgojë njoftim mesazhesh të "
-"rinj\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        i thotë shërbyesit IMAP të dërgojë njoftim mesazhesh të rinj\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        portë TCP për lidhje (e vjetruar, përdorni --service)\n"
+msgstr "      --port        portë TCP për lidhje (e vjetruar, përdorni --service)\n"
 
 #: options.c:688
-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 "  -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
 msgid "      --auth        authentication type (see manual)\n"
@@ -2430,8 +2270,7 @@ msgstr "  -E, --envelope    krye adrese zarfi\n"
 
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual    parashtesë për t’u hequr prej id-je përdoruesi vendor\n"
+msgstr "  -Q, --qvirtual    parashtesë për t’u hequr prej id-je përdoruesi vendor\n"
 
 #: options.c:693
 msgid "      --principal   mail service principal\n"
@@ -2439,19 +2278,15 @@ msgstr "      --principal   parësori i shërbimit postar\n"
 
 #: 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:696
 msgid "  -u, --user[name]  specify users's login on server\n"
-msgstr ""
-"  -u, --user[name]    përcakto kredenciale hyrjeje të përdoruesit te "
-"shërbyesi\n"
+msgstr "  -u, --user[name]    përcakto kredenciale hyrjeje të përdoruesit te shërbyesi\n"
 
 #: 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:698
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
@@ -2491,13 +2326,11 @@ msgstr "      --fetchdomains sill postë për përkatësitë e caktuara\n"
 
 #: 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: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:710
 msgid "  -Z, --antispam,   set antispam response values\n"
@@ -2552,17 +2385,12 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 mbulon vetëm mirëfilltësim me fjalëkalim. Po hiqet dorë.\n"
 
 #: 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"
+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 s’e pranoi urdhrin "
-"CAPA.\n"
+msgstr "TLS-ja është e detyrueshme për këtë sesion, por shërbyesi s’e pranoi urdhrin CAPA.\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2645,20 +2473,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS jo e aktivizuar."
 
 #: rcfile_y.y:217
-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"
+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:225
-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"
+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:339
 msgid "SSL is not enabled"
@@ -2960,9 +2780,7 @@ msgstr "Mundësia MDA përmban zgjerim %%%c nën kllapa njëshe.\n"
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-"S’po pranon të dërgojë. Shihni doracakun dhe ndreqni zgjedhjen tuaj për "
-"mda.\n"
+msgstr "S’po pranon të dërgojë. Shihni doracakun dhe ndreqni zgjedhjen tuaj për mda.\n"
 
 #: sink.c:1211
 #, c-format
@@ -3015,10 +2833,8 @@ msgstr "MDA u përgjigj me gjendje jo zero %d\n"
 
 #: 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, s’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, s’trajton dot %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3099,8 +2915,7 @@ msgstr "gabim getaddrinfo(\"%s\",\"%s\"): %s\n"
 
 #: socket.c:275
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"Provoni të shtoni mundësinë --service (shihni edhe PBR-të, zëri R12).\n"
+msgstr "Provoni të shtoni mundësinë --service (shihni edhe PBR-të, zëri R12).\n"
 
 #: socket.c:289 socket.c:292
 #, c-format
@@ -3157,8 +2972,7 @@ msgstr "OpenSSL-ja njoftoi: %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"Thellësi callback-u verifikimi SSL-je %d: preverify_ok == %d, err = %d, %s\n"
+msgstr "Thellësi callback-u verifikimi SSL-je %d: preverify_ok == %d, err = %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3167,8 +2981,7 @@ msgstr "Dëshmi shërbyesi:\n"
 #: socket.c:662
 #, 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:665
 #, c-format
@@ -3195,8 +3008,7 @@ msgstr "Emër i Zakonshëm Lëshuesi: %s\n"
 
 #: socket.c:681
 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:683
 msgid "Unknown Issuer CommonName\n"
@@ -3213,8 +3025,7 @@ msgstr "Dëshmi e keqe: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
 #: socket.c:701
 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:729
 #, c-format
@@ -3223,8 +3034,7 @@ msgstr "Emër Alternativ Subjekti: %s\n"
 
 #: socket.c:735
 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:752
 #, c-format
@@ -3281,15 +3091,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Zinxhir i dëmtuar dëshmish te: %s\n"
 
 #: socket.c:831
-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 s’dha dëshmi të ndërmjetme AD-je, për "
-"çka fetchmail-i s’mund të bëjë asgjë.  Për hollësi, ju lutem shihni "
-"dokumentin README.SSL-SERVER që shoqëron fetchmail-in.\n"
+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 s’dha dëshmi të ndërmjetme AD-je, për çka fetchmail-i s’mund të bëjë asgjë.  Për hollësi, ju lutem shihni dokumentin README.SSL-SERVER që shoqëron fetchmail-in.\n"
 
 #: socket.c:841
 #, c-format
@@ -3297,17 +3100,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr ""
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Kjo mund të nënkuptonte që dëshmia e nënshkrimit të AD për rrënjën s’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. Për hollësi, "
-"shihni README.SSL.\n"
+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. See README.SSL for details.\n"
+msgstr "Kjo mund të nënkuptonte që dëshmia e nënshkrimit të AD për rrënjën s’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. Për hollësi, shihni README.SSL.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3328,56 +3122,35 @@ msgstr "Versioni juaj OpenSLL s’mbulon TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"U dha protokoll SSL i pavlefshëm '%s', po përdoret parazgjedhja "
-"vetëpërzgjedhje (auto).\n"
+msgstr "U dha protokoll SSL i pavlefshëm '%s', po përdoret parazgjedhja vetëpërzgjedhje (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Librari OpenSSL e ngarkuar %#lx më e vjetër se kryet %#lx, s’pranon të "
-"funksionojë.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Librari OpenSSL e ngarkuar %#lx më e vjetër se kryet %#lx, s’pranon të funksionojë.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Librari OpenSSL e ngarkuar %#lx më e re se kryet %#lx, po provohet të "
-"vazhdohet.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Librari OpenSSL e ngarkuar %#lx më e re se kryet %#lx, po provohet të vazhdohet.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Përshkrues kartele jashtë intervali SSL-je"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Kini parasysh se disa shpërndarje i çaktivizojnë versionet e vjetër të "
-"protokolleve në rrugë të çuditshme jostandarde. Provoni një version "
-"protokolli më të ri.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Kini parasysh se disa shpërndarje i çaktivizojnë versionet e vjetër të protokolleve në rrugë të çuditshme jostandarde. Provoni një version protokolli më të ri.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Kujdes: SSL_set_tlsext_host_name(%p, \"%s\") dështoi (kod %#lx), po provohet "
-"të vazhdohet.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Kujdes: SSL_set_tlsext_host_name(%p, \"%s\") dështoi (kod %#lx), po provohet të vazhdohet.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Kujdes: X509_VERIFY_PARAM_set1_host(%p, \"%s\") dështoi (kod %#x), po "
-"provohet të vazhdohet.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Kujdes: X509_VERIFY_PARAM_set1_host(%p, \"%s\") dështoi (kod %#x), po provohet të vazhdohet.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3399,21 +3172,15 @@ msgstr "S’merret dot shifër e tanishme SSL/TLS - s’është vendosur sesion?
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: po përdoret protokolli %s, shifër %s, %d/%d bite të fshehtë/të "
-"përpunuar\n"
+msgstr "SSL/TLS: po përdoret protokolli %s, shifër %s, %d/%d bite të fshehtë/të përpunuar\n"
 
 #: socket.c:1280
 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:1297
-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"
+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:1339
 msgid "Cygwin socket read retry\n"
@@ -3468,9 +3235,7 @@ 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
@@ -3592,8 +3357,7 @@ msgstr "Gabim shkrimi në kartelën fetchids %s: %s\n"
 #: uid.c:524
 #, 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:528
 #, c-format
diff --git a/po/sr.po b/po/sr.po
index 22511e98..1f8e9c2a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,17 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.5-rc2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-05-04 12:30+0200\n"
 "PO-Revision-Date: 2020-05-06 16:38+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
 #: checkalias.c:174
@@ -35,14 +34,12 @@ msgstr "�е, њихове ИП адре�е �е не подударају\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"неу�пех назива �ервера за време тражења „%s“ у току пропитивања „%s“: %s\n"
+msgstr "неу�пех назива �ервера за време тражења „%s“ у току пропитивања „%s“: %s\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"неу�пех назива �ервера за време тражења „%s“ у току пропитивања „%s“.\n"
+msgstr "неу�пех назива �ервера за време тражења „%s“ у току пропитивања „%s“.\n"
 
 #: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
@@ -138,8 +135,7 @@ msgstr " (%d октета разраде)"
 
 #: driver.c:770
 #, 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 "порука „%s@%s:%d“ није очекиване дужине (�тварна %d != очекивана %d)\n"
 
 #: driver.c:802
@@ -157,23 +153,15 @@ msgstr " није избачено\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] ""
-"ограничење довлачења %d је до�тигнуто; %d порука је о�тала на �ерверу „%s“ "
-"на налогу „%s“\n"
-msgstr[1] ""
-"ограничење довлачења %d је до�тигнуто; %d поруке �у о�тале на �ерверу „%s“ "
-"на налогу „%s“\n"
-msgstr[2] ""
-"ограничење довлачења %d је до�тигнуто; %d порука је о�тало на �ерверу „%s“ "
-"на налогу „%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"
+msgstr[2] "ограничење довлачења %d је до�тигнуто; %d порука је о�тало на �ерверу „%s“ на налогу „%s“\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"и�текло је време након %d �екунде чекајући на повезивање �а �ервером „%s“.\n"
+msgstr "и�текло је време након %d �екунде чекајући на повезивање �а �ервером „%s“.\n"
 
 #: driver.c:903
 #, c-format
@@ -188,8 +176,7 @@ msgstr "и�текло је време након %d �екунде чекају
 #: driver.c:912
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"и�текло је време након %d �екунде чекајући на о�лушкивача да одговори.\n"
+msgstr "и�текло је време након %d �екунде чекајући на о�лушкивача да одговори.\n"
 
 #: driver.c:915
 #, c-format
@@ -202,12 +189,8 @@ msgstr "видим поновљене и�теке времена"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Видео �ам више од %d и�тека времена покушавајући да добавим пошту �а„%s@"
-"%s“.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Видео �ам више од %d и�тека времена покушавајући да добавим пошту �а„%s@%s“.\n"
 
 #: driver.c:934
 msgid ""
@@ -223,8 +206,7 @@ msgstr ""
 "грешком �ервера.  Можете покренути наредбу „fetchmail -v -v“ да\n"
 "видите где је проблем.\n"
 "\n"
-"Добавпошта неће опет пропитивати ово �андуче �ве док га поново не "
-"покренете.\n"
+"Добавпошта неће опет пропитивати ово �андуче �ве док га поново не покренете.\n"
 
 #: driver.c:960
 #, c-format
@@ -280,8 +262,7 @@ msgstr " (претходно овлашћен)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"За помоћ погледајте „http://www.fetchmail.info/fetchmail-FAQ.html#R15“\n"
+msgstr "За помоћ погледајте „http://www.fetchmail.info/fetchmail-FAQ.html#R15“\n"
 
 #: driver.c:1202
 #, c-format
@@ -440,8 +421,7 @@ msgstr "нетачан број порука!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"Превише порука је пре�кочено (%d > %d) у�лед грешака прелазно�ти за „%s“\n"
+msgstr "Превише порука је пре�кочено (%d > %d) у�лед грешака прелазно�ти за „%s“\n"
 
 #: driver.c:1549
 msgid "socket"
@@ -482,8 +462,7 @@ msgstr "неодређено"
 #: driver.c:1579
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"„%s“ грешка приликом довлачења �а „%s@%s“ и и�поручивања СМТП домаћину „%s“\n"
+msgstr "„%s“ грешка приликом довлачења �а „%s@%s“ и и�поручивања СМТП домаћину „%s“\n"
 
 #: driver.c:1581
 msgid "unknown"
@@ -537,8 +516,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Променљива окружења „QMAILINJECT“ је по�тављена.\n"
-"Ово је опа�но јер може дове�ти до тога да �е „qmail-inject“ или увијач "
-"�лања\n"
+"Ово је опа�но јер може дове�ти до тога да �е „qmail-inject“ или увијач �лања\n"
 "поште „qmail“-а поигра �а вашим заглављима „Шаље:“ или „ИБ поруке:“.\n"
 "Покушајте „env QMAILINJECT= %s В�ШИ �РГУМЕ�ТИ ОВДЕ“\n"
 "„%s“: Прекидам.\n"
@@ -548,16 +526,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“ је по�тављена.\n"
-"Ово је опа�но јер може дове�ти до тога да �е „nullmailer-inject“ или увијач "
-"�лања\n"
-"поште „nullmailer“-а поигра �а вашим заглављима „Шаље:“, „ИБ поруке:“ или "
-"„Путања враћања:“.\n"
+"Ово је опа�но јер може дове�ти до тога да �е „nullmailer-inject“ или увијач �лања\n"
+"поште „nullmailer“-а поигра �а вашим заглављима „Шаље:“, „ИБ поруке:“ или „Путања враћања:“.\n"
 "Покушајте „env NULLMAILER_FLAGS= %s В�ШИ �РГУМЕ�ТИ ОВДЕ“\n"
 "„%s“: Прекидам.\n"
 
@@ -586,20 +561,16 @@ msgstr "добављање података адреÑ�е није уÑ�пело Ð
 
 #: env.c:225
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"�е могу да нађем �оп�твеног домаћина у бази података како бих га "
-"квалификовао!\n"
+msgstr "�е могу да нађем �оп�твеног домаћина у бази података како бих га квалификовао!\n"
 
 #: env.c:229
 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 ""
 "Покушавам да на�тавим �а неквалификоваим називом домаћина.\n"
-"�ЕМОЈТЕ извештавати о оштећеним заглављима „Примљене“, „HELO/EHLO“ редовима "
-"или �личним проблемима!\n"
+"�ЕМОЈТЕ извештавати о оштећеним заглављима „Примљене“, „HELO/EHLO“ редовима или �личним проблемима!\n"
 "ПОПР�ВИТЕ „/etc/hosts“, „DNS“, „NIS“ или „LDAP“.\n"
 
 #: etrn.c:49 odmr.c:61
@@ -687,10 +658,8 @@ msgid ""
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
-"Добавпошта долази БЕЗ БИЛО К�КВЕ Г�Р��ЦИЈЕ. Ово је �лободан �офтвер, и ви "
-"га\n"
-"можете ра�подељивати под одређеним у�ловима. За више поједино�ти, "
-"погледајте\n"
+"Добавпошта долази БЕЗ БИЛО К�КВЕ Г�Р��ЦИЈЕ. Ово је �лободан �офтвер, и ви га\n"
+"можете ра�подељивати под одређеним у�ловима. За више поједино�ти, погледајте\n"
 "датотеку „COPYING“ у директоријуму изворног кода или у документацији.\n"
 
 #: fetchmail.c:188
@@ -715,455 +684,414 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "УПОЗОРЕЊЕ: Ваша ССЛ/ТЛС библиотека не подржава ТЛС и1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"УПОЗОРЕЊЕ: Преведено на�прам „LibreSSL“, што није подржано подешавање.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "УПОЗОРЕЊЕ: Преведено на�прам „LibreSSL“, што није подржано подешавање.\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
 msgstr "УПОЗОРЕЊЕ: Преведено без ССЛ/ТЛС.\n"
 
-#: fetchmail.c:340
+#: fetchmail.c:339
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-"Опција „nodetach“ је у деј�тву, занемарујем опцију датотеке дневника.\n"
+msgstr "Опција „nodetach“ је у деј�тву, занемарујем опцију датотеке дневника.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:346
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "�е радим у режиму демона, занемарујем опцију датотеке дневника.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:353
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-"Датотека дневника „%s“ не по�тоји, занемарујем опцију датотеке дневника.\n"
+msgstr "Датотека дневника „%s“ не по�тоји, занемарујем опцију датотеке дневника.\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:359
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Датотека дневника „%s“ није упи�ива, прекидам.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:377
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"по�тављене �у обе опције и „syslog“ и „logfile“, занемарујем „syslog“, и "
-"упи�ујем дневник у „%s“"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "по�тављене �у обе опције и „syslog“ и „logfile“, занемарујем „syslog“, и упи�ујем дневник у „%s“"
 
-#: fetchmail.c:469
+#: fetchmail.c:468
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Узимам опције �а линије наредби„%s%s“\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:469
 msgid " and "
 msgstr " и "
 
-#: fetchmail.c:475
+#: fetchmail.c:474
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "�ема подешених �ервера поште – можда недо�таје „%s“?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:495
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "добавпошта: ни�у наведени �ервери поште.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:507
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "добавпошта: није покренут ниједан други примерак програма\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "добавпошта: грешка упуцавања „%s“ добавпоште на %ld; извлачим �е.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:514 fetchmail.c:523
 msgid "background"
 msgstr "позадина"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:514 fetchmail.c:523
 msgid "foreground"
 msgstr "првоплан�ки"
 
-#: fetchmail.c:523
+#: fetchmail.c:522
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "добавпошта: „%s“ добавпошта на %ld је отрована.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"добавпошта: не могу да проверим пошту док још један примерак ради на и�том "
-"домаћину.\n"
+#: fetchmail.c:545
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "добавпошта: не могу да проверим пошту док још један примерак ради на и�том домаћину.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:551
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"добавпошта: не могу да пропитујем наведене домаћине �а још једним радним "
-"примерком програма на „%ld“.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "добавпошта: не могу да пропитујем наведене домаћине �а још једним радним примерком програма на „%ld“.\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:558
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "добавпошта: још један примерак програма ради у првом плану на %ld.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"добавпошта: не могу да прихватим опције док примерак програма ради у "
-"позадини.\n"
+#: fetchmail.c:568
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "добавпошта: не могу да прихватим опције док примерак програма ради у позадини.\n"
 
-#: fetchmail.c:581
+#: fetchmail.c:580
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "добавпошта: добавпошта у позадини на %ld је пробуђена.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:592
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"добавпошта: �тарији потомак на %ld је умро тајан�твено (убише га злотвори).\n"
+msgstr "добавпошта: �тарији потомак на %ld је умро тајан�твено (убише га злотвори).\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:607
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "добавпошта: не могу да нађем лозинку за „%s@%s“.\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:611
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Уне�ите лозинку за „%s@%s“: "
 
-#: fetchmail.c:654
+#: fetchmail.c:653
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "добавпошта: �е могу да откачим у позадини. Прекидам.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:657
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "покрећем „%s“ демона добавпоште\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:673 fetchmail.c:675
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "не могу да отворим „%s“ да прикачим дневнике\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:694
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "„--check“ режим је укључен, не довлачим пошту\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:716
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "не могу да проверим време „%s“ (грешка %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:721
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "поново покрећем добавпошту („%s“ је измењено)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:725
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"покушај поновног извршења може неу�пети јер директоријум није повраћен\n"
+msgstr "покушај поновног извршења може неу�пети јер директоријум није повраћен\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:751
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "покушај поновног извршења добавпоште није у�пео\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:781
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"пропитивање „%s“ је пре�кочено (потврђивање идентитета није у�пело или "
-"превише и�тека времена)\n"
+msgstr "пропитивање „%s“ је пре�кочено (потврђивање идентитета није у�пело или превише и�тека времена)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:793
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "интервал је до�тигнут, не пропитујем „%s“\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:831
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Стање пропитивања=0 (УСПЕШ�О)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:833
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Стање пропитивања=1 (�ЕМ� ПОШТЕ)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:835
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Стање пропитивања=2 (ПРИКЉУЧ�ИЦ�)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:837
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Стање пропитивања=3 (�ЕУСПЕХ ПОТВРДИДЕ�Т)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:839
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Стање пропитивања=4 (ПРОТОКОЛ)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:841
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Стање пропитивања=5 (СИ�Т�КС�)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:843
 msgid "Query status=6 (IOERR)\n"
 msgstr "Стање пропитивања=6 (УИ_ГРЕШК�)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:845
 msgid "Query status=7 (ERROR)\n"
 msgstr "Стање пропитивања=7 (ГРЕШК�)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:847
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Стање пропитивања=8 (ИСКЉУЧИ)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:849
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Стање пропитивања=9 (З�КЉУЧ�В�ЊЕ З�УЗЕТОСТИ)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:851
 msgid "Query status=10 (SMTP)\n"
 msgstr "Стање пропитивања=10 (СМТП)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:853
 msgid "Query status=11 (DNS)\n"
 msgstr "Стање пропитивања=11 (Д�С)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:855
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Стање пропитивања=12 (БСМТП)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:857
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Стање пропитивања=13 (М�КСИМУМ ДОВЛ�ЧЕЊ�)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:859
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Стање пропитивања=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:901
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Све везе �у од�ечене.  Излазим.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:909
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "�павам на „%s“ %d �екунде\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:933
 #, c-format
 msgid "awakened by %s\n"
 msgstr "пробудио ме је „%s“\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:936
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "пробудио ме је �игнал %d\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:944
 #, c-format
 msgid "awakened at %s\n"
 msgstr "пробуђен �ам на „%s“\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:949
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "уобичајено окончање, �тање %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1113
 msgid "couldn't time-check the run-control file\n"
 msgstr "не могу времен�ки да проверим датотеку управљања покретањем\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1147
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Упозорење: домаћин „%s“ је неколико пута поменут у датотеци подешавања\n"
+msgstr "Упозорење: домаћин „%s“ је неколико пута поменут у датотеци подешавања\n"
 
-#: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"добавпошта: Грешка: неколико „о�новних“ запи�а у датотеци подешавања, или "
-"„о�новни“ није први запи�.\n"
+#: fetchmail.c:1186
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "добавпошта: Грешка: неколико „о�новних“ запи�а у датотеци подешавања, или „о�новни“ није први запи�.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1316
 msgid "SSL support is not compiled in.\n"
 msgstr "ССЛ подршка није преведена.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1323
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Подршка КЕРБЕРОС� и4 је подешена, али није преведена.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1329
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Подршка КЕРБЕРОС� и5 је подешена, али није преведена.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1335
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Подршка „GSSAPI“ је подешена, али није преведена.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1365
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"добавпошта: упозорење: нема до�тупног Д�С-а за проверу више�појних довлачења "
-"�а „%s“\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "добавпошта: упозорење: нема до�тупног Д�С-а за проверу више�појних довлачења �а „%s“\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1376
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "упозорење: више�појно�т за „%s“ захтева опцију коверте!\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1377
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "упозорење: �е тражим подршку ако �ва пошта иде управнику поште!\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1394
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"добавпошта: „%s“ подешавање није и�правно, наведите позитиван број "
-"прикључника за у�лугу или прикључник\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "добавпошта: „%s“ подешавање није и�правно, наведите позитиван број прикључника за у�лугу или прикључник\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1401
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"добавпошта: „%s“ подешавање није и�правно, „RPOP“ захтева привилегован "
-"прикључник\n"
+msgstr "добавпошта: „%s“ подешавање није и�правно, „RPOP“ захтева привилегован прикључник\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1419
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"„%s“ подешавање није и�правно, ЛМТП не може да кори�ти о�новни СМТП "
-"прикључник\n"
+msgstr "„%s“ подешавање није и�правно, ЛМТП не може да кори�ти о�новни СМТП прикључник\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1433
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Довуци �ве и на�тави у демону или режим мировања �у грешке!\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"добавпошта: Грешка: режим мировања не ради за више фацикли или налога!\n"
+#: fetchmail.c:1443
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "добавпошта: Грешка: режим мировања не ради за више фацикли или налога!\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1467
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "окончано �игналом %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "„%s“ и�питује „%s“ (протокол „%s“) на „%s“: пропитивање је започело\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1565
 msgid "POP2 support is not configured.\n"
 msgstr "„POP2“ подршка није подешена.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1577
 msgid "POP3 support is not configured.\n"
 msgstr "„POP3“ подршка није подешена.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1587
 msgid "IMAP support is not configured.\n"
 msgstr "„IMAP“ подршка није подешена.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1593
 msgid "ETRN support is not configured.\n"
 msgstr "„ETRN“ подршка није подешена.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid "ODMR support is not configured.\n"
 msgstr "„ODMR“ подршка није подешена.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1608
 msgid "unsupported protocol selected.\n"
 msgstr "изабран је неподржани протокол.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "„%s“ и�питује „%s“ (протокол „%s“) на „%s“: пропитивање је обављено\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1644
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал пропитивања је %d �екунде\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Датотека дневника је „%s“\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Датотека иб-а је „%s“\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Поруке напредовања биће бележене путем �и�тем�ког дневника\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1654
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Добавпошта ће �е прикрити и неће �творити „Примљене“\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1656
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Добавпошта ће приказати тачке напредовања чак и у датотекама дневника.\n"
+msgstr "Добавпошта ће приказати тачке напредовања чак и у датотекама дневника.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1658
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Добавпошта ће про�ледити лоше упућене више�појне адре�е на „%s“.\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Добавпошта ће преу�мерити погрешну пошту управнику поште.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Добавпошта ће преу�мерити погрешну пошту пошиљаоцу.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1667
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Добавпошта ће �талне грешке �матрати �талним (одбациће поруке).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1669
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Добавпошта ће �талне грешке �матрати привременим (задржаће поруке).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1676
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Опције за добављање �а „%s@%s“:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1680
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Пошта ће бити добављена путем „%s“\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1683
 #, 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"
@@ -1171,432 +1099,395 @@ msgstr[0] "  Пропитивање овог �ервера ће �е одигр
 msgstr[1] "  Пропитивање овог �ервера ће �е одиграти �вака %d интервала.\n"
 msgstr[2] "  Пропитивање овог �ервера ће �е одиграти �ваких %d интервала.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Прави назив �ервера је „%s“.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1690
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Овај домаћин неће бити пропитан када није наведен ниједан домаћин.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1691
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Овај домаћин ће бити пропитан када није наведен ниједан домаћин.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1695
 msgid "  Password will be prompted for.\n"
 msgstr "  Биће по�тављен упит за лозинку.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1699
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  „APOP“ тајна = „%s“.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1702
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  „RPOP“ иб = „%s“.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1705
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Лозинка = „%s“.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1714
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол је „KPOP“ Керберо� %s потврђивањем идентитета"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1717
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол је „%s“"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 #, c-format
 msgid " (using service %s)"
 msgstr " (кори�тим у�лугу „%s“)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1721
 msgid " (using default port)"
 msgstr " (кори�тим о�новни прикључник)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1723
 msgid " (forcing UIDL use)"
 msgstr " (при�иљавам „UIDL“ коришћење)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1729
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Сви до�тупни начини потврђивања идентитета биће покушани.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1732
 msgid "  Password authentication will be forced.\n"
 msgstr "  Потврђивање идентитета лозинком биће при�илно.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1735
 msgid "  MSN authentication will be forced.\n"
 msgstr "  „MSN“ потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1738
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  „NTLM“ потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1741
 msgid "  OTP authentication will be forced.\n"
 msgstr "  „OTP“ потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1744
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  „CRAM-MD5“ потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1747
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  „GSSAPI“ потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1750
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Керберо� И4 потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Керберо� И5 потврђивање идентитета биће при�илно.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1756
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Шифровање � краја на крај је произвољно узето.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1760
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Главник у�луге поште је: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1763
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ССЛ шифроване �е�ије �у омогућене.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1765
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ССЛ протокол: %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1767
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Провера уверења ССЛ �ервера је омогућена.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Провера уверења ССЛ �ервера је онемогућена.\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1772
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Датотека ССЛ поверљивог уверења: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1774
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Директоријум ССЛ поверљивог уверења: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1776
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Општи_�азив ССЛ �ервера: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Оти�ак ССЛ кључа (провереног за кључем �ервера): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Време и�тека неодговарања �ервера је %d �екунде"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1783
 msgid " (default).\n"
 msgstr " (о�новно).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  Default mailbox selected.\n"
 msgstr "  Изабрано је о�новно поштан�ко �андуче.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1795
 msgid "  Selected mailboxes are:"
 msgstr "  Изабрани поштан�ки �андучићи �у:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1801
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Све поруке биће добављене („--all“ је укључено).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1802
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Само нове поруке биће добављене („--all“ је и�кључено).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1804
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Довучене поруке биће задржане на �ерверу („--keep“ је укључено).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1805
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Довучене поруке неће бити задржане на �ерверу („--keep“ је и�кључено).\n"
+msgstr "  Довучене поруке неће бити задржане на �ерверу („--keep“ је и�кључено).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1807
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Старе поруке ће бити избачене пре добављања порука („--flush“ је "
-"укључено).\n"
+msgstr "  Старе поруке ће бити избачене пре добављања порука („--flush“ је укључено).\n"
 
-#: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Старе поруке неће бити избачене пре добављања порука („--flush“ је "
-"и�кључено).\n"
+#: fetchmail.c:1808
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Старе поруке неће бити избачене пре добављања порука („--flush“ је и�кључено).\n"
 
-#: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Превелике поруке ће бити избачене пре добављања порука („--limitflush“ је "
-"укључено).\n"
+#: fetchmail.c:1810
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Превелике поруке ће бити избачене пре добављања порука („--limitflush“ је укључено).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Превелике поруке неће бити избачене пре добављања порука („--limitflush“ "
-"је и�кључено).\n"
+#: fetchmail.c:1811
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Превелике поруке неће бити избачене пре добављања порука („--limitflush“ је и�кључено).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1813
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Препи�ивање �ервер�ко локалних адре�а је омогућено („--norewrite“ је "
-"и�кључено).\n"
+msgstr "  Препи�ивање �ервер�ко локалних адре�а је омогућено („--norewrite“ је и�кључено).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Препи�ивање �ервер�ко локалних адре�а је онемогућено („--norewrite“ је "
-"укључено).\n"
+msgstr "  Препи�ивање �ервер�ко локалних адре�а је онемогућено („--norewrite“ је укључено).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Огољење крајњака реда је омогућено („stripcr“ је укључено).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1817
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Огољење крајњака реда је онемогућено („stripcr“ је и�кључено).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1819
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  При�иљење крајњака реда је омогућено („forcecr“ је укључено).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  При�иљење крајњака реда је онемогућено („forcecr“ је и�кључено).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Тумачење �адржајно прено�ног кодирања је онемогућено („pass8bits“ је "
-"укључено).\n"
+#: fetchmail.c:1822
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Тумачење �адржајно прено�ног кодирања је онемогућено („pass8bits“ је укључено).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Тумачење �адржајно прено�ног кодирања је омогућено („pass8bits“ је "
-"и�кључено).\n"
+#: fetchmail.c:1823
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Тумачење �адржајно прено�ног кодирања је омогућено („pass8bits“ је и�кључено).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1825
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  МИМЕ декодирање је омогућено („mimedecode“ је укључено).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  МИМЕ декодирање је онемогућено („mimedecode“ је и�кључено).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Мировање након пропитивања је омогућено („idle“ је укључено).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1829
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Мировање након пропитивања је онемогућено („idle“ је и�кључено).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1831
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
-msgstr ""
-"  Редови �тања непразно�ти биће одбачени (�тање одбацивања је укључено)\n"
+msgstr "  Редови �тања непразно�ти биће одбачени (�тање одбацивања је укључено)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr ""
-"  Редови �тања непразно�ти биће задржани (�тање одбацивања је и�кључено)\n"
+msgstr "  Редови �тања непразно�ти биће задржани (�тање одбацивања је и�кључено)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1834
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-"  Редови и�поручено�ти биће одбачени (одбацивање и�поручених је укључено)\n"
+msgstr "  Редови и�поручено�ти биће одбачени (одбацивање и�поручених је укључено)\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1835
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-"  Редови и�поручено�ти биће задржани (одбацивање и�поручених је и�кључено)\n"
+msgstr "  Редови и�поручено�ти биће задржани (одбацивање и�поручених је и�кључено)\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1839
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничење величине поруке је %d октета (--limit %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1842
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �ема ограничења величине поруке (--limit 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1844
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Интервал упозорења величине поруке је %d �екунде (--warnings %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1847
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Величина упозорења при �ваком пропитивању („--warnings“ 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1850
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничење примљене поруке је %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1853
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Без ограничења примљене поруке (--fetchlimit 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1855
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Ограничење величине добавке поруке је %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1858
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Без ограничење величине добавке поруке (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1862
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Обавља бинарну претрагу УЈИБ-ова за време �ваког пропитивања („--fastuidl“ "
-"1).\n"
+msgstr "  Обавља бинарну претрагу УЈИБ-ова за време �ваког пропитивања („--fastuidl“ 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1864
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Обавља бинарну претрагу УЈИБ-ова за време �вака %d од %d пропитивања („--"
-"fastuidl“ %d).\n"
+msgstr "  Обавља бинарну претрагу УЈИБ-ова за време �вака %d од %d пропитивања („--fastuidl“ %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1867
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Обавља линеарну претрагу УЈИБ-ова за време �ваког пропитивања („--"
-"fastuidl“ 0).\n"
+msgstr "   Обавља линеарну претрагу УЈИБ-ова за време �ваког пропитивања („--fastuidl“ 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1869
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничење групе СМТП порука је %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1871
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Без ограничења групе СМТП поруке (--batchlimit 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1875
 #, 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:1878
+#: fetchmail.c:1877
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Без при�илних избацивања (--expunge 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1884
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домени за које ће пошта бити довлачена �у:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1889 fetchmail.c:1909
 msgid " (default)"
 msgstr " (о�новно)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1894
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Поруке ће бити прикачене на „%s“ као „BSMTP“\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1896
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Поруке ће бити и�поручене �а „%s“.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1903
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Поруке ће бити „%cMTP“-про�леђене до:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1914
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Део домаћина реда „ПОШТУ Ш�ЉЕ“ биће „%s“\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1917
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  �дре�а која ће бити �тављена у редове „ПРИМ�Л�Ц ПРИМ�“ за и�поруку СМТП-у "
-"биће „%s“\n"
+msgstr "  �дре�а која ће бити �тављена у редове „ПРИМ�Л�Ц ПРИМ�“ за и�поруку СМТП-у биће „%s“\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1926
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Препознати одговори блокирања �пама о�лушкивача �у:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1932
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокирање �пама је и�кључено\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1935
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Веза �ервера биће донета �а „%s“.\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1938
 msgid "  No pre-connection command.\n"
 msgstr "  �ема наредбе пре-везе.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1940
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Веза �ервера биће узета �а „%s“.\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1943
 msgid "  No post-connection command.\n"
 msgstr "  �ема наредбе по�т-везе.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1946
 msgid "  No localnames declared for this host.\n"
 msgstr "  �ема објављених локалних назива за овог домаћина.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1956
 msgid "  Multi-drop mode: "
 msgstr "  Режим више�појно�ти: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1958
 msgid "  Single-drop mode: "
 msgstr "  Режим једно�појно�ти: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1960
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1604,118 +1495,115 @@ msgstr[0] "%d локални назив је препознат.\n"
 msgstr[1] "%d локална назива �у препозната.\n"
 msgstr[2] "%d локалних назива је препознато.\n"
 
-#: fetchmail.c:1976
+#: fetchmail.c:1975
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Д�С претрага за више�појне адре�е је омогућена.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1976
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Д�С претрага за више�појне адре�е је онемогућена.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1980
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  �лија�и �ервера биће упоређени ИП адре�ом �а више�појним адре�ама.\n"
 
-#: fetchmail.c:1983
+#: fetchmail.c:1982
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  �лија�и �ервера биће упоређени називом �а више�појним адре�ама.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1985
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  У�меривање адре�е коверте је онемогућено\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1988
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Заглавље коверте је претпо�тављено да је: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1991
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Број заглавља ковери кој ће бити пре�кочени: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1994
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префик� „%s“ ће бити уклоњен из иб-а кори�ника\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1997
 msgid "  No prefix stripping\n"
 msgstr "  �ема огољавања префик�а\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2002
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Унапред објављени алија�и �ервера поште:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:2010
 msgid "  Local domains:"
 msgstr "  Локални домени:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:2020
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Веза мора бити кроз �учеље „%s“.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2022
 msgid "  No interface requirement specified.\n"
 msgstr "  �и�у наведене потрепштине �учеља.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:2024
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Петља пропитивања ће пратити „%s“.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:2026
 msgid "  No monitor interface specified.\n"
 msgstr "  �ије наведено �учеље праћења.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:2030
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Везе �ервера биће направљене путем прикључка „%s“ (--plugin %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2032
 msgid "  No plugin command specified.\n"
 msgstr "  �ије наведена наредба прикључка.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:2034
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Везе о�лушкивача биће направљене путем откључка „%s“ (--plugout %s).\n"
+msgstr "  Везе о�лушкивача биће направљене путем откључка „%s“ (--plugout %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:2036
 msgid "  No plugout command specified.\n"
 msgstr "  �ије наведена наредба откључка.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:2043
 msgid "  No UIDs saved from this host.\n"
 msgstr "  �иједан УИБ није �ачуван �а овог домаћина.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:2046
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d УИБ-а �ачуван.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:2052
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Подаци праћења пропитивања биће додати заглављу „Примљене“.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:2054
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  �икакви подаци праћења пропитивања неће бити додати заглављу „Примљене“.\n"
+msgstr "  �икакви подаци праћења пропитивања неће бити додати заглављу „Примљене“.\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:2059
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Поруке �а лошим заглављима биће одбачене.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2062
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Поруке �а лошим заглављима биће про�леђене.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:2067
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свој�тва прола�ка кроз „%s“.\n"
@@ -1726,12 +1614,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "�е могу да изменим ма�ку �игнала: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Ваш оперативни �и�тем нити дефинише „PATH_MAX“ нити ће прихватити �тварну "
-"путању (f, NULL). Прекидам.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Ваш оперативни �и�тем нити дефинише „PATH_MAX“ нити ће прихватити �тварну путању (f, NULL). Прекидам.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1767,16 +1651,11 @@ msgstr "Кори�тим назив у�луге [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"�и�ам нашао одговарајуће „GSSAPI“ креденцијале. Пре�качем „GSSAPI“ "
-"потврђивање идентитета.\n"
+msgstr "�и�ам нашао одговарајуће „GSSAPI“ креденцијале. Пре�качем „GSSAPI“ потврђивање идентитета.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"�ко желите да кори�тите „GSSAPI“, прво �у вам потребна пуномоћ�тва, по "
-"могућ�тву од „kinit“-а.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "�ко желите да кори�тите „GSSAPI“, прво �у вам потребна пуномоћ�тва, по могућ�тву од „kinit“-а.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1824,9 +1703,7 @@ msgstr "Грешка �тварања захтева нивоа безбедно
 #: gssapi.c:287
 #, c-format
 msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-"„GSSAPI“ пошаљи_�купину је превелико (%lu) приликом �лања кори�ничког "
-"имена.\n"
+msgstr "„GSSAPI“ пошаљи_�купину је превелико (%lu) приликом �лања кори�ничког имена.\n"
 
 #: gssapi.c:298
 msgid "Releasing GSS credentials\n"
@@ -1890,8 +1767,7 @@ msgstr "%s: пригодна надоградња на ТЛС није уÑ�пеÐ
 #: imap.c:502
 #, c-format
 msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
-"%s: УПОЗОРЕЊЕ: �ервер је понудио „STARTTLS“ али је дато „sslproto ''“.\n"
+msgstr "%s: УПОЗОРЕЊЕ: �ервер је понудио „STARTTLS“ али је дато „sslproto ''“.\n"
 
 #: imap.c:607
 msgid "Required OTP capability not compiled into fetchmail\n"
@@ -1962,11 +1838,8 @@ msgid "%u is first unseen\n"
 msgstr "%u је прва невиђена\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Упозорење: занемарујем нетачне податке за величине порука које је вратио "
-"�ервер.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Упозорење: занемарујем нетачне податке за величине порука које је вратио �ервер.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -1975,8 +1848,7 @@ msgstr "�еи�праван „FETCH“ одговор: %s.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"�е могу да отворим „kvm“ �учеље. Уверите �е да је добавпошта „SGID kmem“."
+msgstr "�е могу да отворим „kvm“ �учеље. Уверите �е да је добавпошта „SGID kmem“."
 
 #: interface.c:396
 #, c-format
@@ -2080,35 +1952,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "добавпошта: грешка читања датотеке закључавања „%s“: %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "добавпошта: уклањам у�тајалу датотеку закључавања\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "добавпошта: грешка отварања датотеке закључавања „%s“: %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "добавпошта: грешка читања датотеке закључавања „%s“: %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "добавпошта: грешка отварања датотеке закључавања „%s“: %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "добавпошта: �тварање закључавања није у�пело.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "добавпошта: грешка читања датотеке закључавања „%s“: %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2271,12 +2126,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile           наводи назив датотеке дневника\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog            кори�ти „syslog(3)“ за већину порука када ради као "
-"демон\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog            кори�ти „syslog(3)“ за већину порука када ради као демон\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2284,14 +2135,11 @@ msgstr "      --nosyslog          и�кључује коришћење „syslo
 
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-"      --invisible         не запи�ује „Примљене“ и омогућује ометање "
-"домаћина\n"
+msgstr "      --invisible         не запи�ује „Примљене“ и омогућује ометање домаћина\n"
 
 #: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc       наводи замен�ку контролну датотеку покретања\n"
+msgstr "  -f, --fetchmailrc       наводи замен�ку контролну датотеку покретања\n"
 
 #: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
@@ -2307,22 +2155,15 @@ msgstr "      --postmaster        наводи примаоца по�ледње
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce          преу�мерава одбијања од кори�ника управнику "
-"поште.\n"
+msgstr "      --nobounce          преу�мерава одбијања од кори�ника управнику поште.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce      брише трајно неи�поручиве поруке.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce        задржава неи�поручиве поруке на �ерверу трајно "
-"(о�новно).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce        задржава неи�поручиве поруке на �ерверу трајно (о�новно).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2346,42 +2187,27 @@ msgstr "      --sslcert           уверење ��л клијента\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck         обавља изричиту проверу уверења �ервера "
-"(препоручено)\n"
+msgstr "      --sslcertck         обавља изричиту проверу уверења �ервера (препоручено)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck       пре�каче изричиту проверу уверења �ервера "
-"(небезбедно)\n"
+msgstr "      --nosslcertck       пре�каче изричиту проверу уверења �ервера (небезбедно)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile       путања до датотеке поверљивог издавача уверења ��л "
-"уверења\n"
+msgstr "      --sslcertfile       путања до датотеке поверљивог издавача уверења ��л уверења\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath       путања до директоријума поверљивог издавача "
-"уверења ��л уверења\n"
+msgstr "      --sslcertpath       путања до директоријума поверљивог издавача уверења ��л уверења\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname     очекује овај „CommonName“ �а �ервера "
-"(обе�храбрујуће)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname     очекује овај „CommonName“ �а �ервера (обе�храбрујуће)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint    оти�ак који мора одговарати оном из уверења "
-"�ервера.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint    оти�ак који мора одговарати оном из уверења �ервера.\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2393,8 +2219,7 @@ msgstr "      --plugin            наводи �пољну наредбу за
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout           наводи �пољну наредбу за отварање �мтп везе\n"
+msgstr "      --plugout           наводи �пољну наредбу за отварање �мтп везе\n"
 
 #: options.c:681
 msgid ""
@@ -2402,44 +2227,31 @@ msgid ""
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {одбаци|прихвати}\n"
-"                          наводи политику за рад �а порукама �а лошим "
-"заглављима\n"
+"                          наводи политику за рад �а порукама �а лошим заглављима\n"
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[кол]        наводи протокол добављања (видите �траницу "
-"упут�тва)\n"
+msgstr "  -p, --proto[кол]        наводи протокол добављања (видите �траницу упут�тва)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr ""
-"  -U, --uidl              при�иљава коришћење УЈИБЛ-ова (�амо „pop3“)\n"
+msgstr "  -U, --uidl              при�иљава коришћење УЈИБЛ-ова (�амо „pop3“)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle              говори ИМ�П �ерверу да пошаље обаве�ти о новим "
-"порукама\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle              говори ИМ�П �ерверу да пошаље обаве�ти о новим порукама\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port              „TCP“ прикључник за повезивање (за�тарело, "
-"кори�тите „--service“)\n"
+msgstr "      --port              „TCP“ прикључник за повезивање (за�тарело, кори�тите „--service“)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service           „TCP“ у�луга за повезивање (може бити бројевни "
-"„TCP“ прикључник)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service           „TCP“ у�луга за повезивање (може бити бројевни „TCP“ прикључник)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
-msgstr ""
-"      --auth              вр�та потврђивања идентитета (видите упут�тво)\n"
+msgstr "      --auth              вр�та потврђивања идентитета (видите упут�тво)\n"
 
 #: options.c:690
 msgid "  -t, --timeout     server nonresponse timeout\n"
@@ -2451,8 +2263,7 @@ msgstr "  -E, --envelope          заглавље адре�е коверте\n
 
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-"  -Q, --qvirtual          префик� за уклањање из иб-а ме�ног кори�ника\n"
+msgstr "  -Q, --qvirtual          префик� за уклањање из иб-а ме�ног кори�ника\n"
 
 #: options.c:693
 msgid "      --principal   mail service principal\n"
@@ -2460,9 +2271,7 @@ msgstr "      --principal         главник у�луге поште\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls        додаје податке праћења пропитивања у заглавље "
-"„Примљене“\n"
+msgstr "      --tracepolls        додаје податке праћења пропитивања у заглавље „Примљене“\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
@@ -2526,13 +2335,11 @@ msgstr "  -b, --batchlimit        по�тавља ограничење груп
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit        по�тавља ограничење добављања за везе �ервера\n"
+msgstr "  -B, --fetchlimit        по�тавља ограничење добављања за везе �ервера\n"
 
 #: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-"      --fetchsizelimit    по�тавља ограничење величине поруке добављања\n"
+msgstr "      --fetchsizelimit    по�тавља ограничење величине поруке добављања\n"
 
 #: options.c:714
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2560,9 +2367,7 @@ msgstr "  -r, --folder            наводи назив удаљене фаÑ�Ñ
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots          приказује тачке напредовања чак и у датотекама "
-"дневника\n"
+msgstr "      --showdots          приказује тачке напредовања чак и у датотекама дневника\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2573,10 +2378,8 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "„POP2“ подржава �амо потврђивање идентитета лозинком. Оду�тајем.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Упозорење: �ађох „Maillennium POP3“, кори�тећи наредбу „RETR“ уме�то „TOP“.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Упозорење: �ађох „Maillennium POP3“, кори�тећи наредбу „RETR“ уме�то „TOP“.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2598,8 +2401,7 @@ msgstr "%s: УПОЗОРЕЊЕ: Ñ�ервер је понудио „STLS“, аÐ
 
 #: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Поне�тало нам је допуштених потврђивача идентитета и не можемо на�тавити.\n"
+msgstr "Поне�тало нам је допуштених потврђивача идентитета и не можемо на�тавити.\n"
 
 #: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2664,20 +2466,12 @@ msgid "SDPS not enabled."
 msgstr "„SDPS“ није омогућено."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"добавпошта: опција �учеља је подржана �амо у Линук�у (без ИПи6) и „FreeBSD“-"
-"у\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "добавпошта: опција �учеља је подржана �амо у Линук�у (без ИПи6) и „FreeBSD“-у\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"добавпошта: опција праћења је подржана �амо у Линук�у (без ИПи6) и „FreeBSD“-"
-"у\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "добавпошта: опција праћења је подржана �амо у Линук�у (без ИПи6) и „FreeBSD“-у\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -3028,11 +2822,8 @@ msgstr "„MDA“ је вратило не-нулто �тање %d\n"
 
 #: 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 и грешку %d/%s, не могу да радим на „%s“:"
-"%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Чудно: „MDA pclose“ је вратило %d и грешку %d/%s, не могу да радим на „%s“:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3113,8 +2904,7 @@ msgstr "„getaddrinfo(„%s“,„%s“) грешка: %s\n"
 
 #: socket.c:275
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"Покушајте да додате опцију „--service“ (видите такође ЧПП �тавку „R12“).\n"
+msgstr "Покушајте да додате опцију „--service“ (видите такође ЧПП �тавку „R12“).\n"
 
 #: socket.c:289 socket.c:292
 #, c-format
@@ -3134,8 +2924,7 @@ msgstr "не могу да направим прикључницу: %s\n"
 #: socket.c:306
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr ""
-"назив „%d“: не могу да направим породицу прикључнице „%d“ вр�те „%d“: %s\n"
+msgstr "назив „%d“: не могу да направим породицу прикључнице „%d“ вр�те „%d“: %s\n"
 
 #: socket.c:324
 msgid "connection failed.\n"
@@ -3195,8 +2984,7 @@ msgstr "Организација издавача: %s\n"
 
 #: socket.c:674
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Упозорење: �азив организације издавача је предуг (по могућ�тву �краћен).\n"
+msgstr "Упозорење: �азив организације издавача је предуг (по могућ�тву �краћен).\n"
 
 #: socket.c:676
 msgid "Unknown Organization\n"
@@ -3292,16 +3080,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Прекинут ланац уверења: %s\n"
 
 #: socket.c:831
-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 ""
-"Ово може да значи да �ервер није обезбедио по�редничко уверење издавача "
-"уверења, у вези чега добавпошта не може да уради баш ништа.  За више "
-"поједино�ти, погледајте документ „README.SSL-SERVER“ који �е до�тавља уз "
-"програм.\n"
+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 "Ово може да значи да �ервер није обезбедио по�редничко уверење издавача уверења, у вези чега добавпошта не може да уради баш ништа.  За више поједино�ти, погледајте документ „README.SSL-SERVER“ који �е до�тавља уз програм.\n"
 
 #: socket.c:841
 #, c-format
@@ -3309,17 +3089,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "�едо�таје уверење �идра поверења: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Ово може да значи да корено потпи�но уверење издавача уверења није на ме�ту "
-"поверљивог уверења издавача уверења, или да „c_rehash“ треба да �е покрене у "
-"директоријуму уверења. За више поједино�ти, погледајте документацију „--"
-"sslcertpath“ и „--sslcertfile“ на �траници упут�тва. Видите „README.SSL“ за "
-"поједино�ти.\n"
+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. See README.SSL for details.\n"
+msgstr "Ово може да значи да корено потпи�но уверење издавача уверења није на ме�ту поверљивог уверења издавача уверења, или да „c_rehash“ треба да �е покрене у директоријуму уверења. За више поједино�ти, погледајте документацију „--sslcertpath“ и „--sslcertfile“ на �траници упут�тва. Видите „README.SSL“ за поједино�ти.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3340,55 +3111,35 @@ msgstr "Ваше издање „OpenSSL“-а не подржава „TLS v1.3
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"�еи�праван „SSL“ протокол „%s“ је наведен, кори�тим подразумевано �амо�тално "
-"бирање (auto).\n"
+msgstr "�еи�праван „SSL“ протокол „%s“ је наведен, кори�тим подразумевано �амо�тално бирање (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Учитах „OpenSSL“ библиотеку „%#lx“ �тарију од заглавља „%#lx“, одбијам да "
-"радим (�тупам у штрајк).\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Учитах „OpenSSL“ библиотеку „%#lx“ �тарију од заглавља „%#lx“, одбијам да радим (�тупам у штрајк).\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Учитах „OpenSSL“ библиотеку „%#lx“ новију од заглавља „%#lx“, покушаћу да "
-"на�тавим.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Учитах „OpenSSL“ библиотеку „%#lx“ новију од заглавља „%#lx“, покушаћу да на�тавим.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Опи�ник датотеке је ван оп�ега за „SSL“"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Знајте да неке ди�тибуције онемогућују �тарија издања протокола на уврнутим "
-"не�тандардним начинима. Пробајте новије издање протокола.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Знајте да неке ди�тибуције онемогућују �тарија издања протокола на уврнутим не�тандардним начинима. Пробајте новије издање протокола.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Упозорење: „SSL_set_tlsext_host_name(%p, \"%s\")“ није у�пело (код %#lx), "
-"покушавам да на�тавим.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Упозорење: „SSL_set_tlsext_host_name(%p, \"%s\")“ није у�пело (код %#lx), покушавам да на�тавим.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Упозорење: „X509_VERIFY_PARAM_set1_host(%p, \"%s\")“ није у�пело (код %#x), "
-"покушавам да на�тавим.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Упозорење: „X509_VERIFY_PARAM_set1_host(%p, \"%s\")“ није у�пело (код %#x), покушавам да на�тавим.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3405,27 +3156,20 @@ msgstr "руковање није уÑ�пело на нивоу протоколÐ
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"�е могу да добијем текућег „SSL/TLS“ шифрера – да ли је у�по�тављена нека "
-"�е�ија?\n"
+msgstr "�е могу да добијем текућег „SSL/TLS“ шифрера – да ли је у�по�тављена нека �е�ија?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: кори�тим протокол „%s“, шифрер „%s“, %d/%d тајна/обрађених битова\n"
+msgstr "SSL/TLS: кори�тим протокол „%s“, шифрер „%s“, %d/%d тајна/обрађених битова\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Провера уверења/оти�ка је некако пре�кочена!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Упозорење: веза није безбедна, ипак на�тављам. (Боље употребите „--"
-"sslcertck“!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Упозорење: веза није безбедна, ипак на�тављам. (Боље употребите „--sslcertck“!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
@@ -3480,8 +3224,7 @@ msgstr "нађох адре�у примљених „%s“\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"нађох нетачан ред заглавља – видите у упут�тву о опцији лошег заглавља\n"
+msgstr "нађох нетачан ред заглавља – видите у упут�тву о опцији лошег заглавља\n"
 
 #: transact.c:615
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index b0f1b3ab..e1cd1899 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-14 23:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -37,14 +37,12 @@ msgstr "Nej, deras IP-adresser stämmer inte\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"namnservern misslyckades när den letade efter �%s� under pollning av %s: %s\n"
+msgstr "namnservern misslyckades när den letade efter �%s� under pollning av %s: %s\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"namnservern misslyckades när den letade efter �%s� under pollning av %s.\n"
+msgstr "namnservern misslyckades när den letade efter �%s� under pollning av %s.\n"
 
 #: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
@@ -138,11 +136,8 @@ msgstr " (%d kroppoktetter)"
 
 #: driver.c:770
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"meddelandet %s@%s:%d hade inte den förväntade längden (%d faktisk ≠ %d "
-"förväntad)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "meddelandet %s@%s:%d hade inte den förväntade längden (%d faktisk ≠ %d förväntad)\n"
 
 #: driver.c:802
 msgid " retained\n"
@@ -159,19 +154,14 @@ msgstr " inte tömt\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] ""
-"hämtningsgränsen %d uppnådd, %d meddelande kvarlämnat på server %s konto %s\n"
-msgstr[1] ""
-"hämtningsgränsen %d uppnådd, %d meddelanden kvarlämnade på server %s konto "
-"%s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "hämtningsgränsen %d uppnådd, %d meddelande kvarlämnat på server %s konto %s\n"
+msgstr[1] "hämtningsgränsen %d uppnådd, %d meddelanden kvarlämnade på server %s konto %s\n"
 
 #: driver.c:899
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"tiden gick ut efter %d sekunders väntan på att ansluta till servern %s.\n"
+msgstr "tiden gick ut efter %d sekunders väntan på att ansluta till servern %s.\n"
 
 #: driver.c:903
 #, c-format
@@ -186,8 +176,7 @@ msgstr "tiden gick ut efter %d sekunders väntan på %s.\n"
 #: driver.c:912
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"tiden gick ut efter %d sekunders väntan på att lyssnare skulle svara.\n"
+msgstr "tiden gick ut efter %d sekunders väntan på att lyssnare skulle svara.\n"
 
 #: driver.c:915
 #, c-format
@@ -200,12 +189,8 @@ msgstr "fetchmail ser att tiden går ut upprepade gånger"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail såg att tiden gick ut mer än %d gånger under försök att hämta post "
-"från %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail såg att tiden gick ut mer än %d gånger under försök att hämta post från %s@%s.\n"
 
 #: driver.c:934
 msgid ""
@@ -432,8 +417,7 @@ msgstr "felaktigt antal meddelanden!"
 #: driver.c:1448
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-"Alltför många brev överhoppade (%d > %d) på grund av transienta fel med %s\n"
+msgstr "Alltför många brev överhoppade (%d > %d) på grund av transienta fel med %s\n"
 
 # Detta och följande meddelanden fylls i %s i meddelandent
 # "%s error while fetching ..." nedan.  Jag tar med "fel" i första delen
@@ -531,8 +515,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Miljövariabeln QMAILINJECT är satt.\n"
-"Detta är farligt eftersom det kan få qmail-inject eller qmail:s sendmail-"
-"omslag\n"
+"Detta är farligt eftersom det kan få qmail-inject eller qmail:s sendmail-omslag\n"
 "att mixtra med dina From:- eller Message-ID:-huvuden.\n"
 "Prova \"env QMAILINJECT= %s DINA ARGUMENT HÄR\"\n"
 "%s: Avbryt.\n"
@@ -542,8 +525,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 ""
@@ -584,8 +566,7 @@ msgstr "Kan inte hitta min egen värd i värddatabasen för att precisera den!\n
 #: env.c:229
 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 ""
 "Försöker fortsätta med opreciserat värdnamn.\n"
@@ -703,11 +684,8 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "VARNING: ditt SSL/TLS-bibliotek stödjer inte TLS v1.3.\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-"VARNING: kompilerad mot LibreSSL, vilket inte är en konfigurations som "
-"stödjs.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgstr "VARNING: kompilerad mot LibreSSL, vilket inte är en konfigurations som stödjs.\n"
 
 #: fetchmail.c:314
 msgid "WARNING: Compiled without SSL/TLS.\n"
@@ -733,11 +711,8 @@ msgstr "Loggfilen �%s� är inte skrivbar, avbryter.\n"
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"Både flaggan syslog och logfile är satta, ignorerar syslog, och loggar till "
-"%s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "Både flaggan syslog och logfile är satta, ignorerar syslog, och loggar till %s"
 
 #: fetchmail.c:469
 #, c-format
@@ -780,21 +755,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s-fetchmail %ld dödad.\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: kan inte kontrollera post medan en annan fetchmail på samma värd "
-"kör.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: kan inte kontrollera post medan en annan fetchmail på samma värd kör.\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: kan inte kontrollera angivna värdar med en annan fetchmail som "
-"kör som %ld.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: kan inte kontrollera angivna värdar med en annan fetchmail som kör som %ld.\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -802,8 +769,7 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: en annan förgrunds-fetchmail kör som %ld.\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: kan inte ta flaggor medan en bakgrunds-fetchmail kör.\n"
 
 #: fetchmail.c:581
@@ -856,9 +822,7 @@ msgstr "startar om fetchmail (%s ändrades)\n"
 
 #: fetchmail.c:726
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"försök att starta om kan misslyckas eftersom aktuell katalog inte har "
-"återställts\n"
+msgstr "försök att starta om kan misslyckas eftersom aktuell katalog inte har återställts\n"
 
 #: fetchmail.c:752
 msgid "attempt to re-exec fetchmail failed\n"
@@ -867,9 +831,7 @@ msgstr "försök att göra om exec fetchmail misslyckades\n"
 #: fetchmail.c:782
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"kontroll av %s hoppas över (autentiseringen misslyckades eller så gick tiden "
-"ut för många gånger)\n"
+msgstr "kontroll av %s hoppas över (autentiseringen misslyckades eller så gick tiden ut för många gånger)\n"
 
 #: fetchmail.c:794
 #, c-format
@@ -976,12 +938,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varning: värden %s nämns flera gånger i konfigurationsfilen\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: Fel: flera �defaults�-poster i konfigurationsfilen, eller så är "
-"�defaults� inte den första posten.\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: Fel: flera �defaults�-poster i konfigurationsfilen, eller så är �defaults� inte den första posten.\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -1001,11 +959,8 @@ msgstr "GSSAPI-stöd är konfigurerat, men inte inkompilerat.\n"
 
 #: fetchmail.c:1366
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: varning: ingen DNS tillgänglig för att kontrollera "
-"flermålshämtningar från %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: varning: ingen DNS tillgänglig för att kontrollera flermålshämtningar från %s\n"
 
 #: fetchmail.c:1377
 #, c-format
@@ -1018,35 +973,26 @@ msgstr "varning: Fråga inte om hjälp om all post går till postmaster!\n"
 
 #: fetchmail.c:1395
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: %s-konfigurationen är ogiltig, ange ett positivt portnummer som "
-"tjänst eller port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: %s-konfigurationen är ogiltig, ange ett positivt portnummer som tjänst eller port\n"
 
 #: fetchmail.c:1402
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: %s-konfigurationen är ogiltig, RPOP kräver en privilegierad port\n"
+msgstr "fetchmail: %s-konfigurationen är ogiltig, RPOP kräver en privilegierad port\n"
 
 #: fetchmail.c:1420
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"%s-konfigurationen är ogiltig, LMTP kan inte använda standard-SMTP-porten\n"
+msgstr "%s-konfigurationen är ogiltig, LMTP kan inte använda standard-SMTP-porten\n"
 
 #: fetchmail.c:1434
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Både fetchall och keep på i demon- eller vilande läge är ett misstag!\n"
+msgstr "Både fetchall och keep på i demon- eller vilande läge är ett misstag!\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Fel: idle-läget fungerar inte för flera mappar eller konton!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Fel: idle-läget fungerar inte för flera mappar eller konton!\n"
 
 #: fetchmail.c:1468
 #, c-format
@@ -1117,9 +1063,7 @@ msgstr "Fetchmail kommer visa förloppspunkter även i loggfiler.\n"
 #: fetchmail.c:1659
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-"Fetchmail kommer vidarebefordra feladresserade multiadresserade meddelanden "
-"till %s.\n"
+msgstr "Fetchmail kommer vidarebefordra feladresserade multiadresserade meddelanden till %s.\n"
 
 #: fetchmail.c:1663
 msgid "Fetchmail will direct error mail to the postmaster.\n"
@@ -1131,14 +1075,11 @@ msgstr "Fetchmail kommer skicka felmeddelanden till avsändaren.\n"
 
 #: fetchmail.c:1668
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail kommer hantera permanenta fel som permanenta (kasta meddelanden).\n"
+msgstr "Fetchmail kommer hantera permanenta fel som permanenta (kasta meddelanden).\n"
 
 #: fetchmail.c:1670
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail kommer hantera permanenta fel som tillfälliga (behålla "
-"meddelanden).\n"
+msgstr "Fetchmail kommer hantera permanenta fel som tillfälliga (behålla meddelanden).\n"
 
 #: fetchmail.c:1677
 #, c-format
@@ -1329,41 +1270,27 @@ msgstr "  Hämtade meddelanden kommer inte att sparas på servern (--keep av).\n
 
 #: fetchmail.c:1808
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-"  Gamla meddelanden kommer kastas före meddelanden hämtas (--flush på).\n"
+msgstr "  Gamla meddelanden kommer kastas före meddelanden hämtas (--flush på).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Gamla meddelanden kommer inte slängas före meddelanden hämtas (--flush "
-"av).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Gamla meddelanden kommer inte slängas före meddelanden hämtas (--flush av).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  För stora meddelanden kommer slängas före meddelanden hämtas (--limitflush "
-"på).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  För stora meddelanden kommer slängas före meddelanden hämtas (--limitflush på).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  För stora meddelanden kommer inte slängas före meddelanden hämtas (--"
-"limitflush av).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  För stora meddelanden kommer inte slängas före meddelanden hämtas (--limitflush av).\n"
 
 #: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Omskrivning av serverlokala adresser är aktiverat (--norewrite av).\n"
+msgstr "  Omskrivning av serverlokala adresser är aktiverat (--norewrite av).\n"
 
 #: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Omskrivning av serverlokala adresser är avaktiverat (--norewrite på).\n"
+msgstr "  Omskrivning av serverlokala adresser är avaktiverat (--norewrite på).\n"
 
 #: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
@@ -1382,14 +1309,11 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Framtvingade vagnreturer är avaktiverat (forcecr av).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Tolkning av Content-Transfer-Encoding är avaktiverat (pass8bits på).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Tolkning av Content-Transfer-Encoding är avaktiverat (pass8bits på).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Tolkning av Content-Transfer-Encoding är aktiverat (pass8bits av).\n"
 
 #: fetchmail.c:1826
@@ -1436,9 +1360,7 @@ msgstr "  Ingen storleksgräns på meddelanden (--limit 0).\n"
 #: fetchmail.c:1845
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-"  Intervall för varning för meddelandestorlek är %d sekunder (--warnings "
-"%d).\n"
+msgstr "  Intervall för varning för meddelandestorlek är %d sekunder (--warnings %d).\n"
 
 #: fetchmail.c:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
@@ -1464,19 +1386,16 @@ msgstr "  Ingen gräns på hämtad meddelandestorlek (--fetchsizelimit 0).\n"
 
 #: fetchmail.c:1863
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Gör en binär sökning av UID:er under varje kontroll (--fastuidl 1).\n"
+msgstr "  Gör en binär sökning av UID:er under varje kontroll (--fastuidl 1).\n"
 
 #: fetchmail.c:1865
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Gör en binär sökning av UID:er under %d av %d kontroller (--fastuidl %d).\n"
+msgstr "  Gör en binär sökning av UID:er under %d av %d kontroller (--fastuidl %d).\n"
 
 #: fetchmail.c:1868
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"  Gör en linjär sökning av UID:er under varje kontroll (--fastuidl 0).\n"
+msgstr "  Gör en linjär sökning av UID:er under varje kontroll (--fastuidl 0).\n"
 
 #: fetchmail.c:1870
 #, c-format
@@ -1527,9 +1446,7 @@ msgstr "  Värddelen av MAIL FROM-raden kommer bli %s\n"
 #: fetchmail.c:1918
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-"  Adress som kommer att anges i RCPT TO-rader lämnade till SMTP kommer vara "
-"%s\n"
+msgstr "  Adress som kommer att anges i RCPT TO-rader lämnade till SMTP kommer vara %s\n"
 
 #: fetchmail.c:1927
 msgid "  Recognized listener spam block responses are:"
@@ -1585,10 +1502,8 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-uppslagning för flermålsadresser är avaktiverat.\n"
 
 #: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Serveralias kommer att jämföras med flermålsadresser via IP-adress.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Serveralias kommer att jämföras med flermålsadresser via IP-adress.\n"
 
 #: fetchmail.c:1983
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
@@ -1646,9 +1561,7 @@ msgstr "  Ingen kontrollslinga angiven.\n"
 #: fetchmail.c:2031
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Serveranslutningar kommer att göras via instickskommandot %s (--plugin "
-"%s).\n"
+msgstr "  Serveranslutningar kommer att göras via instickskommandot %s (--plugin %s).\n"
 
 #: fetchmail.c:2033
 msgid "  No plugin command specified.\n"
@@ -1657,9 +1570,7 @@ msgstr "  Inget instickskommando angivet.\n"
 #: fetchmail.c:2035
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Lyssnaranslutningar kommer att göras via utstickskommando %s (--plugout "
-"%s).\n"
+msgstr "  Lyssnaranslutningar kommer att göras via utstickskommando %s (--plugout %s).\n"
 
 #: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
@@ -1676,14 +1587,11 @@ msgstr "  %d UID:er sparade.\n"
 
 #: fetchmail.c:2053
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Kontrollspårningsinformation kommer läggas till till Received-huvudet.\n"
+msgstr "  Kontrollspårningsinformation kommer läggas till till Received-huvudet.\n"
 
 #: fetchmail.c:2055
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Ingen kontrollspårningsinformation kommer att läggas till till Received-"
-"huvudet.\n"
+msgstr "  Ingen kontrollspårningsinformation kommer att läggas till till Received-huvudet.\n"
 
 #: fetchmail.c:2060
 msgid "  Messages with bad headers will be rejected.\n"
@@ -1704,12 +1612,8 @@ msgid "Cannot modify signal mask: %s"
 msgstr "Kan inte ändra signalmasken: %s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-"Ditt operativsystem definierar inte PATH_MAX och inte heller accepterar det "
-"realpath(f, NULL).  Avbryter.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
+msgstr "Ditt operativsystem definierar inte PATH_MAX och inte heller accepterar det realpath(f, NULL).  Avbryter.\n"
 
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
@@ -1745,14 +1649,11 @@ msgstr "Använder tjänstenamn [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Inga lämpliga GSSAPI-kreditiv hittade.  Hoppar över GSSAPI-autentisering.\n"
+msgstr "Inga lämpliga GSSAPI-kreditiv hittade.  Hoppar över GSSAPI-autentisering.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Om du vill använda GSSAPI behöver du kreditiv först, möjligen från kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Om du vill använda GSSAPI behöver du kreditiv först, möjligen från kinit.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1859,8 +1760,7 @@ msgstr "%s: uppgradering till TLS misslyckades.\n"
 #: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-"%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta\n"
+msgstr "%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta\n"
 
 #: imap.c:502
 #, c-format
@@ -1933,11 +1833,8 @@ msgid "%u is first unseen\n"
 msgstr "%u är det första osedda\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Varning: ignorerar felaktiga data för meddelandestorlek som returneras av "
-"servern.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Varning: ignorerar felaktiga data för meddelandestorlek som returneras av servern.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -2057,8 +1954,7 @@ msgstr "fetchmail: tar bort förlegad låsfil �%s�\n"
 #: lock.c:102
 #, c-format
 msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr ""
-"fetchmail: kan inte ta bort låsfilen �%s� (%s), försöker skriva till den\n"
+msgstr "fetchmail: kan inte ta bort låsfilen �%s� (%s), försöker skriva till den\n"
 
 #: lock.c:116
 #, c-format
@@ -2215,8 +2111,7 @@ msgstr "  -V, --version     visa versionsinformation\n"
 
 #: options.c:646
 msgid "  -c, --check       check for messages without fetching\n"
-msgstr ""
-"  -c, --check       kontrollera om det finns meddelanden utan att hämta\n"
+msgstr "  -c, --check       kontrollera om det finns meddelanden utan att hämta\n"
 
 #: options.c:647
 msgid "  -s, --silent      work silently\n"
@@ -2243,12 +2138,8 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ange loggfilsnamn\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-"      --syslog      använd syslog(3) för de flesta meddelanden vid körning "
-"som en demon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgstr "      --syslog      använd syslog(3) för de flesta meddelanden vid körning som en demon\n"
 
 #: options.c:654
 msgid "      --nosyslog    turns off use of syslog(3)\n"
@@ -2276,22 +2167,15 @@ msgstr "      --postmaster  ange en mottagare som sista utväg\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr ""
-"      --nobounce    omdirigera studsar från användaren till postmaster.\n"
+msgstr "      --nobounce    omdirigera studsar från användaren till postmaster.\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail raderar permanent olevererbara meddelanden.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail raderar permanent olevererbara meddelanden.\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  behåll permanent olevererbara meddelanden på servern "
-"(standard).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  behåll permanent olevererbara meddelanden på servern (standard).\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2315,39 +2199,27 @@ msgstr "      --sslcert     ssl-klientcertifikat\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   gör en strikt kontroll av servercertifikat "
-"(rekommenderas)\n"
+msgstr "      --sslcertck   gör en strikt kontroll av servercertifikat (rekommenderas)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck hoppa över strikt kontroll av servercertifikat "
-"(osäkert)\n"
+msgstr "      --nosslcertck hoppa över strikt kontroll av servercertifikat (osäkert)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile sökväg till fil med ssl-certifikat för betrodda CA\n"
+msgstr "      --sslcertfile sökväg till fil med ssl-certifikat för betrodda CA\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath sökväg till katalog med ssl-certifikat för betrodda CA\n"
+msgstr "      --sslcertpath sökväg till katalog med ssl-certifikat för betrodda CA\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  förvänta detta CommonName från servern (avrådes)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  förvänta detta CommonName från servern (avrådes)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-"      --sslfingerprint fingeravtryck som måste matcha det för serverns "
-"certifikat.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr "      --sslfingerprint fingeravtryck som måste matcha det för serverns certifikat.\n"
 
 #: options.c:677
 msgid "      --sslproto    force ssl protocol (see manual)\n"
@@ -2355,13 +2227,11 @@ msgstr "      --sslproto    framtvinga ssl-protokoll (se manualen)\n"
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      ange externt kommando för att öppna en anslutning\n"
+msgstr "      --plugin      ange externt kommando för att öppna en anslutning\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     ange externt kommando för att öppna en smtp-anslutning\n"
+msgstr "      --plugout     ange externt kommando för att öppna en smtp-anslutning\n"
 
 #: options.c:681
 msgid ""
@@ -2369,8 +2239,7 @@ msgid ""
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
 "      --bad-header {reject|accept}\n"
-"                    ange policy för att hantera meddelanden med felaktiga "
-"huvuden\n"
+"                    ange policy för att hantera meddelanden med felaktiga huvuden\n"
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
@@ -2381,23 +2250,16 @@ msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        framtvinga användning av UIDL:er (endast pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        säger till IMAP-servern att skicka aviseringar om nya "
-"meddelanden\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        säger till IMAP-servern att skicka aviseringar om nya meddelanden\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        TCP-port att ansluta till (föråldrat, använd --service)\n"
+msgstr "      --port        TCP-port att ansluta till (föråldrat, använd --service)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     TCP-tjänst att ansluta till (kan vara numerisk TCP-"
-"port)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     TCP-tjänst att ansluta till (kan vara numerisk TCP-port)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2421,9 +2283,7 @@ msgstr "      --principal   posttjänsthuvudnamn\n"
 
 #: options.c:694
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr ""
-"      --tracepolls  lägg till kontrollspårningsinformation till Received-"
-"huvuden\n"
+msgstr "      --tracepolls  lägg till kontrollspårningsinformation till Received-huvuden\n"
 
 #: options.c:696
 msgid "  -u, --user[name]  specify users's login on server\n"
@@ -2530,16 +2390,12 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 stödjer endast lösenordsautentisering.  Ger upp.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Varning: �Maillennium POP3� funnen, använder RETR-kommando istället för "
-"TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Varning: �Maillennium POP3� funnen, använder RETR-kommando istället för TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"TLS är obligatoriskt för denna session, men servern vägrade CAPA-kommandot.\n"
+msgstr "TLS är obligatoriskt för denna session, men servern vägrade CAPA-kommandot.\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2548,8 +2404,7 @@ msgstr "Men CAPA-kommandot är dock nödvändigt för TLS.\n"
 #: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-"%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta.\n"
+msgstr "%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta.\n"
 
 #: pop3.c:498
 #, c-format
@@ -2623,20 +2478,12 @@ msgid "SDPS not enabled."
 msgstr "SDPS är inte aktiverat."
 
 #: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: gränssnittsflaggan stödjs endast under Linux (utan IPv6) och "
-"FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: gränssnittsflaggan stödjs endast under Linux (utan IPv6) och FreeBSD\n"
 
 #: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: flaggan monitor stödjs endast under Linux (utan IPv6) och "
-"FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: flaggan monitor stödjs endast under Linux (utan IPv6) och FreeBSD\n"
 
 #: rcfile_y.y:339
 msgid "SSL is not enabled"
@@ -2987,11 +2834,8 @@ msgstr "MDA:n returnerade status skild från noll %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Konstigt: pclose av MDA:n returnerade %d och errno %d/%s, kan inte hanteras "
-"vid %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Konstigt: pclose av MDA:n returnerade %d och errno %d/%s, kan inte hanteras vid %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3129,8 +2973,7 @@ msgstr "OpenSSL rapporterade: %s\n"
 #: socket.c:651
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-"SSL-verifieringens återanropsdjup %d: preverify_ok == %d, err = %d, %s\n"
+msgstr "SSL-verifieringens återanropsdjup %d: preverify_ok == %d, err = %d, %s\n"
 
 #: socket.c:657
 msgid "Server certificate:\n"
@@ -3153,8 +2996,7 @@ msgstr "Utgivarorganisation: %s\n"
 
 #: socket.c:674
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Varning: Utgivarorganisationens namn är för långt (möjligen avhugget).\n"
+msgstr "Varning: Utgivarorganisationens namn är för långt (möjligen avhugget).\n"
 
 #: socket.c:676
 msgid "Unknown Organization\n"
@@ -3184,9 +3026,7 @@ msgstr "Felaktigt certifikat: Subjektets vanliga namn är för långt!\n"
 
 #: socket.c:701
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr ""
-"Felaktigt certifikat: Subjektets vanliga namn innehåller nolltecken, "
-"avbryter!\n"
+msgstr "Felaktigt certifikat: Subjektets vanliga namn innehåller nolltecken, avbryter!\n"
 
 #: socket.c:729
 #, c-format
@@ -3195,9 +3035,7 @@ msgstr "Subjektets alternativa namn: %s\n"
 
 #: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Felaktigt certifikat: Subjektets alternativa namn innehåller nolltecken, "
-"avbryter!\n"
+msgstr "Felaktigt certifikat: Subjektets alternativa namn innehåller nolltecken, avbryter!\n"
 
 #: socket.c:752
 #, c-format
@@ -3254,15 +3092,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "Trasig certifikatskedja vid: %s\n"
 
 #: socket.c:831
-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 ""
-"Detta kan betyda att servern inte tillhandahöll de mellanliggande CA:nas "
-"certifikat, vilket inte är något fetchmail kunde göra något åt.  För "
-"detaljer, se dokumentet README.SSL-SERVER som kommer med fetchmail.\n"
+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 "Detta kan betyda att servern inte tillhandahöll de mellanliggande CA:nas certifikat, vilket inte är något fetchmail kunde göra något åt.  För detaljer, se dokumentet README.SSL-SERVER som kommer med fetchmail.\n"
 
 #: socket.c:841
 #, c-format
@@ -3270,16 +3101,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "Förtroendeankarcertifikat saknas: %s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"Detta kan betyda att root-CA:ns signeringscertifikat inte finns på platserna "
-"för betrodda CA-certifikat, eller att c_rehash behöver köras på "
-"certifikatkatalogen.  För detaljer, se dokumentationen av --sslcertpath och "
-"--sslcertfile i manualsidan.  Se README.SSL för detaljer.\n"
+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. See README.SSL for details.\n"
+msgstr "Detta kan betyda att root-CA:ns signeringscertifikat inte finns på platserna för betrodda CA-certifikat, eller att c_rehash behöver köras på certifikatkatalogen.  För detaljer, se dokumentationen av --sslcertpath och --sslcertfile i manualsidan.  Se README.SSL för detaljer.\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3300,54 +3123,35 @@ msgstr "Din version av OpenSSL stödjer inte TLS v1.3.\n"
 #: socket.c:967 socket.c:1046
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Ogiltigt SSL-protokoll �%s� angivet, använder standard autoval (auto).\n"
+msgstr "Ogiltigt SSL-protokoll �%s� angivet, använder standard autoval (auto).\n"
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Det inlästa OpenSSL-biblioteket %#lx är äldre än huvudena %#lx, vägrar att "
-"arbeta.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Det inlästa OpenSSL-biblioteket %#lx är äldre än huvudena %#lx, vägrar att arbeta.\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-"Det inlästa OpenSSL-biblioteket %#lx är nyare än huvudena %#lx, vägrar att "
-"fortsätta.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr "Det inlästa OpenSSL-biblioteket %#lx är nyare än huvudena %#lx, vägrar att fortsätta.\n"
 
 #: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "Filbeskrivare utanför intervallet för SSL"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Observera att några distributioner avaktiverar äldre protokollversioner på "
-"konstiga icke-standardsätt.  Försök med en nyare protokollversion.\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "Observera att några distributioner avaktiverar äldre protokollversioner på konstiga icke-standardsätt.  Försök med en nyare protokollversion.\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Varning: SSL_set_tlsext_host_name(%p, \"%s\") misslyckades (kod %#lx), "
-"försöker att fortsätta.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Varning: SSL_set_tlsext_host_name(%p, \"%s\") misslyckades (kod %#lx), försöker att fortsätta.\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Varning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") misslyckades (kod %#x), "
-"försöker att fortsätta.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Varning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") misslyckades (kod %#x), försöker att fortsätta.\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3364,27 +3168,20 @@ msgstr "handskakningen misslyckades på protokoll- eller förbindelsenivå."
 
 #: socket.c:1270
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"Kan inte hämta aktuellt SSL/TLS-chiffer — ingen förbindelse etablerad?\n"
+msgstr "Kan inte hämta aktuellt SSL/TLS-chiffer — ingen förbindelse etablerad?\n"
 
 #: socket.c:1273
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
-"SSL/TLS: använder protokollet %s, chiffret %s, %d/%d hemliga/bearbetade "
-"bitar\n"
+msgstr "SSL/TLS: använder protokollet %s, chiffret %s, %d/%d hemliga/bearbetade bitar\n"
 
 #: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certifikat-/fingeravtrycksverifikation hoppades på något sätt över!\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Varning: anslutningen är osäker, fortsätter ändå.  (Bättre att använda --"
-"sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Varning: anslutningen är osäker, fortsätter ändå.  (Bättre att använda --sslcertck!)\n"
 
 #: socket.c:1339
 msgid "Cygwin socket read retry\n"
diff --git a/po/vi.po b/po/vi.po
index 143d8e8e..c4669e71 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.0.rc4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2019-09-02 18:59+0200\n"
 "PO-Revision-Date: 2019-09-03 14:38+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -39,14 +39,12 @@ msgstr "Không đúng, địa chỉ IP của chúng không khớp nhau\n"
 #: checkalias.c:207
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"trình phục vụ tên thất bại trong khi tìm “%s�  trong việc thăm dò %s: %s\n"
+msgstr "trình phục vụ tên thất bại trong khi tìm “%s�  trong việc thăm dò %s: %s\n"
 
 #: checkalias.c:230
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"trình phục vụ tên thất bại trong khi tìm “%s�  trong việc thăm dò %s.\n"
+msgstr "trình phục vụ tên thất bại trong khi tìm “%s�  trong việc thăm dò %s.\n"
 
 #: cram.c:95 ntlmsubr.c:65
 msgid "could not decode BASE64 challenge\n"
@@ -74,8 +72,7 @@ msgstr "Cảnh báo Fetchmail v� thư quá lớn"
 #: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Những thư quá lớn theo đây đã bị xoá b� trên máy phục vụ %s tài khoản %s:"
+msgstr "Những thư quá lớn theo đây đã bị xoá b� trên máy phục vụ %s tài khoản %s:"
 
 #: driver.c:353
 #, c-format
@@ -139,8 +136,7 @@ msgstr " (%d octet thân)"
 
 #: driver.c:770
 #, 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 "thư %s@%s:%d không có độ dài đã ng� (%d thật != %d đã ng�)\n"
 
 #: driver.c:802
@@ -158,10 +154,8 @@ msgstr " chưa xoá sạch\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] ""
-"đã đạt đến giới hạn lấy %d; %d thư còn lại trên máy phục vụ %s tài khoản %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "đã đạt đến giới hạn lấy %d; %d thư còn lại trên máy phục vụ %s tài khoản %s\n"
 
 #: driver.c:899
 #, c-format
@@ -194,9 +188,7 @@ msgstr "fetchmail thấy nhi�u việc quá gi�"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
 msgstr "Fetchmail thấy hơn %d việc quá gi� trong khi cố lấy thư từ %s@%s.\n"
 
 #: driver.c:934
@@ -208,9 +200,7 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối "
-"thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị h�ng do lỗi trình phục "
-"vụ. Bạn có thể chạy lệnh “fetchmail -v -v� để chẩn đoán vấn đ� này.\n"
+"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị h�ng do lỗi trình phục vụ. Bạn có thể chạy lệnh “fetchmail -v -v� để chẩn đoán vấn đ� này.\n"
 "\n"
 "Fetchmail sẽ không thăm dò hộp thư này cho đến khi bạn khởi động nó.\n"
 
@@ -268,8 +258,7 @@ msgstr " (đã cho quy�n trước này)"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-"�ể tìm trợ giúp, xem: http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr "�ể tìm trợ giúp, xem: http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
 
 #: driver.c:1202
 #, c-format
@@ -375,7 +364,7 @@ msgstr "đang ch�n hoặc thăm dò thư mục mặc định\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s lúc %s (thư mục %s)"
 
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1335 rcfile_y.y:392
 #, c-format
 msgid "%s at %s"
 msgstr "%s lúc %s"
@@ -505,7 +494,7 @@ msgstr "Không hỗ trợ tùy ch�n “--all� (tất cả) với %s\n"
 msgid "Option --limit is not supported with %s\n"
 msgstr "Không hỗ trợ tùy ch�n “--limit� (hạn chế) với %s\n"
 
-#: env.c:58
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -521,13 +510,12 @@ msgstr ""
 "\"env QMAILINJECT= %s C�C ��I S� CỦA BẠN\".\n"
 "%s: Hủy bộ.\n"
 
-#: env.c:70
+#: env.c:73
 #, 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 ""
@@ -539,39 +527,29 @@ msgstr ""
 "\"env NULLMAILER_FLAGS= %s C�C ��I S� CỦA BẠN\".\n"
 "%s: Hủy bộ.\n"
 
-#: env.c:82
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Không nhận ra bạn. M�i ra kh�i đây.\n"
 
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: không thể phân giải tên máy của bạn!"
 
-#: env.c:223
+#: env.c:172
 #, c-format
 msgid "getaddrinfo failed for %s\n"
 msgstr "getaddrinfo không thành công cho %s\n"
 
-#: env.c:225
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó!\n"
+msgstr "Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó!\n"
 
-#: env.c:229
+#: 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 ""
 "�ang cố tiếp tục với tên máy không có đủ khả năng.\n"
@@ -643,14 +621,13 @@ msgstr "Không hỗ trợ tùy ch�n “--folder� (thư mục) đối với E
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Không hỗ trợ tùy ch�n “--check� (kiểm tra) đối với ETRN\n"
 
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: 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 - %d Matthias Andree\n"
+"Copyright (C) 2005 - 2019 Matthias Andree\n"
 msgstr ""
 "Tác quy�n © năm 2002, 2003 của Eric S. Raymond\n"
 "Tác quy�n © năm 2004 của Matthias Andree, Eric S. Raymond,\n"
@@ -658,7 +635,7 @@ msgstr ""
 "Tác quy�n © năm 2005 - 2012 của Sunil Shetye\n"
 "Tác quy�n © năm 2005 - 2019 của Matthias Andree\n"
 
-#: fetchmail.c:148
+#: 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"
@@ -669,1021 +646,932 @@ msgstr ""
 "�ể tìm thấy thông tin thêm thì hãy xem tập tin có tên COPYING (sao chép)\n"
 "trong thư mục nguồn hay tài liệu.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:187
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "CẢNH B�O: khuyên bạn không chạy với tư cách siêu ngư�i dùng (root).\n"
 
-#: fetchmail.c:200
+#: fetchmail.c:199
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: được g�i bằng"
 
-#: fetchmail.c:223
+#: fetchmail.c:222
 msgid "could not get current working directory\n"
 msgstr "không thể lấy thư mục hoạt động hiện có\n"
 
-#: fetchmail.c:304
+#: fetchmail.c:296
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "�ây là fetchmail bản phát hành %s"
 
-#: fetchmail.c:308
-#, fuzzy
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.3.\n"
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
+#: fetchmail.c:321
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "Tùy ch�n nodetach chịu tác động, b� qua tùy ch�n logfile.\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:328
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "Không chạy trong chế độ daemon (dịch vụ), b� qua tùy ch�n logfile.\n"
 
-#: fetchmail.c:354
+#: fetchmail.c:335
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "Tập tin nhật ký “%s� chưa có, b� qua tùy ch�n logfile.\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:341
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "Tập tin nhật ký “%s� không có quy�n ghi, b� qua.\n"
 
-#: fetchmail.c:378
+#: fetchmail.c:359
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-"cả hai tùy ch�n syslog và logfile đ�u được đặt, b� qua syslog, và ghi nhật "
-"ký vào %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr "cả hai tùy ch�n syslog và logfile đ�u được đặt, b� qua syslog, và ghi nhật ký vào %s"
 
-#: fetchmail.c:469
+#: fetchmail.c:447
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "�ang lấy các tùy ch�n trên dòng lệnh%s%s\n"
 
-#: fetchmail.c:470
+#: fetchmail.c:448
 msgid " and "
 msgstr " và "
 
-#: fetchmail.c:475
+#: fetchmail.c:453
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Chưa thiết lập trình phục vụ thư nào — có lẽ còn thiếu %s ?\n"
 
-#: fetchmail.c:496
+#: fetchmail.c:474
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: chưa chỉ định trình phục vụ thư.\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:486
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: không có thẻ hiện fetchmail khác đang chạy\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:492
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
-msgstr ""
-"fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %ld nên hủy b�.\n"
+msgstr "fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %ld nên hủy b�.\n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:493 fetchmail.c:502
 msgid "background"
 msgstr "n�n"
 
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:493 fetchmail.c:502
 msgid "foreground"
 msgstr "ti�n cảnh"
 
-#: fetchmail.c:523
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: fetchmail %s tại %ld bị buộc kết thúc.\n"
 
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail "
-"khác đang chạy tới cùng một máy.\n"
+#: fetchmail.c:524
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail khác đang chạy tới cùng một máy.\n"
 
-#: fetchmail.c:552
+#: fetchmail.c:530
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: không thể thăm dò các máy đã chỉ định khi có thể hiện fetchmail "
-"khác chạy tại %ld\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: không thể thăm dò các máy đã chỉ định khi có thể hiện fetchmail khác chạy tại %ld\n"
 
-#: fetchmail.c:559
+#: fetchmail.c:537
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: một thể hiện fetchmail cảnh gần khác đang chạy tại %ld.\n"
 
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: không thể chấp nhận tùy ch�n trong khi một thể hiện fetchmail n�n "
-"đang chạy.\n"
+#: fetchmail.c:547
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: không thể chấp nhận tùy ch�n trong khi một thể hiện fetchmail n�n đang chạy.\n"
 
-#: fetchmail.c:581
+#: fetchmail.c:559
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
-msgstr ""
-"fetchmail: thực hiện fetchmail chạy trên n�n hệ thống  tại %ld đã được kích "
-"hoạt.\n"
+msgstr "fetchmail: thực hiện fetchmail chạy trên n�n hệ thống  tại %ld đã được kích hoạt.\n"
 
-#: fetchmail.c:593
+#: fetchmail.c:571
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
-msgstr ""
-"fetchmail: bản sao cũ cùng cấp tại %ld đã kết thúc một cách khó hiểu.\n"
+msgstr "fetchmail: bản sao cũ cùng cấp tại %ld đã kết thúc một cách khó hiểu.\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:586
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: không tìm thấy mật khẩu cho %s@%s.\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:590
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Hãy gõ mật khẩu cho %s@%s: "
 
-#: fetchmail.c:654
+#: fetchmail.c:632
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: không thể tháo b� vào n�n nên hủy b�.\n"
 
-#: fetchmail.c:658
+#: fetchmail.c:636
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "đang khởi chạy dịch vụ chạy n�n fetchmail %s\n"
 
-#: fetchmail.c:674 fetchmail.c:676
+#: fetchmail.c:652 fetchmail.c:654
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "không thể mở %s vào đó cần phụ thêm các sổ theo dõi\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:673
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "--check mode (chế độ kiểm tra) được bật thì không lấy thư\n"
 
-#: fetchmail.c:717
+#: fetchmail.c:695
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "không thể kiểm tra gi� %s (lỗi %d)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:700
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "đang khởi chạy lại fetchmail (%s đã được thay đổi)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:704
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "việc cố thực hiện lại có thể thất bại vì thư mục chưa được phục hồi\n"
 
-#: fetchmail.c:752
+#: fetchmail.c:730
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "việc cố thực hiện lại fetchmail đã thất bại\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:760
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"việc thăm dò %s bị b� qua (xác thực đã thất bại hoặc quá gi� quá nhi�u lần)\n"
+msgstr "việc thăm dò %s bị b� qua (xác thực đã thất bại hoặc quá gi� quá nhi�u lần)\n"
 
-#: fetchmail.c:794
+#: fetchmail.c:772
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "chưa tới khoảng nên không truy vấn %s\n"
 
-#: fetchmail.c:832
+#: fetchmail.c:810
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Trạng thái truy vấn=0 (THÀNH CÔNG)\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:812
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Trạng thái truy vấn=1 (KHÔNG THƯ)\n"
 
-#: fetchmail.c:836
+#: fetchmail.c:814
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Trạng thái truy vấn=2 (Ổ CẮM)\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:816
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Trạng thái truy vấn=3 (X�C THỰC THẤT BẠI)\n"
 
-#: fetchmail.c:840
+#: fetchmail.c:818
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Trạng thái truy vấn=4 (GIAO THỨC)\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:820
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Trạng thái truy vấn=5 (CÚ PH�P)\n"
 
-#: fetchmail.c:844
+#: fetchmail.c:822
 msgid "Query status=6 (IOERR)\n"
 msgstr "Trạng thái truy vấn=6 (LỖI NHẬP/XUẤT)\n"
 
-#: fetchmail.c:846
+#: fetchmail.c:824
 msgid "Query status=7 (ERROR)\n"
 msgstr "Trạng thái truy vấn=7 (LỖI)\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:826
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Trạng thái truy vấn=8 (LOẠI TRỪ)\n"
 
-#: fetchmail.c:850
+#: fetchmail.c:828
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Trạng thái truy vấn=9 (KHO� BẬN)\n"
 
-#: fetchmail.c:852
+#: fetchmail.c:830
 msgid "Query status=10 (SMTP)\n"
 msgstr "Trạng thái truy vấn=10 (SMTP)\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:832
 msgid "Query status=11 (DNS)\n"
 msgstr "Trạng thái truy vấn=11 (DNS)\n"
 
-#: fetchmail.c:856
+#: fetchmail.c:834
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Trạng thái truy vấn=12 (BSMTP)\n"
 
-#: fetchmail.c:858
+#: fetchmail.c:836
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Trạng thái truy vấn=13 (LẤY T�I �A)\n"
 
-#: fetchmail.c:860
+#: fetchmail.c:838
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Trạng thái truy vấn=%d\n"
 
-#: fetchmail.c:902
+#: fetchmail.c:880
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "M�i sự kết nối là bế tắc nên thoát.\n"
 
-#: fetchmail.c:910
+#: fetchmail.c:888
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "đang ngủ tại %s trong %d giây\n"
 
-#: fetchmail.c:934
+#: fetchmail.c:912
 #, c-format
 msgid "awakened by %s\n"
 msgstr "bị %s kích hoạt lại\n"
 
-#: fetchmail.c:937
+#: fetchmail.c:915
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "bị tín hiệu %d kích hoạt lại\n"
 
-#: fetchmail.c:945
+#: fetchmail.c:923
 #, c-format
 msgid "awakened at %s\n"
 msgstr "được kích hoạt lại tại %s\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:928
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "đã kết thúc chuẩn, trạng thái %d\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1089
 msgid "couldn't time-check the run-control file\n"
 msgstr "không thể kiểm tra gi� của tập tin đi�u kiển việc chạy (run-control)\n"
 
-#: fetchmail.c:1148
+#: fetchmail.c:1123
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Cảnh báo: gặp tên máy %s nhi�u lần trong tập tin cấu hình\n"
 
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
+#: fetchmail.c:1162
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Lỗi: gặp nhi�u mục ghi “mặc định� trong tập tin cấu hình.\n"
 
-#: fetchmail.c:1317
+#: fetchmail.c:1284
 msgid "SSL support is not compiled in.\n"
 msgstr "Chưa biên dịch để được hỗ trợ SSL.\n"
 
-#: fetchmail.c:1324
+#: fetchmail.c:1291
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr ""
-"�ược cấu hình là có hỗ trợ KERBEROS v4, nhưng chưa được biên dịch vào.\n"
+msgstr "�ược cấu hình là có hỗ trợ KERBEROS v4, nhưng chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1297
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr ""
-"�ược cấu hình là có hỗ trợ KERBEROS v5, nhưng chưa được biên dịch vào.\n"
+msgstr "�ược cấu hình là có hỗ trợ KERBEROS v5, nhưng chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1336
+#: fetchmail.c:1303
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "�ược cấu hình là hỗ trợ GSSAPI, nhưng chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1333
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: cảnh báo: không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ "
-"%s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: cảnh báo: không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %s\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1344
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cảnh báo: việc đa thả cho %s cần thiết tùy ch�n bao b�c (envelope).\n"
 
-#: fetchmail.c:1378
+#: fetchmail.c:1345
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"cảnh báo: đừng yêu cầu sự hỗ trợ nếu m�i thư được phát cho postmaster (giám "
-"đốc sở bưu điện).\n"
+msgstr "cảnh báo: đừng yêu cầu sự hỗ trợ nếu m�i thư được phát cho postmaster (giám đốc sở bưu điện).\n"
 
-#: fetchmail.c:1395
+#: fetchmail.c:1362
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: cấu hình %s không hợp lệ; hãy chỉ định số hiệu cổng dương cho "
-"dịch vụ hay cổng\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: cấu hình %s không hợp lệ; hãy chỉ định số hiệu cổng dương cho dịch vụ hay cổng\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1369
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: cấu hình %s không hợp lệ; RPOP yêu cầu một cổng đặc quy�n\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1387
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "cấu hình %s không hợp lệ; LMTP không thể sử dụng cổng SMTP mặc định\n"
 
-#: fetchmail.c:1434
+#: fetchmail.c:1401
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình n�n là "
-"trư�ng hợp xấu.\n"
+msgstr "Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình n�n là trư�ng hợp xấu.\n"
 
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-"fetchmail: Lỗi: chế độ idle không làm việc với nhi�u thư mục hay tài khoản!\n"
+#: fetchmail.c:1411
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr "fetchmail: Lỗi: chế độ idle không làm việc với nhi�u thư mục hay tài khoản!\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1435
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "đã kết thúc với tín hiệu %d\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1508
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã khởi chạy\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1533
 msgid "POP2 support is not configured.\n"
 msgstr "Chưa cấu hình để hỗ trợ POP2.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1545
 msgid "POP3 support is not configured.\n"
 msgstr "Chưa cấu hình để hỗ trợ POP3.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1555
 msgid "IMAP support is not configured.\n"
 msgstr "Chưa cấu hình để hỗ trợ IMAP.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1561
 msgid "ETRN support is not configured.\n"
 msgstr "Chưa cấu hình để hỗ trợ ETRN.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1569
 msgid "ODMR support is not configured.\n"
 msgstr "Chưa cấu hình để hỗ trợ ODMR.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1576
 msgid "unsupported protocol selected.\n"
 msgstr "giao thức đã ch�n không được hỗ trợ.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1587
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã chạy xong\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1612
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Khoảng thăm dò là %d giây\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1614
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Tập tin nhật ký là %s\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1616
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Tập tin Id là %s\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1619
 msgid "Progress messages will be logged via syslog\n"
-msgstr ""
-"Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
+msgstr "Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1622
 msgid "Fetchmail will masquerade and will not generate Received\n"
-msgstr ""
-"Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu “Received� (đã nhận)\n"
+msgstr "Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu “Received� (đã nhận)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1624
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
+msgstr "Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1626
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail sẽ chuyển tiếp các thư đa thả có địa chỉ sai tới %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1630
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới postmaster (giám đốc sở bưu điện).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1632
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới ngư�i gởi.\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1635
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail sẽ thấy lỗi b�n bỉ như lâu dài (thì b� thư).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1637
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail sẽ thấy lỗi b�n bỉ như tạm th�i (giữ thư).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1644
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tùy ch�n v� việc lấy từ %s@%s:\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1648
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Thư sẽ được lấy bằng %s\n"
 
-#: fetchmail.c:1684
+#: 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] "  Máy phục vụ này sẽ được thăm dò mỗi %d khoảng.\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1655
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Tên đúng của máy phục vụ là %s.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1658
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Máy này sẽ không được truy vấn khi chưa chỉ định máy nào.\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1659
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Máy này sẽ được truy vấn khi chưa chỉ định máy nào.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1663
 msgid "  Password will be prompted for.\n"
 msgstr "  Sẽ nhắc với mật khẩu.\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1667
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Bí mật APOP = “%s�.\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1670
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  ID RPOP = “%s�.\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1673
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mật khẩu = “%s�.\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1682
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Giao thức là KPOP cùng với sự xác thực Kerberos %s"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1685
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Giao thức là %s"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1687
 #, c-format
 msgid " (using service %s)"
 msgstr " (dùng dịch vụ %s)"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1689
 msgid " (using default port)"
 msgstr " (dùng cổng mặc định)"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1691
 msgid " (forcing UIDL use)"
 msgstr " (buộc dùng UIDL)"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1697
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Sẽ cố dùng m�i phương pháp xác thực sẵn sàng.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1700
 msgid "  Password authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực bằng mật khẩu.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1703
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực MSN.\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1706
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực kiểu NTLM.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1709
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực OTP.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1712
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  xác thực CRAM-MD5 sẽ được ép buộc.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1715
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực GSSAPI.\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1718
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực Kerberos V4.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1721
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thực Kerberos V5.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1724
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Giả sử sự mật mã cuối đến cuối.\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1728
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  �i�u chính trong dịch vụ thư là: %s\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1731
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Phiên chạy được mã hóa bằng SSL đã được bật.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1733
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Giao thức SSL: %s\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1735
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Khả năng kiểm tra chứng nhận máy phục vụ SSL đã được bật.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1737
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  Khả năng kiểm tra chứng nhận máy phục vụ SSL đã bị tắt.\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1740
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  Tập tin chứng nhận đáng tin SSL: %s\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1742
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Thư mục chứng nhận đáng tin SSL: %s\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1744
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  CommonName máy phục vụ SSL: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1746
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Vân tay khoá SSL (so sánh với khoá máy phục vụ): %s\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1749
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Th�i hạn không đáp ứng của máy phục vụ là %d giây"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1751
 msgid " (default).\n"
 msgstr " (mặc định).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1758
 msgid "  Default mailbox selected.\n"
 msgstr "  Hộp thư mặc định đã được ch�n.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1763
 msgid "  Selected mailboxes are:"
 msgstr "  Các hộp thư đã ch�n là:"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1769
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  M�i thư sẽ được lấy (“--all� bật).\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1770
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Chỉ thư mới sẽ được lấy (“--all� tắt).\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1772
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Các thư đã lấy sẽ được giữ lại trên máy phục vụ (“--keep� bật).\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1773
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-"  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (“--keep� tắt).\n"
+msgstr "  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (“--keep� tắt).\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1775
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Các thư cũ sẽ được xoá sạch trước khi lấy thư (“--flush� bật).\n"
 
-#: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-"  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (“--flush� tắt).\n"
+#: fetchmail.c:1776
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (“--flush� tắt).\n"
 
-#: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-"  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (“--limitflush� bật).\n"
+#: fetchmail.c:1778
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr "  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (“--limitflush� bật).\n"
 
-#: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-"  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (“--limitflush� "
-"tắt).\n"
+#: fetchmail.c:1779
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr "  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (“--limitflush� tắt).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1781
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (“--"
-"norewrite� tắt).\n"
+msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (“--norewrite� tắt).\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1782
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (“--"
-"norewrite� bật).\n"
+msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (“--norewrite� bật).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1784
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được bật (“stripcr� bật).\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1785
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được tắt (“stripcr� tắt).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1787
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Việc buộc ký tự v� đầu dòng đã được bật (“forcecr� bật).\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1788
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Việc buộc ký tự v� đầu dòng đã được tắt (“forcecr� tắt).\n"
 
-#: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
-"truy�n) đã được tắt (“pass8bits� bật).\n"
+#: fetchmail.c:1790
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truy�n) đã được tắt (“pass8bits� bật).\n"
 
-#: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
-"truy�n) đã được bật (“pass8bits� tắt).\n"
+#: fetchmail.c:1791
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truy�n) đã được bật (“pass8bits� tắt).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1793
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Khả năng giải mã MIME đã được bật (“mimedecode� bật).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1794
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Khả năng giải mã MIME đã được tắt (“mimedecode� tắt).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1796
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được bật (nghỉ bật).\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1797
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được tắt (nghỉ tắt).\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1799
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Các dòng Trạng thái sẽ được hủy (“dropstatus� bật).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1800
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Các dòng Status (Trạng thái) sẽ được giữ (“dropstatus� tắt).\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1802
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-"  Các dòng Delivered-To (�ược phát cho) sẽ được hủy (“dropdelivered� bật).\n"
+msgstr "  Các dòng Delivered-To (�ược phát cho) sẽ được hủy (“dropdelivered� bật).\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1803
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-"  Các dòng Delivered-To (�ược phát cho) sẽ được giữ (“dropdelivered� tắt).\n"
+msgstr "  Các dòng Delivered-To (�ược phát cho) sẽ được giữ (“dropdelivered� tắt).\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1807
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Giới hạn kích cỡ thư là %d octet (“--limit� %d).\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1810
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư (“--limit� 0).\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1812
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Khoảng cảnh báo kích cỡ thư là %d giây (“--warnings� %d).\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1815
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Cảnh báo v� kích cỡ mỗi lần thăm dò (“--warnings� 0).\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1818
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Giới hạn thư đã nhận là %d (“--fetchlimit� %d).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1821
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Không có giới hạn thư đã nhận (“--fetchlimit� 0).\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1823
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Giới hạn kích cỡ thư lấy là %d (“--fetchsizelimit� %d).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1826
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư lấy (“(--fetchsizelimit� 0).\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1830
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-"  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (“--fastuidl� 1).\n"
+msgstr "  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (“--fastuidl� 1).\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1832
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-"  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (“--fastuidl� "
-"%d).\n"
+msgstr "  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (“--fastuidl� %d).\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1835
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-"   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (“--fastuidl� 0).\n"
+msgstr "   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (“--fastuidl� 0).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1837
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Giới hạn bó thư SMTP là %d.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1839
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Không có giới hạn bó thư SMTP (“--batchlimit� 0).\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1843
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-"  Khoảng xoá b� giữa hai lần xoá hẳn đã được buộc thành %d (“--expunge� "
-"%d).\n"
+msgstr "  Khoảng xoá b� giữa hai lần xoá hẳn đã được buộc thành %d (“--expunge� %d).\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1845
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Không có việc xoá hẳn đã buộc) (“--expunge� 0).\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1852
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Các mi�n cho đó sẽ lấy thư là:"
 
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1857 fetchmail.c:1877
 msgid " (default)"
 msgstr " (mặc định)"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1862
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Các thư sẽ được phụ thêm vào %s là BSMTP\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1864
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Các thư sẽ được phát bằng “%s�.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1871
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Các thư sẽ được chuyển tiếp %cMTP tới:"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1882
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Phần máy của dòng MAIL FROM (thư từ) sẽ là %s\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1885
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  �ịa chỉ cần chèn vào dòng RCPT TO được gởi cho SMTP sẽ là %s\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1894
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Các đáp ứng chặn thư rác đã nhận diện của bộ lắng nghe là:"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1900
 msgid "  Spam-blocking disabled\n"
 msgstr "  Khả năng chặn thư rác được tắt\n"
 
-#: fetchmail.c:1936
+#: fetchmail.c:1903
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được tạo bằng “%s�.\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1906
 msgid "  No pre-connection command.\n"
 msgstr "  Không có lệnh ti�n kết nối.\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1908
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được đóng bằng “%s�.\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1911
 msgid "  No post-connection command.\n"
 msgstr "  Không có lệnh hậu kết nối.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1914
 msgid "  No localnames declared for this host.\n"
 msgstr "  Chưa khai báo tên cục bộ (localname) cho máy này.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1924
 msgid "  Multi-drop mode: "
 msgstr "  Chế độ đa thả: "
 
-#: fetchmail.c:1959
+#: fetchmail.c:1926
 msgid "  Single-drop mode: "
 msgstr "  Chế độ thả đơn: "
 
-#: fetchmail.c:1961
+#: fetchmail.c:1928
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "Chấp nhân %d tên cục bộ.\n"
 
-#: fetchmail.c:1976
+#: fetchmail.c:1943
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được bật.\n"
 
-#: fetchmail.c:1977
+#: fetchmail.c:1944
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được tắt.\n"
 
-#: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-"  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
+#: fetchmail.c:1948
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
 
-#: fetchmail.c:1983
+#: fetchmail.c:1950
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo tên.\n"
 
-#: fetchmail.c:1986
+#: fetchmail.c:1953
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Khả năng định tuyến phong bì-địa chỉ đã được tắt\n"
 
-#: fetchmail.c:1989
+#: fetchmail.c:1956
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Giả sử dòng đầu phong bì là: %s\n"
 
-#: fetchmail.c:1992
+#: fetchmail.c:1959
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Số dòng đầu phong bì cần b� qua: %d\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:1962
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Ti�n tố %s sẽ được gỡ b� ra ID ngư�i dùng\n"
 
-#: fetchmail.c:1998
+#: fetchmail.c:1965
 msgid "  No prefix stripping\n"
 msgstr "  Không gỡ b� ti�n tố\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:1970
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Các bí danh trình phục vụ thư khai báo sẵn:"
 
-#: fetchmail.c:2011
+#: fetchmail.c:1978
 msgid "  Local domains:"
 msgstr "  Mi�n cục bộ:"
 
-#: fetchmail.c:2021
+#: fetchmail.c:1988
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Phải kết nối qua giao diện %s.\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:1990
 msgid "  No interface requirement specified.\n"
 msgstr "  Chưa chỉ định giao diện cần thiết.\n"
 
-#: fetchmail.c:2025
+#: fetchmail.c:1992
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Vòng lặp thăm dò sẽ theo dõi %s.\n"
 
-#: fetchmail.c:2027
+#: fetchmail.c:1994
 msgid "  No monitor interface specified.\n"
 msgstr "  Chưa chỉ định giao diện theo dõi.\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:1998
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-"  Kết nối đến máy phục vụ sẽ được thực hiện thông qua phần bổ xung %s (“--"
-"plugin� %s).\n"
+msgstr "  Kết nối đến máy phục vụ sẽ được thực hiện thông qua phần bổ xung %s (“--plugin� %s).\n"
 
-#: fetchmail.c:2033
+#: fetchmail.c:2000
 msgid "  No plugin command specified.\n"
 msgstr "  Chưa chỉ định lệnh bổ xung.\n"
 
-#: fetchmail.c:2035
+#: fetchmail.c:2002
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-"  Kết nối lắng nghe sẽ được thông qua phần bổ xung %s (“--plugout� %s).\n"
+msgstr "  Kết nối lắng nghe sẽ được thông qua phần bổ xung %s (“--plugout� %s).\n"
 
-#: fetchmail.c:2037
+#: fetchmail.c:2004
 msgid "  No plugout command specified.\n"
 msgstr "  Chưa chỉ định lệnh bổ xung.\n"
 
-#: fetchmail.c:2044
+#: fetchmail.c:2011
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Không có UID được lưu từ máy này.\n"
 
-#: fetchmail.c:2047
+#: fetchmail.c:2014
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID đã được lưu.\n"
 
-#: fetchmail.c:2053
+#: fetchmail.c:2020
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Thông tin vết thăm dò sẽ được thêm vào dòng đầu “Received�.\n"
 
-#: fetchmail.c:2055
+#: fetchmail.c:2022
 msgid "  No poll trace information will be added to the Received header.\n"
-msgstr ""
-"  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu “Received� (Nhận "
-"được).\n"
+msgstr "  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu “Received� (Nhận được).\n"
 
-#: fetchmail.c:2060
+#: fetchmail.c:2027
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Thư nào có dòng đầu sai thì bị từ chối.\n"
 
-#: fetchmail.c:2063
+#: fetchmail.c:2030
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Thư nào có dòng đầu sai thì được gửi qua.\n"
 
-#: fetchmail.c:2068
+#: fetchmail.c:2035
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Tài sản gởi qua “%s�.\n"
@@ -1693,12 +1581,6 @@ msgstr "  Tài sản gởi qua “%s�.\n"
 msgid "Cannot modify signal mask: %s"
 msgstr "Không thể sửa đổi mặt nạ tín hiệu: %s"
 
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
 #: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "LỖI: không hỗ trợ thao tác getpassword() (lấy mật khẩu).\n"
@@ -1733,15 +1615,11 @@ msgstr "�ang dùng tên dịch vụ [%s]\n"
 
 #: gssapi.c:123
 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-"Không tìm thấy thông tin xác thực GSSAPI nên b� qua bước xác thực GSSAPI.\n"
+msgstr "Không tìm thấy thông tin xác thực GSSAPI nên b� qua bước xác thực GSSAPI.\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-"Muốn sử dụng GSSAPI thì trước tiên yêu cầu thông tin xác thực, có thể là từ "
-"kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr "Muốn sử dụng GSSAPI thì trước tiên yêu cầu thông tin xác thực, có thể là từ kinit.\n"
 
 #: gssapi.c:160
 #, c-format
@@ -1848,9 +1726,7 @@ msgstr "%s: việc nâng cấp lên TLS gặp lỗi.\n"
 #: imap.c:487
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp "
-"tục\n"
+msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp tục\n"
 
 #: imap.c:502
 #, c-format
@@ -1920,10 +1796,8 @@ msgid "%u is first unseen\n"
 msgstr "%u là thư đầu chưa xem\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Cảnh báo: đang b� qua dữ liệu giả v� kích cỡ các thư bị máy phục vụ trả v�.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Cảnh báo: đang b� qua dữ liệu giả v� kích cỡ các thư bị máy phục vụ trả v�.\n"
 
 #: imap.c:1177 imap.c:1184
 #, c-format
@@ -2036,35 +1910,18 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: gặp lỗi khi đ�c tập tin khoá “%s�: %s\n"
 
 #: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: đang gỡ b� tập tin khoá cũ...\n"
 
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail:  gặp lỗi khi mở tập tin khoá “%s�: %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: gặp lỗi khi đ�c tập tin khoá “%s�: %s\n"
-
-#: lock.c:126
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail:  gặp lỗi khi mở tập tin khoá “%s�: %s\n"
 
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:169
+msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: việc tạo khoá gặp lỗi.\n"
 
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: gặp lỗi khi đ�c tập tin khoá “%s�: %s\n"
-
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
@@ -2227,12 +2084,9 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     chỉ định tên _tập tin nhật ký_\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr ""
-"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn "
-"thông điệp\n"
+"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn thông điệp\n"
 "                     trong khi chạy là dịch vụ chạy n�n\n"
 
 #: options.c:654
@@ -2242,30 +2096,24 @@ msgstr "      --nosyslog    tắt không dùng syslog(3)\n"
 #: options.c:655
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
-"      --invisible   không ghi Received (dòng đầu �ã nhận) và bật khả năng ẩn "
-"máy đúng)\n"
+"      --invisible   không ghi Received (dòng đầu �ã nhận) và bật khả năng ẩn máy đúng)\n"
 "\t\t\t\t(_vô hình_)\n"
 
 #: options.c:656
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-"  -f, --fetchmailrc \t\tchỉ định tập tin _đi�u khiển chạy_ (rc) xen kẽ\n"
+msgstr "  -f, --fetchmailrc \t\tchỉ định tập tin _đi�u khiển chạy_ (rc) xen kẽ\n"
 
 #: options.c:657
 msgid "  -i, --idfile      specify alternate UIDs file\n"
-msgstr ""
-"  -i, --idfile      chỉ định _tập tin nhận diện_ ngư�i dùng (UID) xen kẽ\n"
+msgstr "  -i, --idfile      chỉ định _tập tin nhận diện_ ngư�i dùng (UID) xen kẽ\n"
 
 #: options.c:658
 msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr ""
-"      --pidfile     chỉ định _tập tin nhận diện tiến trình_ (PID) (khoá) xen "
-"kẽ\n"
+msgstr "      --pidfile     chỉ định _tập tin nhận diện tiến trình_ (PID) (khoá) xen kẽ\n"
 
 #: options.c:659
 msgid "      --postmaster  specify recipient of last resort\n"
-msgstr ""
-"      --postmaster  chỉ định ngư�i nhận cuối cùng (_giám đốc sở bưu điện_)\n"
+msgstr "      --postmaster  chỉ định ngư�i nhận cuối cùng (_giám đốc sở bưu điện_)\n"
 
 #: options.c:660
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
@@ -2274,18 +2122,12 @@ msgstr ""
 "\t\t\t\tsang giám đốc sở bưu điện (_không nảy_)\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-"      --nosoftbounce fetchmail xoá b� mỗi thư không thể phát được (b�n bỉ).\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr "      --nosoftbounce fetchmail xoá b� mỗi thư không thể phát được (b�n bỉ).\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-"      --softbounce  giữ trên máy phục vụ mỗi thư không thể phát được (b�n "
-"bỉ). �ây là ứng xử mặc định.\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgstr "      --softbounce  giữ trên máy phục vụ mỗi thư không thể phát được (b�n bỉ). �ây là ứng xử mặc định.\n"
 
 #: options.c:664
 msgid "  -I, --interface   interface required specification\n"
@@ -2309,36 +2151,26 @@ msgstr "      --sslcert     _chứng nhận_ ứng dụng khách SSL\n"
 
 #: options.c:671
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr ""
-"      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên "
-"dùng)\n"
+msgstr "      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên dùng)\n"
 
 #: options.c:672
 msgid "      --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr ""
-"      --nosslcertck   đừng _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ "
-"(không an toàn)\n"
+msgstr "      --nosslcertck   đừng _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (không an toàn)\n"
 
 #: options.c:673
 msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
-msgstr ""
-"      --sslcertfile    đư�ng dẫn đến tập tin chứng nhận SSL của CA đáng tin\n"
+msgstr "      --sslcertfile    đư�ng dẫn đến tập tin chứng nhận SSL của CA đáng tin\n"
 
 #: options.c:674
 msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr ""
-"      --sslcertpath    đư�ng dẫn đến thư mục chứng nhận SSL của CA đáng tin\n"
+msgstr "      --sslcertpath    đư�ng dẫn đến thư mục chứng nhận SSL của CA đáng tin\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
-"      --sslcommonname  đợi CommonName này đến từ máy phục vụ (bị phản đối)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr "      --sslcommonname  đợi CommonName này đến từ máy phục vụ (bị phản đối)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr ""
 "      --sslfingerprint \t_vân tay SSL_ phải khớp đi�u trong chứng nhận\n"
 "\t\t\t\t\t\tcủa máy phục vụ\n"
@@ -2349,14 +2181,11 @@ msgstr "      --sslproto    buộc dùng _giao thức SSL_ (xem hướng dẫn)\
 
 #: options.c:679
 msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-"      --plugin      chỉ định lệnh bên ngoài để mở kết nối (phần bổ xung)\n"
+msgstr "      --plugin      chỉ định lệnh bên ngoài để mở kết nối (phần bổ xung)\n"
 
 #: options.c:680
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-"      --plugout     chỉ định lệnh bên ngoài để mở kết nối SMTP (phần bổ "
-"xung)\n"
+msgstr "      --plugout     chỉ định lệnh bên ngoài để mở kết nối SMTP (phần bổ xung)\n"
 
 #: options.c:681
 msgid ""
@@ -2370,31 +2199,23 @@ msgstr ""
 
 #: options.c:684
 msgid "  -p, --proto[col]  specify retrieval protocol (see man page)\n"
-msgstr ""
-"  -p, --proto[col]    chỉ định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
+msgstr "  -p, --proto[col]    chỉ định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
 
 #: options.c:685
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        buộc dùng UIDL (chỉ dùng với pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
-msgstr ""
-"      --idle        nói với máy phục vụ IMAP gửi thông báo các thư mới\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
+msgstr "      --idle        nói với máy phục vụ IMAP gửi thông báo các thư mới\n"
 
 #: options.c:687
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-"      --port        _cổng_ TCP nơi cần kết nối (đã cũ, nên thay bằng “--"
-"service�)\n"
+msgstr "      --port        _cổng_ TCP nơi cần kết nối (đã cũ, nên thay bằng “--service�)\n"
 
 #: options.c:688
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-"  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP "
-"số)\n"
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP số)\n"
 
 #: options.c:689
 msgid "      --auth        authentication type (see manual)\n"
@@ -2411,8 +2232,7 @@ msgstr "  -E, --envelope    dòng đầu địa chỉ _phong bì_\n"
 #: options.c:692
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
-"  -Q, --qvirtual    ti�n tố cần gỡ b� ra mã nhận diện ngư�i dùng (UID) cục "
-"bá»™\n"
+"  -Q, --qvirtual    ti�n tố cần gỡ b� ra mã nhận diện ngư�i dùng (UID) cục bộ\n"
 "\t\t\t\t(_q ảo_)\n"
 
 #: options.c:693
@@ -2455,8 +2275,7 @@ msgstr "  -n, --norewrite   _không ghi lại_ các địa chỉ dòng đầu\n"
 
 #: options.c:703
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-"  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
+msgstr "  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
 
 #: options.c:704
 msgid "  -w, --warnings    interval between warning mail notification\n"
@@ -2488,8 +2307,7 @@ msgstr "  -b, --batchlimit  \tđặt _hạn chế bó_ thư cho sự kết nối
 
 #: options.c:712
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-"  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
+msgstr "  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
 
 #: options.c:713
 msgid "      --fetchsizelimit set fetch message size limit\n"
@@ -2501,8 +2319,7 @@ msgstr "      --fastuidl    tìm kiếm UIDL một cách nhị phân (_nhanh_)\n
 
 #: options.c:715
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-"  -e, --expunge     đặt số thư đã xoá b� tối đa giữa hai lần _xoá hẳn_\n"
+msgstr "  -e, --expunge     đặt số thư đã xoá b� tối đa giữa hai lần _xoá hẳn_\n"
 
 #: options.c:716
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2522,8 +2339,7 @@ msgstr "  -r, --folder      chỉ định tên _thư mục_ từ xa\n"
 
 #: options.c:720
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr ""
-"      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
+msgstr "      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
 
 #: pop2.c:67
 msgid "POP2 does not support STLS. Giving up.\n"
@@ -2534,16 +2350,12 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 chỉ hỗ trợ xác thực mật khẩu. Cho nên đầu hàng.\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Cảnh báo: tìm thấy “Maillennium POP3� nên dùng lệnh RETR thay cho TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgstr "Cảnh báo: tìm thấy “Maillennium POP3� nên dùng lệnh RETR thay cho TOP.\n"
 
 #: pop3.c:414
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối "
-"lệnh CAPA.\n"
+msgstr "Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối lệnh CAPA.\n"
 
 #: pop3.c:415
 msgid "The CAPA command is however necessary for TLS.\n"
@@ -2552,9 +2364,7 @@ msgstr "Còn lệnh CAPA cần thiết cho TLS.\n"
 #: pop3.c:492
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp "
-"tục.\n"
+msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp tục.\n"
 
 #: pop3.c:498
 #, c-format
@@ -2579,8 +2389,7 @@ msgstr "Nhãn gi� APOP không hợp lệ.\n"
 
 #: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
-msgstr ""
-"Gặp yêu cầu giao thức không được chỉ định trong “POP3_auth� (xác thực)\n"
+msgstr "Gặp yêu cầu giao thức không được chỉ định trong “POP3_auth� (xác thực)\n"
 
 #: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
@@ -2601,9 +2410,7 @@ msgstr "id=%s (số=%u) đã được xoá b�, nhưng còn đó!\n"
 
 #: pop3.c:934
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trư�ng hợp "
-"này.\n"
+msgstr "Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trư�ng hợp này.\n"
 
 #: pop3.c:1032
 msgid "protocol error\n"
@@ -2622,49 +2429,41 @@ msgstr "id=%s (số=%d) đã được xoá b�, nhưng còn có.\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Không hỗ trợ tùy ch�n “--folder� (thư mục) với POP3\n"
 
-#: rcfile_y.y:130
+#: rcfile_y.y:132
 msgid "server option after user options"
 msgstr "tùy ch�n máy phục vụ nằm sau các tùy ch�n ngư�i dùng"
 
-#: rcfile_y.y:173
+#: rcfile_y.y:175
 msgid "SDPS not enabled."
 msgstr "Chưa bật SDPS."
 
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: tùy ch�n giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và "
-"FreeBSD (kiểu UNIX)\n"
+#: rcfile_y.y:219
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: tùy ch�n giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
 
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: tùy ch�n theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và "
-"FreeBSD (kiểu UNIX)\n"
+#: rcfile_y.y:227
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: tùy ch�n theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
 
-#: rcfile_y.y:339
+#: rcfile_y.y:341
 msgid "SSL is not enabled"
 msgstr "Chưa bật SSL"
 
-#: rcfile_y.y:391
+#: rcfile_y.y:393
 msgid "end of input"
 msgstr "kết thúc kết nhập"
 
-#: rcfile_y.y:429
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Tập tin %s phải là một tập tin chuẩn.\n"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Không cho phép tập tin %s có quy�n hạn lớn hơn “-rwx------� (0700).\n"
 
-#: rcfile_y.y:451
+#: rcfile_y.y:453
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Tập tin %s phải bị bạn sở hữu.\n"
@@ -2942,9 +2741,7 @@ msgstr "Tùy ch�n MDA chứa một trích dẫn đơn %%%c mở rộng.\n"
 
 #: sink.c:1168
 msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-"Từ chối phát đi. Kiểm tra hướng dẫn sử dụng và sửa chữa tùy ch�n mda của "
-"bạn.\n"
+msgstr "Từ chối phát đi. Kiểm tra hướng dẫn sử dụng và sửa chữa tùy ch�n mda của bạn.\n"
 
 #: sink.c:1211
 #, c-format
@@ -2997,11 +2794,8 @@ msgstr "MDA đã trả v� trạng thái không phải số không %d\n"
 
 #: sink.c:1396
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Lạ: việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý "
-"tại %s:%d\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Lạ: việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý tại %s:%d\n"
 
 #: sink.c:1421
 msgid "SMTP listener refused delivery\n"
@@ -3049,82 +2843,80 @@ msgstr "Xác thực LOGIN ESMTP...\n"
 msgid "smtp listener protocol error\n"
 msgstr "lỗi giao thực bộ lắng nghe SMTP\n"
 
-#: socket.c:112 socket.c:141
+#: socket.c:111 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc (phân chia bộ nhớ) gặp lỗi\n"
 
-#: socket.c:173
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair (cặp ổ cắm) gặp lỗi\n"
 
-#: socket.c:179
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: việc tạo tiến trình con gặp lỗi\n"
 
-#: socket.c:186
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "việc dup2 (nhân bản) gặp lỗi\n"
 
-#: socket.c:192
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "đang chạy %s (máy %s dịch vụ %s)\n"
 
-#: socket.c:197
+#: socket.c:196
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) gặp lỗi\n"
 
-#: socket.c:272
+#: socket.c:271
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "Lá»—i getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:275
+#: socket.c:274
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"Hãy cố thêm tùy ch�n “--service� (dịch vụ) (xem cũng mục FAQ [H�i �áp] "
-"R12).\n"
+msgstr "Hãy cố thêm tùy ch�n “--service� (dịch vụ) (xem cũng mục FAQ [H�i �áp] R12).\n"
 
-#: socket.c:289 socket.c:292
+#: socket.c:288 socket.c:291
 #, c-format
 msgid "unknown (%s)"
 msgstr "không rõ (%s)"
 
-#: socket.c:295
+#: socket.c:294
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "�ang thử kết nối đến %s/%s..."
 
-#: socket.c:304
+#: socket.c:303
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "không thể tạo ổ cắm: %s.\n"
 
-#: socket.c:306
+#: socket.c:305
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "tên %d: không thể tạo nhóm ổ cắm %d kiểu %d: %s\n"
 
-#: socket.c:324
+#: socket.c:323
 msgid "connection failed.\n"
 msgstr "lỗi kết nối.\n"
 
-#: socket.c:326
+#: socket.c:325
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:327
+#: socket.c:326
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "tên %d: lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:333
+#: socket.c:332
 msgid "connected.\n"
 msgstr "đã kết nối.\n"
 
-#: socket.c:346
+#: socket.c:345
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -3133,271 +2925,229 @@ msgstr ""
 "Lỗi kết nối cho lần thăm dò này:\n"
 "%s"
 
-#: socket.c:416
+#: socket.c:411
 #, c-format
 msgid "OpenSSL reported: %s\n"
 msgstr "OpenSSL báo cáo: %s\n"
 
-#: socket.c:651
+#: socket.c:646
 #, c-format
 msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
 msgstr "SSL xác thực độ sau g�i ngược %d: preverify_ok == %d, lỗi = %d, %s\n"
 
-#: socket.c:657
+#: socket.c:652
 msgid "Server certificate:\n"
 msgstr "Chứng nhận máy phục vụ:\n"
 
-#: socket.c:662
+#: socket.c:657
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "Dãy chứng nhận, từ gốc đến đồng đẳng, bắt đầu ở độ sâu %d:\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "Chứng nhận ở độ sâu %d:\n"
 
-#: socket.c:671
+#: socket.c:666
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Tổ chức phát hành: %s\n"
 
-#: socket.c:674
+#: socket.c:669
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Cảnh báo: tên Tổ chức Phát hành quá dài (có thể bị cắt xén).\n"
 
-#: socket.c:676
+#: socket.c:671
 msgid "Unknown Organization\n"
 msgstr "Không biết Tổ chức\n"
 
-#: socket.c:678
+#: socket.c:673
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Tên Chung phát hành: %s\n"
 
-#: socket.c:681
+#: socket.c:676
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Cảnh báo: Tên Chung nhà phát hành quá dài (có thể bị cắt xén).\n"
 
-#: socket.c:683
+#: socket.c:678
 msgid "Unknown Issuer CommonName\n"
 msgstr "Không biết Tên Chung nhà phát hành\n"
 
-#: socket.c:689
+#: socket.c:684
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "Tên Chung Chủ đ�: %s\n"
 
-#: socket.c:695
+#: socket.c:690
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Chứng nhận sai: Tên Chung Chủ đ� quá dài.\n"
 
-#: socket.c:701
+#: socket.c:696
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Chứng nhận sai: Tên Chung Chủ đ� chứa NUL (vô giá trị) nên hủy b�.\n"
 
-#: socket.c:729
+#: socket.c:724
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Tên Thay thế Chủ đ�: %s\n"
 
-#: socket.c:735
+#: socket.c:730
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Chứng nhận sai: Tên Thay thế Chủ đ� chứa NUL (vô giá trị) nên hủy b�.\n"
+msgstr "Chứng nhận sai: Tên Thay thế Chủ đ� chứa NUL (vô giá trị) nên hủy b�.\n"
 
-#: socket.c:752
+#: socket.c:747
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Tên Chung máy phục vụ không khớp: %s != %s\n"
 
-#: socket.c:759
+#: socket.c:754
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Chpa đặt tên máy phục vụ nên không thể thẩm tra chứng nhận.\n"
 
-#: socket.c:764
+#: socket.c:759
 msgid "Unknown Server CommonName\n"
 msgstr "Không biết Tên Chung máy phục vụ\n"
 
-#: socket.c:766
+#: socket.c:761
 msgid "Server name not specified in certificate!\n"
 msgstr "Không chỉ định tên máy phục vụ trong chứng nhận.\n"
 
-#: socket.c:778
+#: socket.c:773
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() gặp lỗi.\n"
 
-#: socket.c:782
+#: socket.c:777
 msgid "Out of memory!\n"
 msgstr "Hết bộ nhớ!\n"
 
-#: socket.c:790
+#: socket.c:785
 msgid "Digest text buffer too small!\n"
 msgstr "Bộ đệm digest quá nh�.\n"
 
-#: socket.c:796
+#: socket.c:791
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Vân tay chìa khoá %s: %s\n"
 
-#: socket.c:800
+#: socket.c:795
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Vân tay chìa khoá %s trùng.\n"
 
-#: socket.c:802
+#: socket.c:797
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Vân tay chìa khoá %s không trùng.\n"
 
-#: socket.c:814
+#: socket.c:809
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Lỗi thẩm tra chứng nhận máy phục vụ: %s\n"
 
-#: socket.c:829
+#: socket.c:824
 #, c-format
 msgid "Broken certification chain at: %s\n"
 msgstr "Chuỗi chứng nhận bị ngắt giữa chừng tại: %s\n"
 
-#: socket.c:831
-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 ""
-"Lỗi này bình thư�ng xảy ra khi máy phục vụ không cung cấp chứng nhận của CA "
-"trung gian, đây là một trư�ng hợp mà fetchmail không thể làm gì được. �ể có "
-"thông tin chi tiết, xin hãy đ�c tài liệu “README.SSL-SERVER� đi kèm với "
-"fetchmail.\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 "Lỗi này bình thư�ng xảy ra khi máy phục vụ không cung cấp chứng nhận của CA trung gian, đây là một trư�ng hợp mà fetchmail không thể làm gì được. �ể có thông tin chi tiết, xin hãy đ�c tài liệu “README.SSL-SERVER� đi kèm với fetchmail.\n"
 
-#: socket.c:841
+#: socket.c:836
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
 msgstr "Thiếu giấy chứng nhận neo tin cậy: %s\n"
 
-#: socket.c:844
-#, fuzzy
-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. See README.SSL for details.\n"
-msgstr ""
-"Có nghĩa là chứng nhận ký gốc không nằm ở một vị trí chứng nhận CA đáng tin, "
-"hoặc là “c_rehash� cần phải được chạy trong thư mục chứng nhận. �ể biết chi "
-"tiết hơn, hãy xem thông tin v� hai tuỳ ch�n “--sslcertpath� và “--"
-"sslcertfile� trên trang hướng dẫn (man).\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 "Có nghĩa là chứng nhận ký gốc không nằm ở một vị trí chứng nhận CA đáng tin, hoặc là “c_rehash� cần phải được chạy trong thư mục chứng nhận. �ể biết chi tiết hơn, hãy xem thông tin v� hai tuỳ ch�n “--sslcertpath� và “--sslcertfile� trên trang hướng dẫn (man).\n"
 
-#: socket.c:918 socket.c:996
+#: socket.c:912 socket.c:990
 msgid "Your OpenSSL version does not support SSLv3.\n"
 msgstr "Phiên bản OpenSSL của bạn không hỗ trợ SSLv3.\n"
 
-#: socket.c:936 socket.c:1014
+#: socket.c:930 socket.c:1008
 msgid "Your OpenSSL version does not support TLS v1.1.\n"
 msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.1.\n"
 
-#: socket.c:947 socket.c:1025
+#: socket.c:941 socket.c:1019
 msgid "Your OpenSSL version does not support TLS v1.2.\n"
 msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.2.\n"
 
-#: socket.c:958 socket.c:1036
+#: socket.c:952 socket.c:1030
 msgid "Your OpenSSL version does not support TLS v1.3.\n"
 msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.3.\n"
 
-#: socket.c:967 socket.c:1046
+#: socket.c:961 socket.c:1040
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr ""
-"Chỉ định giao thức SSL không hợp lệ “%s� nên dùng mặc định là tự ch�n (tự "
-"Ä‘á»™ng).\n"
+msgstr "Chỉ định giao thức SSL không hợp lệ “%s� nên dùng mặc định là tự ch�n (tự động).\n"
 
-#: socket.c:1081
+#: socket.c:1075
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-"Thư viện OpenSSL đã tải %#lx cũ hơn phần đầu %#lx, chưa rõ ràng để có thể "
-"hoạt động.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr "Thư viện OpenSSL đã tải %#lx cũ hơn phần đầu %#lx, chưa rõ ràng để có thể hoạt động.\n"
 
-#: socket.c:1086
+#: 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 "Thư viện OpenSSL đã tải %#lx mới hơn phần đầu %#lx, có thử tiếp tục.\n"
 
-#: socket.c:1106
+#: socket.c:1100
 msgid "File descriptor out of range for SSL"
 msgstr "Bộ mô tả tập tin ở ngoại phạm vị SSL"
 
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"Chú ý rằng một số bản phân phối tắt các giao thức phiên bản cũ nếu nó không "
-"còn hợp chuẩn nữa. Hãy thử dùng phiên bản mới hơn.\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 "Chú ý rằng một số bản phân phối tắt các giao thức phiên bản cũ nếu nó không còn hợp chuẩn nữa. Hãy thử dùng phiên bản mới hơn.\n"
 
-#: socket.c:1195
+#: socket.c:1189
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"Cảnh báo: SSL_set_tlsext_host_name(%p, \"%s\") gặp lỗi (mã %#lx), có thử "
-"tiếp tục.\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "Cảnh báo: SSL_set_tlsext_host_name(%p, \"%s\") gặp lỗi (mã %#lx), có thử tiếp tục.\n"
 
-#: socket.c:1210
+#: socket.c:1204
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"Cảnh báo: X509_VERIFY_PARAM_set1_host(%p, \"%s\") gặp lỗi (mã %#x), có thử "
-"tiếp tục.\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "Cảnh báo: X509_VERIFY_PARAM_set1_host(%p, \"%s\") gặp lỗi (mã %#x), có thử tiếp tục.\n"
 
-#: socket.c:1247
+#: socket.c:1241
 msgid "Server shut down connection prematurely during SSL_connect().\n"
 msgstr "Máy chủ ngắt kết nối bất ng� khi đang SSL_connect().\n"
 
-#: socket.c:1250
+#: socket.c:1244
 #, c-format
 msgid "System error during SSL_connect(): %s\n"
 msgstr "Hệ thống gặp lỗi trong khi SSL_connect(): %s\n"
 
-#: socket.c:1250
+#: socket.c:1244
 msgid "handshake failed at protocol or connection level."
 msgstr "bắt tay gặp lỗi ở mức giao thức hoặc kết nối."
 
-#: socket.c:1270
+#: socket.c:1264
 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-"Không thể lấy được kiểu mã hóa SSL/TLS hiện tại - nên không thiết lập được "
-"phiên làm việc?\n"
+msgstr "Không thể lấy được kiểu mã hóa SSL/TLS hiện tại - nên không thiết lập được phiên làm việc?\n"
 
-#: socket.c:1273
+#: socket.c:1267
 #, c-format
 msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
 msgstr "SSL/TLS: đang dùng giao thức %s, mã hóa %s, %d/%d bí mật/xử lý bít\n"
 
-#: socket.c:1280
+#: socket.c:1274
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Việc thẩm tra chứng nhận/vân tay bị b� qua vì lý do nào.\n"
 
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-"Cảnh báo: kết nối này không bảo mật, vẫn còn tiếp tục. (Khuyên bạn sử dụng "
-"“--sslcertck� !)\n"
+#: socket.c:1291
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
+msgstr "Cảnh báo: kết nối này không bảo mật, vẫn còn tiếp tục. (Khuyên bạn sử dụng “--sslcertck� !)\n"
 
-#: socket.c:1339
+#: socket.c:1333
 msgid "Cygwin socket read retry\n"
 msgstr "Việc cố lại đ�c ổ cắm Cygwin\n"
 
-#: socket.c:1342
+#: socket.c:1336
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Việc cố lại đ�c ổ cắm Cygwin gặp lỗi.\n"
 
@@ -3446,9 +3196,7 @@ msgstr "tìm thấy địa chỉ Received (�ã nhận) “%s�\n"
 
 #: transact.c:613
 msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr ""
-"tìm được dòng đầu không đúng: xem trang hướng dẫn (man) v� tuỳ ch�n dòng đầu "
-"sai (bad-header)\n"
+msgstr "tìm được dòng đầu không đúng: xem trang hướng dẫn (man) v� tuỳ ch�n dòng đầu sai (bad-header)\n"
 
 #: transact.c:615
 #, c-format
@@ -3467,8 +3215,7 @@ msgstr "�ang phân tích các tên nhận được “%-.*s�\n"
 
 #: transact.c:1124
 msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-"Không tìm thấy ngư�i nhận phong bì, đang dùng đến sự ph�ng đoán phần đầu.\n"
+msgstr "Không tìm thấy ngư�i nhận phong bì, đang dùng đến sự ph�ng đoán phần đầu.\n"
 
 #: transact.c:1142
 #, c-format
@@ -3515,71 +3262,65 @@ msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
 msgstr "Bộ đệm quá nh�. �ây là một lỗi trong bộ g�i của %s:%lu.\n"
 
 #: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: gặp lỗi khi đ�c tập tin khoá “%s�: %s\n"
-
-#: uid.c:273
 #, c-format
 msgid "Old UID list from %s:\n"
 msgstr "Danh sách UID cũ từ %s:\n"
 
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:266 uid.c:275 uid.c:343
 msgid " <empty>"
 msgstr " <trống>"
 
-#: uid.c:284
+#: uid.c:273
 msgid "Scratch list of UIDs:\n"
 msgstr "Danh sách linh tinh của UID:\n"
 
-#: uid.c:369 uid.c:413
+#: uid.c:357 uid.c:401
 #, c-format
 msgid "Merged UID list from %s:\n"
 msgstr "�ã hoà trộn danh sách UID từ %s:\n"
 
-#: uid.c:372
+#: uid.c:360
 #, c-format
 msgid "New UID list from %s:\n"
 msgstr "Danh sách UID mới từ %s:\n"
 
-#: uid.c:402
+#: uid.c:390
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "không tráo đổi danh sách UID, chưa xem UID trong việc truy vấn này\n"
 
-#: uid.c:422
+#: uid.c:410
 msgid "discarding new UID list\n"
 msgstr "đang hủy danh sách UID mới\n"
 
-#: uid.c:479
+#: uid.c:467
 msgid "Deleting fetchids file.\n"
 msgstr "�ang xoá b� tập tin fetchids (lấy các ID).\n"
 
-#: uid.c:482
+#: uid.c:470
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Gặp lỗi khi xoá b� %s: %s\n"
 
-#: uid.c:489
+#: uid.c:477
 msgid "Writing fetchids file.\n"
 msgstr "�ang ghi tập tin fetchids (lấy các ID).\n"
 
-#: uid.c:503 uid.c:512
+#: uid.c:491 uid.c:500
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "Lỗi ghi vào tập tin fetchids %s: %s\n"
 
-#: uid.c:524
+#: uid.c:512
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
+msgstr "Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
 
-#: uid.c:528
+#: uid.c:516
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Không thể đổi tên tập tin  fetchids (lấy các ID) %s thành %s: %s\n"
 
-#: uid.c:532
+#: uid.c:520
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Không thể mở tập tin  fetchids (lấy các ID) %s để ghi: %s\n"
@@ -3593,8 +3334,7 @@ msgid "realloc failed\n"
 msgstr "realloc (cấp phát lại bộ nhớ) gặp lỗi\n"
 
 #~ msgid "Required LOGIN capability not supported by server\n"
-#~ msgstr ""
-#~ "Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
+#~ msgstr "Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
 
 #~ msgid "Saved error is still %d\n"
 #~ msgstr "Lỗi đã lưu vẫn còn là %d\n"
@@ -3605,11 +3345,8 @@ msgstr "realloc (cấp phát lại bộ nhớ) gặp lỗi\n"
 #~ msgid "unknown issuer (first %d characters): %s\n"
 #~ msgstr "không biết nhà phát hành (%d ký tự đầu): %s\n"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: cảnh báo: cả syslog (bản ghi hệ thống) lẫn logfile (tập tin "
-#~ "ghi lưu) đ�u đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr "fetchmail: cảnh báo: cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi lưu) đ�u đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
 
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "Chủ đ�: cảnh báo Fetchmail v� máy phục vụ không tới được"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 27149717..ecf2b84b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-15 09:14-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -134,8 +134,7 @@ msgstr "(邮件内容 %d 字节)"
 
 #: driver.c:770
 #, 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 "%s@%s:%d 邮件�所需大� (实际 %d 字节!= 所�求的 %d 字节)\n"
 
 #: driver.c:802
@@ -153,8 +152,7 @@ msgstr "未删除\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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "到达收件上� %d；%d �邮件留在�务器 %s ��为 %s\n"
 
 #: driver.c:899
@@ -188,9 +186,7 @@ msgstr "fetchmail �现��超时"
 
 #: driver.c:930
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
 msgstr "Fetchmail �试从 %2$s@%3$s 收�邮件时�现多于 %1$d 次超时。\n"
 
 #: driver.c:934
@@ -515,8 +511,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 ""
@@ -556,8 +551,7 @@ msgstr "无法在主机数�库中找到自己的主机�验�它�\n"
 #: env.c:229
 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 ""
 "正在�试用未验�的主机�继续�作。\n"
@@ -675,8 +669,7 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "警告：您的 SSL/TLS 库�支� TLS v1.3。\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
 msgstr "警告：使用 LibreSSL 编译，该�置��支�。\n"
 
 #: fetchmail.c:314
@@ -703,8 +696,7 @@ msgstr "日志文件 \"%s\" ��写，退出。\n"
 
 #: fetchmail.c:378
 #, 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 "�时指定了 syslog 和 logfile 选项，忽略 syslog 并登录至 %s"
 
 #: fetchmail.c:469
@@ -748,18 +740,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail 进程� %ld 终止。\n"
 
 #: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
 msgstr "fetchmail: 有�一个 fetchmail 在�一主机上�行时无法检查邮件。\n"
 
 #: fetchmail.c:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: 有�一个 fetchmail 进程� %ld 在指定主机上�行时无法收邮件。\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: 有�一个 fetchmail 进程� %ld 在指定主机上�行时无法收邮件。\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -767,8 +754,7 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: �一个�� fetchmail 进程� %ld 正在�行。\n"
 
 #: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有�� fetchmail 正在�行时无法接�选项\n"
 
 #: fetchmail.c:581
@@ -937,12 +923,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在�置文件中多次��主机 %s\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: 错误: 在�置文件中有多个 “defaults� 记录，或者“defaults��是第一个"
-"记录。\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: 错误: 在�置文件中有多个 “defaults� 记录，或者“defaults��是第一个记录。\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -962,8 +944,7 @@ msgstr "�置了 GSSAPI 支�，但该功能未编译在内。\n"
 
 #: fetchmail.c:1366
 #, 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: 警告: 无�用的 DNS �检查�自 %s 的多投邮件\n"
 
 #: fetchmail.c:1377
@@ -977,9 +958,7 @@ msgstr "警告: 如果所有邮件å�‡è¢«é‚®ä»¶ç®¡ç�†å‘˜æ”¶å�–，ä¸�è¦�寻求支æ
 
 #: fetchmail.c:1395
 #, 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: %s �置无效，为�务或端�指定大于零的端�\n"
 
 #: fetchmail.c:1402
@@ -997,8 +976,7 @@ msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收�所有邮件并�留�务器上的备份或使用 idle 模�是错误的�\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr "fetchmail: 错误：idle 模�对多个文件夹或账���用�\n"
 
 #: fetchmail.c:1468
@@ -1279,20 +1257,15 @@ msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收�新邮件�删除旧邮件(--flush 开�).\n"
 
 #: fetchmail.c:1809
-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 " 在收�新邮件��删除旧邮件(--flush 关闭).\n"
 
 #: fetchmail.c:1811
-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 " 收件�将删除超大的邮件(--limitflush 开�).\n"
 
 #: fetchmail.c:1812
-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 " 收件�将�删除超大的邮件(--limitflush 关闭).\n"
 
 #: fetchmail.c:1814
@@ -1320,13 +1293,11 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " �在�行�强行�入回车符(forcecr 关闭).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开�).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " �忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
 #: fetchmail.c:1826
@@ -1515,8 +1486,7 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS �寻多投地�。\n"
 
 #: fetchmail.c:1981
-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 " �务器昵称将以 IP 地�与多投地�进行比较\n"
 
 #: fetchmail.c:1983
@@ -1628,9 +1598,7 @@ msgid "Cannot modify signal mask: %s"
 msgstr "无法修改信� mask：%s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
 msgstr "您的�作系统既未定义 PATH_MAX 也�接� realpath(f, NULL)。中止�作。\n"
 
 #: getpass.c:71
@@ -1670,8 +1638,7 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "未找到�适的 GSSAPI �书。忽略 GSSAPI 认�。\n"
 
 #: gssapi.c:124
-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，您首先需��书，也许�自 kinit。\n"
 
 #: gssapi.c:160
@@ -1849,8 +1816,7 @@ msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
 #: imap.c:1078
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "警告: 忽略�务器返回的邮件大�的无效数�。\n"
 
 #: imap.c:1177 imap.c:1184
@@ -2155,9 +2121,7 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile\t指定日志文件�\n"
 
 #: options.c:653
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr " --syslog\t以���务�行时用 syslog(3) 得到更多的信�\n"
 
 #: options.c:654
@@ -2189,14 +2153,11 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce\t将回�邮件从用户�定�至邮件管�员\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
 
 #: options.c:662
-msgid ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
 msgstr "      --softbounce\t将无法投递的邮件长期�留在�务器上(默认)。\n"
 
 #: options.c:664
@@ -2236,14 +2197,11 @@ msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath     �信 CA ssl �书文件的目录\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr " --sslcommonname\t期望返回�务器� (�鼓励)\n"
 
 #: options.c:676
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr " --sslfingerprint\t指定一个指纹，它必须与�务器�书的指纹匹�\n"
 
 #: options.c:677
@@ -2275,8 +2233,7 @@ msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr "      --idle        告知 IMAP �务器为新邮件��通知\n"
 
 #: options.c:687
@@ -2284,8 +2241,7 @@ msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port\t�连接的 TCP 端�(过时了，用 --service)\n"
 
 #: options.c:688
-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, --service\t�连接的 TCP �务(�许用 TCP 端�的数值�表示)\n"
 
 #: options.c:689
@@ -2417,8 +2373,7 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 �支�密�验�。放弃�作。\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr "警告: �现\"Maillennium POP3\"，用 RETR 命令代替 TOP。\n"
 
 #: pop3.c:414
@@ -2506,15 +2461,11 @@ msgid "SDPS not enabled."
 msgstr "SDPS ��用"
 
 #: rcfile_y.y:217
-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 "fetchmail: interface 选项�有 Linux(无 IPv6)和 FreeBSD 支�\n"
 
 #: rcfile_y.y:225
-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 "fetchmail: monitor 选项�有 Linux(无 IPv6)和 FreeBSD 支�\n"
 
 #: rcfile_y.y:339
@@ -2866,8 +2817,7 @@ msgstr "MDA 返回�零值 %d\n"
 
 #: sink.c:1396
 #, 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 "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s，在 %s:%d 无法处�\n"
 
 #: sink.c:1421
@@ -3125,14 +3075,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "�书链错误，�于: %s\n"
 
 #: socket.c:831
-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 ""
-"这�能�味��务器未�供中间 CA �书，fetchmain 对此无能为力。详细信�请查看"
-"�� fetchmail �行的 README.SSL-SERVER 文档。\n"
+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 "这�能�味��务器未�供中间 CA �书，fetchmain 对此无能为力。详细信�请查看�� fetchmail �行的 README.SSL-SERVER 文档。\n"
 
 #: socket.c:841
 #, c-format
@@ -3140,14 +3084,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "缺失信任锚（trust anchor）�书：%s\n"
 
 #: socket.c:844
-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. See README.SSL for details.\n"
-msgstr ""
-"这�味�根�书�在 CA �书�信路径处，或是需�在�书目录下�行 c_rehash。详细"
-"信�请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
+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. See README.SSL for details.\n"
+msgstr "这�味�根�书�在 CA �书�信路径处，或是需�在�书目录下�行 c_rehash。详细信�请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3172,14 +3110,12 @@ msgstr "指定了无效的 SSL �议“%s�，将用默认的自动选择（au
 
 #: socket.c:1081
 #, 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 "已加载的 OpenSSL 库 %#lx 比头文件 %#lx 更旧，拒�工作。\n"
 
 #: socket.c:1086
 #, 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 "已加载的 OpenSSL 库 %#lx 比头文件 %#lx 更新，�试继续工作。\n"
 
 #: socket.c:1106
@@ -3187,30 +3123,18 @@ msgid "File descriptor out of range for SSL"
 msgstr "文件�述符超出 SSL 的范围"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"请注�，�些�行版以�标准的方��用了较旧的�议版本。请�试更新的�议版"
-"本。\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "请注�，�些�行版以�标准的方��用了较旧的�议版本。请�试更新的�议版本。\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"警告：SSL_set_tlsext_host_name(%p, \"%s\") 失败（代� %#lx），�试继续�"
-"作。\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "警告：SSL_set_tlsext_host_name(%p, \"%s\") 失败（代� %#lx），�试继续�作。\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"警告：X509_VERIFY_PARAM_set1_host(%p, \"%s\") 失败（代� %#x），�试继续�"
-"作。\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "警告：X509_VERIFY_PARAM_set1_host(%p, \"%s\") 失败（代� %#x），�试继续�作。\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3239,9 +3163,7 @@ msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "�书/指纹验�被�明原因地跳过�\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
 msgstr "警告:此连接�安全，但会继续�行。(最好使用 --sslcertck�)\n"
 
 #: socket.c:1339
@@ -3453,8 +3375,7 @@ msgstr "realloc 失败\n"
 #~ msgid "swapping UID lists\n"
 #~ msgstr "正在转储 UID 列表\n"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 #~ msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录�\n"
 
 #~ msgid "Subject: Fetchmail unreachable-server warning."