Record po files for 6.3.15 release.

21 files changed, 6446 insertions, 6085 deletions

diff --git a/po/ca.po b/po/ca.po
index 49be9d48..0ea8182a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.11\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2009-08-06 14:52+0200\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -57,12 +57,12 @@ msgstr "error de kerberos %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [el servidor diu: '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [el servidor diu: '%*s'] \n"
 
 #: driver.c:335
@@ -97,72 +97,72 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d missatge de %d octets om�s per part del fetchmail."
 msgstr[1] "  %d missatges, %d octets en total, omesos per part del fetchmail."
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ometent el missatge %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ometent el missatge %s@%s:%d (%d octets)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (mida -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (excessiu)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "falta la cap�alera, missatge %s@%s:%d (%d octets)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "llegint el missatge %s@%s:%d de %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octets)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (cap�alera de %d octets) "
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (cos de %d octets) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "el missatge %s@%s:%d no tenia la mida esperada (%d real != %d esperada)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " retingut\n"
 
 # lliurat, expedit, despatxat, esborrat, eliminat...
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " eliminat\n"
 
 # �dem
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " no eliminat\n"
 
 # traducci� de "fetchlimit"
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -172,36 +172,36 @@ msgstr[0] ""
 msgstr[1] ""
 "assolit el l�mit de %d missatge(s); en queden %d al servidor %s compte %s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "temps esgotat despr�s de %d segons esperant connectar amb %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "temps esgotat despr�s de %d segons esperant el servidor %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "temps esgotat despr�s de %d segons esperant per a %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "temps esgotat despr�s de %d segons esperant resposta del receptor.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "temps d'espera esgotat despr�s de %d segons.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail: S'esgota el temps d'espera molt sovint"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -210,7 +210,7 @@ msgstr ""
 "El fetchmail ha esgotat el temps d'espera m�s de %d cops quan intentava "
 "obtenir el correu de %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -227,78 +227,78 @@ msgstr ""
 "El fetchmail no tornar� a comprovar m�s aquesta b�stia fins que el\n"
 "reinicieu.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "l'ordre de preconnexi� ha finalitzat amb un senyal %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "l'ordre de preconnexi� ha fallat amb estat %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no s'ha pogut trobar cap casella HESIOD per a %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "El servidor principal no t� nom.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "no s'ha pogut trobar el nom can�nic DNS de %s (%s): %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "la connexi� %s amb %s ha fallat"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: fetchmail: Servidor inaccessible."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "La conexi� SSL ha fallat.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Bloqueig temporal de la b�stia per a %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Servidor ocupat per a %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "L'autoritzaci� per a %s@%s%s ha fallat\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (pr�viament autoritzat)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail: L'autenticaci� per a %s@%s ha fallat"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "El fetchmail no ha pogut obtenir el correu de %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -312,7 +312,7 @@ msgstr ""
 "(tal com que el servidor est� ocupat) que el fetchmail no pot identificar\n"
 "perqu� el servidor no envia missatges d'error que ho permetin."
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -331,7 +331,7 @@ msgstr ""
 "El fetchmail continar� intentant connectar-s'hi a cada cicle, per� no us\n"
 "enviar� m�s notificacions fins que el servei es restableixi."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -350,180 +350,180 @@ msgstr ""
 "El dimoni fetchmail continuar� funcionant i intentant connectar-s'hi a cada\n"
 "cicle, per� no us enviar� m�s notificacions fins que restabliu el servei."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Es torna a recollir el correu immediatament de %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Error no identificat de login o autenticaci� per a %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autoritzaci� reeixida per a %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail: Autenticaci� reeixida per a %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "El fetchmail ha estat capa� d'accedir a %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "El servei s'ha restablert.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionant o re-examinant la carpeta %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionant o re-examinant la carpeta per omissi�\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s a %s (carpeta %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Consultant %s\n"
 
 # seen
-#: driver.c:1341
+#: driver.c:1344
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d missatge (%d %s) per a %s"
 msgstr[1] "%d missatges (%d %s) per a %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "vist"
 msgstr[1] "vistos"
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d missatge per a %s"
 msgstr[1] "%d missatges per a %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hi ha correu per a %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "recompte de missatges erroni!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "de socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "de cap�alera RFC822"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "de MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "de sincronitzaci� client/servidor"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "de protocol client/servidor"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "de bloqueig temporal al servidor"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "de transacci� SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "de consulta DNS"
 
 # aquest missatge va directe a stderr
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "no identificat"
 
-#: driver.c:1567
+#: driver.c:1569
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 "error %s en recollir el correu de %s@%s i lliurar-lo via SMTP al host %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "desconegut"
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "error %s en recollir el correu de %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "l'ordre de postconnexi� ha finalitzat amb un senyal %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "l'ordre de postconnexi� ha fallat amb estat %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "El suport per Kerberos V4 no est� enlla�at.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "El suport per Kerberos V5 no est� enlla�at.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "L'opci� --flush no est� suportada per %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "L'opci� --all no est� suportada per %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "L'opci� --limit no est� suportada per %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -538,7 +538,7 @@ msgstr ""
 "Proveu \"env QMAILINJECT= %s ELS VOSTRES ARGUMENTS AQU�\"\n"
 "%s: Avorta.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -555,27 +555,27 @@ msgstr ""
 "Proveu \"env NULLMAILER_FLAGS= %s ELS VOSTRES ARGUMENTS AQU�\"\n"
 "%s: Avorta.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: No existiu. Escampeu la boira.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: no s'ha pogut determinar el vostre host!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "ha fallat la funci� gethostbyname per a %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 "No s'ha pogut trobar el host propi a la base de dades per qualificar-lo!\n"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -791,13 +791,13 @@ msgstr ""
 "\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "iniciant el dimoni fetchmail %s \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "no s'ha pogut obrir %s per afegir-hi el registre d'activitat \n"
 
 #: fetchmail.c:607
@@ -933,39 +933,39 @@ msgid "normal termination, status %d\n"
 msgstr "finalitzaci� normal, estat %d\n"
 
 # nota: run-control �s fitxer de control (i.e. .fetchmailrc)
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "no s'ha pogut verificar la data del fitxer de control\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Atenci�: hi ha m�ltiples mencions del host %s en el fitxer de configuraci�\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Error: hi ha m�s d'un compte \"default\" en el fitxer de "
 "configuraci�.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "El suport per SSL no est� compilat.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Suport per a KERBEROS v4 configurat, per� no compilat.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Suport per a KERBEROS v5 configurat, per� no compilat.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Suport per a GSSAPI configurat, per� no compilat.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -973,16 +973,16 @@ msgstr ""
 "fetchmail: atenci�: cap DNS disponible per verificar les obtencions "
 "multidrop de %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "atenci�: el sistema multidrop per a %s requereix l'opci� envelope!\n"
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "atenci�: No demaneu ajuda si tot el correu va al postmaster!\n"
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -991,316 +991,316 @@ msgstr ""
 "fetchmail: la configuraci� de %s no �s v�lida, el port no pot ser n�mero "
 "negatiu\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, 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"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, 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 habitual "
 "d'SMTP\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Les opcions `fetchall' i `keep on' s�n incompatibles!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogant %s (protocol %s) el %s: consulta iniciada\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no est� configurat.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no est� configurat.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no est� configurat.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no est� configurat.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no est� configurat.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no est� suportat.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogant %s (protocol %s) el %s: consulta finalitzada\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes �s de %d segons\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre �s %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions �s %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrar� via syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascarar� i no generar� cap�aleres Recieved\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "El fetchmail mostrar� punts de progressi� �dhuc als fitxers de registre.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "El fetchmail enviar� els missatges multidrop mal adre�ats a %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigir� els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigir� els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "El fetchmail considerar� els errors permanents permanents (perdr� els "
 "missatges).\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "El fetchmail considerar� els errors permanents temporals (es quedar� els "
 "missatges).\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a l'obtenci� de %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindr� via %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, 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 consultar� a cada interval.\n"
 msgstr[1] "  Aquest servidor es consultar� cada %d intervals.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom aut�ntic del servidor �s %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Aquest host no es consultar� quan no se'n hagi especificat cap altre.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Aquest host es consultar� quan no se'n hagi especificat cap altre.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanar� la contrasenya.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificaci� RPOP = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol �s KPOP amb autenticaci� per Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol �s %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'�s d'UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els m�todes d'autenticaci� disponibles.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per contrasenya.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per MSN.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per NTLM.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per OTP.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per CRAM-Md5.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per GSSAPI.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat �s d'extrem a extrem.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu �s: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovaci� del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confian�a: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  CommonName del servidor SSL: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Empremta de la clau SSL (comprovada contra la clau del servidor): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El temps d'espera de la resposta del servidor �s de %d segons"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la b�stia per defecte.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Les b�sties seleccionades s�n:"
 
 # al tanto amb la substituci�
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Es descarregaran tots els missatges (--all on).\n"
 
 # al tanto amb la substituci�
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Nom�s es descarregaran els missatges nous (--all off).\n"
 
 # la substituci� �s: "<espai>/ no "
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Els missatges obtinguts no s'eliminaran del servidor (--keep on).\n"
 
 # la substituci� �s: "<espai>/ no "
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Els missatges obtinguts no es conservaran al servidor (--keep off).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Els missatges vells s'eliminaran abans d'obtenir el correu (--flush on).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Els missatges vells no s'eliminaran abans d'obtenir el correu (--flush "
 "off).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1308,7 +1308,7 @@ msgstr ""
 "  Els missatges excessivament grans s'eliminaran abans d'obtenir el correu "
 "(--limitflush on).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1316,340 +1316,347 @@ msgstr ""
 "  Els missatges excessivament grans no s'eliminaran abans d'obtenir el "
 "correu (--limitflush off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La reescriptura d'adreces locals est� habilitada (--norewrite off).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La reescriptura d'adreces locals est� deshabilitada (--norewrite on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  L'eliminaci� de retorns de carro est� habilitada (stripcr on).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  L'eliminaci� de retorns de carro est� deshabilitada (stripcr off).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  L'inserci� de retorns de carro est� habilitada (forcecr on).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  L'inserci� de retorns de carro est� deshabilitada (forcecr off).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interpretaci� del Content-Transfer-Encoding est� deshabilitada "
 "(pass8bits on).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interpretaci� del Content-Transfer-Encoding est� habilitada (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  El desxifrat MIME est� habilitat (mimedecode on).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  El desxifrat MIME est� deshabilitat (mimedecode off).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  La pausa despr�s de cada obtenci� est� habilitada (idle on).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  La pausa despr�s de cada obtenci� est� deshabilitada (idle off).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Les l�nies Status que no estiguin en blanc es descartaran (dropstatus on)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Les l�nies Status que no estiguin en blanc es mantindran (dropstatus off)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les l�nies Delivered-To es descartaran (dropdelivered on)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les l�nies Delivered-To es mantindran (dropdelivered off)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  El l�mit de mida dels missatges �s de %d octets (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha l�mit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  L'interval d'avisos de missatges grans �s de %d segons (--warnings %d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de missatges grans a cada obtenci� (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  El l�mit de missatges obtinguts �s de %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha l�mit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  El l�mit de mida dels missatges �s de %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha l�mit de mida dels missatges (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Es far� una cerca bin�ria de UIDs a cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Es far� una cerca bin�ria de UIDs %d consultes de cada %d (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Es far� una cerca lineal de UIDs a cada consulta (--fastuidl 0).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El l�mit de missatges enviats en s�rie �s de %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No hi ha l�mit de missatges enviats en s�rie (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  L'interval entre supressions �s de %d missatge(s) eliminat(s) (--expunge %"
 "d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins el final (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollir� el correu s�n:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (per omissi�)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Els missatges s'afegiran a %s com a BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El nom del host a la l�nia MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adre�a de les l�nies RCPT TO enviades per SMTP ser� %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam s�n:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam est� deshabilitat\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, 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:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexi�.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, 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:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexi�.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "S'ha reconegut %d nom local.\n"
 msgstr[1] "S'han reconegut %d noms locals.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop est� habilitada.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop est� deshabilitada.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Els �lies del servidor es compararan amb les adreces multidrop per adre�a "
 "IP.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Els �lies del servidor es compararan amb les adreces multidrop pel nom.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adre�a de l'embolcall est� deshabilitat.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  S'assumeix que la cap�alera de l'embolcall �s: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nombre de cap�aleres de l'embolcall que s'ignoraran: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Es suprimir� el prefix %s del nom d'usuari\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimir� cap prefix\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  �lies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexi� s'establir� a trav�s de l'interf�cie %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interf�cie requerida.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorar� l'interf�cie %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interf�cie a monitorar.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Les connexions amb el servidor es faran via %s (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexi�.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Les connexions amb el receptor SMTP es faran via %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexi� per SMTP.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  S'afegir� el rastre de l'obtenci� a la cap�alera Received.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  No s'afegir� el rastre de l'obtenci� a la cap�alera Received.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
@@ -1667,7 +1674,7 @@ msgstr ""
 "\n"
 "S'ha rebut un SIGINT... es deixa estar.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "No s'ha pogut obtenir el nom de servei de [%s]\n"
@@ -1884,46 +1891,46 @@ msgstr "No s'ha trobat cap interf�cie amb el nom de %s"
 msgid "No IP address found for %s"
 msgstr "No s'ha trobat cap adre�a IP per a %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "falta l'adre�a IP de l'interf�cie\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "l'adre�a IP de l'interf�cie no �s v�lida\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "la m�scara IP de l'interf�cie no �s v�lida\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activitat a %s -vista- com %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr ""
 "ometent l'obtenci� de %s, %s apagada\n"
 "\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "ometent l'obtenci� de %s, l'adre�a IP de %s est� exclosa\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activitat a %s comprovada com %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "ometent l'obtenci� de %s, %s inactiva\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "activitat a %s era %d, �s %d\n"
@@ -2044,119 +2051,124 @@ msgstr "No s'ha pogut desxifrar la codificaci� OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La cadena '%s' no �s un nombre v�lid.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "El valor de la cadena '%s' �s %s que %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "m�s petit"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "m�s gran"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "El protocol `%s' especificat no �s v�lid.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocol `%s' especificat no �s v�lid.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "L'autenticaci� `%s' especificada no �s v�lida.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "sintaxi: fetchmail [opcions] [servidor ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Les opcions s�n les seg�ents:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra aquesta ajuda\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informaci� sobre la versi�\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       comprova si hi ha correu sense recollir-lo\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      funciona en silenci\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     genera missatges informatius i de diagn�stic\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      funciona com a dimoni, en intervals de n segons\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    funciona com a dimoni, per� en primer terme\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        finalitza el proc�s d'un dimoni\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica el fitxer on registrar l'activitat\n"
 
-#: options.c:613
+#: options.c:626
 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:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   no deixa traces a les cap�aleres dels missatges\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc usa un fitxer de configuraci� alternatiu\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      usa un fixter d'UIDs alternatiu\n"
 
-#: options.c:617
+#: options.c:630
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     usa un fixter PID (bloqueig) alternatiu\n"
 
 # last resort
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica el destinatari en �ltima inst�ncia\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    redirigeix els missatges retornats cap al postmaster\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce esborra permanentment missatges que no es poden "
 "lliurar\n"
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2164,44 +2176,44 @@ msgstr ""
 "      --softbounce  mant� al servidor missatges que no es poden lliurar "
 "(predet.)\n"
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interf�cie de xarxa requerida pel funcionament\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 "  -M, --monitor     monitora l'activitat de l'interf�cie especificada\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         encripta les comunicacions amb ssl\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      fitxer que cont� la clau ssl privada\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificat ssl del client\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   verificaci� estricta del certificat (recomanat)\n"
 "\n"
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath cam� cap als certificats ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  espera aquest CommonName del servidor (no recomenat)\n"
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2209,168 +2221,174 @@ msgstr ""
 "      --sslfingerprint empremta que ha de coincidir amb el cert. del "
 "servidor.\n"
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    obliga l'�s del protocol ssl (SSL2/SSL3/TLS1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica l'ordre externa per obrir una connexi�\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plogout     especifica l'ordre externa per obrir una connexi� smtp\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica el protocol que s'usa per obtenir el correu\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        obliga l'�s d'UIDLs (nom�s pop3)\n"
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        port TCP/IP al qual connectar-se (obsolet, useu --"
 "service)\n"
 
-#: options.c:642
+#: options.c:657
 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 un n�mero de "
 "port)\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipus d'autenticaci� (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     temps d'espera per la resposta del servidor\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cap�alera que cont� l'adre�a de l'embolcall\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix que es suprimeix del nom d'usuari local\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   servei de correu principal\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  afegeix el rastre de l'obtenci� a la cap�alera Received\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    especifica el nom de login al servidor\n"
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  recull els missatges tant nous com vells\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 "  -K, --nokeep      esborra els missatges nous despr�s de recollir-los\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        deixa els missatges al servidor un cop recollits\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       esborra els missatges vells del servidor\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  esborra els missatges excessivament grans\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescriu les adreces de l'encap�alament\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recull els missatges que superin la mida "
 "especificada\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval entre avisos de notificaci� de correu\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    estableix el host pel reenviament via SMTP\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recull el correu pels dominis especificats\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress estableix el domini usat pel lliurament via SMTP\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    estableix el nom complet SMTP nomusuari@domini\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   estableix els valors reconeguts com a resposta antispam\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  estableix el l�mit de missatges SMTP enviats en s�rie\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  estableix el l�mit de missatges obtinguts per connexi�\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit estableix el l�mit de mida dels missatges\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    fa una cerca bin�ria de UIDLs\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     estableix el m�xim de missatges eliminats entre "
 "supressions\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         estableix l'MDA que s'utilitza pel reenviament\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       estableix el fitxer de sortida BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) pel lliurament\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      estableix el nom de la carpeta remota\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostra punts de progressi� �dhuc als fitxers de "
@@ -2453,15 +2471,15 @@ msgstr "error de protocol quan es rebien els UIDLs\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opci� --folder no est� suportada per POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "opcions del servidor despr�s de les opcions de l'usuari"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS no habilitat."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2469,7 +2487,7 @@ msgstr ""
 "fetchmail: l'opci� d'interf�cie nom�s est� suportada en Linux (sense IPv6) i "
 "FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2477,25 +2495,25 @@ msgstr ""
 "fetchmail: l'opci� de monitoraci� nom�s est� suportada en Linux (sense IPv6) "
 "i FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL no habilitat"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "final de l'entrada"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, 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:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "El fitxer %s no pot tenir permisos m�s que -rwx------ (0700).\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "El fitxer %s ha de ser propietat vostra.\n"
@@ -2519,181 +2537,182 @@ msgstr "Es reescriur� la cap�alera %s"
 msgid "Rewritten version is %s\n"
 msgstr "La versi� reescrita �s %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Reeixit"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuari restringit (hi ha algun problema amb el compte)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Nom d'usuari o contrassenya no v�lids"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Error de la de�tat"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "Component RPA 2: Error del desxifrat Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "El servei ha elegit la versi� RPA %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Repte del servei (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Informaci� hor�ria del servei %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "La mida del component RPA 2 �s incorrecta\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Llista de reialmes: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Error d'RPA a la cadena servei@reialme\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "Component RPA 4: Error de desxifrat Base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticaci� de l'usuari (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estat RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "La mida del component RPA 4 �s incorrecta\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA us rebutja: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA us rebutja, motiu desconegut\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "La mida del component RPA User Authentication �s incorrecta: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "La mida del component RPA Session key �s incorrecta: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallada en l'autenticaci� del _servei_ RPA. Nom del servidor fals?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Clau de sessi� establerta:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Autoritzaci� RPA completada\n"
 
 # �s un nom?
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Petici� de resposta\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "La petici� de resposta ha retornat %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Cap�alera diferent de 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "La mida del component �s incorrecta\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "La mida del component %d no lliga amb rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mecanisme de camp incorrecte\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "error de dec64 al car�cter %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Dades bin�ries entrants:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Dades sortints:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Cadena RPA massa llarga\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA no ha pogut obrir /dev/urandom. Aix� no impedeix\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    que entreu al sistema, per� vol dir que no\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    podeu estar segurs d'estar parlant amb el\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    servei que creieu (s�n possibles atacs\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    per repetici� per part d'un servei deshonest).\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Clau de l'usuari:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 que s'aplica al bloc de dades:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "L'MD5 resultant �s: \n"
 
 #: servport.c:53
@@ -2715,98 +2734,114 @@ msgstr "Si us plau, especifiqueu el servei com a un n�mero decimal de port.\n"
 msgid "forwarding to %s\n"
 msgstr "reenviant a %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cos del missatge retornat)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correu de %s retornat a %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'error desat encara �s %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "El servidor SMTP requereix STARTTLS, es mant� el missatge.\n"
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "No s'ha pogut obrir el fitxer BSMTP: %s\n"
 
-#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "No s'ha pogut escriure el pre�mbul del fitxer BSMTP.\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adre�a del destinatari `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adre�a de destinaci� `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adre�a coincideix; el postmaster no est� definit.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adre�a coincideix; reenviant a %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
+#: sink.c:1240
+#, fuzzy, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "No s'ha pogut reanomenar el fitxer d'ids %s a %s: %s\n"
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "no s'ha pogut executar l'MDA\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexi� %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no s'ha pogut lliurar via SMTP; recorrent a %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Ha fallat la terminaci� del missatge o el tancament del fitxer BSMTP\n"
+
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error en escriure a l'MDA: %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2814,24 +2849,20 @@ msgstr ""
 "Estrany: La funci� pclose de l'MDA a retornat %d i errno %d/%s, no es pot "
 "continuar a %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Ha fallat la terminaci� del missatge o el tancament del fitxer BSMTP\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta no-503 inesperada al final del missatge LMTP: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2868,197 +2899,197 @@ msgstr "Autenticaci� de LOGIN per ESMTP...\n"
 msgid "smtp listener protocol error\n"
 msgstr "error de protocol del receptor smtp\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: la rutina malloc ha fallat\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: la rutina socketpair ha fallat\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: la rutina fork ha fallat\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "la rutina dup2 ha fallat\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "executant %s (host %s servei %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "la rutina execvp(%s) ha fallat\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Proveu d'afegir l'opci� --service (vegeu el punt R12 de les FAQ).\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "desconegut (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Tractant de connectar a %s/%s..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "no s'ha pogut crear el socket: %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "la conexi� ha fallat.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, 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:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "connectat.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organitzaci� emissora: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Atenci�: El nom de l'organitzaci� emissora �s massa llarg (pot estar "
 "truncat).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Organitzaci� desconeguda\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nom com� de l'emissor: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Atenci�: El nom com� de l'emissor �s massa llarg (pot estar truncat).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nom com� de l'emissor desconegut\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Nom com� del servidor: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificat erroni: El CommonName del subjecte �s massa llarg!\n"
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 "Certificat erroni: El CommonName del subjecte cont� un car�cter nul, "
 "s'avorta!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nom alternatiu del subjecte: %s\n"
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 "Certificat erroni: El nom alternatiu del subjecte cont� un car�cter nul!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "El nom com� del servidor no coincideix: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nom del servidor no est� definit, no es pot verificar el certificat!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Nom com� del servidor desconegut\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "El certificat no especifica el nom del servidor!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ha fallat!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Mem�ria exhaurida!\n"
 
 # digest text
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "El buffer del sumari de text �s massa petit!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Empremta de la clau de %s: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Les empremtes digitals de %s encaixen.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Les empremtes digitals de %s no encaixen!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Error en verificar el certificat del servidor: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emissor desconegut (primers %d car�cters): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor del fitxer fora d'abast per SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "El protocol SSL especificat `%s' no �s v�lid, s'usa SSLv23.\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La verificaci� del certificat o de l'empremta s'ha om�s!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
 
@@ -3106,46 +3137,46 @@ msgstr "no s'ha trobat cap adre�a a la cap�alera Received\n"
 msgid "found Received address `%s'\n"
 msgstr "s'ha trobat l'adre�a `%s' a la cap�alera Received\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "s'ha trobat una l�nia incorrecta quan s'analitzava l'encap�alament\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "l�nia: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "cap conincid�ncia local, reenviant a %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenviament i eliminaci� omesos a causa d'errors de DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrivint cap�aleres msgblk RFC822\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "cap adre�a de destinatari coincideix amb els noms locals declarats"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'adre�a del destinatari %s no lliga amb cap nom local"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "el missatge cont� car�cters NUL"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "el receptor SMTP ha rebutjat les adreces locals de destinaci�: "
 
-#: transact.c:1440
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "error en escriure el text del missatge\n"
 
diff --git a/po/cs.po b/po/cs.po
index 16f3f9ff..a3b24745 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-22 12:59+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/po/da.po b/po/da.po
index 06d16102..3f019f13 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2003-09-02 20:21+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -53,12 +53,12 @@ msgstr "kerberosfejl %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server siger '%*s']\n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [server siger '%*s']\n"
 
 #: driver.c:335
@@ -89,68 +89,68 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
 msgstr[1] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (l�ngde -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:602
+#: driver.c:605
 #, 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:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "l�ser brev %s@%s:%d af %d"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soktetter)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 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:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " ikke slettet\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -158,37 +158,37 @@ msgid_plural ""
 msgstr[0] "afhentningsgr�nse %d n�et; %d breve 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:885
+#: driver.c:888
 #, 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:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten p� server %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten p� %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, 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:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail har gentagne tidsafbrud\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -197,7 +197,7 @@ msgstr ""
 "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%"
 "s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -212,36 +212,36 @@ msgstr ""
 "\n"
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "F�rer-server har ikke noget navn.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "kunne ikke finde kanonisk DNS-navn for %s (%s)\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:1084
+#: driver.c:1087
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -249,45 +249,45 @@ msgstr ""
 "\n"
 "Fetchmail kunne ikke naa postserveren %s:"
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "L�s optaget-fejl p� %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server optaget-fejl p� %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Godkendelsesfejl p� %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail - godkendelse mislykkedes paa %s@%s\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -309,7 +309,7 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -334,7 +334,7 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -353,180 +353,180 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Pr�ver straks igen %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl p� %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden p� %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail - godkendelse i orden paa %s@%s\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, 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:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "v�lger eller pr�ver igen brevbakke %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "v�lger eller pr�ver igen indbakken\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Pr�ver %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d %s) til %s"
 msgstr[1] "%d %s (%d %s) til %s"
 
-#: driver.c:1344
+#: driver.c:1347
 #, fuzzy
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gamle"
 msgstr[1] "gamle"
 
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s til %s"
 msgstr[1] "%d %s til %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "server l�st-"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "udefineret fejl\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%sfejl ved levering til SMTP-v�rt fra %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "v�rten er ukendt."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%sfejl ved hentning fra %s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-st�tte.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-st�tte.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke underst�ttet med %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke underst�ttet med %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke underst�ttet med %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -541,7 +541,7 @@ msgstr ""
 "Pr�v \"env QMAILINJECT= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -558,26 +558,26 @@ msgstr ""
 "Pr�v \"env NULLMAILER_FLAGS= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Du findes ikke.  Fjern dig.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: kan ikke bestemme din v�rtsmaskine!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fejlede for %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -775,13 +775,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: ingen anden fetchmail k�rer\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "starter fetchmail %s-d�mon\n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "kunne ikke �bne %s for at tilf�je logs til \n"
 
 #: fetchmail.c:607
@@ -915,40 +915,40 @@ msgstr "v�kket %s\n"
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsf�ste k�rselskontrolfilen\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, 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:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Advarsel: flere forekomster af v�rt %s i konfigurationsfil\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -956,679 +956,686 @@ msgstr ""
 "fetchmail: advarsel: DNS er ikke tilg�ngelig til at tjekke flermodtager-"
 "afhentninger fra %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "konfiguration af %s forkert, portnummer kan ikke v�re negativt\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "konfiguration af %s forkert, RPOP kr�ver en privilegeret port\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, 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:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Brug af b�de fetchall og keep som d�mon er en fejl!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, 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:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-underst�ttelse.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-underst�ttelse.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-underst�ttelse.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-underst�ttelse.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-underst�ttelse.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-underst�ttet protokol valgt.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, 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:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Pr�vemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forl�bsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forl�bsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  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:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Denne v�rt %s blive forespurgt n�r ingen v�rt er specificeret.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Denne v�rt %s blive forespurgt n�r ingen v�rt er specificeret.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilg�ngelige godkendelsesmetoder vil blive fors�gt.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Servers almennavn %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, 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:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter p� svar fra server i h�jst %d sekunder"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Hentede breve %s blive gemt p� serveren (--keep %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Hentede breve %s blive gemt p� serveren (--keep %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Inds�ttelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Inds�ttelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter pr�vning er %s (idle %s).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Tomgang efter pr�vning er %s (idle %s).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, 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:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal st�rrelse p� breve (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, 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:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  St�rrelsesadvarsler ved hver pr�vning (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal st�rrelse p� breve (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgr�nse er %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgr�nse (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, 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:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Dom�ner som der vil blive hentet post til:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilf�jet %s som BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, 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:1804
+#: fetchmail.c:1809
 #, 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:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er sl�et fra\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne v�rt.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokale navne genkendt\n"
 msgstr[1] "%d lokale navne genkendt\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "Adressering efter konvolutadressen er sl�et fra\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, 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:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nr. konvolutadresse som vil blive analyseret: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, 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:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Ingen pr�fikssletning\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderkl�rede postserveraliaser:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Lokale dom�ner:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem gr�nseflade %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen gr�nsefladekrav specificeret.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Pr�vel�kke vil overv�ge %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overv�gning af gr�nseflade specificeret.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serverforbindelser vil blive lavet vha. hj�lpeprogrammet %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hj�lpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Modtagerforbindelser vil blive lavet vha. hj�lpeprogrammet %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hj�lpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne v�rt.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilf�jet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Sporingsinformation vil ikke blive tilf�jet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: \"%s\".\n"
@@ -1645,7 +1652,7 @@ msgstr ""
 "\n"
 "Fangede SIGINT... Jeg tr�kker mig.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kunne ikke f� servicenavn for [%s]\n"
@@ -1858,44 +1865,44 @@ msgstr "Ingen gr�nseflade med navnet %s fundet"
 msgid "No IP address found for %s"
 msgstr "ingen IP-adresse fundet for %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "manglende IP-gr�nsefladeadresse\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "Ugyldig IP-gr�nsefladeadresse\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "Ugyldig IP-gr�nseflademaske\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivitet p� %s opfattet som %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "springer pr�vning af %s over, %s er nede\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "springer pr�vning af %s over, %s's IP-adresse er fravalgt\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivitet p� %s tjekket som %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "springer pr�vning af %s over, %s er inaktiv\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivitet p� %s var %d, er %d\n"
@@ -2018,319 +2025,330 @@ msgstr "Kunne ikke afkode OTP-anr�b\n"
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt l�sen: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "strengen '%s' er ikke en gyldig talstreng.\n"
 
-#: options.c:181
+#: options.c:183
 #, 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:182
+#: options.c:184
 msgid "smaller"
 msgstr "mindre"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "st�rre"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Ugyldig protokol '%s' specificeret.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ugyldig protokol '%s' specificeret.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ugyldig godkendelse '%s' specificeret.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "brug: fetchmail [tilvalg] [server ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Mulige tilvalg er:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        vis denne hj�lp\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     vis versionsinformation\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tjek om der er breve uden at hente dem\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      v�r stille\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     v�r larmende (diagnostisk uddata)\n"
 
-#: options.c:609
+#: options.c:622
 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:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    s�t ikke ikke d�monprocessen i baggrunden\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        dr�b d�monproces\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     angiv navn p� logfil\n"
 
-#: options.c:613
+#: options.c:626
 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:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   skriv ikke Received-linjer & lav v�rtssl�ring\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specificer en alternativ k�rselskontrolfil\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specificer modtager som sidste udvej\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   specifikation af kr�vet gr�nseflade\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     overv�g gr�nseflade for aktivitet\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         brug ssl-kryptering\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      privat ssl-n�glefil\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:630
+#: options.c:643
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:631
+#: options.c:644
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      -ssl          brug bestemt af ssl-protokol (ssl2/ss3/tls1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hj�lpeprogram til at �bne forbindelse\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     specificer hj�lpeprogram til at �bne smtp-forbindelse\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:641
+#: options.c:656
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
 
-#: options.c:642
+#: options.c:657
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:646
+#: options.c:661
 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:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  tilf�j sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specificer brugernavn p� server\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         hent gamle og nye breve\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve p� server\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       slet gamle breve p� server\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:657
+#: options.c:672
 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:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anf�r v�rt til SMTP-levering\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anf�rte dom�ner\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anf�r SMTP-afleveringsdom�ne at bruge\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anf�r fuldt SMTP-navn - brugernavn@dom�ne\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anf�r antispam-svarv�rdier\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  anf�r maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  anf�r maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:667
+#: options.c:682
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains hent post til anf�rte dom�ner\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     anf�r maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anf�r MDA til brug for levering\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anf�r BSMTP-uddatafil\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn p� brevbakke p� server\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forl�bsprikker selv i logfiler\n"
 
@@ -2407,15 +2425,15 @@ msgstr "protokolfejl ved hentning af UID'er\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke underst�ttet med POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "tilvalg vedr. server efter brugertilvalgene"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS er ikke sl�et til."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2423,7 +2441,7 @@ msgstr ""
 "fetchmail: gr�nsefladetilvalg (interface) er kun underst�ttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2431,25 +2449,25 @@ msgstr ""
 "fetchmail: overv�gningstilvalg (monitor) er kun underst�ttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL er ikke sl�et til"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "slut p� inddata"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Filen %s skal v�re en regul�r fil.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Filen %s m� ikke flere tilladelser end -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Filen %s skal v�re ejet af dig.\n"
@@ -2473,181 +2491,182 @@ msgstr "Skal til at omskrive %s"
 msgid "Rewritten version is %s\n"
 msgstr "Omskreven version er %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Succes"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Begr�nset bruger (noget er galt med kontoen)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Ugyldigt brugernavn eller l�sen"
 
 # Hvad i alverden er deity error?
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Gudefejl"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA symbol 2: Base64-afkodningsfejl\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service valgte RPA-version %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service anr�b (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service tidsstempel %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA symbol 2 l�ngdefejl\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Omr�deliste: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "RPA-fejl i service@omr�de-streng\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA symbol 4: Base64-afkodningsfejl\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Brugergodkendelse (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA-status: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA symbol 4 l�ngdefejl\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA afviser dig: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA afviser dig, �rsag ukendt\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA-brugergodkendelses-l�ngdefejl: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA-sessionsn�gle-l�ngdefejl: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth-fejl. Narreserver?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Sessionsn�gle etableret:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA-godkendelse komplet\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "F�r svar\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "F�r svar %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr ikke 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Symboll�ngdefejl\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Symboll�ngde %d stemmer ikke overens med rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanismefelt ukorrekt\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64-fejl ved tegn %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Indg�ende bin�re data:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Udg�ende data:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA-streng for lang\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA �bning af /dev/urandom mislykkedes. Det skulle ikke\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    forhindre dig i at logge ind, men betyder at du\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    ikke kan v�re sikker p� at du taler med den\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    service som du tror (gentagelses-\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    angreb af en u�rlig service er mulig).\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Brugeranr�b:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 bliver anvendt p� datablok:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "MD5-resultatet er:\n"
 
 #: servport.c:53
@@ -2669,121 +2688,132 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst til afvisningsbrev)\n"
 
-#: sink.c:320
+#: 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:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gemt fejlkode er stadig %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "BSMTP-fil �ben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "BSMTP-fil �ben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, 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:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "MDA-�bning mislykkedes\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, 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:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA d�de af signal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Underligt: MDA pclose returnede %d, kan ikke h�ndtere det i %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl p� EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2821,195 +2851,195 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udf�rer %s (server %s service %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr ""
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (m�ske afsk�ret).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (m�ske afsk�ret).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Servers almennavn %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "D�rligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "D�rligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "D�rligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anf�rt, kunne ikke verificere certifikat!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s n�gle-fingeraftryk: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Advarsel: servercertifikat-verificering: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de f�rste %d tegn): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert v�rdi til SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev p� en eller anden m�de sprunget "
 "over!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Fors�ger igen at l�se cygwin-sokkel\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Fors�g p� at l�se cygwin-sokkel mislykkedes!\n"
 
@@ -3056,46 +3086,46 @@ msgstr "ingen \"Received\"-adresse fundet\n"
 msgid "found Received address `%s'\n"
 msgstr "fandt \"Received\"-adresse `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "ukorrekt brevhovedlinje fundet under l�sningen af brevhovedet\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "Linje: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erkl�rede lokale navne"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "skriver brevtekst\n"
diff --git a/po/de.po b/po/de.po
index d61d70e9..bdb4958a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-26 10:14+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-02-24 01:58+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -99,51 +99,51 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d Nachricht,   %d Bytes lang, von fetchmail ausgelassen."
 msgstr[1] "  %d Nachrichten, %d Bytes lang, von fetchmail ausgelassen."
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Nachricht %s@%s:%d wird ausgelassen"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Nachricht %s@%s:%d (%d Bytes) wird ausgelassen"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (Länge -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (übergroß)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "Kopfzeilen konnten nicht geholt werden, Nachricht %s@%s:%d (%d Bytes)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "Nachricht %s@%s:%d von %d wird gelesen"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d Bytes)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d Bytes im Nachrichtenkopf)"
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d Bytes im Nachrichtenkörper)"
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -151,19 +151,19 @@ msgstr ""
 "Nachricht %s@%s:%d hatte nicht die erwartete Länge (%d tatsächlich != %d "
 "erwartet)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " aufbewahrt\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " gelöscht\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " nicht gelöscht\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -173,40 +173,40 @@ msgstr[0] ""
 msgstr[1] ""
 "fetchlimit %d erreicht; %d Nachrichten auf Server %s Konto %s verblieben\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "Zeitüberschreitung nach %d Sekunden beim Warten auf Verbindung mit Server %"
 "s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf Server %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "Zeitüberschreitung nach %d Sekunden beim Warten Antwort des SMTP/LMTP-"
 "Servers.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail erlebt wiederholte Zeitüberschreitungen"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -215,7 +215,7 @@ msgstr ""
 "Fetchmail hat mehr als %d Zeitüberschreitungen erhalten beim Versuch, Mail "
 "von %s@%s abzuholen.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -232,79 +232,79 @@ msgstr ""
 "\n"
 "Fetchmail wird diese Mailbox nicht mehr abfragen, bis Sie es erneut starten\n"
 
-#: driver.c:946
+#: driver.c:949
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "Vor-Verbindungs-Befehl wurde mit Signal %d beendet\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "Vor-Verbindungs-Befehl scheiterte mit Status %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "konnte das HESIOD-Postfach für %s nicht finden\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Erster Server hat keinen Namen.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "konnte kanonischen DNS-Namen von %s (%s) nicht finden: %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-Verbindung zu %s fehlgeschlagen"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail-Warnung: Server nicht erreichbar."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail konnte keine Mail von %s erhalten:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL-Verbindung fehlgeschlagen.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-beschäftigt-Fehler bei %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server-beschäftigt-Fehler bei %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authentifikationsfehlschlag bei %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (vormals autorisiert)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail: Authentifikation fehlgeschlagen bei %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail konnte keine Mail von %s@%s erhalten.\n"
 
 #
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -319,7 +319,7 @@ msgstr ""
 "brauchbare Fehlermeldung geliefert hat."
 
 #
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -341,7 +341,7 @@ msgstr ""
 "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet."
 
 #
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -363,178 +363,178 @@ msgstr ""
 "versuchen, eine Verbindung herzustellen. Es werden bis zur\n"
 "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Sofortige erneute Abfrage von %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unbekannter Einlogg- oder Authentifikationsfehler bei %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authentifikation OK bei %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: Fetchmail: Authentifikation OK bei %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail war in der Lage, sich bei %s@%s einzuloggen.\n"
 
 #
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Der Dienst ist wieder hergestellt.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "Ordner %s wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "Vorgabe-Ordner wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s bei %s (Ordner %s)"
 
-#: driver.c:1332 rcfile_y.y:389
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s bei %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Frage %s ab\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d Nachricht (%d %s) für %s"
 msgstr[1] "%d Nachrichten (%d %s) für %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gesehene"
 msgstr[1] "gesehene"
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d Nachricht für %s"
 msgstr[1] "%d Nachrichten für %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d Bytes).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Keine Post für %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "ungültige Nachrichtenanzahl!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "fehlende oder fehlerhafte RFC822-Kopfzeile"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "Klient/Server-Synchronisation"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "Klient/Server-Protokoll"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "Lock auf Server beschäftigt"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP-Transaktion"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS-Nachschlag"
 
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "undefinierter"
 
-#: driver.c:1567
+#: driver.c:1569
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-Fehler beim Abholen von %s@%s und Auslieferung zum SMTP-Host %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "unbekannt"
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s-Fehler beim Abholen von %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "Nach-Verbindungs-Befehl wurde mit Signal %d beendet\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Nach-Verbindungs-Befehl scheiterte mit Status %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos-V4-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos-V5-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush ist mit %s nicht unterstützt\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all ist mit %s nicht unterstützt\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit ist mit %s nicht unterstützt\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -550,7 +550,7 @@ msgstr ""
 "Versuchen Sie es mit „env QMAILINJECT= %s <Argumente> <kommen> <hier>“\n"
 "%s: Abbruch.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -567,28 +567,28 @@ msgstr ""
 "Versuchen Sie es mit „env NULLMAILER_FLAGS= %s <Argumente> <kommen> <hier>“\n"
 "%s: Abbruch.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Sie existieren nicht.  Hinfort!\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: kann Ihren Host nicht bestimmen!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fehlgeschlagen für %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 "Kann meinen eigenen Rechnernamen nicht in der Hosts-Datenbank finden und "
 "nicht qualifizieren!\n"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -940,39 +940,39 @@ msgstr "erweckt um %s\n"
 msgid "normal termination, status %d\n"
 msgstr "normale Beendigung, Status %d\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "konnte keine Zeitüberprüfung der Run-Control-Datei durchführen\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Warnung: mehrfache Erwähnung von Host %s in Konfigurationsdatei\n"
 
-#: fetchmail.c:1105
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Fehler: mehrere „defaults”-Einträge in Konfigurationsdatei\n"
 
-#: fetchmail.c:1227
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-Unterstützung ist nicht einkompiliert.\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1237
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr ""
 "KERBEROS-v4-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n"
 
-#: fetchmail.c:1240
+#: fetchmail.c:1243
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr ""
 "KERBEROS-v5-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n"
 
-#: fetchmail.c:1246
+#: fetchmail.c:1249
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n"
 
-#: fetchmail.c:1276
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -980,17 +980,17 @@ msgstr ""
 "fetchmail: Warnung: Kein DNS verfügbar, um Multidrop-Abholung von %s zu "
 "überprüfen\n"
 
-#: fetchmail.c:1287
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "Warnung: multidrop für %s erfordert envelope-Option!\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "Warnung: Fragen Sie nicht nach Hilfe, wenn alle Mail zum Postmaster geht!\n"
 
-#: fetchmail.c:1305
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -999,308 +999,308 @@ msgstr ""
 "fetchmail: %s-Konfiguration ungültig, bitte positive Portnummer für Port/"
 "Service angeben\n"
 
-#: fetchmail.c:1312
+#: fetchmail.c:1315
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: %s-Konfiguration ungültig, RPOP erfordert einen privilegierten "
 "Port\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s-Konfiguration ungültig, LMTP kann nicht den Standard-SMTP-Port benutzen\n"
 
-#: fetchmail.c:1344
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Sowohl fetchall als auch keep anzuschalten, ist im Dämon- oder Idle-Modus "
 "ein Fehler!\n"
 
-#: fetchmail.c:1369
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beendet mit Signal %d\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s fragt %s ab (Protokoll %s) um %s: Abfrage gestartet\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1503
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1510
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "nicht unterstütztes Protokoll ausgewählt.\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s fragt ab %s (Protokoll %s) um %s: Abfrage beendet\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Abfrageintervall ist %d Sekunden\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-Datei ist %s\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile ist %s\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Fortschrittsnachrichten werden via syslog geloggt\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail wird maskieren und kein „Received“ generieren\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail wird Fortschrittspunkte auch in Log-Dateien zeigen.\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail wird fehladressierte Multidrop-Nachricht an %s weiterleiten.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an „postmaster“ schicken.\n"
 
-#: fetchmail.c:1557
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an den Absender schicken.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1563
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail wird permanente Fehler als solche behandeln (Nachrichten "
 "verwerfen).\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1565
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an den Absender schicken.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Optionen für Abholen von %s@%s:\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post wird abgeholt via %s\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1579
 #, 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] "  Abfrage dieses Servers wird jedesmal erfolgen.\n"
 msgstr[1] "  Abfrage dieses Servers wird alle %d Intervalle erfolgen.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Wahrer Name des Servers ist %s.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Dieser Host wird nicht abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Dieser Host wird abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Nach Passwörtern wird nachgefragt.\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-Geheimnis = „%s“.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = „%s“.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Passwort = „%s“.\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokoll ist KPOP mit Kerberos-%s-Authentifikation"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll ist %s"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (unter Benutzung von Service %s)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (unter Benutzung des Standard-Ports)"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (erzwungene UIDL-Benutzung)"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle verfügbaren Authentifikationsmethoden werden versucht.\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Passwort-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos-V4-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos-V5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Ende-zu-Ende-Verschlüsselung wird angenommen.\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinzipal des Mailservice ist: %s\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-verschlüsselte Sitzungen ermöglicht.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-Protokoll: %s.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-Server-Zertifikat-Überprüfung ermöglicht.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL-Verzeichnis für vertrauenswürdige Zertifikate: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL-Server-CommonName: %s\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-Schlüssel-Fingerabdruck (gegen Server-Schlüssel überprüft): %s\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Auszeit für nichtantwortenden Server ist %d Sekunden"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (Voreinstellung).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Standard-Postfach ausgewählt.\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Gewählte Postfächer sind:"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle Nachrichten werden abgeholt (--all on).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Nur neue Nachrichten werden abgeholt (--all off).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1696
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Abgeholte Nachrichten werden auf dem Server belassen (--keep on).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1697
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Abgeholte Nachrichten werden nicht auf dem Server belassen (--keep off).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung gelöscht (--flush "
 "on).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1700
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--"
 "flush off).\n"
 
-#: fetchmail.c:1699
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1308,7 +1308,7 @@ msgstr ""
 "  Übergroße Nachrichten werden vor der Nachrichtenabholung gelöscht (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1316,348 +1316,348 @@ msgstr ""
 "  Übergroße Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist an (--norewrite off).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist aus (--norewrite on).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist ein (stripcr on).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist aus (stripcr off).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist ein (forcecr on).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist aus (forcecr off).\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist aus (pass8bits on).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist ein (pass8bits off).\n"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-Decodierung ist ein (mimedecode on).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-Decodierung ist aus (mimedecode off).\n"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  „Idle“ nach Abfrage ist ein (idle on).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  „Idle“ nach Abfrage ist aus (idle off).\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nichtleere Statuszeilen werden verworfen (dropstatus on)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nichtleere Statuszeilen werden beibehalten (dropstatus off)\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-Zeilen werden verworfen (dropdelivered on)\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-Zeilen werden beibehalten (dropdelivered off)\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Nachrichtengrößen-Beschränkung ist %d Bytes (--limit %d).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengröße (--limit 0).\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Nachrichtengröße-Warnungsintervall ist %d Sekunden (--warnings %d).\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Größenwarnungen bei jeder Abfragen (--warnings 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit für erhaltene Nachrichten ist %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Kein Limit für erhaltene Nachrichten (--fetchlimit 0).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Limit für die Größe erhaltener Nachrichten ist %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengröße (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Bei jeder Abfrage binäre Suche nach UIDs durchführen (--fastuidl 1).\n"
 
-#: fetchmail.c:1753
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Binäre Suche nach UIDs bei %d von %d Abfragen durchführen (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Bei jeder Abfrage lineare Suche nach UIDs durchführen (--fastuidl 0).\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit für SMTP-Stapelauslieferung ist %d.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Kein Limit für SMTP-Stapelauslieferung (--batchlimit 0).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Anzahl der Löschvorgänge zwischen tatsächlichen Säuberungen auf %d gesetzt "
 "(--expunge %d).\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Keine erzwungenen Säuberungen (--expunge 0).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domänen, für die Mail abgeholt werden wird, sind:"
 
-#: fetchmail.c:1778 fetchmail.c:1798
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (Voreinstellung)"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Nachrichten werden an %s als BSMTP angehängt\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Nachrichten werden mit „%s“ ausgeliefert.\n"
 
-#: fetchmail.c:1792
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Nachrichten werden mit %cMTP weitergeleitet an:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host-Teil der „MAIL FROM“-Zeile ist %s\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresse, die in „RCPT TO“-Zeilen, die an SMTP ausgeliefert werden, "
 "verwendet wird, ist %s\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Erkannte Spam-Abblock-Antworten des SMTP/LMTP-Servers sind:"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-Abblocken deaktiviert\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server-Verbindung wird aktiviert mit „%s“.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Kein Vor-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server-Verbindungs wird beendet mit „%s“.\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Kein Nach-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Keine lokalen Namen (localnames) für diesen Host definiert.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Multi-Drop-Modus: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Einzel-Drop-Modus: "
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokaler Name erkannt.\n"
 msgstr[1] "%d lokale Namen erkannt.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist ein.\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist aus.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1872
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand der IP.\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand des Namens.\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Umschlag-Adress-Routing ist deaktiviert\n"
 
-#: fetchmail.c:1877
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Umschlag-Header wird angenommen als: %s\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Anzahl der zu überspringenden Umschlag-Kopfzeilen: %d\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Präfix %s wird von Nutzer-ID entfernt\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Keine Präfix-Entfernung\n"
 
-#: fetchmail.c:1893
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Vordeklarierte Mailserver-Aliase:"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Lokale Domänen:"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Verbindung muss durch Schnittstelle %s geschehen.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Kein Schnittstellen-Bindung angefordert.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Abfrageschleife wird %s überwachen.\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Kein Überwachungsinterface angegeben.\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serververbindungen werden mittels Plugin %s durchgeführt (--plugin %s).\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Kein Plugin-Befehl angegeben.\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  SMTP/LMTP-Server-Verbindungen werden mittels Plugout %s durchgeführt (--"
 "plugout %s).\n"
 
-#: fetchmail.c:1928
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Kein Plugout-Befehl angegeben.\n"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Keine UIDs von diesem Host gespeichert.\n"
 
-#: fetchmail.c:1942
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gespeichert.\n"
 
-#: fetchmail.c:1950
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Abfrage-Nachverfolgungsinformationen werden dem Received-Header "
 "hinzugefügt.\n"
 
-#: fetchmail.c:1952
+#: fetchmail.c:1955
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Keine Abfrage-Nachverfolgungsinformationen werden dem Received-Header\n"
 "  hinzugefügt.\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1960
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  Nachrichten mit defekten Headern werden abgewiesen.\n"
 
-#: fetchmail.c:1960
+#: fetchmail.c:1963
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  Nachrichten mit defekten Headern werden ausgeliefert.\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Eigenschaften zum Durchleiten „%s“.\n"
@@ -1674,7 +1674,7 @@ msgstr ""
 "\n"
 "SIGINT erhalten... steige aus.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Konnte Servicenamen für [%s] nicht bestimmen\n"
@@ -1890,44 +1890,44 @@ msgstr "Kein Schnittstelle mit dem Namen %s gefunden"
 msgid "No IP address found for %s"
 msgstr "Keine IP-Adresse für %s gefunden"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "fehlende IP-Adresse\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "ungültige IP-Schnittstellen-Adresse\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "ungültige IP-Schnittstellen-Maske\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "Aktivität auf %s -festgestellt- als %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "überspringe Abfrage von %s, %s ist aus\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "überspringe Abfrage von %s, %s IP-Adresse ausgeschlossen\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "Aktivität auf %s überprüft als %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "überspringe Abfrage von %s, %s inaktiv\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "Aktivität auf %s war %d, ist %d\n"
@@ -2525,179 +2525,179 @@ msgstr "Dabei, %s umzuschreiben"
 msgid "Rewritten version is %s\n"
 msgstr "Umgeschriebene Version ist %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Erfolg"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Eingeschränkter Benutzer (irgendwas mit dem Konto ist falsch)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Ungültiges Konto oder Passwort"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Fehler der Gottheit"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA-Token 2: Fehler beim Base64-Dekodieren\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service wählte RPA-Version %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service-Herausforderung (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service-Zeitstempel %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA-Token-2-Längenfehler\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Liste der Reiche: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "RPA-Fehler in service@reich-Zeichenkette\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA-Token 4: Fehler beim Base64-Dekodieren\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Nutzer-Authentifikation (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA-Status: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA-Token-4-Längenfehler\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA lehnt Sie ab: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA lehnt Sie ab, Grund unbekannt\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA Nutzerauthentifikations-Längenfehler: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Sitzungsschlüssel-Längenfehler: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _Service_ Authentifikations-Fehlschlag. Server beschwindeln?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Sitzungsschlüssel vereinbart:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA-Authentifikation abgeschlossen\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Hole Erwiderung\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Hole Erwiderung liefert %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr nicht 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Token-Längenfehler\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Tokenlänge %d stimmt nicht mit rxlen %d überein\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mechanismus-Feld inkorrekt\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "Fehler in dec64 bei Zeichen %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Eingehende binäre Daten:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Ausgehende Daten:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA Zeichenkette zu lang\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA Kann /dev/urandom nicht öffnen. Das sollte Sie nicht\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    davon abhalten, sich einzuloggen, heißt aber, dass Sie\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    nicht sicher sein können, mit dem Service zu reden, mit\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    dem Sie zu reden denken. (Wiedergabe-Angriffe durch einen\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    unehrlichen Host sind möglich.\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Nutzerherausforderung:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 wird auf Datenblock angewandt:\n"
 
-#: rpa.c:886
+#: rpa.c:887
 msgid "MD5 result is:\n"
 msgstr "MD5-Resultat ist:\n"
 
@@ -2720,114 +2720,114 @@ msgstr "Bitte geben sie den Dienst als dezimale Portnummer an.\n"
 msgid "forwarding to %s\n"
 msgstr "weitergeleitet an %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (Körper der Umleitungs-Nachricht)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "Post von %s umgeleitet zu %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gespeicherter Fehler ist immer noch %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-Fehler: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP-Server erfordert STARTTLS, behalte Nachricht.\n"
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Öffnen der BSMTP-Datei fehlgeschlagen: %s\n"
 
-#: sink.c:787
+#: sink.c:788
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Schreiben der BSMTP-Präambel fehlgeschlagen: %s.\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-Server mag Empfängeradresse „%s“ nicht\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-Server mag Empfänger-Adresse „%s“ irgendwie nicht\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "keine Adressen stimmten überein; kein Postmaster gesetzt.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kann noch nicht einmal an %s senden!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "dabei, auszuliefern mit: %s\n"
 
-#: sink.c:1239
+#: sink.c:1240
 #, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "Kann nicht zur User-ID %ld umschalten: %s\n"
 
-#: sink.c:1251
+#: sink.c:1252
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr "Kann nicht zur ursprünglichen User-ID %ld zurückschalten: %s\n"
 
-#: sink.c:1258
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "MDA Öffnen fehlgeschlagen\n"
 
-#: sink.c:1297
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-Verbindung zu %s fehlgeschlagen\n"
 
-#: sink.c:1321
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kann SMTP/LMTP-Server nicht erreichen; falle zurück auf %s"
 
-#: sink.c:1379
+#: sink.c:1380
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 "Nachrichtenbeendigung oder Schließen der BSMTP-Datei fehlgeschlagen: %s\n"
 
-#: sink.c:1406
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fehler beim Transport an den MDA: %s\n"
 
-#: sink.c:1409
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA starb durch Signal %d\n"
 
-#: sink.c:1412
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA gab Status %d ungleich Null zurück\n"
 
-#: sink.c:1415
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2835,20 +2835,20 @@ msgstr ""
 "Merkwürdig: MDA pclose gab %d und errno %d/%s zurück, kann das nicht "
 "behandeln bei %s:%d\n"
 
-#: sink.c:1440
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-Server verweigerte Auslieferung\n"
 
-#: sink.c:1470
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-Auslieferungsfehler bei EOM\n"
 
-#: sink.c:1473
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unerwartete Nicht-503-Erwiderung auf LMTP EOM: %s\n"
 
-#: sink.c:1628
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2885,194 +2885,194 @@ msgstr "ESMTP-LOGIN-Authentifikation...\n"
 msgid "smtp listener protocol error\n"
 msgstr "Protokollfehler im SMTP-Server\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc fehlgeschlagen\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail socketpair fehlgeschlagen\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork fehlgeschlagen\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 fehlgeschlagen\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "benutze %s (Host %s, Service %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) fehlgeschlagen\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\")-Fehler: %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Geben Sie die --service-Option an (siehe auch FAQ-Punkt R12).\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "unbekannt (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Versuche, mit %s/%s zu verbinden..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "kann Socket nicht erzeugen: %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "Verbindung fehlgeschlagen.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "Verbindung zu %s:%s [%s/%s] fehlgeschlagen: %s.\n"
 
-#: socket.c:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "verbunden.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Herausgeber-Organisation: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Warnung: Herausgeber-Organisations-Name zu lang (möglicherweise "
 "beschnitten).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Unbekannte Organisation\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Herausgeber-CommonName: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Warnung: Herausgeber-CommonName zu lang (möglicherweise beschnitten).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unbekannter Herausgeber-CommonName\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Server-CommonName: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Ungültiges Zertifikat: Server-CommonName zu lang!\n"
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Ungültiges Zertifikat: Subject-CommonName enthält NUL, breche ab!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Subject Alternative Name: %s\n"
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 "Ungültiges Zertifikat: Subject-Alternative-Name enthält NUL, breche ab!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server-CommonName stimmt nicht überein: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server-Name nicht gesetzt, konnte Zertifikat nicht verifizieren!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Unbekannter Server-CommonName\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Server-Name nicht in Zertifikat spezifiziert!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() fehlgeschlagen!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Kein Speicher mehr frei!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Textpuffer für Digest zu klein!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s-Schlüssel-Fingerabdruck: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s-Fingerabdrücke stimmen überein.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s-Fingerabdrücke stimmen nicht überein!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fehler bei Server-Zertifikat-Überprüfung: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "unbekannter Herausgeber (erste %d Zeichen): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
 
@@ -3128,37 +3128,37 @@ msgstr "inkorrekte Kopfzeile gefunden beim Scannen der Kopfzeilen\n"
 msgid "line: %s"
 msgstr "Zeile: %s"
 
-#: transact.c:1136
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "keine lokalen Übereinstimmungen, Weiterleitung an %s\n"
 
-#: transact.c:1151
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "Weiterleiten und Löschen wegen DNS-Fehlern unterdrückt\n"
 
-#: transact.c:1261
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "schreibe RFC822 msgblk.headers\n"
 
-#: transact.c:1280
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "keine Empfängeradresse stimmt mit deklarierten lokalen Namen überein"
 
-#: transact.c:1287
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "Empfängeradresse %s stimmt mit keinem lokalen Namen überein"
 
-#: transact.c:1296
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "Nachricht hat eingebettete NUL-Zeichen"
 
-#: transact.c:1304
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-Server lehnte Adressen mit lokalem Empfänger ab: "
 
-#: transact.c:1443
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "Fehler beim Schreiben des Nachrichtentextes\n"
 
diff --git a/po/el.po b/po/el.po
index d84700c9..995cd6ca 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -57,12 +57,12 @@ msgstr "������ kerberos %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [� ������������ ���� '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [� ������������ ���� '%*s'] \n"
 
 #: driver.c:335
@@ -95,50 +95,50 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
 msgstr[1] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "�������� ��������� %s@%s:%d (%d octets)"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "�������� ��������� %s@%s:%d (%d octets)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (����� -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (���������� �������)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "�������� ����� ������������, ������ %s@%s:%d (%d octets)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "�������� ��������� %s@%s:%d ��� %d"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octets �������) "
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d octets �������) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -146,19 +146,19 @@ msgstr ""
 "�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d "
 "�����������)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr "������������\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr "�����������\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr "��� �����������\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -168,38 +168,38 @@ msgstr[0] ""
 msgstr[1] ""
 "�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ������� ���� %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ��� ����������� %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� �� %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "���� ������ ���� ��� %d ������� �������� ��� ��� �������� ��� �������.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "���� ������ ���� ��� %d �������.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: �� fetchmail ������ ����������������� ������ ����� ������\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -208,7 +208,7 @@ msgstr ""
 "�� fetchmail ���� ����������� ��� %d ������ ����� ������ ���� ��� ���������� "
 "��� �������� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -225,36 +225,36 @@ msgstr ""
 "�� fetchmail ��� �� ����������� ���� �� ��������������� ����� �� ��\n"
 "��������������.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "�������� ������� HESIOD ���. ������� ��� �� %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "� ���������� ������������ ��� ���� �����.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "�������� ������� ��������� �������� DNS ��� %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s ������� ��� %s �������"
 
-#: driver.c:1084
+#: driver.c:1087
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -262,45 +262,45 @@ msgstr ""
 "\n"
 "�� fetchmail �������� �� ����������� �� ���������� ������������� %s:"
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "�������� ��� fetchmail ����� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "� ������� SSL �������.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "������ lock-busy ���� %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "������ busy ���������� ���� %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "�������� �������������� ���� %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (������������ ���������������)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail �������� �������������� ��� %s@%s\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "�������� ��� fetchmail ����� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
 "������������� � ��������."
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -349,7 +349,7 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
 "������������� � ��������."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -369,179 +369,179 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� ��\n"
 "������������� � ��������."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "����������� ������ ��� %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "������� ������ ������� � �������������� ��� %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "������������� ������ ���� %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: ������������� ��� fetchmail ������ ��� %s@%s\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "�������� ������� ��� fetchmail ��� %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "� �������� ��������������.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "������� � �����-����������� ������� %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "������� � �����-����������� ��'������� �������\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ���  %s (������� %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s ���  %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "����������� ��� %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (���� %d) ��� �� %s"
 msgstr[1] "%d %s (���� %d) ��� �� %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s ��� �� %s"
 msgstr[1] "%d %s ��� �� %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "��� ������� ������������ ��� �� %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "��������� ������� ���������!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "������ � ����� ����������� RFC822"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "������������ ������/�����������"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "��������� ������/�����������"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "������������ �������� ��� �����������"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "��������� SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "��������� DNS"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "�� �������� ������\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s ������ ���� ��� �������� ��� ���������� SMTP %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "�������� �����������."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s ������ ���� ��� ���� ��� �� %s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V4 ��� ���� ��������.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V5 ��� ���� ��������.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "� ������� --flush ��� ������������� �� �� %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "� ������� --all ��� ������������� �� �� %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "� ������� --limit ��� ������������� �� �� %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -556,7 +556,7 @@ msgstr ""
 "��������� \"env QMAILINJECT= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -573,26 +573,26 @@ msgstr ""
 "��������� \"env NULLMAILER_FLAGS= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: ��� ��������.  ������ ������.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: �������� ������������� ��� ���������� ���!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "� gethostbyname ������� ��� �� %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -793,13 +793,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: ��� ������ ���� fetchmail\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "�������� ������� fetchmail %s \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "�������� ���������� ��� %s ��� �������� ���������� �� ���� \n"
 
 #: fetchmail.c:607
@@ -933,58 +933,58 @@ msgstr "����������� ��� %s\n"
 msgid "normal termination, status %d\n"
 msgstr "������������ �����������, ��������� %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "�������� �������-���� ��� ������ run-control\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: �������������: ������ ��������� DNS ��� ������ ������ ��� %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -992,310 +992,310 @@ msgid ""
 msgstr ""
 "�� ������� ��������� %s, � ������� ����� ��� ������ �� ����� ���������\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "�� ������� ��������� %s, �� RPOP ������� ����������� ����\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "�� ������� ��������� %s, �� LMTP ��� ����� ����� ��� �� ������� ����� SMTP\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "����� ����� �� fetchall ��� ���� �� �������� �� ��������� �������!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "����� �� ���� %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������ � �������\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP2.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP3.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� IMAP.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ETRN.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ODMR.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "���������� �� �������������� ����������.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������������ � �������\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "��������� �������� ����� %d ������������\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "������ ����������� ����� �� %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "������ Id ����� �� %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�� �������� ������� �� ������������ ���� ��� syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "�� fetchmail �� ���������� ��� �� �� ������� Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "�� fetchmail �� ������� ������� ������� ��� ��� ������ ����������.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "�� fetchmail �� ������� multidrop �������� �� ���� ��������� ��� %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� postmaster.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� ���������.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "�� fetchmail �� ������� multidrop �������� �� ���� ��������� ��� %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� ���������.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "�������� ��� ���� ��� %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  � ������������ �� ������ ���� ��� %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
 msgstr[1] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  �� ������� ����� ��� ����������� ����� %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  � ���� ������ �� �������.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ������� APOP = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ���� ������ = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  �� ���������� ����� KPOP �� ������������� Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  �� ���������� ����� %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (����� ��������� %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (������������� ����� ��'�������)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (������������ ������ UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ���� �� ���������� ������� �������������� �� �����������.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� �� ���� ������.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� NTLM.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� NTLM.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� OTP.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� CRAM-Md5.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� GSSAPI.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ������������� ����-��-���� ���������.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ���������� ��������� ������������� �����: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ������������ ���������������� SSL ���������.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ���������� SSL: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  ������������ ������� �������������� ����������� SSL.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ������� ������������� �������������� SSL: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "���������� �����������: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ��������� �������� SSL (�� �������� �� �� ������ �����������): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ���� ������ ���-��������� ��� �� ����������� ����� %d ������������"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (��'�������).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  �� ������� ��������������� ����������.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  ���������� ��������������� �����:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s �������� �� ������� (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s �������� �� ������� (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1303,7 +1303,7 @@ msgid ""
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1311,352 +1311,359 @@ msgid ""
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  �� ���� �������� ��������� ����� %d octets (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  �������� �������������� �������� ��������� ����� %d ������� (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ��������������� �������� �� ���� ������� (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  ������ ���� ����������-��������� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ���� ������ ��������� SMTP ����� %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  ������ ���� ������ ��������� SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  �������� ��������� ������ ���������� ������������� �� %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ������ ������������� �������� (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �������� ��� ��� ������ ������������ �� ������ �����:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (��'�������)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �� �������� �� ���������� �� %s ��� BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �� �������� �� ����������� �� \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �� �������� �� ���������� %cMTP ��:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  �� ����� ���������� ��� ������� MAIL FROM �� ����� %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  ��������� ��� �� ����� ���� ������� RCPT TO ��� ������������� ����\n"
 "   SMTP �� ����� %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  �������������� ���������� �������������� spam ������� �����:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  �������������� ��������������-spam\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������ �� \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  ������ ������ ���-��������.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������������ �� \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  ������ ������ ����-��������.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  ������ ������ ����� ��� �������� ��� ���� �� ����������.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  ��������� multi-drop: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  ��������� single-drop: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d ������ �����(��) ��������������.\n"
 msgstr[1] "%d ������ �����(��) ��������������.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ���������������� � ����������� �����������-�������\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "����������� ������� �������� �� �����: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  ������� ������������ ������� ��� �� �������������: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  �� ������� %s �� ��������� ��� �� user id\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  ������ �������� ����������\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "����������� ��������� �����������-�������������:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  ������� ��������:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  � ������� ������ �� ����� ���� ��� interface %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  ��� ��������� ���������� interface.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ������� �������� �� ������������ �� %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  ��� �������� interface ��������������.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ��������� ����������� �� ������ ���� ��� plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  ��� �������� ������ plugin.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  ��������� ������� �� ������ ���� ��� plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  ��� �������� ������ plugout.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ��� ������������� UID ��� ���� �� ����������.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID �������������.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  ����������� ���������� �������� �� ��������� ���� ����������� Received.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  ������ ���������� ���������� �������� �� �� ��������� ���� �����������\n"
 "Received.\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ��������� Pass-through \"%s\".\n"
@@ -1673,7 +1680,7 @@ msgstr ""
 "\n"
 "������� SIGINT... �����������.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "�������� ����� �������� ��������� ��� [%s]\n"
@@ -1890,44 +1897,44 @@ msgstr "�� ������� ������ interface �� ����� %s"
 msgid "No IP address found for %s"
 msgstr "��� �������� ����������� IP ��� �� %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "��� ������� ��������� IP interface\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "�� ������ ��������� IP interface\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "�� ������ IP interface mask\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "������������� ��� %s -����������- ��� %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "��������� �������� ��� %s, �� %s ����� ����\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "��������� �������� ��� %s, � ��������� IP %s ������������\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "������������� ��� %s ��������� ��� %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "��������� �������� ��� %s, %s ���������\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "������������� ��� %s ���� %d, ����� %d\n"
@@ -2050,79 +2057,84 @@ msgstr "�������� ���������������� ��������� OTP\n"
 msgid "Secret pass phrase: "
 msgstr "������� ����� ������: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "� ������������ '%s' ��� ����� ������ ������������ �������.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "���� ��� ������������� '%s' ����� %s ���� %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "���������"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "����������"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "�������� �� ������ ���������� `%s'.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "�������� �� ������ ���������� `%s'.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "�������� �� ������ ������������� `%s'.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "�����: fetchmail [��������] [������������ ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  �� �������� ����� �� ���������:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        ���������� ����� ��� ��������� ��������\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     ���������� ����������� ��������\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       ������� ��� �������� ����� ��������\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      ������� �������\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     ��������� ������� (����������� ������)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      �������� ��� �������� ��� ���� ���� n �������\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    ������� ��������� ���������� ��� �������\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ����������� ���������� �������\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ���������� �������� ������� ����������\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2130,245 +2142,251 @@ msgstr ""
 "      --syslog      ������������� ��� syslog(3) ��� �� ����������� ��������\n"
 "                    ���� ��������� ��� ��������\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   �� ������� Received & ���������� ��� ��������� "
 "����������\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ������� ������������ ������� �����������\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ������� ��������� ��� ��������� ����\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    �������������� ��� ����������� ��� ������ �� "
 "postmaster.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   ������������ ������� interface\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ������������� interface ��� �������������\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ������������ ssl ���������������� ���������\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ��������� ������ �������� ssl\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
-#: options.c:630
+#: options.c:643
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
-#: options.c:631
+#: options.c:644
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    ������������ ����������� ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      ���������� ���������� ������� ��� ������� ��������\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     ���������� ���������� ������� ��� ������� smtp ��������\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    ���������� ����������� ��������� (����� ������ man)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        ������������ ������ ��� UIDL (pop3 ����)\n"
 
-#: options.c:641
+#: options.c:656
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
 
-#: options.c:642
+#: options.c:657
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ����� �������������� (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ������ ����� ��-��������� ����������\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ������� ������������ ����������\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    ������� ��� �������� ��� �� ������ user id\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ���������� ��������� �������������\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  �������� ����������� ����������-�������� ��� Received\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ������� ��� user login ��� �����������\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         ���� ������ ��� ���� ���������\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      �������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ���������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ��� ����������� ��� ������������ �����������\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       ��� ���� ��������� ���� ��� �� ������� �������\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    �������� ������ ������������� ��������� ��������������\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ������� ���������� SMTP ��� ��������\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress ������� �������� ��������� SMTP ��� �����\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ������� ����� ��������SMTP username@domain\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   ������� ����� ���������� ����-spam\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  ������� ����� ������ ��� ��� ��������� SMTP\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  ������� ����� ����� ��� ��� ��������� �����������\n"
 
-#: options.c:667
+#: options.c:682
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ������� �������� ��������� ������ ����������\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ������� MDA ��� ����� �� ��������\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ������� ������� ������ BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ������� LMTP (RFC2033) ��� ��������\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      ���������� �������� �������������� �������\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    �������� ������� ������� ��� ��� ������ ����������\n"
@@ -2447,15 +2465,15 @@ msgstr "������ ����������� ���� �� ���� UIDL\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "� ������� --remote ��� ������������� �� �� POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "������� ����������� ���� ��� �������� ������"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "�� SDPS ��� ���� �������������."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2463,7 +2481,7 @@ msgstr ""
 "fetchmail: � ������� interface ������������� ���� ��� Linux (����� IPv6) ��� "
 "�� FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2471,25 +2489,25 @@ msgstr ""
 "fetchmail: � ������� monitor ������������� ���� ��� Linux (����� IPv6) ��� "
 "�� FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "�� SSL ��� ���� �������������"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "����� �������"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "�� ������ %s ������ �� ����� �������� ������.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "�� ������ %s �� ������ �� ���� ���� ��� -rwx--x--- (0710) ������.\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "�� ������ %s ������ �� ������ �� ����.\n"
@@ -2513,180 +2531,181 @@ msgstr "�������� �� ������������ %s"
 msgid "Rewritten version is %s\n"
 msgstr "������������ ������ ����� %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "��������"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "������������� ������� (���� ��������� �� �� ����������)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "�� ������ userid � ����� ������"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "������ ��������"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA �������� 2: ������ ���������������� Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "� �������� ������� ������ RPA %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "�������� ��������� (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "����������� ��������� %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "������ ������ RPA ��������� 2\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "����� ������������: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "������ RPA ��� ������������ service@realm\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA �������� 4: ������ ���������������� Base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "������������� ������ (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "��������� RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "������ ������ RPA �������� 4\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "�� RPA ��� ����������: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "�� RPA ��� ����������, ������� �����\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "������ ������ �������������� ������ RPA: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "������ ������ �������� RPA ���������: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth �������. �������� �����������;\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "������������� ������ ���������:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "������������� RPA ������������\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "���� ���������\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "� ���� ��������� ��������� %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr ��� 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "������ ������ ���������\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "�� ����� ��������� %d �������� �� �� rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "���������� ���������� ������\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "������ dec64 ��� ��������� %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "����������� ������� ��������:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "���������� ��������:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "������������ RPA ���������� ������\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "�� RPA ������� �� ������� �� /dev/urandom. ���� �� ������\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    �� ��� ��������� �� ������, ���� �������� ���\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    �� �������� �� ����� �������� ��� ������ ����\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    �������� ��� �������� (��������� ����������\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ��� ��� ����� �������� ����� �������.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "�������� ������:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "�� MD5 ����������� ��� ����� ��������:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "���������� MD5: \n"
 
 #: servport.c:53
@@ -2708,121 +2727,132 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "���������� ��� %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message ����)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "� ������������ ��� %s ��������� ��� %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "�� ������������ ������ ����� ����� %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP ������: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "� �������� %cMTP ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "� �������� %cMTP ���������� ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "������ ��������� ���������� ��� ���� ������� postmaster.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "�������� ��������� ����� ��� ��� %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "������ ��������� ���������� �������� ��� %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "�������� �� ����������� ��: %s\n"
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "������� MDA �������\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "������� %cMTP ��� %s �������\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "�������� �������� ������޷ ����� ��� %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "����������� ��������� � �������� ��� ������� BSMTP �������\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "���������� ��� %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "�� MDA �������� ��� ���� %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "�� MDA ��������� ��-�������� ��������� %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "��������: �� MDA pclose ��������� %d, �������� ��������� ��� %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "����������� ��������� � �������� ��� ������� BSMTP �������\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "� �������� SMTP �������� �� �������\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "������ �������� LMTP ���  EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�� ����������� �������� ���-503 ��� LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2860,196 +2890,196 @@ msgstr "������������� ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "������ ����������� ������� smtp\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: ������� �� malloc\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair �������\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: ������� �� fork\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 �������\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "��������� %s (����������� %s �������� %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) �������\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr ""
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "�������� ��������� ����� ��� ��� %s!\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "� ������� SSL �������.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s ������� ��� %s �������"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "� ������� SSL �������.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "�������� ����������\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "������� ���������� ������\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "���������� �����������: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "���� �������������: Subject ���������� ���������� ������!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "���� �������������: Subject ���������� ���������� ������!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "���� �������������: Subject ���������� ���������� ������!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "�� ��������� �������������� ����������: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "��� ���� ������� ����� �����������, �������� ����������� ��������������!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "������� ���������� ����������\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "��� ���� ������� ����� ���������� ��� �������������!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() �������!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "������ � �����!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "� ��������� ����� �������� ��������� ����� ���������� �����!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ��������� ��������: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ����������� ����������.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ����������� ��� ����������!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "�������������: ���������� �������������� ����������: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "�������� ������� (������ %d ����������): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "� ����������� ������� ����� �������� ��� �� SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "����������� ����� ���������� SSL '%s', ����� �� ������� (SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "���������� ��������������/������������ ����� �����������!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "��������������� ��������� �������� Cygwin\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������������� ��������� �������� Cygwin �������!\n"
 
@@ -3094,46 +3124,46 @@ msgstr "��� �������� ����������� Received\n"
 msgid "found Received address `%s'\n"
 msgstr "�������� ����������� Received `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "������� ����� ������ ������������ ���� ��� ������ ������������\n"
 
-#: transact.c:594
+#: transact.c:597
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "����������� ��� %s\n"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "��� �������� ������ �����, �������� ��� %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "��������� ��������� ��� ��������� ���� ��������� ��� DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "������� RFC822 msgblk.headers\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "������ ��������� ��������� �� ��������� �� �� �������� ������ �������"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "��������� ��������� %s ��� ��������� �� ������ ������ �����"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "�� ������ �������� ���������� NULs"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "� �������� SMTP �������� ��� ����������� ������� ����������: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "������� �������� ���������\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 6821619c..93d0da78 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -55,12 +55,12 @@ msgstr "kerberos error %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server says '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [server says '%*s'] \n"
 
 #: driver.c:335
@@ -91,69 +91,69 @@ 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:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "skipping message %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "skipping message %s@%s:%d (%d octets)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (length -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (oversized)"
 
-#: driver.c:602
+#: driver.c:605
 #, 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:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "reading message %s@%s:%d of %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octets)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d header octets)"
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d body octets)"
 
-#: driver.c:751
+#: driver.c:754
 #, 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"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " retained\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " flushed\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " not flushed\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -161,36 +161,36 @@ msgid_plural ""
 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:885
+#: driver.c:888
 #, 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:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "timeout after %d seconds waiting for server %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "timeout after %d seconds waiting for %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, 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:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "timeout after %d seconds.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail sees repeated timeouts"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -199,7 +199,7 @@ msgstr ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
 "s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -215,78 +215,78 @@ msgstr ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "pre-connection command failed with status %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-connection command failed with status %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "couldn't find HESIOD pobox for %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Lead server has no name.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, 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:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s connection to %s failed"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail unreachable-server warning."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail could not reach the mail server %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL connection failed.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-busy error on %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server busy error on %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authorisation failure on %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (previously authorised)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail authentication failed on %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail could not get mail from %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -300,7 +300,7 @@ msgstr ""
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
 "error message."
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -320,7 +320,7 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -340,177 +340,177 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Repoll immediately on %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unknown login or authentication error on %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authorisation OK on %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail authentication OK on %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail was able to log into %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Service has been restored.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecting or re-polling folder %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "selecting or re-polling default folder\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s at %s (folder %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polling %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, 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:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "seen"
 msgstr[1] "seen"
 
-#: driver.c:1347
+#: driver.c:1350
 #, 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:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No mail for %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "bogus message count!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "missing or bad RFC822 header"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "client/server synchronisation"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "client/server protocol"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "lock busy on server"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP transaction"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS lookup"
 
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "undefined"
 
-#: driver.c:1567
+#: driver.c:1569
 #, 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:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "unknown"
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s error while fetching from %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "post-connection command failed with status %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "post-connection command failed with status %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 support not linked.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 support not linked.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush is not supported with %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all is not supported with %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit is not supported with %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -525,7 +525,7 @@ msgstr ""
 "Try \"env QMAILINJECT= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -542,26 +542,26 @@ msgstr ""
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: You don't exist.  Go away.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: can't determine your host!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname failed for %s\n"
 
-#: env.c:170
+#: env.c:172
 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:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -769,13 +769,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "starting fetchmail %s daemon \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "could not open %s to append logs to \n"
 
 #: fetchmail.c:607
@@ -904,55 +904,55 @@ msgstr "awakened at %s\n"
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, 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:1103
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 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:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -961,299 +961,299 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, 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:1328
+#: fetchmail.c:1333
 #, 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:1342
+#: fetchmail.c:1347
 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:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, 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:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, 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:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, 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:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 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:1582
+#: fetchmail.c:1587
 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:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Server CommonName: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, 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:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 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:1692
+#: fetchmail.c:1697
 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:1694
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Old messages will be flushed before message retrieval (--flush on).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 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:1697
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1261,7 +1261,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1269,327 +1269,334 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, 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:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 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:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 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:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, 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:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, 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:1804
+#: fetchmail.c:1809
 #, 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:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, 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:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 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:1869
+#: fetchmail.c:1874
 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:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, 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:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, 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:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, 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:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 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:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -1606,7 +1613,7 @@ msgstr ""
 "\n"
 "Caught SIGINT... bailing out.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Couldn't get service name for [%s]\n"
@@ -1820,44 +1827,44 @@ msgstr "No interface found with name %s"
 msgid "No IP address found for %s"
 msgstr "No IP address found for %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "missing IP interface address\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "invalid IP interface address\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "invalid IP interface mask\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "skipping poll of %s, %s down\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "skipping poll of %s, %s IP address excluded\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "skipping poll of %s, %s inactive\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "activity on %s was %d, is %d\n"
@@ -1978,79 +1985,84 @@ msgstr "Could not decode OTP challenge\n"
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is not a valid number string.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Value of string '%s' is %s than %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "smaller"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "larger"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Invalid protocol `%s' specified.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Invalid protocol `%s' specified.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Invalid authentication `%s' specified.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [options] [server ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Options are as follows:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        display this option help\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     display version info\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       check for messages without fetching\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      work silently\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     work noisily (diagnostic output)\n"
 
-#: options.c:609
+#: options.c:622
 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:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    don't detach daemon process\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        kill daemon process\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specify logfile name\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2058,75 +2070,75 @@ msgstr ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   don't write Received & enable host spoofing\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specify alternate run control file\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specify alternate UIDs file\n"
 
-#: options.c:617
+#: options.c:630
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specify alternate PID (lock) file\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specify recipient of last resort\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirect bounces from user to postmaster.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor interface for activity\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         enable ssl encrypted session\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl private key file\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl client certificate\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath path to ssl certificates\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2134,153 +2146,159 @@ msgstr ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specify external command to open connection\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     specify external command to open smtp connection\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specify retrieval protocol (see man page)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        TCP port to connect to (obsolete, use --service)\n"
 
-#: options.c:642
+#: options.c:657
 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:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server nonresponse timeout\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelope address header\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix to remove from local user id\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   mail service principal\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  add poll-tracing information to Received header\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specify users's login on server\n"
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  retrieve old and new messages\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      delete new messages after retrieval\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        save new messages after retrieval\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       delete old messages from server\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  delete oversized messages\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   don't rewrite header addresses\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       don't fetch messages over given size\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval between warning mail notification\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    set SMTP forwarding host\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains fetch mail for specified domains\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress set SMTP delivery domain to use\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    set SMTP full name username@domain\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   set antispam response values\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  set batch limit for SMTP connections\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  set fetch limit for server connections\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit set fetch message size limit\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    do a binary search for UIDLs\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         set MDA to use for forwarding\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       set output BSMTP file\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        use LMTP (RFC2033) for delivery\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specify remote folder name\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    show progress dots even in logfiles\n"
 
@@ -2358,15 +2376,15 @@ msgstr "protocol error while fetching UIDLs\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "server option after user options"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS not enabled."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2374,7 +2392,7 @@ msgstr ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2382,25 +2400,25 @@ msgstr ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL is not enabled"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "end of input"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "File %s must be a regular file.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "File %s must be owned by you.\n"
@@ -2424,180 +2442,181 @@ msgstr "About to rewrite %s"
 msgid "Rewritten version is %s\n"
 msgstr "Rewritten version is %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Success"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Restricted user (something wrong with account)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Invalid userid or passphrase"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Deity error"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 decode error\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service chose RPA version %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service challenge (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service timestamp %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2 length error\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Realm list: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "RPA error in service@realm string\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 decode error\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "User authentication (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA status: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4 length error\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA rejects you: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA rejects you, reason unknown\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA User Authentication length error: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Session key length error: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth fail. Spoof server?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Session key established:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA authorisation complete\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Get response\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Get response return %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr not 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Token length error\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Token Length %d disagrees with rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mechanism field incorrect\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64 error at char %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Inbound binary data:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Outbound data:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA String too long\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA Failed open of /dev/urandom. This shouldn't\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    prevent you logging in, but means you\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    cannot be sure you are talking to the\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    service that you think you are (replay\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    attacks by a dishonest service are possible.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "User challenge:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 being applied to data block:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "MD5 result is: \n"
 
 #: servport.c:53
@@ -2619,122 +2638,133 @@ msgstr "Please specify the service as decimal port number.\n"
 msgid "forwarding to %s\n"
 msgstr "forwarding to %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message body)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "mail from %s bounced to %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Saved error is still %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP error: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, 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:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
+#: sink.c:1240
+#, 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:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, 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:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Message termination or close of BSMTP file failed\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2771,191 +2801,191 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp listener protocol error\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc failed\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair failed\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork failed\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 failed\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "running %s (host %s service %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) failed\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:289
+#: socket.c:284
 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:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "unknown (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Trying to connect to %s/%s..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "cannot create socket: %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "connection failed.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
 
-#: socket.c:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "connected.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Issuer Organisation: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Unknown Organisation\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Warning: Issuer CommonName too long (possibly truncated).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unknown Issuer CommonName\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Server CommonName: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server CommonName mismatch: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server name not set, could not verify certificate!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Unknown Server CommonName\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Server name not specified in certificate!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() failed!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Out of memory!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Digest text buffer too small!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s key fingerprint: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingerprints match.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingerprints do not match!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "unknown issuer (first %d characters): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "File descriptor out of range for SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certificate/fingerprint verification was somehow skipped!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin socket read retry\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin socket read retry failed!\n"
 
@@ -3002,46 +3032,46 @@ msgstr "no Received address found\n"
 msgid "found Received address `%s'\n"
 msgstr "found Received address `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "incorrect header line found while scanning headers\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "line: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no local matches, forwarding to %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "forwarding and deletion suppressed due to DNS errors\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "writing RFC822 msgblk.headers\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "no recipient addresses matched declared local names"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "recipient address %s didn't match any local name"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "message has embedded NULs"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP listener rejected local recipient addresses: "
 
-#: transact.c:1440
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "error writing message text\n"
 
diff --git a/po/es.po b/po/es.po
index 142b1097..fab140ee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.12\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\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"
@@ -58,13 +58,13 @@ msgid "kerberos error %s\n"
 msgstr "error de kerberos %s\n"
 
 #: driver.c:249
-#, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [el servidor dice «%s»] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n"
 
 #: driver.c:335
@@ -99,51 +99,51 @@ 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:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "omitiendo mensaje %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "omitiendo mensaje %s@%s:%d (%d octetos)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (longitud -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (demasiado grande)"
 
-#: driver.c:602
+#: driver.c:605
 #, 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"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "leyendo el mensaje %s@%s:%d de %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octetos)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos en la cabecera) "
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos en el cuerpo) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -151,19 +151,19 @@ msgstr ""
 "el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d "
 "esperada)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " retenido\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " eliminado\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " no eliminado\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -175,39 +175,39 @@ msgstr[1] ""
 "límite de %d mensajes alcanzado; se dejaron %d mensajes en la cuenta %s del "
 "servidor %s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, 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"
 
-#: driver.c:889
+#: driver.c:892
 #, 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:893
+#: driver.c:896
 #, 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:898
+#: driver.c:901
 #, 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"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tiempo agotado después de %d segundos.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Asunto: fetchmail ve repetidos excesos del tiempo de espera"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -216,7 +216,7 @@ msgstr ""
 "Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba "
 "obtener correo de %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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,78 +231,78 @@ msgstr ""
 "para diagnosticar el problema.\n"
 "Fetchmail no consultará esta casilla hasta que lo reinicie.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, 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:949
+#: driver.c:952
 #, 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:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no fue posible encontrar la casilla HESIOD para %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "El servidor líder no tiene nombre.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, 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:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Falló la conexión de %s a %s"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Asunto: aviso de fetchmail servidor fuera de alcance."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Error «lock-busy» en %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Error: servidor ocupado en %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallo de autorización en %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (previamente autorizado)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Asunto: la autenticación de fetchmail falló en %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail no pudo obtener correo de %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -324,7 +324,7 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio se restablezca."
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -344,7 +344,7 @@ msgstr ""
 "en cada ciclo.  No se enviarán futuras notificaciones hasta que el servicio\n"
 "se restaure."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -366,177 +366,177 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio se restablezca."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Volver a consultar inmediatamente %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, 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:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorización correcta en %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Asunto: autenticación de fetchmail correcta en %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail pudo registrarse en %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "El servicio se ha reestablecido.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionando o volviendo a consultar la carpeta %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionando o volviendo a consultar la carpeta predeterminada\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Consultando %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, 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:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "visto"
 msgstr[1] "vistos"
 
-#: driver.c:1347
+#: driver.c:1350
 #, 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:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "zócalo"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "el encabezado RFC822 falta o es incorrecto"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "sincronización cliente/servidor"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "bloqueo ocupado en el servidor"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "Transacción SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "búsqueda en DNS"
 
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "indefinido"
 
-#: driver.c:1567
+#: driver.c:1569
 #, 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:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "desconocida"
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "error %s al recibir de %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, 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:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "la orden de postconexión falló con estado %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Soporte de Kerberos V4 no incluido.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Soporte de Kerberos V5 no incluido.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opción --flush no permitida con %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opción --all no permitida con %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opción --limit no permitida con %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -551,7 +551,7 @@ msgstr ""
 "Pruebe “env QMAILINJECT= %s SUS ARGUMENTOS AQUÍ”\n"
 "%s: Abortar.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -568,28 +568,28 @@ msgstr ""
 "Prueba “env NULLMAILER_FLAGS= %s SUS ARGUMENTOS AQUÍ”\n"
 "%s: Abortar.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: No existe. Fuera.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: ¡no se puede determinar su anfitrión!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falló para %s\n"
 
-#: env.c:170
+#: env.c:172
 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"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -801,13 +801,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: No se puede separar en segundo plano. Abortando.\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "no fue posible abrir %s para anexarle mensajes de registro\n"
 
 #: fetchmail.c:607
@@ -942,39 +942,39 @@ msgstr "despertado en %s\n"
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 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:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Aviso: múltiples menciones del anfitrión %s en el archivo de configuración\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 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:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no se compiló.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 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:1238
+#: fetchmail.c:1243
 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:1244
+#: fetchmail.c:1249
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "El soporte de  GSSAPI está configurado pero no compilado\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -982,18 +982,18 @@ msgstr ""
 "fetchmail: aviso: no hay DNS disponible para verificar recepciones "
 "«multidrop» de %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "aviso: ¡«multidrop» para %s requiere la opción «envelope»!\n"
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "aviso: ¡no pida soporte técnico si todo el correo está dirigido al "
 "postmaster!\n"
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1002,314 +1002,314 @@ 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:1310
+#: fetchmail.c:1315
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: la configuración %s no es válida, RPOP requiere un puerto "
 "privilegiado\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuración de %s inválida, LMTP no puede usar el puerto SMTP "
 "predeterminado\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Ambos, «fetchall» y «keep on» en el demonio o en el modo de espera, es un "
 "error\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, 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:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "se seleccionó un protocolo no permitido.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, 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:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso se registrarán vía syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará «Received»\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes «multidrop» mal direccionados a %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al «postmaster».\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, 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:1560
+#: fetchmail.c:1565
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail tratará los errores permanentes como temporales (mantener "
 "mensajes).\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo se recibirá vía %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, 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:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Este anfitrión no será consultado cuando no se especifica un anfitrión.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Este anfitrión será consultado cuando no se especifique ningún anfitrión.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Se pedirá la contraseña.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = «%s».\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identidad RPOP = «%s».\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contraseña = «%s».\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (usando puerto predeterminado)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con contraseña.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación MSN.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones cifradas con SSL activadas.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "«CommonName» del servidor SSL: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Huella digital de la clave SSL (comprobada con la clave del servidor): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (predeterminado).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla predeterminada está seleccionada.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes se recibirán (--all on).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 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:1692
+#: fetchmail.c:1697
 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:1694
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush "
 "on).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 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:1697
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1317,7 +1317,7 @@ msgstr ""
 "  Los mensajes demasiado grandes se eliminarán antes de recibir nuevos (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1325,353 +1325,360 @@ msgstr ""
 "  Los mensajes demasiado garndes no se eliminarán antes de recibir nuevos (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro se eliminarán (stripcr on).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se eliminarán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se añadirán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se añadirán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 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:1710
+#: fetchmail.c:1715
 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:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Las líneas «Status» que no estén vacías se descartarán (dropstatus on).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Las líneas «Status» que no estén vacías se conservarán (dropstatus off).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas «Delivered-To» se descartarán (dropdelivered on).\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas «Delivered-To» se conservarán (dropdelivered off).\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, 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:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán cada %d segundos (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán en cada consulta (--"
 "warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  El límite de tamaño para los mensajes recibidos es de %d (--fetchsizelimit "
 "%d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UID durante cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UID durante %d de cada %d consultas (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Utilizar búsqueda lineal de UID durante cada consulta (--fastuidl 0).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensajes por lote SMTP es %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  El intervalo de borrado entre eliminaciones está forzado a %d (--expunge %"
 "d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (predeterminado)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, 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:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes se entregarán con «%s».\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes se reenviarán con %cMTP a:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, 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:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  La dirección a poner en las líneas RCPT TO enviadas al STMP será %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de basura son:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de  basura está desactivado\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, 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:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  No hay orden de preconexión.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, 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:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  No hay orden de postconexión.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para este anfitrión.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Modo «multi-drop»: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Modo «single-drop»: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, 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:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones «multidrop».\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 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:1869
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Se comparará el nombre de los alias del servidor contra las direcciones "
 "«multidrop».\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El enrutado por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, 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:1878
+#: fetchmail.c:1883
 #, 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:1881
+#: fetchmail.c:1886
 #, 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:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  No se eliminará ningún prefijo\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, 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:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificaron requerimientos de la interfaz.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta se monitorizará %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitorización.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Las conexiones al servidor se llevarán a cabo a través del complemento %s "
 "(--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó una orden para el complemento.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Las conexiones al cliente se llevarán a cabo a través del «plugout» %s (--"
 "plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó una orden para el «plugout».\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UID guardadas de este anfitrión.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID guardadas.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 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:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, 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:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso «%s».\n"
@@ -1688,7 +1695,7 @@ msgstr ""
 "\n"
 "SIGINT recibido... abortando.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "No fue posible obtener el nombre de servicio para [%s]\n"
@@ -1905,44 +1912,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:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "falta la dirección IP de la interfaz\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "la dirección IP de la interfaz no es válida\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "la máscara IP de la interfaz no es válida\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "actividad en %s -vista- como %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "omitiendo consulta %s, %s desactivada\n"
 
-#: interface.c:684
+#: interface.c:685
 #, 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:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "actividad en %s verificada como %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "no se consulta %s, %s inactiva\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "la actividad en %s era %d, es %d\n"
@@ -2063,82 +2070,87 @@ msgstr "No fue posible decodificar el desafío OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, 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:181
+#: options.c:183
 #, 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:182
+#: options.c:184
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "mayor"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "El protocolo «%s» especificado no es válido.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocolo «%s» especificado no es válido.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Se especificó una autenticación «%s» inválida.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opciones] [servidor ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Las opciones son las siguientes:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        muestra esta ayuda\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     muestra información sobre la versión\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       verifica si hay mensajes sin recibir\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabajar silenciosamente\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabajar ruidosamente (información de diagnóstico)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      correr en segundo plano y activarse una vez cada n "
 "segundos\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    no lanzar un proceso en segundo plano\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        terminar el proceso en segundo plano\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especificar el nombre del archivo de registro\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2146,41 +2158,41 @@ msgstr ""
 "      --syslog      usar syslog(3) para la mayoría de los mensajes cuando se "
 "ejecuta en segundo plano\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   no escribir «Received» y activar falsificación del "
 "anfitrión\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especificar archivo de control de ejecución alterno\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      especificar archivo de UID alterno\n"
 
-#: options.c:617
+#: options.c:630
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     especificar archivo PID alternativo (bloqueado)\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especificar el recipiente de último recurso\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirigir rebotes del usuario al postmaster.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail borra permanentemente los mensajes que no se "
 "pueden entregar.\n"
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2188,44 +2200,44 @@ msgstr ""
 "      --softbounce  mantiene permanentemente los mensajes que no se pueden "
 "entregar en el servidor (predeterminado).\n"
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificación de interfaz requerida\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar interfaz por actividad\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesión cifrada con ssl\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      archivo de clave privada ssl\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl del cliente\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcert     comprobación estricta del certificado del servidor "
 "(recomendado)\n"
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ubicación de los certificados ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  esperar este «CommonName» del servidor "
 "(desaconsejado)\n"
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2233,172 +2245,178 @@ msgstr ""
 "      --sslfingerprint huella digital que debe coincidir con la del "
 "certificado del servidor.\n"
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    forzar protocolo (SSL2/SSL3/TLS1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especificar la orden externa para abrir una conexión\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especificar la orden externa para abrir una conexión "
 "smtp\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 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:640
+#: options.c:655
 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:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        Puerto TCP a conectar (obsoleto, use --service)\n"
 
-#: options.c:642
+#: options.c:657
 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:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        tipo de autenticación (contraseña/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tiempo de espera por respuesta del servidor\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envolver encabezados de dirección\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefijo a eliminar de la identificación local del "
 "usuario\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal del servicio de correo\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  añadir información sobre traceado de consultas al "
 "encabezado «Received»\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    especificar el acceso del usuario en el servidor\n"
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  recuperar antiguos y nuevos mensajes\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borrar nuevos mensajes después de recibidos\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        guardar nuevos mensajes después de recibidos\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  borrar mensajes demasiado grandes\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescribir las direcciones del encabezado\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recibir mensajes más grandes de lo especificado\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre las notificaciones de correo\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configurar el anfitrión de reenvío de SMTP\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:662
+#: options.c:677
 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:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    usar nombreusuario@dominio como nombre completo para "
 "SMTP\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurar los valores de respuesta anti basura\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  configurar el límite de mensajes para las conexiones "
 "SMTP\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configurar el límite de mensajes para las conexiones al "
 "servidor\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit configurar el límite de tamaño de mensaje\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    utilizar búsqueda binaria para los UIDL\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     configurar la cantidad de mensajes borrados entre "
 "eliminaciones\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         configurar el MDA para que reenvíe\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configurar archivo de salida de BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para entrega\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especificar nombre de la carpeta remota\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
@@ -2480,15 +2498,15 @@ msgstr "error de protocolo durante la recepción de UIDL\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está permitida con POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "opciones de servidor tras opciones de usuario"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS no activado."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2496,7 +2514,7 @@ msgstr ""
 "fetchmail: la opción «interface» solo está permitida bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2504,25 +2522,25 @@ msgstr ""
 "fetchmail: la opción «monitor» sólo está permitida bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL no está activado"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "fin de entrada"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El archivo %s debe ser de tipo normal.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, 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:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Usted debe ser el propietario del archivo %s.\n"
@@ -2546,180 +2564,181 @@ msgstr "A punto de reescribir %s"
 msgid "Rewritten version is %s\n"
 msgstr "La versión reescrita es %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Éxito"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuario restringido (hay un problema con la cuenta)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Nombre de usuario o contraseña inválidos"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Error en deidad"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "Componente RPA 2: error de decodificación Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "El servicio eligió RPA versión %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Desafío del servicio (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Sello de tiempo del servicio %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "Error de longitud en el componente RPA 2\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de reinos: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Error de RPA en la cadena servicio@reino\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "Componente RPA 4: error de decodificación\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticación de usuario (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estado RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "Error de longitud en el componente RPA 4\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA lo rechaza: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA lo rechaza, razón desconocida\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, 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:302
+#: rpa.c:303
 #, 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:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallo en la autenticación del _servicio_ RPA. ¿Servidor falso?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Clave de sesión establecida:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Autorización RPA completa\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Obtener respuesta\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Obtener respuesta %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Encabezado no es 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Error de longitud en el componente\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, 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:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Campo del mecanismo incorrecto\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "Error de dec64 en el carácter %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Datos binarios entrantes:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Datos salientes:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Cadena RPA muy larga\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA falló abriendo /dev/urandom. Esto no debería\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    prevenir su ingreso, pero significa que\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    no se puede estar seguro de estar hablando\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    al servicio que usted cree (son posibles\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ataques de respuesta por un servicio deshonesto).\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Desafío de usuario:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "Aplicando MD5 al bloque de datos:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "El resultado de MD5 es: \n"
 
 #: servport.c:53
@@ -2741,122 +2760,134 @@ msgstr "Especifique el servicio como un número de puerto decimal.\n"
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "El error guardado es aún %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "El servidor SMTP necesita STARTTLS, manteniendo mensaje.\n"
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Fallo en la apertura del archivo de BSMTP: %s\n"
 
-#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Fallo en la escritura del preámbulo\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, 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:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "Al servidor %cMTP realmente no le gusta la dirección de recipiente «%s»\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
+#: sink.c:1240
+#, 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:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, 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:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error escribiendo a MDA: %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA murió por la señal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA devolvió un estado %d distinto de cero\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "Extraño: MDA pclose devolvió %d y errno %d/%s, no se puede manejar en %s:%d\n"
 
-#: sink.c:1406
-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:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, 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:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2893,201 +2924,201 @@ msgstr "Autenticación ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "error de protocolo en el servidor smtp\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc falló\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: par de sockets falló\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: falló la bifurcación\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 falló\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "ejecutando %s (anfitrión %s servicio %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) falló\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(«%s»,«%s») error: %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 "Intentando añadir la opción --service (vea también FAQ elemento R12).\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "desconocido (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Intentando conectar a %s/%s..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "no se puede crear el zócalo %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "Fallo en la conexión.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, 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:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "conectado.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organización emisora: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Aviso: el nombre de la organización emisora es muy largo (posiblemente "
 "truncado).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Organización desconocida\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "«CommonName» del emisor: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Aviso: el «CommonName» del emisor es muy largo (posiblemente truncado).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "«CommonName» del emisor desconocido\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "«CommonName» del servidor: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificado incorrecto: el «CommonName» del asunto es muy largo.\n"
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 "Certificado incorrecto: el «CommonName» del asunto contiene NUL, abortando.\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "Nombre alternativo del asunto: %s\n"
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 "Certificado incorrecto: El nombre alternativo del asunto contiene NUL, "
 "abortando.\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "«CommonName» del servidor no coincide: %s = %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nombre de servidor no fue configurado, ¡no fue posible verificar el "
 "certificado!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "«CommonName» del servidor desconocido\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "¡No se especifica el nombre del servidor en el certificado!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falló\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "¡No hay memoria!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "¡El espacio para el resumen de texto es muy pequeño!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Huella digital de la clave %s: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Las huellas digitales de %s coinciden.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "¡Las huellas digitales de %s no coinciden!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 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:943
+#: socket.c:938
 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:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del zócalo cygwin\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del zócalo cygwin\n"
 
@@ -3134,48 +3165,48 @@ msgstr "no se encontró la dirección de «Received»\n"
 msgid "found Received address `%s'\n"
 msgstr "se encontró la dirección de «Received» «%s»\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 "encabezado incorrecto encontrado durante la exploración de encabezados\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "línea: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no hay coincidencias locales, reenviado a %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribiendo encabezados RFC822\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "ninguna dirección de destino coincidió con los nombres locales declarados"
 
-#: transact.c:1284
+#: transact.c:1288
 #, 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:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "el mensaje contiene NULs"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
 
-#: transact.c:1440
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "error al escribir el texto del mensaje\n"
 
diff --git a/po/fi.po b/po/fi.po
index 3cfa6c20..1d1793ef 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2007-11-06 01:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -55,12 +55,12 @@ msgstr "kerberos-virhe %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [palvelin sanoo ”%*s”] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [palvelin sanoo ”%*s”] \n"
 
 #: driver.c:335
@@ -95,70 +95,70 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ohitetaan viesti %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ohitetaan viesti %s@%s:%d (%d oktettia)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (pituus -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (ylisuuri)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "otsakkeiden noutaminen ei onnistunut viestille %s@%s:%d (%d oktettia)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "luetaan viesti %s@%s:%d / %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktettia)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d otsakeoktettia) "
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d runko-oktettia) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " säilytettiin\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " poistettiin\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " ei poistettu\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -170,39 +170,39 @@ msgstr[1] ""
 "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
 "%2$d viestiä\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "aikakatkaistu %d sekunnissa odotettaessa yhdistämistä palvelimelle %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa palvelinta %s.\n"
 
 # Odotettaessa mitä, häh?
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, fuzzy, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa kuuntelijan vastausta.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "aikakatkaistu %d sekunnissa.\n"
 
 # Subject: on todennäköisesti postin otsakekentän nimi, jota ei saa kääntää.
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail havaitsee toistuvia aikakatkaisuja"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -211,7 +211,7 @@ msgstr ""
 "Fetchmail havaitsi yli %d aikakatkaisua yrittäessään noutaa postia "
 "tunnukselta %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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,79 +221,79 @@ msgid ""
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
 
-#: driver.c:946
+#: driver.c:949
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr ""
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr ""
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr ""
 
-#: driver.c:1021
+#: driver.c:1024
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr ""
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetchmailin varoitus tavoittamattomissa olevasta palvelimesta."
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ei pystynyt noutamaan postia paikasta %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr ""
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmailin todennus epäonnistui käyttäjälle %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ei pystynyt noutamaan postia paikasta %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -302,7 +302,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -314,7 +314,7 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -326,60 +326,60 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr ""
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmailin todennus onnistui käyttäjälle %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr ""
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s palvelimella %s (kansio %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s palvelimella %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Noudetaan koneelta %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -387,119 +387,119 @@ msgstr[0] "%d viesti (%d %s) käyttäjälle %s"
 msgstr[1] "%d viestiä (%d %s) käyttäjälle %s"
 
 # Tämä on edellisen kohdan ensimmäinen %s.
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "nähty"
 msgstr[1] "nähtyä"
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d viesti käyttäjälle %s"
 msgstr[1] "%d viestiä käyttäjälle %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktettia).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ei postia käyttäjälle %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr ""
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "puuttuva tai virheellinen RFC822-otsake"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr ""
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr ""
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr ""
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr ""
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr ""
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "määrittelemätön virhe\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "konenimi on tuntematon."
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr ""
 
-#: driver.c:1583
+#: driver.c:1585
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr ""
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr ""
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -509,7 +509,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -520,26 +520,26 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Teitä ei ole olemassa. Menkää pois.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr ""
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr ""
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -738,12 +738,12 @@ msgstr ""
 
 #: fetchmail.c:587
 #, c-format
-msgid "starting fetchmail %s daemon \n"
+msgid "starting fetchmail %s daemon\n"
 msgstr ""
 
 #: fetchmail.c:603 fetchmail.c:605
 #, c-format
-msgid "could not open %s to append logs to \n"
+msgid "could not open %s to append logs to\n"
 msgstr ""
 
 #: fetchmail.c:607
@@ -872,688 +872,694 @@ msgstr ""
 msgid "normal termination, status %d\n"
 msgstr ""
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr ""
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr ""
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr ""
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr ""
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Noutoväli on %d sekuntia\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Lokitiedosto on %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr ""
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Edistymisviestit tallennetaan lokiin syslogitse\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr ""
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr ""
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Palvelimen todellinen nimi on %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Salasanaa kysytään.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr ""
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr ""
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (käytetään palvelua %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (käytetään oletusporttia)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr ""
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Vaaditaan todennus.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr ""
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokolla: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr ""
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (oletus).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Oletuspostilaatikko valittu.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Valitut postilaatikot ovat:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr ""
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr ""
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr ""
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr ""
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr ""
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr ""
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Viestin kokoraja on %d oktettia (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ei viestin kokorajaa (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr ""
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr ""
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (oletus)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr ""
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr ""
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr ""
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr ""
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d paikallista nimeä tunnistettu.\n"
 msgstr[1] "%d paikallista nimeä tunnistettu.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr ""
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr ""
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr ""
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr ""
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr ""
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr ""
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr ""
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr ""
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr ""
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr ""
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr ""
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID:tä tallennettu.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr ""
@@ -1568,7 +1574,7 @@ msgid ""
 "Caught SIGINT... bailing out.\n"
 msgstr ""
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr ""
@@ -1782,44 +1788,44 @@ msgstr ""
 msgid "No IP address found for %s"
 msgstr "Nimelle %s ei löydy IP-osoitetta"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr ""
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr ""
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr ""
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr ""
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr ""
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr ""
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr ""
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr ""
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr ""
@@ -1941,309 +1947,320 @@ msgstr ""
 msgid "Secret pass phrase: "
 msgstr ""
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr ""
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Merkkijonon \"%s\" arvo on %s kuin %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "pienempi"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "suurempi"
 
-#: options.c:349
+#: options.c:321
+#, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr ""
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr ""
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr ""
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "käyttö:  fetchmail [valitsimet] [palvelin ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Valitsimet ovat seuraavat:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        näytä tämä ohje\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     näytä versiotiedot\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tarkasta viestit hakematta niitä\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      toimi hiljaisesti\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     toimi äänekkäästi (tulostetaan lisätietoa)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      aja palvelimena kerran n sekunnissa\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        tapa palvelinprosessi\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ota käyttöön SSL-salattu istunto\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr ""
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:642
+#: options.c:657
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        todennustapa (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 #, fuzzy
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     "
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    määrittele käyttäjän tunnus palvelimella\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         nouda sekä uudet että vanhat viestit\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      poista uudet viestit noudon jälkeen\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        säilytä uudet viestit noudon jälkeen\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   älä uudelleenkirjoita otsakkeiden osoitteita\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       älä nouda annetun koon ylittäviä viestejä\n"
 
-#: options.c:658
+#: options.c:673
 #, fuzzy
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    "
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
@@ -2319,45 +2336,45 @@ msgstr ""
 msgid "Option --folder is not supported with POP3\n"
 msgstr ""
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL ei ole käytössä"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "syötteen loppu"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Tiedoston %s on oltava tavallinen tiedosto.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Tiedostolla %s ei saa olla enempää kuin -rwx--x--- (0710) -oikeudet.\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2381,180 +2398,181 @@ msgstr ""
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr ""
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr ""
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr ""
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr ""
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr ""
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr ""
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr ""
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr ""
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr ""
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr ""
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr ""
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr ""
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr ""
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr ""
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr ""
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr ""
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr ""
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr ""
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr ""
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr ""
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr ""
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr ""
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr ""
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr ""
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr ""
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr ""
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr ""
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr ""
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr ""
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr ""
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr ""
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr ""
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr ""
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr ""
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr ""
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "MD5-tulos on: \n"
 
 #: servport.c:53
@@ -2576,120 +2594,132 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr ""
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr ""
 
-#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr ""
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1375
+#: sink.c:1380
+#, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr ""
+
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr ""
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr ""
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2724,191 +2754,191 @@ msgstr ""
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr ""
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr ""
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: haarauttaminen epäonnistui\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 epäonnistui\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) epäonnistui\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr ""
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr ""
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -2953,46 +2983,46 @@ msgstr ""
 msgid "found Received address `%s'\n"
 msgstr ""
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "rivi: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr ""
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr ""
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr ""
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr ""
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr ""
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "kirjoitetaan viestin tekstiä\n"
diff --git a/po/fr.po b/po/fr.po
index 6bac1dcc..e2953521 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-22 07:24+0100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 7919b5f6..02b36e1c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.3.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2000-04-10 01:26+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -60,12 +60,12 @@ msgstr "erro %s de kerberos\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [o servidor di '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [o servidor di '%*s'] \n"
 
 #: driver.c:335
@@ -96,69 +96,69 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
 msgstr[1] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#: driver.c:565
+#: driver.c:568
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:584
+#: driver.c:587
 #, fuzzy
 msgid " (oversized)"
 msgstr " (exceso de tama�o, %d octetos)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:619
+#: driver.c:622
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensaxe %d de %d"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d octetos%s)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos de corpo) "
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos de corpo) "
 
-#: driver.c:751
+#: driver.c:754
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "a mensaxe %d non ti�a o tama�o agardado (%d real != %d agardado)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " mantida\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " non eliminada\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -166,38 +166,38 @@ msgid_plural ""
 msgstr[0] "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 msgstr[1] "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a conexi�n � servidor %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando � servidor %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "tempo esgotado tras %d segundos agardando a resposta do servidor receptor.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado tras %d segundos.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail atopa repetidas expiraci�ns do tempo de espera\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -206,7 +206,7 @@ msgstr ""
 "Fetchmail atopou m�is de %d expiraci�ns do tempo de espera tentando colle-lo "
 "correo de %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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,79 +222,79 @@ msgstr ""
 "\n"
 "Fetchmail non recibir� de novo correo desta caixa ata que o reinicie.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "o programa de pre-conexi�n fallou con estado %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "o programa de pre-conexi�n fallou con estado %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "non se puido atopar a caixa postal HESIOD para %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "O servidor principal non ten nome.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "non se puido atopar o nome DNS can�nico de %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallou a autorizaci�n en %s@%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fallou a autenticaci�n do fetchmail\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -303,7 +303,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -321,7 +321,7 @@ msgstr ""
 "non pode distinguilas porque non env�an mensaxes de erro �tiles cando\n"
 "hai un fallo de login.\n"
 
-#: driver.c:1224
+#: driver.c:1227
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -339,180 +339,180 @@ msgstr ""
 "non pode distinguilas porque non env�an mensaxes de erro �tiles cando\n"
 "hai un fallo de login.\n"
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desco�ecido de login ou autenticaci�n en %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Fallou a autorizaci�n en %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fallou a autenticaci�n do fetchmail\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "O servicio escolleu a versi�n %d.%d do RPA\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta por defecto\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Recibindo de %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d lidas) para %s"
 msgstr[1] "%d %s (%d lidas) para %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s para %s"
 msgstr[1] "%d %s para %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Non hai correo para %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "a cabeceira RFC822 falta ou � err�nea"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "sincronizaci�n cliente/servidor"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "bloqueo activado no servidor"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "Transacci�n SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "erro indefinido\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s � baixar correo de %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "a m�quina � desco�ecida."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s � baixar correo de %s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "o comando de pos-conexi�n fallou con estado %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "o comando de pos-conexi�n fallou con estado %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Non est� enlazado con soporte Kerberos V4.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Non est� enlazado con soporte Kerberos V5.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "A opci�n --flush non est� soportada con %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "A opci�n --all non est� soportada con %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "A opci�n --limit non est� soportada con %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -522,7 +522,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -533,26 +533,26 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Vostede non existe.  Marche.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: non se pode determina-la s�a m�quina"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "o gethostbyname fallou para %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -756,13 +756,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: non hai outro fetchmail a se executar\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "iniciando o demonio de fetchmail %s \n"
 
 #: fetchmail.c:603 fetchmail.c:605
 #, c-format
-msgid "could not open %s to append logs to \n"
+msgid "could not open %s to append logs to\n"
 msgstr ""
 
 #: fetchmail.c:607
@@ -910,41 +910,41 @@ msgstr "espertado en %s\n"
 msgid "normal termination, status %d\n"
 msgstr "finalizaci�n normal, estado %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "non se puido comprobar a data do ficheiro de control de execuci�n\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Aviso: m�ltiples menci�ns da m�quina %s no ficheiro de configuraci�n\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Aviso: m�ltiples menci�ns da m�quina %s no ficheiro de configuraci�n\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -952,16 +952,16 @@ msgstr ""
 "fetchmail: aviso: ning�n DNS dispo�ible para comprobar recepci�ns con "
 "m�ltiples entregas de %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -969,310 +969,310 @@ msgid ""
 msgstr ""
 "configuraci�n de %s non v�lida, o n�mero de porto non pode ser negativo\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuraci�n de %s non v�lida, RPOP require un porto privilexiado\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuraci�n de %s non v�lida, LMTP non pode usar o porto por defecto SMTP\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "�Baixar e manter t�dalas mensaxes en modo demonio � un erro!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con sinal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "non est� configurado o soporte POP3.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "non est� configurado o soporte IMAP.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "non est� configurado o soporte ETRN.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "o protocolo escollido non est� soportado.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "O intervalo entre petici�ns � de %d segundos\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "O ficheiro de rexistro � %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "O ficheiro de identificaci�ns � %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "As mensaxes de progreso rexistraranse polo syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascararase e non xerar� unha li�a Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviar� mensaxes multidrop con enderezo incorrecto a %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail enviar� as mensaxes de erro � postmaster.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail enviar� as mensaxes de erro � autor.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail reenviar� mensaxes multidrop con enderezo incorrecto a %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail enviar� as mensaxes de erro � autor.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opci�ns para recibir de %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  O correo recibirase v�a %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Recibirase deste servidor cada %d intervalos.\n"
 msgstr[1] "  Recibirase deste servidor cada %d intervalos.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O nome real do servidor � %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina%sser� interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina%sser� interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Pedirase a contrasinal.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificaci�n RPOP = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasinal = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  O protocolo � KPOP con autenticaci�n Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  O protocolo � %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando o servicio %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (usando o porto por defecto)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (forzando o uso de UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Autenticaci�n NTLM soportada\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autenticaci�n NTLM soportada\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autenticaci�n CRAM-MD5 soportada\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Activada a preautenticaci�n Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Activada a preautenticaci�n Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  As�mese encriptado dun punto � outro.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  O protocolo � %s"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  O tempo de espera de resposta do servidor � %d segundos"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correo por defecto escollida.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correo escollidas son:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  As mensaxes recibidas%sser�n mantidas no servidor (--keep %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As mensaxes recibidas%sser�n mantidas no servidor (--keep %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
@@ -1280,7 +1280,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
@@ -1289,7 +1289,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1299,7 +1299,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1311,7 +1311,7 @@ msgstr ""
 # A traducci�n est� feita cos : porque � o �nico xeito de que as
 # palabras "activado" e "desactivado" sirvan para as sentencias
 # masculinas e femininas, sen que quede moi mal
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
@@ -1319,243 +1319,243 @@ msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 # A traducci�n est� feita cos : porque � o �nico xeito de que as
 # palabras "activado" e "desactivado" sirvan para as sentencias
 # masculinas e femininas, sen que quede moi mal
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Eliminaci�n do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Eliminaci�n do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpretaci�n de Content-Transfer-Encoding: %s (pass8bits %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpretaci�n de Content-Transfer-Encoding: %s (pass8bits %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Decodificaci�n MIME: %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Decodificaci�n MIME: %s (mimedecode %s).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inactividade despois da recepci�n: %s (idle %s).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Inactividade despois da recepci�n: %s (idle %s).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O l�mite de tama�o de mensaxe � %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Sen l�mite de tama�o de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de avisos do tama�o das mensaxes � %d segundos (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tama�o de mensaxe en cada recepci�n (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O l�mite de mensaxes recibidas � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Sen l�mite de mensaxes recibidas (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O l�mite de mensaxes recibidas � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Sen l�mite de tama�o de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O l�mite de lote de mensaxes SMTP � %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Sen l�mite de lote de mensaxes SMTP (--bathlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  O intervalo de borrado entre eliminaci�ns forzado a %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Sen eliminaci�ns forzadas (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensaxes ser�n engadidas a %s como BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensaxes ser�n entregadas con \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensaxes ser�n redirixiadas a trav�s de %cMTP a:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da m�quina na li�a MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas de bloques spam reco�ecidas polo servidor receptor son:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueo de spam desactivado\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conexi�n � servidor ser� iniciada con \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Ning�n comando de pre-conexi�n.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conexi�n � servidor ser� rematada con \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Ning�n comando de pos-conexi�n.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Non hai ning�n nome local declarado para esta m�quina.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Modo de entrega m�ltiple: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simple: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome(s) local(is) reco�ecidos.\n"
 msgstr[1] "%d nome(s) local(is) reco�ecidos.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Busca no DNS por enderezos de m�ltiple entrega: %s.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Busca no DNS por enderezos de m�ltiple entrega: %s.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1563,101 +1563,107 @@ msgstr ""
 "  Os aliases do servidor compararanse cos enderezos de m�ltiple entrega "
 "segundo "
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Os aliases do servidor compararanse cos enderezos de m�ltiple entrega "
 "segundo "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O encami�amento dos enderezos do sobre est� desactivado\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  As�mese que a cabeceira do sobre �: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  N�mero da cabeceira do sobre a procesar: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Eliminarase o prefixo %s do identificador de usuario\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Sen eliminaci�n de prefixo\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliases predeclarados do servidor de correo:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Dominios locais:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conexi�n ten que ser a trav�s da interfaz %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Non se indicou ning�n requirimento de interfaz.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  O bucle de recibimento monitorizar� %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Non se indicou ningunha interfaz de monitorizaci�n.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conexi�ns � servidor faranse polo plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Non se indicou ning�n comando de plugin.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  �s conexi�ns � servidor receptor faranse polo plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Non se indicou ning�n comando de plugout.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ning�n UID foi grabado desta m�quina.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gravados.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso \"%s\".\n"
@@ -1674,7 +1680,7 @@ msgstr ""
 "\n"
 "SIGINT recibido... sa�ndo.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Non se puido obte-lo nome do servicio para [%s]\n"
@@ -1892,44 +1898,44 @@ msgstr ""
 msgid "No IP address found for %s"
 msgstr "non se atopou ning�n enderezo `Received'\n"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "falta o enderezo IP da interfaz\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "enderezo IP da interfaz non v�lido\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "m�scara IP da interfaz non v�lida\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "actividade en %s -percibida- como %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "omitindo a recepci�n de %s, %s est� desactivada\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "omitindo a recepci�n de %s, enderezo IP de %s exclu�do\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "actividade en %s comprobada como %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "omitindo a recepci�n de %s, %s est� inactiva\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "actividade en %s era %d, � %d\n"
@@ -2057,80 +2063,85 @@ msgstr "Non se puido decodificar o challenge OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Contrasinal segreda: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "A cadea '%s' non � unha cadea num�rica v�lida.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "O valor da cadea '%s' � %s que %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "m�is pequeno"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "maior"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Protocolo indicado `%s' non v�lido.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo indicado `%s' non v�lido.\n"
 
-#: options.c:396
+#: options.c:409
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Preautenticaci�n `%s' indicada non v�lida.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opci�ns] [servidor ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  As opci�ns son as seguintes:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        amosar esta axuda das opci�ns\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     amosa-la informaci�n da versi�n\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       comprobar as mensaxes sen recollelas\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      traballar silenciosamente\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     traballar barullentamente (sa�da de diagn�stico)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      executarse como un demonio unha vez cada n segundos\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    non quitar do primeiro plano o proceso demonio\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        mata-lo proceso demonio\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     indica-lo nome do ficheiro de rexistro\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2138,254 +2149,260 @@ msgstr ""
 "      --syslog      usar syslog(3) para a maior parte das mensaxes � "
 "se                     executar como demonio\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   non escribir `Received' e activar finximento de m�quina\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc indicar un ficheiro de control de execuci�n diferente\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      indicar un ficheiro de UIDs alternativo\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      indicar un ficheiro de UIDs alternativo\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  indicar o destinatario en �ltimo caso\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    redirixir as mensaxes erradas do usuario � postmaster.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   indicaci�n de requirimento de interfaz\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar a actividade da interfaz\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesi�n encriptada con ssl\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ficheiro coa chave privada ssl\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:630
+#: options.c:643
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:631
+#: options.c:644
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      indicar comando externo para abri-la conexi�n\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     indicar comando externo para abri-la conexi�n smtp "
 "local\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    indicar o protocolo de recepci�n (mirar a p�xina man)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar o uso de UIDLs (s� pop3)\n"
 
-#: options.c:641
+#: options.c:656
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        porto do servicio TCP/IP � que se conectar\n"
 
-#: options.c:642
+#: options.c:657
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        porto do servicio TCP/IP � que se conectar\n"
 
-#: options.c:643
+#: options.c:658
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --preauth     tipo de preautenticaci�n: password (contrasinal),\n"
 "                    kerberos, ou ssh\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tempo de espera da resposta do servidor\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabeceira co enderezo do sobre\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo a borrar da identificaci�n de usuario local\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    indicar o login do usuario no servidor\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         coller as mensaxes vellas e novas\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borra-las novas mensaxes despois de recollelas\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        mante-las novas mensaxes despois de recollelas\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   non rescribi-los enderezos das cabeceiras\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       non coller mensaxes meirandes que o tama�o dado\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    intervalo entre notificaci�ns de avisos de correo\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    establece-lo servidor SMTP para redirixir\n"
 
-#: options.c:661
+#: options.c:676
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress establece-lo dominio de entrega SMTP a usar\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   establece-los valores de resposta antispam\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  establece-lo l�mite de lote para conexi�ns SMTP\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:667
+#: options.c:682
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     establece-lo n�mero m�ximo de borrados entre "
 "eliminaci�ns\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         establece-lo MDA a usar para redirixir\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       establece-lo ficheiro BSMTP de sa�da\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para a entrega\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      indicar o nome da carpeta remota\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
@@ -2463,45 +2480,45 @@ msgstr "erro de protocolo � obter os UIDLs\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "A opci�n --remote non est� soportada con POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2525,180 +2542,181 @@ msgstr "a piques de entregar con: %s\n"
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "�xito"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuario restrinxido (algo est� mal coa conta)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Identificador de usuario ou contrasinal non v�lidos"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Erro fatal"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA s�mbolo 2: Erro de decodificaci�n Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "O servicio escolleu a versi�n %d.%d do RPA\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Challenge do servicio (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "Erro na lonxitude do s�mbolo 2 RPA\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de dominios: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Erro RPA na cadea servicio@dominio\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA s�mbolo 4: Erro de decodificaci�n Base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticaci�n de usuario (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estado RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "Erro na lonxitude do s�mbolo 4 RPA\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA rexeitoulle: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA rexeitoulle, raz�n desco�ecida\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Erro de lonxitude da autenticaci�n de usuario RPA: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Erro de lonxitude da chave da sesi�n RPA: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallo na autorizaci�n do _servicio_ RPA. �Servidor falsificado?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Chave de sesi�n establecida:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Autorizaci�n RPA completa\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Obtenci�n de resposta\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "A obtenci�n de resposta devolveu %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "A cabeceira non � 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Erro de lonxitude do s�mbolo\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "A lonxitude %d do compo�ente non est� de acordo coa rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Campo de mecanismo incorrecto\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no car�cter %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Datos binarios entrantes:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Datos sa�ntes:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Cadea RPA longa de m�is\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA fallou na apertura de /dev/urandom. Isto non deber�a\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedilo de se conectar, pero significa que\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    non pode estar seguro de estar a falar co\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    servicio que vostede cre (son posibles\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ataques de re-tentativa por un servicio deshonesto.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Challenge de usuario:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 sendo aplicado � bloque de datos:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "O resultado MD5 �: \n"
 
 #: servport.c:53
@@ -2720,122 +2738,133 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "redirixindo a %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "erro de %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do pre�mbulo\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do pre�mbulo\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "�non se pode nin sequera enviar a %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a piques de entregar con: %s\n"
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "Fallou a apertura MDA\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erro liberando as credenciais\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "O MDA saiu anormalmente ou devolveu estado non cero\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "O receptor SMTP rexeitou a entrega\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta distinta de 503 non agardada � LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2872,192 +2901,192 @@ msgstr ""
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 #, fuzzy
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: fallou o fork\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: fallou o socketpair\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fallou o fork\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "fallou o dup2\n"
 
-#: socket.c:192
+#: socket.c:187
 #, fuzzy, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "executando %s %s %s\n"
 
-#: socket.c:195
+#: socket.c:190
 #, fuzzy, c-format
 msgid "execvp(%s) failed\n"
 msgstr "fallou o execl(%s)\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, fuzzy, c-format
 msgid "unknown (%s)"
 msgstr "a m�quina � desco�ecida."
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "�non se pode nin sequera enviar a %s!\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:627
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:867
+#: socket.c:862
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo indicado `%s' non v�lido.\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3104,48 +3133,48 @@ msgstr "non se atopou ning�n enderezo `Received'\n"
 msgid "found Received address `%s'\n"
 msgstr "atopouse o enderezo `Received' `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr "delimitador de mensaxes atopado � explora-las cabeceiras\n"
 
-#: transact.c:594
+#: transact.c:597
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Recibindo de %s\n"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "non hai ningunha coincidencia local, reenviando a %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenv�o e borrado omitidos por causa de erros de DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribindo cabeceiras de mensaxe RFC822\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "ning�n dos enderezos coincidiu cos nomes locais declarados"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "o enderezo de destinatario %s non coincidiu con ning�n nome local"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "a mensaxe cont�n caracteres nulos"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 "O servidor SMTP receptor rexeitou os enderezos de destinatario locais: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "escribindo o texto da mensaxe\n"
diff --git a/po/id.po b/po/id.po
index 7356e331..3e3d549b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-22 22:35+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
diff --git a/po/it.po b/po/it.po
index d354410d..14a3deeb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-22 07:00+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/po/nl.po b/po/nl.po
index c6c04fc0..7cd1ab57 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-25 10:25+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 197780c6..2a3c797b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-21 21:15+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0cdb6800..cfdd4a61 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-5.4.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2000-07-28 09:40-03:00\n"
 "Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -56,13 +56,13 @@ msgid "kerberos error %s\n"
 msgstr "erro kerberos %s\n"
 
 #: driver.c:249
-#, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [servidor informa '%s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [servidor informa '%*s'] \n"
 
 #: driver.c:335
@@ -97,69 +97,69 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 msgstr[1] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:565
+#: driver.c:568
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:584
+#: driver.c:587
 #, fuzzy
 msgid " (oversized)"
 msgstr " (muito grande, %d octetos)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:619
+#: driver.c:622
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensagem %d de %d"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soctetos)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos no corpo da mensagem) "
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos no corpo da mensagem) "
 
-#: driver.c:751
+#: driver.c:754
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "mensagem %d n�o possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " retida\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " n�o eliminada\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -171,40 +171,40 @@ msgstr[1] ""
 "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
 "servidor\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "tempo esgotado ap�s %d segundos esperando para conectar ao servidor %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando pelo servidor %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando por %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando pelo receptor responder.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado ap�s %d segundos.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Assunto: o fetchmail tem notado repetidos vencimentos de temporiza��o\n"
 "\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -213,7 +213,7 @@ msgstr ""
 "Fetchmail notou mais que %d vencimentos de temporiza��o enquanto tentava "
 "baixar mensagens de %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -229,81 +229,81 @@ msgstr ""
 "\n"
 "Fetchmail n�o vai consultar mais esta caixa postal at� que seja reiniciado.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "comando de pr�-conex�o falhou com status %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "comando de pr�-conex�o falhou com status %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "n�o foi poss�vel encontrar caixa postal HESIOD para %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Servidor l�der n�o possui nome.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "n�o foi poss�vel encontrar o nome de DNS can�nico para %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Falha de autoriza��o para %s@%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr ""
 "Assunto: falha de autentica��o do fetchmail\n"
 "\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -312,7 +312,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -329,7 +329,7 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail n�o consegue distinguir desta\n"
 "pois eles n�o enviam mensagens de erro �teis durante a falha no login.\n"
 
-#: driver.c:1224
+#: driver.c:1227
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -346,182 +346,182 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail n�o consegue distinguir desta\n"
 "pois eles n�o enviam mensagens de erro �teis durante a falha no login.\n"
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desconhecido de login ou autentica��o em %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Falha de autoriza��o para %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr ""
 "Assunto: falha de autentica��o do fetchmail\n"
 "\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "Servi�o escolheu a vers�o %d.%d do RPA\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta padr�o\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s em %s (pasta %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Baixando %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d visualizadas) para %s"
 msgstr[1] "%d %s (%d visualizadas) para %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s para %s"
 msgstr[1] "%d %s para %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nenhuma mensagem para %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "cabe�alho RFC822 ruim ou faltando"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "sincroniza��o cliente/servidor"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "arquivo de lock existente no servidor"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "Transa��o SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "erro n�o definido\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "a m�quina � desconhecida."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "comando de p�s-conex�o falhou com status %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "comando de p�s-conex�o falhou com status %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Suporte a Kerberos V4 n�o inclu�do (linkado).\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Suporte a Kerberos V5 n�o inclu�do (linkado).\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Op��o --flush n�o � suportada com %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Op��o --all n�o � suportada com %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Op��o --limit n�o � suportada com %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -531,7 +531,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -542,26 +542,26 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Voc� n�o existe. V� embora.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: n�o foi poss�vel determinar sua m�quina!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falhou para %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -765,13 +765,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nenhum outro fetchmail est� rodando\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
 #: fetchmail.c:603 fetchmail.c:605
 #, c-format
-msgid "could not open %s to append logs to \n"
+msgid "could not open %s to append logs to\n"
 msgstr ""
 
 #: fetchmail.c:607
@@ -919,43 +919,43 @@ msgstr "acordado em %s\n"
 msgid "normal termination, status %d\n"
 msgstr "encerramento normal, status %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "n�o foi poss�vel checar o hor�rio do arquivo de controle de execu��o\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Aten��o: m�ltiplas entradas para a m�quina %s no arquivo de configura��o\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "Aten��o: m�ltiplas entradas para a m�quina %s no arquivo de configura��o\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -963,332 +963,332 @@ msgstr ""
 "fetchmail: warning: nenhum DNS dispon�vel para checar buscas com m�ltiplas\n"
 "entregas de %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "configura��o de %s inv�lida, n�mero da porta n�o pode ser negativo\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configura��o de %s inv�lida, o RPOP exige uma porta privilegiada\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "configura��o de %s inv�lida, LMTP n�o pode usar a porta SMTP padr�o\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "fetchall e modo daemon juntos est� errado!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "encerrado com o sinal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "O suporte a POP3 n�o est� configurado.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "O suporte a IMAP n�o est� configurado.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "O suporte a ETRN n�o est� configurado.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "protocolo n�o suportado escolhido.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervalo de consulta � %d segundos\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Arquivo de registro � %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Arquivo de identifica��o � %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mensagens de progresso ser�o gravadas pelo syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail far� mascaramento e n�o gerar� `Received'\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviar� mensagens multidrop mal endere�adas para %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ir� enviar mensagens de correio de erro para o postmaster.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ir� enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail reenviar� mensagens multidrop mal endere�adas para %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail ir� enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Op��es para consulta de %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mensagens ser�o recuperadas via %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Consulta deste servidor ir� ocorrer a cada %d intervalos.\n"
 msgstr[1] "  Consulta deste servidor ir� ocorrer a cada %d intervalos.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O verdadeiro nome do servidor � %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina %s ser� consultada quando nenhuma m�quina for\n"
 "especificada.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina %s ser� consultada quando nenhuma m�quina for\n"
 "especificada.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  A senha ser� solicitada.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identifica��o RPOP = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "   Senha = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocolo � KPOP com autentica��o Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocolo � %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servi�o %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (usando porta padr�o)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (for�ando o uso de UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autentica��o OTP � suportada\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Autentica��o NTLM � suportada\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autentica��o NTLM � suportada\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autentica��o OTP � suportada\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autentica��o CRAM-MD5 � suportada\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autentica��o GSS � suportada\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Pr�-autentica��o Kerberos V4 ativada.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Pr�-autentica��o Kerberos V5 ativada.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Criptografia end-to-end assumida.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo � %s"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Data/hor�rio do servi�o %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 "  O tempo m�ximo para n�o obten��o de resposta do servidor � %d segundos"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (padr�o).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correio padr�o selecionada.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correio selecionadas s�o:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s mensagens ser�o recuperadas (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s mensagens ser�o recuperadas (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  As Mensagens baixadas %s ser�o mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As Mensagens baixadas %s ser�o mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
@@ -1296,7 +1296,7 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1305,7 +1305,7 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1314,251 +1314,251 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  A reescrita de endere�os no servidor local est� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  A reescrita de endere�os no servidor local est� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  A elimina��o do retorno de carro (CR) est� %s (stripcr %s).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  A elimina��o do retorno de carro (CR) est� %s (stripcr %s).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  For�ar retorno de carro (CR) est� %s (forcecr %s).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  For�ar retorno de carro (CR) est� %s (forcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  A interpreta��o de Content-Transfer-Encoding est� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  A interpreta��o de Content-Transfer-Encoding est� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  A decodifica��o MIME est� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  A decodifica��o MIME est� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inatividade ap�s consulta � %s (inatividade %s).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Inatividade ap�s consulta � %s (inatividade %s).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O tamanho limite por mensagem � %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de aviso de tamanho de mensagem � de %d segundos (--warnings \n"
 "%d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tamanho a cada recebimento (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O limite de mensagem recebida � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nenhum limite para mensagem recebida (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O limite de mensagem recebida � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O limite de lote de mensagens SMTP � %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nenhum limite de lote de mensagens SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  O intervalo de dele��o entre elimina��es � %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nenhuma elimina��o (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (padr�o)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensagens ser�o anexadas a %s como BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensagens ser�o entregues com \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensagens ser�o re-enviadas via %cMTP para:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da m�quina na linha MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas reconhecidas de blocos spam s�o:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueio de spam desabilitado\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conex�o do servidor ser� efetuada com \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Nenhum comando de pr�-conex�o.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conex�o com o servidor ser� derrubada com \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Nenhum comando de p�s-conex�o.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nenhum nome local declarado para esta m�quina.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Modo de m�ltipla entrega (multi-drop): "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simples (single-drop): "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome(s) local(is) reconhecido(s).\n"
 msgstr[1] "%d nome(s) local(is) reconhecido(s).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  A busca no DNS por endere�os de m�ltipla entrega est� %s.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  A busca no DNS por endere�os de m�ltipla entrega est� %s.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1566,101 +1566,107 @@ msgstr ""
 "  Os apelidos de servidores ser�o comparados com endere�os de m�ltipla\n"
 "entrega por "
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Os apelidos de servidores ser�o comparados com endere�os de m�ltipla\n"
 "entrega por "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O roteamento de endere�os de envelope est� desabilitado\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Assume-se que o cabe�alho do envelope esteja: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  N�mero de cabe�alhos de envelope  a serem processados: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  O prefixo %s ser� removido da identifica��o do usu�rio\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Nenhuma remo��o de prefixo\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Apelidos pr�-declarados do servidor de correio eletr�nico:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Dom�nios locais:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conex�o precisa se dar pela interface %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  N�o foi especificada nenhuma exig�ncia de interface.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Ciclo de consultas monitorar� %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Nenhuma interface de monitoramento foi especificada.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conex�es com o servidor se dar�o via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Nenhum comando \"plugin\" especificado.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  As conex�es com o cliente se dar�o via \"plugout\" %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Nenhum comando \"plugout\" especificado.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nenhuma identifica��o de usu�rio gravada a partir desta m�quina.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d identifica��es de usu�rios gravadas.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriedades de passagem \"%s\".\n"
@@ -1677,7 +1683,7 @@ msgstr ""
 "\n"
 "Sinal SIGINT recebido... saindo.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "N�o foi poss�vel obter nome do servi�o para [%s]\n"
@@ -1898,44 +1904,44 @@ msgstr ""
 msgid "No IP address found for %s"
 msgstr "nenhum endere�o Received encontrado\n"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "faltando endere�o IP da interface\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "endere�o IP da interface inv�lido\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "m�scara IP da interface inv�lida\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "atividade em %s -percebida- como %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "pulando mensagens de %s, %s est� parado\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "pulando mensagens de %s, endere�o IP de %s exclu�do\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "atividade em %s checada como %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "pulando mensagens de %s, %s inativo\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "atividade em %s foi %d, � %d\n"
@@ -2063,81 +2069,86 @@ msgstr "N�o foi poss�vel decodificar o desafio OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Frase-senha secreta: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Cadeia '%s' n�o � uma cadeia de n�meros v�lidos.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Valor da cadeia '%s' � %s que %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "maior"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Protocolo `%s' inv�lido foi especificado.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo `%s' inv�lido foi especificado.\n"
 
-#: options.c:396
+#: options.c:409
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Pr�-autentica��o `%s' inv�lida foi especificada.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso: fetchmail [op��es] [servidor ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  As op��es s�o:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra esta tela de ajuda\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informa��es sobre a vers�o\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       checa por mensagens sem baix�-las\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabalha silenciosamente\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabalha barulhentamente (sa�das para diagn�stico)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      roda como um servidor uma vez a cada n segundos\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 "  -N, --nodetach    n�o desconecta o processo servidor do seu terminal\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        elimina processo servidor\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica o nome do arquivo de log\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2145,258 +2156,264 @@ msgstr ""
 "      --syslog      usa o syslog(3) para a maioria das mensagens quando\n"
 "                    estiver rodando como servidor\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   n�o escreve `Received' & ativa mascaramento da m�quina\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especifica arquivo de controle de execu��o alternativo\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usu�rios \n"
 "                    alternativo\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usu�rios \n"
 "                    alternativo\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica o destinat�rio usado em �ltimo caso\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redireciona mensagens erradas para o postmaster.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especifica��o de interface exigida\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitora a atividade na interface\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         habilita sess�o ssl criptografada\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      arquivo contendo a chave ssl privada\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:630
+#: options.c:643
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:631
+#: options.c:644
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica um comando externo para abrir uma conex�o\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especifica um comando externo para abrir uma conex�o "
 "smtp\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica o protocolo de retirada (ver p�gina de \n"
 "                    manual)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        for�a o uso de UIDLs (somente para pop3)\n"
 
-#: options.c:641
+#: options.c:656
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        Porta TCP para conex�o\n"
 
-#: options.c:642
+#: options.c:657
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        Porta TCP para conex�o\n"
 
-#: options.c:643
+#: options.c:658
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --preauth     tipo de pr�-autentica��o (senha/kerberos/ssh)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 "  -t, --timeout     tempo limite para n�o obten��o de resposta do servidor\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabe�alho do endere�o de envelope\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo para remover da identifica��o de um usu�rio "
 "local\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    especifica a identifica��o do usu�rio no servidor\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         recupera mensagens antigas e novas\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      apaga novas mensagens ap�s a recupera��o\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        n�o apaga novas mensagens ap�s recupera��o\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   n�o reescreve os cabe�alhos das mensagens\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       n�o recupera mensagens acima de um dado tamanho\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre avisos de notifica��o de e-mail\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configura a m�quina SMTP para reenvio\n"
 
-#: options.c:661
+#: options.c:676
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress configura o dom�nio de entrega do SMTP a ser usado\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configura o valor das respostas anti-spam\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  configura o limite de lote para conex�es SMTP\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:667
+#: options.c:682
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     configura o m�ximo de dele��es entre elimina��es\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "      --mda         configura o MDA a ser usado para reenvio\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configura o arquivo de sa�da BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) para entrega\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especifica o nome da pasta remota\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
@@ -2473,45 +2490,45 @@ msgstr "erro de protocolo durante a obten��o de UIDLs\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Op��o --remote n�o � compat�vel com POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2535,181 +2552,182 @@ msgstr "prestes a entregar para: %s\n"
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Sucesso"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Usu�rio restrito (algo errado com a conta)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Identifica��o de usu�rio ou frase-senha inv�lidos"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Erro fatal"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Erro de decodifica��o Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Servi�o escolheu a vers�o %d.%d do RPA\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Desafio de servi�o (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Data/hor�rio do servi�o %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "Erro no comprimento do token 2 RPA\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de dom�nios: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Erro RPA na cadeia servi�o@dom�nio\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Erro de decodifica��o Base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autentica��o de usu�rio (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "status RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "Erro no comprimento do s�mbolo 4 RPA\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "Voc� foi rejeitado pelo RPA: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "Voc� foi rejeitado pelo RPA por motivos desconhecidos\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Erro no comprimento da autentica��o de usu�rio RPA: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Erro no comprimento da chave da sess�o RPA: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Autentica��o de _servi�o_ RPA falhou. Enganar o servidor?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Chave de sess�o estabelecida:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Autoriza��o RPA completa\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Resposta recebida\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Recebido retorno de resposta %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr n�o � 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Erro no comprimento do Token\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Comprimento do s�mbolo %d n�o combina com rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Campo mecanismo incorreto\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no caractere %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Entrada de dados bin�rios:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Sa�da de dados:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Cadeia RPA muito longa\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA falhou na abertura de /dev/urandom. Isto n�o deveria\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedi-lo de se conectar, mas significa que\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    voc� n�o pode ter certeza de estar falando com\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    o servi�o que voc� pensa estar (ataques\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 "    de re-tentativa por parte de um servi�o desonesto s�o poss�veis.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Desafio de usu�rio:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 est� sendo aplicado ao bloco de dados:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "O resultado MD5 �: \n"
 
 #: servport.c:53
@@ -2731,123 +2749,134 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "repassando para %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erro %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de pre�mbulo falhou\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de pre�mbulo falhou\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Cliente %cMTP n�o gosta do endere�o do destinat�rio `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Cliente %cMTP n�o gosta do endere�o do destinat�rio `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "n�o � poss�vel nem mandar para %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "prestes a entregar para: %s\n"
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "Abertura MDA falhou\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erro na libera��o de credenciais\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 "O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "Cliente SMTP recusou a entrega\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta n�o-503 para o EOM LMTP: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2884,192 +2913,192 @@ msgstr ""
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 #, fuzzy
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair falhou\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 falhou\n"
 
-#: socket.c:192
+#: socket.c:187
 #, fuzzy, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "rodando %s %s %s\n"
 
-#: socket.c:195
+#: socket.c:190
 #, fuzzy, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, fuzzy, c-format
 msgid "unknown (%s)"
 msgstr "a m�quina � desconhecida."
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "n�o � poss�vel nem mandar para %s!\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:627
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Data/hor�rio do servi�o %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:867
+#: socket.c:862
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo `%s' inv�lido foi especificado.\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3116,48 +3145,48 @@ msgstr "nenhum endere�o Received encontrado\n"
 msgid "found Received address `%s'\n"
 msgstr "encontrado endere�o Received `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 "encontrado o delimitador de mensagens durante varredura de cabe�alhos\n"
 
-#: transact.c:594
+#: transact.c:597
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Baixando %s\n"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvio e remo��o suprimidos devido a erro de DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrevendo cabe�alhos RFC822\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "nenhum endere�o de destino combina com o valor local declarado"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "endere�o do destinat�rio %s n�o combina com nenhum nome local"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "a mensagem possui NULs inseridos"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Cliente SMTP rejeitou o endere�o do destinat�rio: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "escrevendo o texto da mensagem\n"
diff --git a/po/ru.po b/po/ru.po
index c1f7b887..74baafa6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\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"
@@ -56,12 +56,12 @@ msgstr "ошибка kerberos %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [сервер сообщил '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [сервер сообщил '%*s'] \n"
 
 #: driver.c:335
@@ -96,50 +96,50 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  fetchmail пропустил %d сообщение длиной %d октетов."
 msgstr[1] "  fetchmail пропустил %d сообщений длиной %d октетов."
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "пропускается сообщение %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "пропускается сообщение %s@%s:%d (%d октетов)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (длина -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (завышенного размера)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "невозможно было извлечь заголовки, сообщение %s@%s:%d (%d октетов)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "считывается сообщение %s@%s:%d из %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d октетов)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d октетов в заголовке)"
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d октетов в теле)"
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -147,19 +147,19 @@ msgstr ""
 "длина сообщения %s@%s:%d не совпала с ожидаемой (%d на самом деле != %d "
 "ожидалось)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " задержано\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " очищено\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " не очищено\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -171,36 +171,36 @@ msgstr[1] ""
 "Достигнут предел извлечения %d; осталось %d сообщений, сервер %s, учётная "
 "запись %s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "таймаут после %d секунд ожидания подключения к серверу %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "таймаут после %d секунд ожидания сервера %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "таймаут после %d секунд ожидания %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "таймаут после %d секунд ожидания ответа от слушателя.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "таймаут после %d секунд.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Тема: fetchmail наблюдает повторяющиеся тайм-ауты"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -209,7 +209,7 @@ msgstr ""
 "Fetchmail обнаружил более %d тайм-аутов при попытке получения почты из %s@%"
 "s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -227,78 +227,78 @@ msgstr ""
 "Fetchmail не будет опрашивать этот почтовый ящик до тех\n"
 "пор, пока вы его не перезапустите.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "выполняемая до соединения команда завершена с сигналом %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "сбой команды, выполняемой до соединения; статус: %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "невозможно было найти HESIOD pobox для %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Ведущий сервер без имени.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "невозможно было найти каноническое имя DNS %s (%s): %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "сбой %s-подключения к %s"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Тема: Предупреждение Fetchmail о недоступности сервера."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail не смог установить связь с почтовым сервером %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "Сбой подключения через SSL.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Ошибка блокировки занятости для %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Ошибка занятости сервера для %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Ошибка авторизации для %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (ранее авторизовано)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Тема: Ошибка аутентификации fetchmail для %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail не смог получить почту из %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -312,7 +312,7 @@ msgstr ""
 "fetchmail не смог распознать из-за того, что сервер не отправил\n"
 "сообщение об ошибке."
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -332,7 +332,7 @@ msgstr ""
 "подключиться. В дальнейшем уведомления отправляться не будут до тех\n"
 "пор, пока служба не будет восстановлена."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -355,177 +355,177 @@ msgstr ""
 "отправляться не будут до тех пор, пока служба не будет\n"
 "восстановлена."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Немедленно повторить опрос для %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Неизвестный логин или ошибка аутентификации для %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Авторизация выполнена для %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Тема: Выполнена авторизация fetchmail для %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail вошел в систему %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Служба была восстановлена.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "выбирается или повторяется опрос каталога %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "выбирается или повторяется опрос каталога по умолчанию\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s на %s (каталог %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Опрашивается %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, 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:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "просмотрено"
 msgstr[1] "просмотрено"
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d сообщение для %s"
 msgstr[1] "%d сообщений для %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d октетов).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Для %s почты нет\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "фиктивное количество сообщений!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "сокет"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "отсутствует или неверный заголовок RFC822"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "синхронизация клиент/сервер"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "протокол клиент/сервер"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "блокировка занятости на сервере"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP-транзакция"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS-запрос"
 
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "неопределённый"
 
-#: driver.c:1567
+#: driver.c:1569
 #, 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:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "неизв."
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Ошибка %s при выборке из %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "выполняемая после соединения команда завершена с сигналом %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "сбой команды, выполняемой после соединения; статус: %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Поддержка Kerberos V4 не связана.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Поддержка Kerberos V5 не связана.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Опция --flush не поддерживается с %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Опция --all не поддерживается с %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Опция --limit не поддерживается с %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -541,7 +541,7 @@ msgstr ""
 "Попробуйте \"env QMAILINJECT= %s СВОИ АРГУМЕНТЫ\"\n"
 "%s: Сброс.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -558,28 +558,28 @@ msgstr ""
 "Попробуйте \"env NULLMAILER_FLAGS= %s СВОИ АРГУМЕНТЫ\"\n"
 "%s: Сброс.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Ты существуешь.  Вали отсюда.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: невозможно определить ваш хост!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "сбой gethostbyname для %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 "Невозможно найти свой собственный хост в базе данных хостов, чтобы "
 "определить его!\n"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -793,13 +793,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "запускается демон fetchmail %s\n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "невозможно было открыть %s для добавления записей\n"
 
 #: fetchmail.c:607
@@ -931,37 +931,37 @@ msgstr "разбужен на %s\n"
 msgid "normal termination, status %d\n"
 msgstr "нормальное завершение, статус %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "невозможно было проверить время файла контроля запуска\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Предупреждение: многократные ссылки на хост %s в файле настройки\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "Поддержка SSL не была включена при компиляции.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v4 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v5 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Поддержка GSSAPI настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -969,18 +969,18 @@ msgstr ""
 "fetchmail: предупреждение: не доступен DNS для проверки многоканальной "
 "выборки из %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "предупреждение: multidrop для %s требует опцию envelope!\n"
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "предупреждение: Не просите технической поддержки, если все сообщения "
 "отправляются постмастеру!\n"
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -989,308 +989,308 @@ msgstr ""
 "fetchmail: конфигурация %s не верна, укажите положительный номер порта для "
 "службы\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный "
 "порт\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Запускать fetchall, оставляя его при этом в режиме демона или простоя, "
 "нельзя!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "завершен по сигналу %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос начат\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "Поддержка POP2 не настроена.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "Поддержка POP3 не настроена.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "Поддержка IMAP не настроена.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "Поддержка ETRN не настроена.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "Поддержка ODMR не настроена.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "выбран неподдерживаемый протокол.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос завершен\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал опроса - %d секунд\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Лог-файл - %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-файл - %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Обработка сообщений будет регистрироваться через syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail включит маскировку и не создаст поле Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail будет пересылать многоканальные сообщения без адреса на %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail направит ошибочное письмо постмастеру.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail направит ошибочное письмо отправителю.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail будет считать постоянные ошибки постоянными (удалит сообщения).\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr ""
 "Fetchmail будет считать постоянные ошибки временными (сохранит сообщения).\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Параметры для получения из %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Почта будет получена через %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, 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:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Настоящее имя севера - %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, этот хост не будет запрошен.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, будет запрошен этот хост.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Будет затребован пароль.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Секрет APOP = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Пароль = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол - KPOP с аутентификацией Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол - %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (используется служба %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (используется порт по умолчанию)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (принудительно используется UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Будут испробованы все доступные способы аутентификации.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация с паролем.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация MSN.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация NTLM.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация OTP.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация CRAM-Md5.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация GSSAPI.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Допускается оперативное шифрование.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Принципал почтовой службы: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Включены сессии, зашифрованные SSL.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Протокол SSL: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Включена проверка сертификата сервера SSL.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Каталог доверенных сертификатов SSL: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  Общепринятое имя SSL-сервера: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Отпечаток ключа SSL (сверенный с ключом сервера): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Таймаут молчания сервера - %d секунд"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (по умолчанию).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Выбран почтовый ящик по умолчанию.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Выбранные почтовые ящики:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Будут получены все сообщения (--all on).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Будут получены только новые сообщения (--all off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Выбранные сообщения будут оставлены на сервере (--keep on).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Выбранные сообщения будут удалены с сервера (--keep off).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Старые сообщения будут удалены перед получением сообщения (--flush on).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Старые сообщения не будут удалены перед получением сообщения (--flush "
 "off).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1298,7 +1298,7 @@ msgstr ""
 "  Сообщения завышенного размера будут удалены перед получением сообщения (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1306,339 +1306,346 @@ msgstr ""
 "  Сообщения завышенного размера не будут удалены перед получением сообщения "
 "(--limitflush  off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Перезапись локальных адресов сервера включена (--norewrite off).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Перезапись локальных адресов сервера выключена (--norewrite on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Удаление возврата каретки включено (stripcr on).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Удаление возврата каретки выключено (stripcr off).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Принудительный возврат каретки включен (forcecr on).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Принудительный возврат каретки выключен (forcecr off).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Интерпретация кодировки передаваемого контента включена (pass8bits off).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-декодирование включено (mimedecode on).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-декодирование выключено (mimedecode off).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Простой после опроса включен (idle on).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Простой после опроса выключен (idle off).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Непустые строки состояния будут удалены (dropstatus on)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Непустые строки состояния будут сохранены (dropstatus off)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Строки Delivered-To будут удалены (dropdelivered on)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Строки Delivered-To будут сохранены (dropdelivered off)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничение на размер сообщения - %d октетов (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Нет ограничения на размер сообщения (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Интервал между предупреждениями о размере сообщения - %d секунд (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Предупреждения о размере при каждом опросе (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничение на полученные сообщения - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Нет ограничения на полученные сообщения (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Нет ограничения на размер выборки сообщений (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничение на пакет SMTP-сообщений - %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Нет ограничения на пакет SMTP-сообщений (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Интервал между удалениями принудительно установлен в %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Нет принудительных удалений (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домены, для которых будет выполняться выборка почты:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (по умолчанию)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Сообщения будут прикреплены к %s как BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Сообщения будут доставлены с \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Сообщения будут переадресованы по %cMTP на:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Часть хоста из строки MAIL FROM будет %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Ответные действия на распознанные слушателем спам-блоки:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокировка спама отключена\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Подключение к серверу будет установлено с \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Нет команды, выполняемой до соединения.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Подключение к серверу будет разорвано с \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Нет команды, выполняемой после соединения.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Нет локальных имен, объявленных для этого хоста.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Многоканальный режим:"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Одноканальный режим: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, 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:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов включен.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов выключен.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Алисы сервера будут сравнены с многоканальными адресами по имени.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Маршрутизация охватывающего адреса отключена\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Охватывающий заголовок должен быть: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Количество пропускаемых охватывающих заголовков: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префикс %s будет удален из id пользователя\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Нет разборки префикса\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Ранее объявленные алиасы почтового сервера:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Локальные домены:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Подключение должно быть через интерфейс %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Не указаны требования интерфейса.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Цикл опроса будет наблюдать за %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Не указан интерфейс монитора.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Подключения к серверу будут выполняться посредством плагина %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Не указана команда плагина.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Не указана команда plugout'а.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  С этого хоста нет сохраненных UID'ов.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Сохранено %d UID'ов.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Информация с трассировкой опроса будет добавлена в заголовок Received.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Информация с трассировкой опроса не будет добавлена в заголовок Received.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свойства ретрансляции \"%s\".\n"
@@ -1655,7 +1662,7 @@ msgstr ""
 "\n"
 "Получен SIGINT... завершение работы.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Невозможно было получить имя службы для [%s]\n"
@@ -1874,44 +1881,44 @@ msgstr "Не найден интерфейс с именем %s"
 msgid "No IP address found for %s"
 msgstr "Не найден IP-адрес для %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "отсутствует адрес IP-интерфейса\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "неверный адрес IP-интерфейса\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "неверная маска IP-интерфейса\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "активность на %s -отмечена- как %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "пропускается опрос %s, %s отключен\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "пропускается опрос %s, %s IP-адрес исключен\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "активность на %s проверена как %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "пропускается опрос %s, %s отключен\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "активность на %s была %d, %d\n"
@@ -2032,80 +2039,85 @@ msgstr "Невозможно было декодировать запрос OTP\
 msgid "Secret pass phrase: "
 msgstr "Секретная идентификационная фраза:"
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Строка '%s' не является верной числовой строкой.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Значение строки '%s' - %s, чем %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "меньше"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "больше"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Указан неверный протокол `%s'.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Указан неверный протокол `%s'.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Указана неверная аутентификация `%s'.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "использование:  fetchmail [опции] [сервер ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Используемые опции:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        вывод этой справки\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     вывод информации о версии\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       проверка сообщений без выборки\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      работа без лишней информации\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     работа с подробным выводом диагностических данных\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      запуск в виде демона каждые n секунд\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    не отсоединять процесс демона\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        останов процесса демона\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     указание имени log-файла\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2113,38 +2125,38 @@ msgstr ""
 "      --syslog      использование syslog(3) для большинства сообщений, когда "
 "запущен как демон\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   не записывать Received и включить спуфинг хоста\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc указание другого файла контроля запуска\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      указание других UID'ов файла\n"
 
-#: options.c:617
+#: options.c:630
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     указание другого файла с PID'ом\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  указать получателя на крайний случай\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    перенаправлять рикошеты пользователей постмастеру\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 "      --nosoftbounce fetchmail удаляет постоянно недоставляемые сообщения\n"
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
@@ -2152,43 +2164,43 @@ msgstr ""
 "      --softbounce  сохранять на сервере постоянно недоставляемые сообщения "
 "(по умолчанию)\n"
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   требуемая для интерфейса спецификация\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     наблюдение за активностью интерфейса\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         включение сессии, зашифрованной ssl\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      файл секретного ключа ssl\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     сертификат клиента ssl\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   строгая проверка сертификата севера (рекомендуется)\n"
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath путь к сертификатам ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 "      --sslcommonname  ожидать это общепринятое имя от сервера (не "
 "рекомендуется)\n"
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2196,172 +2208,178 @@ msgstr ""
 "      --sslfingerprint отпечаток, который должен соответствовать сертификату "
 "сервера.\n"
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 "      --sslproto    принудительное использование протокола ssl (SSL2/SSL3/"
 "TLS1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      указание внешней команды для установки соединения\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     указание внешней команды для установки соединения smtp\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    указание протокола поиска (см. man page)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        принудительное использование UIDL'ов (только pop3)\n"
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        TCP-порт для подключения (устарел, используйте --"
 "service)\n"
 
-#: options.c:642
+#: options.c:657
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     служба TCP для подключения (может быть числовым TCP-"
 "портом)\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        тип аутентификации (password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     таймаут молчания сервера\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    заголовок охватывающего адреса\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    префикс, удаляемый из id локального пользователя\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   принципал почтовой службы\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  добавление информации трассировки опроса в заголовок "
 "Received\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    указание логина пользователя на сервере\n"
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  получение старых и новых сообщений\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      удаление новых сообщений после получения\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        сохранение новых сообщений после получения\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       удаление старых сообщений с сервера\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  удаление сообщений завышенного размера\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   не перезаписывать адреса заголовка\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       не делать выборку сообщений больше заданного размера\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    промежутки между предупреждающими почтовыми "
 "уведомлениями\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    установка хоста переадресации SMTP\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains выборка почты для указанных доменов\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress установка домена, используемого для доставки SMTP\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    установка полного (пользователь@домен) имени SMTP\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   установка значений антиспамерских ответных действий\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  установка ограничения на пакет для SMTP-соединений\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  установка ограничения на выборку для соединений сервера\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchsizelimit установка ограничения на размер выборки сообщений\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    выполнить двоичный поиск UIDL'ов\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     установка максимального количества удалений\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         установка MDA, используемого для переадресации\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       установка файла вывода BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        использование для доставки LMTP (RFC2033)\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      указание имени удаленного каталога\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    отображение точечной строки прогресса даже в log-файлах\n"
@@ -2444,15 +2462,15 @@ msgstr "ошибка протокола при выборке UIDL'ов\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опция --folder не поддерживается с POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "опция сервера после опций пользователя"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS не включен."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2460,32 +2478,32 @@ msgstr ""
 "fetchmail: опция interface поддерживается только в Linux (без IPv6) и "
 "FreeBSD\n"
 
-#: rcfile_y.y:222
+#: 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:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL не включен"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "конец ввода"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Файл %s должен быть обычным файлом.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Файл %s должен иметь прав доступа не более -rwx------ (0700).\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Владельцем файла %s должны быть вы.\n"
@@ -2509,180 +2527,181 @@ msgstr "Будет перезаписан %s"
 msgid "Rewritten version is %s\n"
 msgstr "Переписанная версия %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Успешно"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Ограниченный пользователь (что-то не так с учетной записью)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Неверный id пользователя или идентификационная фраза"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Божественная ошибка"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: ошибка декодирования Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Служба выбрала RPA версии %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Запрос службы (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Временная метка службы %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "Ошибка длины RPA token 2\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Список области: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Ошибка RPA в строке служба@область\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: ошибка декодирования Base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Аутентификация пользователя (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Статус RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "Ошибка длины RPA token 4\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA отверг вас: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA отверг вас, причина неизвестна\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Ошибка продолжительности аутентификации пользователя RPA: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Ошибка длины ключа сеанса RPA: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Сбой RPA _service_ auth. Ложный сервер?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Сеансовый ключ признан:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Авторизация RPA завершена\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Получение ответа\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Получение обратного ответа %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Заголовок не 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Ошибка длины маркера\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Длина маркера %d не совпадает с rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Поле механизма неверно\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "Ошибка dec64 в символе %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Входящие двоичные данные:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Исходящие данные:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Строка RPA слишком длинная\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Уникод:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA не смог открыть /dev/urandom. Это не должно было\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    помешать вам войти в систему, но означает, что вы\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    не можете быть уверены в том, что общаетесь со\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    службой, в которой, как вы думаете, вы есть (возможны\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    воспроизведения атак подложной службы.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Запрос пользователя:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 применяется к блоку данных:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "Результат MD5: \n"
 
 #: servport.c:53
@@ -2704,97 +2723,113 @@ msgstr "Укажите службу в виде десятичного номе�
 msgid "forwarding to %s\n"
 msgstr "переадресовывается на %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (тело сообщения-рикошета)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "письмо от %s отправлено рикошетом на %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Сохраненная ошибка все еще %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Ошибка %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "Для SMTP-сервера требуется STARTTLS; сообщение сохранено.\n"
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Не удалось открыть файл BSMTP: %s\n"
 
-#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Не удалось записать начальную часть BSMTP.\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Слушателю %cMTP не понравился адрес получателя `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Слушателю %cMTP в самом деле не понравился адрес получателя `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "нет сопоставленных адресов; постмастер не установлен.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "даже невозможно отправить на %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "нет сопоставленных адресов; переадресовывается на %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "будет отправлен с: %s\n"
 
+#: sink.c:1240
+#, fuzzy, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n"
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "Не удалось открыть MDA\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Сбой %cMTP-подключения к %s\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "невозможно запустить слушателя; откат на %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Не удалось удалить сообщение или закрыть файл BSMTP\n"
+
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Ошибка записи в MDA: %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA завершен по сигналу %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA возвратил ненулевой статус %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2802,24 +2837,20 @@ msgstr ""
 "Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно "
 "обработать в %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Не удалось удалить сообщение или закрыть файл BSMTP\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "Слушатель SMTP отказал в доставке\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ошибка доставки LMTP на EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Неожиданный не-503 ответ для LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2856,196 +2887,196 @@ msgstr "Аутентификация ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "ошибка протокола слушателя smtp\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: сбой malloc\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: сбой socketpair\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: не удалось создать дочерний процесс\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "сбой dup2\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "запущен %s (хост %s служба %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "сбой execvp(%s)\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "ошибка getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Попробуйте добавить опцию --service (см. FAQ, пункт R12).\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "неизв. (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Попытка подключения к %s/%s..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "невозможно создать сокет: %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "не удалось подключиться.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n"
 
-#: socket.c:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "соединение установлено.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Запрашивающая организация: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Предупреждение: имя запрашивающей организации слишком длинное (возможно "
 "укорочено).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Неизвестная организация\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Общепринятое имя: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Неизвестное общепринятое имя\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Общепринятое имя сервера: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Несовпадение общепринятого имени сервера: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Имя сервера не установлено, невозможно проверить сертификат!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Неизвестное общепринятое имя сервера\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Имя сервера не указано в сертификате!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "сбой EVP_md5()!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Нехватка памяти!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Буфер текстового журнала слишком мал!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Отпечаток ключа %s: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Отпечатки %s совпадают.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Отпечатки %s не совпадают!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ошибка проверки сертификата сервера: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "неизвестная запрашивающая сторона (первые %d символов): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Дескриптор файла вне диапазона SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Указан неверный протокол SSL '%s', используется протокол по умолчанию "
 "(SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Повторная попытка чтения сокета Cygwin\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Сбой повторного чтения сокета Cygwin!\n"
 
@@ -3092,46 +3123,46 @@ msgstr "адрес Received не найден\n"
 msgid "found Received address `%s'\n"
 msgstr "найден адрес Received `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "при сканировании заголовков найдена неверная строка\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "строка: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "нет локальных совпадений, переадресовывается на %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "переадресация и удаление приостановлены из-за ошибок DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "записываются заголовки RFC822 msgblk\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "нет адресов получателей, соответствующих объявленным локальным именам"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "адрес получателя %s не соответствует ни одному локальному имени"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "сообщение содержит вложенные NUL"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Слушатель SMTP отверг адреса локальных получателей: "
 
-#: transact.c:1440
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "ошибка записи текста сообщения\n"
 
diff --git a/po/sk.po b/po/sk.po
index 3afa0188..c40db03c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2003-06-12 15:02+00\n"
 "Last-Translator: Lubos Vitek <lubos_vitek@yahoo.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -54,12 +54,12 @@ msgstr "Kerberos-chyba %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server odpovedal '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [server odpovedal '%*s'] \n"
 
 #: driver.c:335
@@ -90,68 +90,68 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
 msgstr[1] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "vynech�vam spr�vu %s@%s:%d (%d oktetov)"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "vynech�vam spr�vu %s@%s:%d (%d oktetov)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr "(d�ka -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr "(nadrozmern�)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nem��em z�ska� z�hlavie, spr�va %s@%s:%d (%d oktetov)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "��tam spr�vu %s@%s:%d z %d"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %s oktetov)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetov v tele spr�vy)"
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetov v tele spr�vy)"
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "spr�va %s@%s:%d nemala o�ak�van� d�ku (%d aktu�lne != %d o�ak�van�)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " ponechan�\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " vypr�zdnen�\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " nevypr�zdnen�\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -161,43 +161,43 @@ msgstr[0] ""
 msgstr[1] ""
 "fetchlimit %d dosiahnut�; %d spr�v ponech�n�ch na serveri %s ��et %s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na pripojenie na server "
 "%s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na odpove� zo servera %"
 "s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na odpove� z "
 "prij�ma�a.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "vypr�anie �asov�ho limitu po %d sekund�ch.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Predmet: fetchmail spozoroval opakovan� vypr�anie �asov�ch limitov\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -206,7 +206,7 @@ msgstr ""
 "Fetchmail zistil viac ako %d vypr�an� �asov�ch limitov pri pokusoch\n"
 "z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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,36 +222,36 @@ msgstr ""
 "\n"
 "Fetchmail nebude pracova� s t�mto prie�inkom, pokia� ho nespust�te znova.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "pr�kaz sp���an� pred spojen�m nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pr�kaz sp���an� pred spojen�m nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nem��em n�js� HESIOD po�tov� schr�nku pre %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Ved�ci server nem� meno.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nem��em n�js� kanonick� DNS meno pre %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s spojen� s %s bolo ne�spe�n�ch"
 
-#: driver.c:1084
+#: driver.c:1087
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -259,45 +259,45 @@ msgstr ""
 "\n"
 "Fetchmail sa nemohol spoji� s po�tov�m serverom %s:"
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohol z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL spojenie ne�spe�n�.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Z�mka-chyba zanepr�zdnenia pri %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba zanepr�zdnenia servra pri %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autoriz�cie pri %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (predt�m autorizovan�)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Predmet: autentifik�cia fetchmailu ne�spe�n� pri %s@%s\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohol z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
 "nebude obnoven�."
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -346,7 +346,7 @@ msgstr ""
 "o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
 "nebude obnoven�."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -366,179 +366,179 @@ msgstr ""
 "o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
 "nebude obnoven�."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okam�it� stiahnutie z %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Nezn�ma chyba pri prihl�sen� alebo autentifik�cii na %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autentifik�cia OK na %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Predmet: fetchmail autentifik�cia OK na %s@%s\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail bol �spe�n� pri prihl�sen� na %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Slu�ba bola obnoven�.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "v�ber alebo stiahnutie prie�inka %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "v�ber alebo stiahnutie �tandardn�ho prie�inka\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s pri %s (prie�inok %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s pri %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Obnovujem %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d viden�) pre %s"
 msgstr[1] "%d %s (%d viden�) pre %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s pre %s"
 msgstr[1] "%d %s pre %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetov).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "�iadna po�ta pre %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "neplatn� po�et spr�v!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "ch�baj�ce alebo neplatn� z�hlavie RFC822"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "klient/server synchroniz�cia"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "klient/server protokol"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "z�mka na servri zanepr�zdnen�"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP transakcia"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS vyh�ad�vanie"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "nezn�ma chyba\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-chyba pri doru�ovan� na SMTP server %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "hostite� je nezn�my."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s-chyba pri s�ahovan� po�ty z %s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "pr�kaz sp���an� po spojen� nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "pr�kaz sp���an� po spojen� nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Podpora Kerberos V4 nebola pripojen�.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Podpora Kerberos V5 nebola pripojen�.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Vo�ba --flush nie je podporovan� s %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Vo�ba --all nie je podporovan� s %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Vo�ba --limit nie je podporovan� s %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -553,7 +553,7 @@ msgstr ""
 "Sk�ste \"env QMAILINJECT= %s PARAMETRE\"\n"
 "%s: Ukon�en�.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -569,26 +569,26 @@ msgstr ""
 "N�vratov�-cesta: z�hlav�. Sk�ste \"env NULLMAILER_FLAGS= %s PARAMETRE\"\n"
 "%s: Ukon�en�.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Neexistujete. Cho�te pre�.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: nem��em rozozna� v�ho hostite�a!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zlyhalo pre %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -787,13 +787,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nie je spusten� �iadny �al�� fetchmail\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "�tartujem fetchmail %s d�mona \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "nem��em otvori� %s pre pripojenie logov k \n"
 
 #: fetchmail.c:607
@@ -926,40 +926,40 @@ msgstr "zobuden� o %s\n"
 msgid "normal termination, status %d\n"
 msgstr "norm�lne ukon�enie, stav %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "nem��em vykona� �asov� kontrolu run-control s�boru\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Upozornenie: viacer� zmienky o hostiteli %s v konfigura�nom s�bore\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Upozornenie: viacer� zmienky o hostiteli %s v konfigura�nom s�bore\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL podpora nebola prelo�en�.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola prelo�en�.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola prelo�en�.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL podpora nebola prelo�en�.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -967,325 +967,325 @@ msgstr ""
 "fetchmail: varovanie: nie je dostupn� DNS pre kontrolu Multidrop-spracovan� "
 "z %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "nespr�vna konfigur�cia %s, ��slo portu nem��e by� z�porn�\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "nespr�vna konfigur�cia %s, RPOP vy�aduje privilegovan� port\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "nespr�vna konfigur�cia %s, LMTP nem��e pou�i� �tandardn� SMTP port\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Pou�itie fetchall ako aj keep on v re�ime d�mona je chybn�!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukon�en� sign�lom %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: �ahanie spusten�\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "vybran� nepodporovan� protokol.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: �ahanie dokon�en�\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Dotazovac� interval je %d sek�nd\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-s�bor je %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile je %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Protokol o spr�vach bude zaznamenan� syslog-om\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail sa bude maskova� a nebude generova� Received\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazova� priebeh pomocou bodiek aj v log-s�bore.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail bude nespr�vne adresovan� spr�vy posiela� �alej na %s.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude smerova� chybov� spr�vy spr�vcovi po�ty.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude smerova� chybov� spr�vy odosielate�ovi.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail bude nespr�vne adresovan� spr�vy posiela� �alej na %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail bude smerova� chybov� spr�vy odosielate�ovi.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Vo�by pre pr�jem z %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Po�ta bude prijat� cez %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Dotazovanie tohoto servra bude vykonan� ka�d� %d intervaly.\n"
 msgstr[1] "  Dotazovanie tohoto servra bude vykonan� ka�d� %d intervaly.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skuto�n� n�zov servera je %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tento hostite� %s dotazovan�, ke� nebude �pecifikovan� �iadny in�.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tento hostite� %s dotazovan�, ke� nebude �pecifikovan� �iadny in�.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Heslo bude po�adovan�.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP tajomstvo = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol je KPOP s Kerberos %s autentifik�ciou"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol je %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (pou��vam slu�bu %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (pou��vam �tandardn� port)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (povinn� pou�itie UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr " V�etky dostupn� met�dy autentifik�cie bud� vysk��an�.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Autentifik�cia heslom bude povinn�.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  NTLM autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Predpokladan� �ifrovanie na �rovni koncov�ho zariadenia.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Ved�ci po�tovej slu�by je: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL �ifrovan� spojenia povolen�.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL Protokol je %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifik�tu SSL servra povolen�.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL prie�inok pre d�vern� certifik�ty: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr ""
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odtla�ok SSL k���a (kontrolovan� proti k���u servra): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  �asov� limit pre ne-odpovedanie servra je %d sek�nd"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (implicitn� hodnota).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Vybran� �tandardn� po�tov� prie�inok.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Vybran� po�tov� prie�inky s�:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s spr�vy budu prijat� (--all %s).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s spr�vy budu prijat� (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stiahnut� spr�vy %s ponechan� na servri (--keep %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stiahnut� spr�vy %s ponechan� na servri (--keep %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1293,7 +1293,7 @@ msgid ""
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1301,350 +1301,357 @@ msgid ""
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Prepis lok�lnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Prepis lok�lnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Vynechanie znaku \"n�vrat voz�ka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Vynechanie znaku \"n�vrat voz�ka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vyn�tenie znaku \"n�vrat voz�ka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vyn�tenie znaku \"n�vrat voz�ka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpret�cia �ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpret�cia �ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dek�dovanie MIME je %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dek�dovanie MIME je %s (mimedecode %s).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Ne�innos� po stiahnut� je %s (idle %s).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Ne�innos� po stiahnut� je %s (idle %s).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nepr�zdne stavov� riadky bud� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nepr�zdne stavov� riadky bud� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To riadky bud� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To riadky bud� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit pre ve�kos� spr�vy je %d oktetov (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Spr�vy nemaj� limitovan� ve�kos� (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Interval pre varovanie oh�adom ve�kosti spr�vy je %d sek�nd (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varovanie o ve�kosti spr�v pri ka�dom s�ahovan� (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit pre prijat� spr�vy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pr�jem spr�v nie je limitovan� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit pre prijat� spr�vy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Spr�vy nemaj� limitovan� ve�kos� (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit d�vky SMTP spr�v je %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  D�vka SMTP spr�v nie je limitovan� (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval medzi skuto�n�mi vymazaniami nastaven� na %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nevyn�ten� vymazania (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Dom�ny pre ktor� bude doru�en� po�ta s�:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr "(implicitn� hodnota)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Spr�vy bud� pripojen� k %s ako BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Spr�vy bud� doru�en� s \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Spr�vy bud� %cMTP-dopraven� na:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Hos�ov� �as� z MAIL FROM riadku bude %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adresa, ktor� sa pou�ije v RCPT TO a bude doru�en� v SMTP bude %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznan� SPAM-blokovan� odpovede prij�ma�a s�:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  SPAM-blokovanie vypnut�\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Spojenie so servrom bude aktivovan� s \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Pr�kaz sp���an� pred spojen�m neexistuje.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Spojenie so servrom bude ukon�en� s \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Pr�kaz sp���an� po spojen� neexistuje.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nie s� definovan� �iadne lok�lne n�zvy pre tohto hostite�a.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop m�d: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Single-drop m�d: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d rozpoznan�ch lok�lnych n�zvov.\n"
 msgstr[1] "%d rozpoznan�ch lok�lnych n�zvov.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS vyh�ad�vanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS vyh�ad�vanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Prez�vky servra bud� porovn�van� s multi-drop adresami pomocou "
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Prez�vky servra bud� porovn�van� s multi-drop adresami pomocou "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Smerovanie adries ob�lok nie je aktivovan�\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Predpoklad� sa z�hlavie ob�lky: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Po�et z�hlav� ob�lok na anal�zu: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s bude odstr�nen� z pou��vate�ovho id\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  �iadne odstr�nenie prefixu\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Preddeklarovan� prez�vky po�tov�ho servra:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Lok�lne dom�ny:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojenie mus� by� realizovan� pomocou rozhrania %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Neboli �pecifikovan� �iadne po�iadavky na rozhranie.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Dotazovac� cyklus s monitorom %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Nebolo �pecifikovan� �iadne monitorovacie rozhranie.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Spojenie so servrom bude realizovan� pomocou plugin-u %s (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Nebol �pecifikovan� �iadny pr�kaz pre plugin.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Spojenia s prij�ma�om bud� realizovan� pomocou plugout-u %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Nebol �pecifikovan� �iadny pr�kaz pre plugout.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Neboli ulo�en� �iadne UID-y z tohoto hostite�a.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID-ov ulo�en�ch.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Inform�cia o trase dotazu bude pridan� do z�hlavia Received.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Do z�hlavia Received nebude pridan� �iadna inform�cia o trase s�ahovania.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Vlastnosti prechodu \"%s\".\n"
@@ -1661,7 +1668,7 @@ msgstr ""
 "\n"
 "SIGINT obdr�an�... kon��m.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Nem��em z�ska� n�zov slu�by pre [%s]\n"
@@ -1875,44 +1882,44 @@ msgstr "Nebolo n�jden� �iadne rozhranie s n�zvom %s"
 msgid "No IP address found for %s"
 msgstr "Nebola n�jden� �iadna IP adresa pre %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "ch�baj�ca IP adresa rozhrania\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "neplatn� IP adresa rozhrania\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "neplatn� IP maska rozhrania\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivita na %s -zaznamenan�- ako %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "s�ahovanie z %s vynechan�, %s je nedostupn�\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "s�ahovanie z %s vynechan�, IP adresa %s je vyl��en�\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivita na %s skontrolovan� ako %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "s�ahovanie z %s vynechan�, %s neakt�vny\n"
 
-#: interface.c:729
+#: interface.c:730
 #, fuzzy, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivita na %s bola %d, je %d\n"
@@ -2039,307 +2046,318 @@ msgstr "Nie je mo�n� dek�dova� OTP v�zvu\n"
 msgid "Secret pass phrase: "
 msgstr "Heslo: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Re�azec '%s' nie je platn� ��selny re�azec.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota re�azca '%s' je %s ako %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "men�ia"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "v��ia"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "�pecifikovan� neplatn� protokol `%s'.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "�pecifikovan� neplatn� protokol `%s'.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "�pecifikovan� neplatn� autentifik�cia `%s'.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "pou�itie:  fetchmail [prep�na�e] [server ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Prep�na�e s� nasledovn�:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobraz tohto pomocn�ka\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobraz inform�ciu o verzii\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       skontroluj spr�vy bez stiahnutia\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracuj potichu\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracuj hlu�ne (diagnostick� v�stup)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spusti ako d�mon raz za n sek�nd\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodp�jaj proces d�mona\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabi proces d�mona\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     �pecifikuj n�zov log-s�boru\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 "      --syslog      pou�i syslog(3) pre v��inu spr�v ke� be�� ako d�mon\n"
 
-#: options.c:614
+#: options.c:627
 #, fuzzy
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   nezapisuj Received & povo� podvrhnutie hostite�a\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc �pecifikuj n�hradn� sp���ac� riadiaci s�bor\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      �pecifikuj n�hradn� s�bor UID-ov\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      �pecifikuj n�hradn� s�bor UID-ov\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr ""
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr ""
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:642
+#: options.c:657
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr ""
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr ""
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr ""
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr ""
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
@@ -2416,45 +2434,45 @@ msgstr ""
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Vo�ba --flush nie je podporovan� s ODMR\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2478,180 +2496,180 @@ msgstr ""
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr ""
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr ""
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr ""
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr ""
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr ""
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr ""
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr ""
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr ""
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr ""
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr ""
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr ""
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr ""
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr ""
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr ""
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr ""
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr ""
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr ""
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr ""
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr ""
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr ""
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr ""
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr ""
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr ""
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr ""
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr ""
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr ""
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr ""
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr ""
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr ""
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr ""
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr ""
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr ""
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr ""
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr ""
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr ""
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+msgid "MD5 result is:\n"
 msgstr ""
 
 #: servport.c:53
@@ -2673,120 +2691,132 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr ""
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr ""
 
-#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr ""
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1375
+#: sink.c:1380
+#, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr ""
+
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr ""
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1384
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr ""
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2821,191 +2851,191 @@ msgstr ""
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr ""
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr ""
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr ""
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr ""
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr ""
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr ""
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr ""
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "SSL spojenie ne�spe�n�.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%s spojen� s %s bolo ne�spe�n�ch"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "SSL spojenie ne�spe�n�.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr ""
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:758
+#: socket.c:753
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "  SSL prie�inok pre d�vern� certifik�ty: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -3052,47 +3082,47 @@ msgstr "nen�jden� adresa Received\n"
 msgid "found Received address `%s'\n"
 msgstr "n�jden� adresa Received `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "nespr�vny riadok z�hlavia n�jden� pri prezeran� z�hlav�\n"
 
-#: transact.c:594
+#: transact.c:597
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Obnovujem %s\n"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "�iadne lok�lne zhody, posielam na %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "odoslanie a zmazanie odlo�en� kv�li DNS chyb�m\n"
 
-#: transact.c:1258
+#: transact.c:1262
 #, fuzzy
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "z�pis msgblk.hlavi�iek RFC822\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "�iadna adresa pr�jemcu nezodpoved� zadan�m lok�lnym men�m"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa pr�jemcu %s nezodpoved� �iadnemu lok�lnemu menu"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "spr�va obsahuje NUL-y"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP prij�ma� zamietol lok�lne adresy pr�jemcu: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "z�pis textu spr�vy\n"
diff --git a/po/sq.po b/po/sq.po
index 16894d93..3162066d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2008-02-29 00:24+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -55,12 +55,12 @@ msgstr "gabim kerberos %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [shërbyesi thotë '%*s'] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [shërbyesi thotë '%*s'] \n"
 
 #: driver.c:335
@@ -92,69 +92,69 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "  %d msg me gjatësi %d oktete u anashkaluan prej fetchmail-it."
 msgstr[1] "  %d msg me gjatësi %d oktete u anashkaluan prej fetchmail-it."
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "po anashkaloj mesazh %s@%s:%d"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "po anashkaloj mesazh %s@%s:%d (%d tetëshe)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (gjatësi -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (tej mase)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nuk munda të sjell tituj, mesazh %s@%s:%d (%d tetëshe)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "po lexoj mesazh %s@%s:%d nga %d"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktete)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d tetëshe titulli) "
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d tetëshe trupi) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr "mbjatur\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " zbrazur\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " i pa zbrazur\n"
 
-#: driver.c:828
+#: driver.c:831
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -164,37 +164,37 @@ msgstr[0] ""
 msgstr[1] ""
 "mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "mbarim kohe pas %d sekondash po pres për t'u lidhur me shërbyesin %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për shërbyesin %s.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për %s.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "mbarim kohe pas %d sekondash po pres të përgjigjet dëgjuesi.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "mbarim kohe pas %d sekondash.\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjekt: fetchmail-i sheh mbarime të përsëritur kohe"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -203,7 +203,7 @@ msgstr ""
 "Fetchmail-i vërejti më tepër se %d mbarime kohe ndërsa përpiqej të merrte "
 "postë prej %s@%s.\n"
 
-#: driver.c:920
+#: driver.c:923
 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,78 +220,78 @@ msgstr ""
 "\n"
 "Fetchmail-i nuk do të vjelë sërish prej kësaj kutie para se ta rinisni.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "urdhri para-lidhje dështoi me përfundim %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "urdhri para-lidhje dështoi me përfundim %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nuk munda të gjej kuti postare HESIOD for %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Shërbyesi udhëheqës nuk ka emër.\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nuk munda të gjej emër DNS kanonikal të %s (%s)\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "lidhja %s me %s dështoi"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subjekt: Sinjalizim Fetchmail për shërbyes të pakapshëm."
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail-i nuk mundi të lidhet me shërbyesin e postës %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gabim duket-i-zënë te %s@%s\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gabim shërbyes i zënë te %s@%s\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Dështim autorizimi te %s@%s%s\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (autorizuar dikur)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subjekt: mirëfilltësimi fetchmail dështoi te %s@%s"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail-i nuk mundi të marrë postë prej %s@%s.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -315,7 +315,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -342,7 +342,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -363,178 +363,178 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Rivil menjëherë te %s@%s\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Gabim mirëfilltësimi ose hyrje e panjohur te %s@%s\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "OK autorizimi te %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subjekt: OK mirëfilltësimi fetchmail-i te %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail-i mundi të hyjë te %s@%s.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Shërbimi është rivendosur.\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "po përzgjedh ose vjel prej dosjes %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "po përzgjedh ose vjel prej dosjes parazgjedhje\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s te %s (dosja %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s te %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "Po mbledh %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mesazh për %s"
 msgstr[1] "%d mesazhe për %s"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mesazh për %s"
 msgstr[1] "%d mesazhe për %s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktete).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Pa postë për %s\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "numërim mesazhesh me gabime!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "\"socket\""
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "titull RFC822 mungues ose i dëmtuar"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "njëkohësim klient/server"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protokoll klient/server"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "kyçje e zënë te shërbyes"
 
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "shkëmbim SMTP"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "kërkim DNS"
 
-#: driver.c:1561
+#: driver.c:1563
 msgid "undefined"
 msgstr "e papërcaktuar"
 
-#: driver.c:1567
+#: driver.c:1569
 #, 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 strehë SMTP %s\n"
 
-#: driver.c:1569
+#: driver.c:1571
 msgid "unknown"
 msgstr "i/e panjohur"
 
-#: driver.c:1571
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "gabim %s gjatë sjelljes prej %s@%s\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "urdhër pas-lidhjeje dështoi me gjendje %d\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "urdhër pas-lidhjeje dështoi me gjendje %d\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr ""
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr ""
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Mundësia --zbrazje nuk mbulohet me %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Mundësia --all nuk mbulohet me %s\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Mundësi --limit nuk mbulohet me %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -549,7 +549,7 @@ msgstr ""
 "Provoni \"env QMAILINJECT= %s ARGUMENTE TUAJT KËTU\"\n"
 "%s: Ndërprerje.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -567,26 +567,26 @@ msgstr ""
 "Provoni \"env NULLMAILER_FLAGS= %s ARGUMENTE TUAJT KËTU\"\n"
 "%s: Ndërprerje.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Ju nuk ekzistoni.  Ik tutje.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: nuk përcaktoj dot strehën tuaj!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname dështoi për %s\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "Nuk gjej dot strehën time te bazë të dhënash strehësh për ta shquar!\n"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -800,13 +800,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nuk po xhiron tjetër fetchmail\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "po nis demon fetchmail-i %s\n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "nuk munda të hap %s ku të vargëzoj regjistrime \n"
 
 #: fetchmail.c:607
@@ -940,40 +940,40 @@ msgstr "përmendur më %s\n"
 msgid "normal termination, status %d\n"
 msgstr "përfundim normal, gjendje %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "s'munda të kontrolloj kohën për kartelën run-control\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, 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"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Gabim: \"defaults\" të shumëfishtë në kartelën formësim.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -981,17 +981,17 @@ msgstr ""
 "fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje "
 "shpërndarjesh të shumëfishta %s\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "sinjalizim: Mos kërkoni ndihmë nëse tërë posta i shkon postmaster-it!\n"
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1000,309 +1000,309 @@ msgstr ""
 "fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për "
 "shërbimin ose portën\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, 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"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "formësimi i %s i pavlefshëm, LMTP nuk mund të përdorë portën SMTP "
 "parazgjedhje\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "\"fetchall\" e njëkohësisht \"keep on\" gjatë mënyrës demon përbën gabim!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "përfunduar me sinjal %d\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja filloi\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP2.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP3.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për IMAP.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ETRN.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ODMR.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "përzgjedhur protokoll i pambuluar.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja u plotësua\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervali i vjeljes është %d sekonda\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Jetëgjatësia e regjistrit është %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile është %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesazhe ecurie do të regjistrohen përmes syslog\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail do të kryejë maskim dhe nuk do të prodhojë Të Marrë\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail-i do të tregojë pika ecurie edhe në kartela regjistrimesh.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, 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"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste drejt ustait të postës.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të "
 "shumëfishtë te %s.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Mundësi për marrje prej %s@%s:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do të merret përmes %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i vërtetë i shërbyesit është %s.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Kjo strehë nuk do pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Kjo strehë do të pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Do të kërkohet fjalëkalim.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Sekret APOP= \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjalëkalim = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli është KPOP me mirëfilltësim Kerberos %s"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll është %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (po përdor shërbim %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (po përdor portë parazgjedhje)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (po detyroj përdorim UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Do të provohen tërë metodat e mundshme për mirëfilltësim.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim me fjalëkalim.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim MSN.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim NTLM.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-Md5.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim GSSAPI.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V4.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V5.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Nënkuptohet kodim cep-më-cep.\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Parësori i shërbimit postar është: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Mundësuar sesione SSL të koduar.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Mundësuar kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  drejtori dëshmish SSL të besueshme: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Emër i Zakonshëm Shërbyesi: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  shenjë gishtash kyçi SSL (kontrolluar kundrejt kyçi shërbyesi): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mospërgjigjes së shërbyesit është %d sekonda"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e përzgjedhur.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Kutitë postare të përzgjedhura janë:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Do të merren tërë mesazhet (--all on).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Do të merren vetëm mesazhet e rinj (--all off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesazhet e sjellë %s mbahen në shërbyes (--keep on).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesazhet e sjellë nuk do të mbahen në shërbyes (--keep off).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 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"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Mesazhet e vjetër nuk do të zbrazen para marrjes së mesazheve (--flush "
 "off).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1310,7 +1310,7 @@ msgstr ""
 "  Mesazhet tej masës do të zbrazen para marrjes së mesazheve (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1318,348 +1318,355 @@ msgstr ""
 "  Mesazhet tej masës nuk do të zbrazen para marrjes së mesazheve (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Rishkrimi i vendndodhjeve vendore të shërbyesit është veprues (--norewrite "
 "off).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Rishkrimi i vendndodhjeve vendore të shërbyesit është joveprues (--"
 "norewrite on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Heqja e \"carriage-return\"-it është vepruese (stripcr on).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e \"carriage-return\"-it është jovepruese (stripcr off).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është veprues (forcecr on).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është joveprues (forcecr off).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është joveprues "
 "(pass8bits on).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është veprues "
 "(pass8bits off).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Çkodimi MIME është veprues (mimedecode on).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Çkodimi MIME është joveprues (mimedecode off).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "Plogështia pas vjeljes është vepruese (idle on).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "Plogështia pas vjeljes është jovepruese (idle off).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Nuk do të merren parasysh rreshta Gjendjeje Joboshe (dropstatus on)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Do të merren parasysh rreshta Gjendjeje Joboshe do të jenë (dropstatus "
 "off)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Rreshtat Nisur Për nuk do të merren parasysh (dropdelivered on)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur Për do të merren parasysh (dropdelivered off)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Kufiri i madhësisë së mesazheve është %d tetëshe (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, 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"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madhësie në çdo vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Kufiri për mesazhe të marrë është %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa kufi për mesazhe të marrë (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Kufi madhësie mesazhesh që sillen është %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh që sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, 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"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Kryej kërkim linear të UID-ve gjatë çdo vjeljeje (--fastuidl 0).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Kufiri për tufë mesazhesh SMTP është %d.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa kufi për tufë mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval fshirjesh ndërmjet shuarjesh detyruar në %d (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje të detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Përkatësitë për të cilat do të jepet postë janë:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesazhet do të vargëzohen te %s si BSMTP\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do të shpërndahen me \"%s\".\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do të përcillen si %cMTP te:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Vendndodhja që do vendoset tek rreshtat RCPT TO të dërguar te SMTP do të "
 "jetë %s\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Përgjigje të pranuara blloqesh spam dëgjuesi janë:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokim spamesh i çaktivizuar\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të sillet me \"%s\".\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdhër para-lidhjeje.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të lihet me \"%s\".\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdhër pas-lidhjeje.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendorë të deklaruar për këtë strehë.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Mënyrë shpërndarje e shumëfishtë: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Mënyrë shpërndarje njëshe: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është veprues.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është joveprues.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
 "shumëfishta nga prej vendndodhjes IP.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
 "shumëfishta prej emrit.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Përcjellje vendndodhjesh zarf është çaktivizuar\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Titulli zarf nënkuptohet të jetë: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numër titujsh zarf për t'u anashkaluar: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Parashtesa %s do të hiqet prej id-je përdoruesi\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash shërbyesi të paradeklaruar:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Përkatësi vendore:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet të jetë përmes ndërfaqes %s.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht të përcaktuar rreth ndërfaqes.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do të mbikqyrë %s.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa ndërfaqe mbikqyrjeje të përcaktuar.\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, 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"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Lidhje dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdhër shtojce daljeje të përcaktuar.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID të ruajtura prej kësaj strehe.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID të ruajtur.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Të dhëna gjurmimi vjeljeje do të shtohen te titulli Të Marrë.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Nuk do të shtohen të dhëna gjurmimi vjeljeje te titulli Të Marrë.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-nëpër \"%s\".\n"
@@ -1676,7 +1683,7 @@ msgstr ""
 "\n"
 "U kap SIGINT... po qërohem që këtej.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Nuk arrita të kem emër shërbimi për [%s]\n"
@@ -1891,44 +1898,44 @@ msgstr "Nuk u gjet ndërfaqe me emrin %s"
 msgid "No IP address found for %s"
 msgstr "Nuk u gjet vendndodhje IP për %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "mungon vendndodhje ndërfaqeje IP\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "vendndodhje ndërfaqeje IP e pavlefshme\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "maskë ndërfaqeje IP e pavlefshme\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "veprimatri në %s -parë- si %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "po anashkaloj vjeljen e %s, %s i pakapshëm\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "po anashkaloj vjeljen e %s, vendndodhje IP e %s e përjashtuar\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "veprimtari në %s shenjuar si %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "po anashkaloj vjeljen e %s, %s joveprues\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "veprimtaria në %s qe %d, është %d\n"
@@ -2049,79 +2056,84 @@ msgstr ""
 msgid "Secret pass phrase: "
 msgstr "Frazë pass sekrete: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Vargu '%s' nuk është një varg numerik i vlefshëm.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Vlera e vargut '%s' është %s se %d.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "më e vogël"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "më e madhe"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Është treguar protokoll i pavlefshëm `%s'.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Është treguar protokoll i pavlefshëm `%s'.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Është treguar mirëfilltësim i pavlefshëm `%s'.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "përdorimi:  fetchmail [mundësi] [shërbyes ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  Mundësitë janë si vijon:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        shfaq ndihmën për këtë mundësi\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     shfaq të dhëna versioni\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       kontrollon për mesazhe por pa sjellë\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      puno në heshtje\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     puno me zhurmë (diagnostiko ecurinë)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      xhiro si demon njëherë në n sekonda\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    mos shkëput proces demoni\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        asgjëso proces demoni\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     përcakto emër kartele regjistrimi\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2129,78 +2141,78 @@ msgstr ""
 "      --syslog      përdor syslog(3) për shumicën e mesazheve kur xhiron si "
 "demon\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   mos shkruaj Të Marrë & dhe mundëso \"host spoofing\"\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc përcakto kartelë \"run control\" alternative\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      përcakto tjetër kartelë UID-rash\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      përcakto tjetër kartelë UID-rash\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  përcakto marrës të zonës së fundit\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   përcaktim i ndërfaqes së nevojshme\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     mbikqyr ndërfaqen për veprimtari\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         mundëso sesion të koduar me ssl\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      kartelë kyçi ssl vetiak\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     dëshmi ssl klienti\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath shteg për te dëshmi ssl\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2208,163 +2220,169 @@ msgstr ""
 "      --sslfingerprint shenjë gishtash që duhet të përputhet me atë të "
 "dëshmisë së shërbyesit.\n"
 
-#: options.c:634
+#: options.c:647
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    detyro protokoll ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      përcakto urdhër të jashtëm për hapje lidhjeje\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     përcakto urdhër të jashtëm për hapje lidhjeje smtp\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    përcakto protokoll marrjeje (shih faqen man)\n"
 
-#: options.c:640
+#: options.c:655
 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:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        portë TCP për lidhje (e vjetëruar, përdorni --service)\n"
 
-#: options.c:642
+#: options.c:657
 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:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        lloj mirëfilltësimi (fjalëkalim/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     afat mospërgjigjeje shërbyesi\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    titull vendndodhje si të qe zarf\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    parashtesë për t'u hequr pre id-je përdoruesi vendor\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   parësori i shërbimit postar\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  shton të dhëna gjurmimi vjeljeje te titull Të marrë\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    përcakto futjen e përdoruesit te shërbyesi\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         merr mesazhe të rinj dhe të vjetër\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      fshi mesazhe të rinj pas marrjeje\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ruaj mesazhe të rinj pas marrjejel\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       fshi mesazhe të vjetër prej shërbyesit\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  fshij mesazhe tej mase\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   mos rishkruaj titull vendndodhjesh\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       mos sill mesazhe tej madhësisë së dhënë\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval midis njoftimesh sinjalizimi poste\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    cakto strehë SMTP përcjelljeje\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains sill postë për përkatësitë e caktuar\n"
 
-#: options.c:662
+#: options.c:677
 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"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    cakto emër të plotë SMTP emërpërdoruesi@përkatësi\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   cakto vlera përgjigjesh antispam\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  cakto kufi tufe për lidhje SMTP\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  cakto kufi prurjeje për lidhje shërbyesish\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit cakto kufi madhësie mesazhesh që sillen\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    kryej një kërkim dyor për UIDL-ra\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     cakto maksimum fshirjesh ndërmjet shuarjesh\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         cakto MDA për t'u përdorur për përcjellje\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       cakto kartelë përfundimesh BSMTP\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        përdor LMTP (RFC2033) për shpërndarje\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      cakto emër dosjeje të largët\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika përparimi edhe në kartela regjistrimi\n"
 
@@ -2443,15 +2461,15 @@ msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "mundësi shërbyesi pas mundësish përdoruesi"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS jo vepruese."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2459,7 +2477,7 @@ msgstr ""
 "fetchmail: mundësia e ndërfaqes mbulohet vetëm nën Linux (pa IPv6) dhe "
 "FreeBSD\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2467,25 +2485,25 @@ msgstr ""
 "fetchmail: mundësia e mbikqyrjes mbulohet vetëm nën Linux (pa IPv6) dhe "
 "FreeBSD\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL nuk është vepruese"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "fund futjeje"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Kartela %s duhet të jetë një kartelë e rregullt.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Kartela %s duhet të ketë jo më shumë se lejet -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Kartela %s duhet të jetë prona juaj.\n"
@@ -2509,180 +2527,181 @@ msgstr "Gati për rishkrimin e %s"
 msgid "Rewritten version is %s\n"
 msgstr "Versioni i rishkruar është %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Sukses"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Përdorues i kufizuar (diçka nuk shkon me llogarinë)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Id përdoruesi ose fjalëkalim i pavlefshëm"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Gabim Perëndie"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: gabim çkodimi Base64\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Shërbimi zgjodhi version RPA-je %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr ""
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Vulë kohore shërbimi %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "Gabim gjatësie \"token\"-i RPA 2\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr ""
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "Gabim RPA në vargun service@realm\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: gabim kodimi base64\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Mirëfilltësim përdoruesi (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Gjendje RPA: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "Gabim gjatësie \"token\"-i RPA 4\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA nuk ju pranon: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA nuk ju pranon, arsye e panjohur\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Gabim gjatësie Mirëfilltësimi Përdoruesi RPA: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Gabim gjatësie kyçi sesioni RPA: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr ""
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Kyç sesioni i vendosur:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "Autorizim RPA i plotë\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Merr përgjigje\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Merr kthim përgjigjeje %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr jo 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Gabim gjatësie \"token\"-i\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Gjatësia e \"token\"-i %d nuk pajtohet me rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Fushë e pasaktë mekanizmi\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "gabim dec64 tek shenja %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr ""
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "Varg RPA shumë i gjatë\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unikod:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA dështoi në hapjen e /dev/urandom. Çka s'duhej të ndodhte\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    parandalon hyrjen tuaj, por nënkupton\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    që nuk mund të jeni të sigurt se po flisni te\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    shërbimi që mendoni se jeni(sulmet\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    si përgjigje nga një shërbim i pandershëm janë të mundshëm.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 po zbatohet te bllok të dhënash:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "përfundimi MD5 është: \n"
 
 #: servport.c:53
@@ -2704,123 +2723,134 @@ msgstr "Ju lutemi jepeni shërbimin si numër dhjetor porte.\n"
 msgid "forwarding to %s\n"
 msgstr "po përcjell te %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst mesazhi kërcimesh)\n"
 
 #  this will usually go to sylog...
 #  this will usually go to sylog...
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "postë prej %s kërceu për te %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gabimi i ruajtur është ende %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "gabim %cMTP: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Dëgjesi %cMTP nuk e pëlqen vendndodhjen e marrësit `%s'\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "dëgjuesi %cMTP nuk e ka dhe aq qejf vendndodhjen e marrësit `%s'\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "pa përputhje vendndodhjesh; s'është caktuar \"postmaster\".\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "s'mund as të dërgoj te %s!\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "pa përputhje vendndodhjesh; po përcjell drejt %s.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "gati për të shpërndarë me: %s\n"
 
+#: sink.c:1240
+#, fuzzy, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "S'riemërtoj dot kartelën fetchids %s si %s: %s\n"
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "Hapja e MDA-s dështoi\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Lidhja %cMTP me %s dështoi\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "s'ia dal dot me dëgjuesin; po rikthehem te %s"
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Dështoi përfundim mesazhi ose mbyllje e kartelës BSMTP\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gabim në fshirjen e kartelës \"%s\": %s\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA riktheu gjendje jo zero %d\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Çudi: MDA pclose riktheu %d, nuk mund të trajtojë %s:%d\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Dështoi përfundim mesazhi ose mbyllje e kartelës BSMTP\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "Gabim shpërndarjeje LMTP në EOM\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Përgjigje jo-503 e papritur për LMTP EOM: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2857,197 +2887,197 @@ msgstr "Mirëfilltësim ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "gabim protokolli dëgjuesi smtp\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: dështoi \"malloc\"\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair dështoi\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: degëzimi dështoi\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 dështoi\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "po xhiroj %s (streha %s shërbimi %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) dështoi\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "gabim getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 "Provoni të shtoni mundësinë --service (shihni po ashtu FAQ, zëri R12).\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, fuzzy, c-format
 msgid "unknown (%s)"
 msgstr "i/e panjohur"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr "s'mund as të dërgoj te %s!\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "lidhja %s me %s dështoi"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizëm Lëshues: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Sinjalizim: Emër Organizmi Lëshues shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Organizëm i Panjohur\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Emër i Zakonshëm Lëshuesi: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Sinjalizim: Emër i Zakonshëm Lëshues shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Emër i Zakonshëm Lëshuesi i Panjohur\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Emër i Zakonshëm Shërbyesi: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dëshmi e gabuar: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "Dëshmi e gabuar: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "Dëshmi e gabuar: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ngatërrim Emri të Zakonshëm Shërbyesi: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar, nuk munda të verifikoj dëshminë!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Emër i Zakonshëm Shërbyesi I panjohur\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar në dëshmi!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() dështoi!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Kujtesë e pamjaftueshme!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Shtytëz përmbledhjeje tekstesh shumë e vogël!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "gjurmë gishtash kyçi %s: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s gjurmat e gishtave përputhen.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s gjurmat e gishtave nuk përputhen!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Gabim verifikim dëshmie shërbyesi: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "lëshues i panjohur (%d gërmat e para): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Përshkrues kartele jashtë intervali për SSL"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Treguar protokoll SSL i pavlefshëm '%s', po përdor të parazgjedhurin "
 "(SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 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:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Riprovë për lexim prej një \"socket\"-i Cygwin\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Leximi dhe shkrimi prej një \"socket\"-i Cygwin dështuan!\n"
 
@@ -3094,46 +3124,46 @@ msgstr "nuk u gjet vendndodhje Të Marrë\n"
 msgid "found Received address `%s'\n"
 msgstr "u gjet vendndodhje Të Marrë `%s'\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "u gjet rresht i pasaktë titulli ndërkohë që skanoheshin titujt\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "rreshti: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "pa përputhje vendore, po përcjell te %s\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "përcjellje dhe fshirje lënë përgjysmë për shkak gabimesh DNS\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "po shkruaj tituj RFC822 msgblk\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "asnjë vendndodhje marrësi nuk përputhet me emra vendorë të deklaruar"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "vendndodhja e marrësit %s nuk u përputh me ndonjë emër vendor"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "mesazhi ka NULe të trupëzuar"
 
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "dëgjuesi SMTP hodhi tej vendndodhje vendore marrësish: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "po shkruaj tekst mesazhi\n"
diff --git a/po/tr.po b/po/tr.po
index 9f045edd..3069eabe 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2003-10-17 17:27+0200\n"
 "Last-Translator: Engin G�nd�z <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -55,12 +55,12 @@ msgstr "kerberos hatas� %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
 #: driver.c:335
@@ -93,50 +93,50 @@ msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
 msgstr[1] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlan�yor"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ileti %s@%s:%d atlan�yor (%d sekizlik)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr " (b�y�kl�k -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr " (�ok b�y�k)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "ba�l�klar getirilemedi, ileti %s@%s:%d (%d sekizlik)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:624
+#: driver.c:627
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %ssekizlik)"
 
-#: driver.c:625
+#: driver.c:628
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (ileti g�vdesi %d sekizlik) "
 
-#: driver.c:692
+#: driver.c:695
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (ileti g�vdesi %d sekizlik) "
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -144,19 +144,19 @@ msgstr ""
 "%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen "
 "%d)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr " b�rak�ld�\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr " bo�alt�ld�\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr " bo�alt�lmad�\n"
 
-#: driver.c:828
+#: driver.c:831
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -166,38 +166,38 @@ msgstr[0] ""
 msgstr[1] ""
 "`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "%d saniye %s sunucusuna ba�lanmak beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "sunucu %2$s %1$d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%2$s %1$d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "dinleyici %d saniye beklendikten sonra zamana��m�na u�rand�.\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:913
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail �ok say�da zamana��m� ile kar��la��yor\n"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -206,7 +206,7 @@ msgstr ""
 "Fetchmail %2$s@%3$s'den posta almaya �al���rken %1$d'den �ok zamana��m� ile "
 "kar��la�t�.\n"
 
-#: driver.c:920
+#: driver.c:923
 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"
@@ -223,37 +223,37 @@ msgstr ""
 "Fetchmail yeniden �al��t�r�lana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:946
+#: driver.c:949
 #, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "ba�lant� sonras� komut ba�ar�s�z oldu, durum kodu %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "ba�lant� sonras� komut ba�ar�s�z oldu, durum kodu %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s i�in HESIOD pobox bulunamad�\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Lead sunucunun ad� yok.\n"
 
 # canonical'in T�rk�esi ne ola? kanonik hi� ho� de�il.
-#: driver.c:1021
+#: driver.c:1024
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "%s (%s)'in kanonik DNS ad�n� bulamad�m\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
 
-#: driver.c:1084
+#: driver.c:1087
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -261,45 +261,45 @@ msgstr ""
 "\n"
 "Fetchmail posta sunucusuna (%s) ula�amad�:"
 
-#: driver.c:1086
+#: driver.c:1089
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail %s@%s'den posta alamad�.\n"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Me�gul kilit hatas� (%s@%s)\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Sunucu me�gul hatas� (%s@%s)\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s'te yetkilendirme hatas�\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr " (�nceden yetkilendirilmi�)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetlemesi ba�ar�s�z oldu\n"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamad�.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
 "�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
 
-#: driver.c:1214
+#: driver.c:1217
 #, fuzzy
 msgid ""
 "\n"
@@ -348,7 +348,7 @@ msgstr ""
 "Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
 "�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -367,71 +367,71 @@ msgstr ""
 "Fetchmail daemon'� �al��maya devam edecek ve s�ras� geldik�e ba�lanmaya\n"
 "�al��acak. Hizmet yeniden sa�lanana dek ba�ka bir bildirim g�nderilmeyecek."
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s'te bilinmeyen giri� ya da kimlik denetleme hatas�\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi ba�ard�.\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden sa�lan�yor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "%s klas�r�n� se�iyor ya da yeniden kontrol ediyorum\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "�ntan�ml� klas�r� se�iyor ya da yeniden kotrol ediyorum\n"
 
 # kaynak koduna bak�lacak
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klas�r %3$s)"
 
 # kaynak koduna bak�lacak
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklan�yor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1341
+#: driver.c:1344
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%5$s i�in (%3$d adedi %4$s) %1$d %2$s"
 msgstr[1] "%5$s i�in (%3$d adedi %4$s) %1$d %2$s"
 
-#: driver.c:1344
+#: driver.c:1347
 #, fuzzy
 msgid "seen"
 msgid_plural "seen"
@@ -439,114 +439,114 @@ msgstr[0] "g�r�lm��"
 msgstr[1] "g�r�lm��"
 
 # �nceki iki ileti ile ilgili.
-#: driver.c:1347
+#: driver.c:1350
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%3$s i�in %1$d %2$s"
 msgstr[1] "%3$s i�in %1$d %2$s"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s i�in mektup yok\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "sahte ileti say�s�!"
 
-#: driver.c:1537
+#: driver.c:1539
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1540
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ba�l��� ya hi� yok ya da format� k�t�"
 
-#: driver.c:1543
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1549
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokol�"
 
-#: driver.c:1552
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "sunucuda kilit me�gul"
 
 # transaction'� i�lem diye �evirdim. Do�ru mu?
-#: driver.c:1555
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP i�lemi"
 
-#: driver.c:1558
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1561
+#: driver.c:1563
 #, fuzzy
 msgid "undefined"
 msgstr "tan�mlanmam�� hata\n"
 
-#: driver.c:1567
+#: driver.c:1569
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "SMTP makinas� %2$s'e da��t�l�rken %1$s hatas�\n"
 
-#: driver.c:1569
+#: driver.c:1571
 #, fuzzy
 msgid "unknown"
 msgstr "makina bilinmiyor."
 
-#: driver.c:1571
+#: driver.c:1573
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%2$s'den getirilirken %1$s hatas�\n"
 
-#: driver.c:1583
+#: driver.c:1585
 #, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "ba�lant� sonras� komut %d durum kodu ile ba�ar�s�z oldu\n"
 
-#: driver.c:1585
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "ba�lant� sonras� komut %d durum kodu ile ba�ar�s�z oldu\n"
 
-#: driver.c:1604
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 deste�i yok.\n"
 
-#: driver.c:1612
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 deste�i yok.\n"
 
-#: driver.c:1623
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1638
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit se�ene�i %s ile desteklenmiyor\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -562,7 +562,7 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -579,26 +579,26 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Burada yoksunuz. Uzak durun.\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: makinan�z� belirleyemiyorum!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "`gethostbyname' %s i�in ba�ar�s�z oldu\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -798,13 +798,13 @@ msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: ba�ka bir fetchmail �al��m�yor\n"
 
 #: fetchmail.c:587
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "fetchmail %s daemon ba�lat�l�yor \n"
 
 #: fetchmail.c:603 fetchmail.c:605
-#, c-format
-msgid "could not open %s to append logs to \n"
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "kay�t eklemek i�in %s a��lamad� \n"
 
 # multidrop'u �eviremedim.
@@ -942,59 +942,59 @@ msgstr "%s'de uyand�r�ld�m\n"
 msgid "normal termination, status %d\n"
 msgstr "normal biti�, durum kodu %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1041
 msgid "couldn't time-check the run-control file\n"
 msgstr "�al��ma denetimi (run-control) dosyas�n�n zaman� kontrol edilemedi\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1108
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1237
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1243
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1249
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
 # multidrop'u �eviremedim.
-#: fetchmail.c:1274
+#: fetchmail.c:1279
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: uyar�: %s'den multidrop iletileri kontrol etmek i�in DNS yok\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1286
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1303
+#: fetchmail.c:1308
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1002,58 +1002,58 @@ msgid ""
 msgstr "%s yap�land�rma ge�ersiz, port s�f�rdan k���k bir say� olamaz\n"
 
 # priviledged port = ayr�cal�kl� port???
-#: fetchmail.c:1310
+#: fetchmail.c:1315
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "%s yap�land�rma ge�ersiz, RPOP ayr�cal�kl� bir port gerektirir\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s yap�land�rma ge�ersiz, LMTP, SMTP'nin �ntan�ml� portunu kullanamaz\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1347
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "`fetchall' ve daemon kipinde �al��ma birlikte olmaz!\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1445
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%4$s'de %1$s %2$s'i sorguluyor (protokol %3$s): yoklama ba�lat�ld�\n"
 
-#: fetchmail.c:1465
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol se�ilmi�.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1518
+#: fetchmail.c:1523
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -1061,526 +1061,526 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1535
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nab�z yoklama aral��� %d saniye\n"
 
 # logfile = kay�t dosyas� ?
-#: fetchmail.c:1537
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Kay�t  dosyas� = %s\n"
 
 # Idfile'i T�rk�e'ye �evirebilir miyim burada (kimlik dosyas�?) Kaynak koduna bak
-#: fetchmail.c:1539
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyas� %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�lerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail k�l�k de�i�tirecek ve Received sat�r� olu�turmayacak\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail ilerleme durumunu g�steren noktalar� kay�t dosyalar�nda bile "
 "g�sterecek.\n"
 
 # multidrop message ne demek?
-#: fetchmail.c:1549
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
 
 # postmaster = postmaster ??
-#: fetchmail.c:1553
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini g�ndericiye iletecek.\n"
 
 # multidrop message ne demek?
-#: fetchmail.c:1558
+#: fetchmail.c:1563
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr ""
 "Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1565
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail hata iletisini g�ndericiye iletecek.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek i�in se�enekler:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1574
+#: fetchmail.c:1579
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
 msgstr[1] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun ger�ek ad� %s.\n"
 
 # Bu �eviriyi kontrol et.
-#: fetchmail.c:1581
+#: fetchmail.c:1586
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
 
 # Bu �eviriyi kontrol et.
-#: fetchmail.c:1582
+#: fetchmail.c:1587
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullan�c� ad� = \"%s\".\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullan�l�yor"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullan�yorum)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (�ntan�ml� port kullan�l�yor)"
 
 # 'to force' nas�l �evrilebilir?
-#: fetchmail.c:1614
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullan�m� istenecek)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  T�m kimlik denetleme y�ntemleri denenecek.\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1631
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  U�tan uca �ifreleme varsay�l�yor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1651
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile �ifrelenmi� oturumlar etkinle�tirildi.\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokol�: %s.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikas� kontrol� etkinle�tirildi.\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL g�venilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1668
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Sunucu `CommonName'i: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL anahtar parmakizi (sunucu anahtar� ile denetlendi): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamana��m� %d saniye"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (�ntan�ml�).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr "  �ntan�ml� posta kutusu se�ildi.\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr "  Se�ilen posta kutular�:"
 
 #  bu �eviriyi kontrol et
-#: fetchmail.c:1688
+#: fetchmail.c:1693
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
 #  bu �eviriyi kontrol et
-#: fetchmail.c:1689
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1696
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1699
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1700
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1702
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1703
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1705
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1706
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1703
+#: fetchmail.c:1708
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1704
+#: fetchmail.c:1709
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1706
+#: fetchmail.c:1711
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1707
+#: fetchmail.c:1712
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1714
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1715
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1717
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1718
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
 
 # idle = ?? Ba�kalar�na sor
-#: fetchmail.c:1715
+#: fetchmail.c:1720
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # idle = ?? Ba�kalar�na sor
-#: fetchmail.c:1716
+#: fetchmail.c:1721
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1718
+#: fetchmail.c:1723
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
 
 # Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1719
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
 
 # Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1721
+#: fetchmail.c:1726
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
 
 # Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1722
+#: fetchmail.c:1727
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  �leti boyut s�n�r� %d sekizlik (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �leti boyut s�n�r� yok (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  �leti boyut uyar�s� aral��� %d saniye (--warnings %d).\n"
 
 # poll = yoklama
-#: fetchmail.c:1734
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada b�y�kl�k uyar�s� (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Al�nan ileti s�n�r� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Al�nan ileti s�n�r� yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Getirilen ileti boyut s�n�r� %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Getirilen ileti boyut s�n�r� yok (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Her yoklama s�ras�nda UID'lerin 'binary' aramas�n� yap (--fastuidl %d).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1756
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Her %2$d yoklaman�n %1$d tanesinde UID'lerin 'binary' aramas�n� yap (--"
 "fastuidl %3$d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Her yoklama s�ras�nda UID'ler i�in do�rusal arama yap (--fastuidl 0).\n"
 
 # batch = ?
-#: fetchmail.c:1756
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1758
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Silmeler aras�ndaki zaman aral��� olarak %d kullan�lacak (--expunge %d).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Silmeler zorlanmayacak (--expunge 0).\n"
 
 # bu �eviriye bir bak. domain=alan deyince 'alanlar' sanki 'recipients' gibi anla��labilir??
-#: fetchmail.c:1771
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �u alanlar (domains) i�in posta getirilecek:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (�ntan�ml�)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �letiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �letiler \"%s\" ile ula�t�r�lacak.\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �letiler %cMTP ile a�a��dakilere iletilecek:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  MAIL FROM sat�r�n�n bilgisayar b�l�m� %s olacak\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1809
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  SMTP'ye g�nderilecek RCPT TO sat�rlar�na konacak adres %s olacak\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yan�tlar� ��yle:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin de�il\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile a��lacak.\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile kopat�lacak.\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina i�in hi�bir yerel ad tan�mlanmam��.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1852
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1588,13 +1588,13 @@ msgstr[0] "%d yerel ad tan�nd�.\n"
 msgstr[1] "%d yerel ad tan�nd�.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1862
+#: fetchmail.c:1867
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1863
+#: fetchmail.c:1868
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
@@ -1603,7 +1603,7 @@ msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
 # ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
 # bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye b�yle oldu�unu anlamak i�in.
-#: fetchmail.c:1867
+#: fetchmail.c:1872
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1613,102 +1613,109 @@ msgstr "  "
 # ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
 # bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye b�yle oldu�unu anlamak i�in.
-#: fetchmail.c:1869
+#: fetchmail.c:1874
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  "
 
-#: fetchmail.c:1872
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin de�il\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope ba�l��� ��yle varsay�l�yor: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1883
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Parse edilecek envelope ba�l��� say�s�: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s �neki kullan�c� kimli�inden silinecek\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr "  �nceden tan�mlanm�� posta sunucusu takma adlar�:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ba�lat� %s aray�z�nden olmal�.\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir aray�z�n kullan�lmas� zorunlu ko�ulmam��.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama d�ng�s� %s'i g�zleyecek.\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr "  G�zleme aray�z� belirtilmemi�.\n"
 
 # plugin == ?
-#: fetchmail.c:1920
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Sunucu ba�lant�lar� %s plugin'i ile yap�lacak (--plugin %s).\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemi�.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:1924
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Dinleyici ba�lant�lar� %s plugout'u ile yap�lacak (--plugput %s).\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemi�.\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hi�bir UID saklanmad�.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID sakland�.\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received ba�l���na yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1955
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Received ba�l���na yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:1963
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  �zellikler ge�iriliyor \"%s\".\n"
@@ -1725,7 +1732,7 @@ msgstr ""
 "\n"
 "SIGINT yakaland�... ��k�yorum.\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "[%s] i�in hizmet ad� al�namad�\n"
@@ -1940,44 +1947,44 @@ msgstr "Ad� %s olan bir aray�z bulunamad�"
 msgid "No IP address found for %s"
 msgstr "%s i�in bir IP adresi bulunamad�"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "IP aray�z� adresi yok\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "ge�ersiz IP aray�z� adresi\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "ge�ersiz IP aray�z� maskesi\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "%s'in yoklanmas�n� atl�yorum, %s �al��m�yor\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "%s'in yoklamas� atlan�yor, %s IP adresi d��ar�da tutuluyor\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "%s'in yoklamas� atlan�yor, %s etkin de�il\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s'de etkinlik %d idi, �imdi %d\n"
@@ -2100,79 +2107,84 @@ msgstr "OPT challenge'�n�n kodu ��z�lemedi\n"
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "'%s' katar� ge�erli bir say� katar� de�il.\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "'%1$s'in de�eri %3$d'den %2$s.\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "k���k"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "b�y�k"
 
-#: options.c:349
+#: options.c:321
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Ge�ersiz protokol `%s' belirtilmi�.\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ge�ersiz protokol `%s' belirtilmi�.\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ge�ersiz kimlik denetlemesi y�ntemi `%s' belirtilmi�.\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "kullan�m: fetchmail [se�enekler] [sunucu ...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "  A�a��daki se�enekler kullan�labilir:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        bu yard�m iletisini g�ster\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     s�r�m bilgisini g�ster\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       iletileri kontrol et ama getirme\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      sessizce �al��\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     �ok ayr�nt�l� bilgi ver (tan�lama ��kt�s�)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      n saniye i�in bir kez daemon olarak  �al��\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    deamon s�recini 'detach' etme\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        daemon s�recini �ld�r\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     kay�t dosyas� ad�n� belirle\n"
 
-#: options.c:613
+#: options.c:626
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2180,243 +2192,249 @@ msgstr ""
 "      --syslog      daemon olarak �al���rken �o�u ileti i�in syslog(3) "
 "kullan\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   'Received' sat�rlar�n� yazma ve 'spoof' etmeye izin ver\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ba�ka bir yap�land�rma dosyas� kullan\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
 
-#: options.c:617
+#: options.c:630
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ba�ka bir \"son �are\" al�c�s� belirle\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    bounce eden iletileri kullan�c�dan postmaster'a g�nder.\n"
 
-#: options.c:620
+#: options.c:633
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:634
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     aray�z�n etkinli�ini g�zle\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ssl ile �ifrelenmi� oturumu etkinle�tir\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl �zel anahtar dosyas�\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl istemci sertifikas�\n"
 
-#: options.c:630
+#: options.c:643
 #, fuzzy
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcert     ssl istemci sertifikas�\n"
 
-#: options.c:631
+#: options.c:644
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ssl istemci sertifikas�\n"
 
-#: options.c:632
+#: options.c:645
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:646
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:647
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    ssl protokol�n� se� (ssl2/ssl3/tls1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      ba�lat�lar� a�mak i�in d��ar�dan bir program belirle\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     SMTP ba�lant�lar�n� yapmak i�in d��ar�dan bir program "
 "belirle\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    belirtilen protokol� kullan (man sayfas�na bak�n�z)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        UIDL kullan�m�n� zorunlu k�l (yaln�zca pop3 i�in)\n"
 
-#: options.c:641
+#: options.c:656
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
 
-#: options.c:642
+#: options.c:657
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        kimlik kan�tama t�r� (parola/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     sunucu zamana��m� s�resi\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope   envelope adresi ba�l���\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    yerel kullan�c� kimli�inden silinecek �nek\n"
 
 # 'principal' ne demek?
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   posta hizmeti pricipal'�\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received ba�l�klar�na yoklama bilgisi ekle\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    kullan�c�n�n sunucudak� kullan�c� ad�\n"
 
-#: options.c:651
+#: options.c:666
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         eski ve yeni iletileri getir\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      getirdikten sonra yeni iletileri sil\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep       getirdikten sonra yeni iletileri sakla\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:655
+#: options.c:670
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ba�l�k adreslerini yeniden yazma\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -w, --limit       belirtilenden daha b�y�k iletileri getirme\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    posta bildirimleri aras�ndaki zaman aral���\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    bu SMTP sunucusunu kullan\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "      --fetchdomains belirtilen alan adlar� i�in gelen postalar� getir\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress kullan�lacak SMTP da��t�m alan� (domain) belirle\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    bu SMTP kullan�c�@alanad� adresini kullan\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam yan�t de�erlerini kullan\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  SMTP ba�lant�lar� i�in batch limiti belirle\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  sunucu ba�lant�lar� i�in getirme s�n�r�\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit getirilen iletilerin boyut s�n�r�n� ayarla\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL'ler i�in 'binary' arama yap\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         iletim i�in kullan�lacak MDA'y� belirle\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP ��kt�s�n� bu dosyaya al\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        da��t�m i�in LMTP (RFC2033) kullan\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder    uzaktaki klas�r ad� olarak bunu kullan\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ilerlemeyi g�steren noktalar� kay�t dosyalar�nda bile "
@@ -2497,15 +2515,15 @@ msgstr "UIDL'leri getirirken protokol hatas�\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "--remote se�ene�i POP3 ile desteklenmiyor\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "kullan�c� se�eneklerinden sonra sunucu se�ene�i verilmi�"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS etkin de�il."
 
-#: rcfile_y.y:215
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2513,7 +2531,7 @@ msgstr ""
 "fetchmail: 'interface' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
 "destekleniyor\n"
 
-#: rcfile_y.y:222
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2521,26 +2539,26 @@ msgstr ""
 "fetchmail: 'monitor' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
 "destekleniyor\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL etkin de�il."
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "girdi sonu"
 
 # symbolic link?
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "%s dosyas� normal bir dosya olmal�.\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Dosyan�n (%s) izinleri -rwx--x--- (0710)'den �ok olmamal�.\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Dosyanin (%s) sahibi siz olmal�s�n�z.\n"
@@ -2564,183 +2582,184 @@ msgstr "%s'i yeniden yazmak �zereyim"
 msgid "Rewritten version is %s\n"
 msgstr "Yeniden yaz�lan %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Ba�ar�l�"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr ""
 "S�n�rl� kullan�c� (kullan�c� hesab� ile ilgili yanl�� bir�eyler olabilir)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Kullan�c� ad� ya da parolas� ge�ersiz"
 
 # deity error???
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "`Deity' hatas�"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 kod ��zme hatas�\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Hizmet RPA s�r�m %d.%d'i se�ti\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Hizmet challenge'i (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Hizmet zaman damgas� %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2'de uzunluk hatas� var\n"
 
 # realm = alem
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Alem listesi: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "hizmet@alem katar�nda RPA hatas�\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 kod ��zme hatas�\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Kullan�c� kimlik kan�tlama (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA durumu: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4: uzunluk hatas�\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA sizi reddediyor: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA sizi reddediyor, nedeni bilinmiyor\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA Kullan�c� Kimlik Kan�tlama uzunluk hatas�: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Oturumu anahtar uzunlu�u hatas�: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _hizmet_ kimlik kan�tlamas� ba�ar�s�z oldu.\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Oturum anahtar� kuruldu:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA yetkilendirme tamamland�\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Yan�t al\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Yan�t alma %d d�nd� [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Ba�l�k 60 de�il\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Token uzunluk hatas�\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Token uzunlu�u %d rxlen (%d) ile uyu�muyor\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanizma alan� do�ru de�il\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "karakter %d'de dec64 hatas�: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Gelen ikilik veri:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Giden veri:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA katar� �ok uzun\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA /dev/urandom a��lamad�. Bu durum sisteme\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    girmenize engel de�ildir, ancak konu�tu�unuzu\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    d���nd���n�z sistem ile konu�muyor\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    olabilirsiniz (k�t� niyetli sistemler\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    `replay' sald�r�s� yapabilir).\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "Kullan�c� challenge'�:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "Veri blo�una MD5 uygulan�yor:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "MD5 sonucu:\n"
 
 #: servport.c:53
@@ -2762,125 +2781,136 @@ msgstr ""
 msgid "forwarding to %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: ('bounce' iletisi g�vdesi)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Kaydedilen hata hala %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP hatas�: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr ""
 
-#: sink.c:741
+#: sink.c:742
 #, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
 
-#: sink.c:787
-#, fuzzy
-msgid "BSMTP preamble write failed.\n"
+#: sink.c:788
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi al�c� adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi al�c� adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "hi�bir adres uyu�mad�; postmaster yok.\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile g�nderilemedi!\n"
 "\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hi�bir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek �zereyim: %s\n"
 
+#: sink.c:1240
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr ""
+
 #: sink.c:1252
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "MDA a�ma ba�ar�s�z oldu\n"
 
-#: sink.c:1289
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%2$s'e %1$cMTP ba�lant�s� ba�ar�s�z oldu\n"
 
-#: sink.c:1313
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici �al��t�r�lamad�; %s denenecek"
 
-#: sink.c:1375
+#: sink.c:1380
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr ""
+"�letiyi bitirme ya da BSMTP dosyas�n� kapatma i�lemi ba�ar�s�zl�kla "
+"sonu�land�\n"
+
+#: sink.c:1407
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:1378
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile �ld�r�ld�\n"
 
-#: sink.c:1381
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA s�f�rdan ba�ka bir durum kodu d�nd�rd� (%d)\n"
 
-#: sink.c:1384
+#: sink.c:1416
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Garip: MDA pclose durum kodu olarak %d d�nd�rd�, %s:%d'de sorun\n"
 
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr ""
-"�letiyi bitirme ya da BSMTP dosyas�n� kapatma i�lemi ba�ar�s�zl�kla "
-"sonu�land�\n"
-
-#: sink.c:1428
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi da��t�m� reddetti\n"
 
-#: sink.c:1458
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "�leti sonunda LMTP da��t�m hatas�\n"
 
-#: sink.c:1461
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM'a beklenmeyen, 503 olmayan yan�t: %s\n"
 
-#: sink.c:1616
+#: sink.c:1629
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2918,197 +2948,197 @@ msgstr "ESMTP LOGIN Kimlik kan�tlamas�...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatas�\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ba�ar�s�z oldu\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ba�ar�s�z oldu\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ba�ar�s�z oldu\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 ba�ar�s�z oldu\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s �al��t�r�l�yor (makina %s hizmet %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ba�ar�s�z oldu\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, fuzzy, c-format
 msgid "unknown (%s)"
 msgstr "bilinmeyen"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr ""
 
-#: socket.c:314
+#: socket.c:309
 #, fuzzy, c-format
 msgid "cannot create socket: %s\n"
 msgstr ""
 "%s'e bile g�nderilemedi!\n"
 "\n"
 
-#: socket.c:330
+#: socket.c:325
 #, fuzzy
 msgid "connection failed.\n"
 msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: socket.c:332
+#: socket.c:327
 #, fuzzy, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
 
-#: socket.c:338
+#: socket.c:333
 #, fuzzy
 msgid "connected.\n"
 msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "��karan Kurum: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uyar�: ��karan Kurum Ad� �ok uzun (sonundan kesilmi� olabilir).\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "��karan `CommonName'i: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uyar�: ��karan `CommonName'i �ok uzun (sonundan kesilmi� olabilir).\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen ��karan `CommonName'i\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Sunucu `CommonName'i: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
 
-#: socket.c:644
+#: socket.c:639
 #, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
-#: socket.c:671
+#: socket.c:666
 #, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyu�mazl���: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu ad� ayarlanmam��, sertifikay� do�rulayam�yorum!\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu ad� sertifikada belirtilmemi�!\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ba�ar�s�z oldu!\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu �ok k���k!\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtar� parmak izi: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyu�uyor.\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s parmak izleri uyu�muyor!\n"
 
-#: socket.c:758
+#: socket.c:753
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Uyar�: sunucu sertifikas� do�rulamas�: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "bilinmeyen ��karan firma ad� (ilk %d karakter): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL i�in s�n�rlar d���nda"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ge�ersiz SSL protokol� '%s' belirtildi, �ntan�ml� olan kullan�l�yor "
 "(SSLv23).\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi do�rulamas� bir bi�imde atland�!\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma ba�ar�s�z oldu!\n"
 
@@ -3157,48 +3187,48 @@ msgid "found Received address `%s'\n"
 msgstr "`%s' Received adresi bulundu\n"
 
 # delimiter = s�n�r belirteci  (Sankur'un s�zl���nden)
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "ba�l�klar taran�rken ge�ersiz ba�l�k sat�r� bulundu\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "sat�r: %s"
 
-#: transact.c:1133
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "yerelde uyan bulunamad�, %s'e iletiliyor\n"
 
-#: transact.c:1148
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "iletme ve silme DNS hatalar� nedeniyle yap�lm�yor\n"
 
-#: transact.c:1258
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers yaz�l�yor\n"
 
-#: transact.c:1277
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "al�c� adreslerinden hi�biri bildirilen yerel adlardan hi�birine uymuyor"
 
-#: transact.c:1284
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "al�c� adresi %s yerel adlardan hi�birine uymuyor"
 
-#: transact.c:1293
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "iletinin i�inde NUL karakterleri var"
 
 # listener = dinleyici
-#: transact.c:1301
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP dinleyicisi yerel al�c� adreslerini reddetti: "
 
-#: transact.c:1440
+#: transact.c:1444
 #, fuzzy
 msgid "error writing message text\n"
 msgstr "ileti metni yaz�l�yor\n"
diff --git a/po/vi.po b/po/vi.po
index b3d42f1f..703c17b2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-25 21:47+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-22 18:10+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 27719851..994018c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-04 09:16+0100\n"
+"POT-Creation-Date: 2010-03-19 19:41+0100\n"
 "PO-Revision-Date: 2010-03-02 15:32+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -90,111 +90,111 @@ msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
 msgstr[0] "fetchmail 跳过 %d 封邮件，%d octets。"
 
-#: driver.c:511
+#: driver.c:514
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "忽略 %s@%s:%d 封邮件"
 
-#: driver.c:565
+#: driver.c:568
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "跳过 %s@%s:%d 封邮件(%d 字节)"
 
-#: driver.c:581
+#: driver.c:584
 msgid " (length -1)"
 msgstr "( 长度 -1)"
 
-#: driver.c:584
+#: driver.c:587
 msgid " (oversized)"
 msgstr "(超大)"
 
-#: driver.c:602
+#: driver.c:605
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "无法获取邮件头，邮件 %s@%s:%d (%d 字节)\n"
 
-#: driver.c:619
+#: driver.c:622
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "读取 %1$s@%2$s:%4$d 封中的 %3$d 封邮件"
 
-#: driver.c:624
+#: driver.c:627
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d 字节)"
 
-#: driver.c:625
+#: driver.c:628
 #, c-format
 msgid " (%d header octets)"
 msgstr "(邮件头 %d 字节)"
 
-#: driver.c:692
+#: driver.c:695
 #, c-format
 msgid " (%d body octets)"
 msgstr "(邮件内容 %d 字节)"
 
-#: driver.c:751
+#: driver.c:754
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "%s@%s:%d 邮件非所需大小 (实际 %d 字节!= 所要求的 %d 字节)\n"
 
-#: driver.c:783
+#: driver.c:786
 msgid " retained\n"
 msgstr "已保留\n"
 
-#: driver.c:793
+#: driver.c:796
 msgid " flushed\n"
 msgstr "已删除\n"
 
-#: driver.c:810
+#: driver.c:813
 msgid " not flushed\n"
 msgstr "未删除\n"
 
-#: driver.c:828
+#: driver.c:831
 #, 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"
 
-#: driver.c:885
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "等待连接服务器 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "等待服务器 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:893
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "等待 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:898
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "等待接收端 %d 秒无响应超时。\n"
 
-#: driver.c:901
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "等待 %d 秒后超时。\n"
 
-#: driver.c:913
+#: driver.c:916
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "主题: fetchmail 发现反复超时"
 
-#: driver.c:916
+#: driver.c:919
 #, c-format
 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:920
+#: driver.c:923
 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"
@@ -209,78 +209,78 @@ msgstr ""
 "\n"
 "Fetchmail 不会再查寻此邮箱中的邮件，除非您重启\n"
 
-#: driver.c:946
+#: driver.c:949
 #, c-format
 msgid "pre-connection command terminated with signal %d\n"
 msgstr "预连接命令终止，返回信号 %d\n"
 
-#: driver.c:949
+#: driver.c:952
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "预连接命令失败，状态码 %d\n"
 
-#: driver.c:973
+#: driver.c:976
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "HESIOD pobox 中找不到 %s\n"
 
-#: driver.c:994
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "主服务器无名字。\n"
 
-#: driver.c:1021
+#: driver.c:1024
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "无法找到规范的 %s (%s) 的 DNS 名称： %s\n"
 
-#: driver.c:1068
+#: driver.c:1071
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s 连接至 %s 时失败"
 
-#: driver.c:1084
+#: driver.c:1087
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "主题: Fetchmail 警告，找不到服务器。"
 
-#: driver.c:1086
+#: driver.c:1089
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail 不能找到邮件服务器 %s:"
 
-#: driver.c:1114
+#: driver.c:1117
 msgid "SSL connection failed.\n"
 msgstr "SSL 连接失败。\n"
 
-#: driver.c:1167
+#: driver.c:1170
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "%s@%s 出现死锁错误\n"
 
-#: driver.c:1171
+#: driver.c:1174
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s 出现服务器繁忙错误\n"
 
-#: driver.c:1176
+#: driver.c:1179
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s 出现授权失败错误\n"
 
-#: driver.c:1179
+#: driver.c:1182
 msgid " (previously authorized)"
 msgstr "(事先已授权)"
 
-#: driver.c:1200
+#: driver.c:1203
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "主题: fetchmail 在 %s@%s 上验证失败"
 
-#: driver.c:1204
+#: driver.c:1207
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail 无法从 %s@%s 中获取邮件。\n"
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -293,7 +293,7 @@ msgstr ""
 "提示信息，因此这可能是另一种错误情况(比如服务器忙)，从而导致\n"
 " fetchmail 无法区分这些错误。"
 
-#: driver.c:1214
+#: driver.c:1217
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -311,7 +311,7 @@ msgstr ""
 "fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非\n"
 "服务重置，否则它不会再发送任何提示信息了。"
 
-#: driver.c:1224
+#: driver.c:1227
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -329,174 +329,174 @@ msgstr ""
 "fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非服务\n"
 "重置，否则它不会再发送任何提示信息了。"
 
-#: driver.c:1240
+#: driver.c:1243
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "立即从 %s@%s 中重新收件\n"
 
-#: driver.c:1245
+#: driver.c:1248
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s 有未知的登录或验证错误\n"
 
-#: driver.c:1269
+#: driver.c:1272
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "验证正确 %s@%s\n"
 
-#: driver.c:1275
+#: driver.c:1278
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "主题: fetchmail 验证正确 %s@%s"
 
-#: driver.c:1279
+#: driver.c:1282
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail 可登录 %s@%s。\n"
 
-#: driver.c:1283
+#: driver.c:1286
 msgid "Service has been restored.\n"
 msgstr "服务已经被重置。\n"
 
-#: driver.c:1315
+#: driver.c:1318
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "正在选择或重新检索邮箱 %s\n"
 
-#: driver.c:1317
+#: driver.c:1320
 msgid "selecting or re-polling default folder\n"
 msgstr "正在选择或重检默认邮箱\n"
 
-#: driver.c:1329
+#: driver.c:1332
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s 在 %s (邮箱 %s)"
 
-#: driver.c:1332 rcfile_y.y:389
+#: driver.c:1335 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
 
-#: driver.c:1337
+#: driver.c:1340
 #, c-format
 msgid "Polling %s\n"
 msgstr "正在检取 %s\n"
 
-#: driver.c:1341
+#: driver.c:1344
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%4$s 有 %1$d 封邮件 (%2$d %3$s)"
 
-#: driver.c:1344
+#: driver.c:1347
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "已读"
 
-#: driver.c:1347
+#: driver.c:1350
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%2$s 有 %1$d 封邮件"
 
-#: driver.c:1354
+#: driver.c:1357
 #, c-format
 msgid " (%d octets).\n"
 msgstr "(%d 字节)。\n"
 
-#: driver.c:1360
+#: driver.c:1363
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s 无邮件\n"
 
-#: driver.c:1393
+#: driver.c:1396
 msgid "bogus message count!"
 msgstr "发现无效邮件！"
 
-#: driver.c:1536
+#: driver.c:1539
 msgid "socket"
 msgstr "套接口"
 
-#: driver.c:1539
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "未找到或错误的 RFC822 协议头"
 
-#: driver.c:1542
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1545
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "客户端/服务器同步"
 
-#: driver.c:1548
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "客户端/服务器协议"
 
-#: driver.c:1551
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "服务器死锁"
 
-#: driver.c:1554
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "处理 SMTP"
 
-#: driver.c:1557
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "查询 DNS"
 
-#: driver.c:1560
+#: driver.c:1563
 msgid "undefined"
 msgstr "未定义"
 
-#: driver.c:1566
+#: driver.c:1569
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "从 %2$s@%3$s 收邮件并投递至 SMTP 主机 %4$s 时出现错误 %1$s\n"
 
-#: driver.c:1568
+#: driver.c:1571
 msgid "unknown"
 msgstr "未知"
 
-#: driver.c:1570
+#: driver.c:1573
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "从 %2$s@%3$s 收件时产生错误 %1$s\n"
 
-#: driver.c:1582
+#: driver.c:1585
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "执行后续程序失败，返回信号 %d\n"
 
-#: driver.c:1584
+#: driver.c:1587
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "执行后续程序失败，状态码 %d\n"
 
-#: driver.c:1603
+#: driver.c:1606
 msgid "Kerberos V4 support not linked.\n"
 msgstr "未连接 Kerberos V4 支持\n"
 
-#: driver.c:1611
+#: driver.c:1614
 msgid "Kerberos V5 support not linked.\n"
 msgstr "未连接 Kerberos V5 支持\n"
 
-#: driver.c:1622
+#: driver.c:1625
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "%s 不支持 --flush 选项\n"
 
-#: driver.c:1628
+#: driver.c:1631
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "%s 不支持 --all 选项\n"
 
-#: driver.c:1637
+#: driver.c:1640
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "%s 不支持 --limit 选项\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -511,7 +511,7 @@ msgstr ""
 "尝试用 “env QMAILINJECT= %s 您的参数”\n"
 "%s: 退出\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -527,26 +527,26 @@ msgstr ""
 "Return-Path:字段。尝试用 “env NULLMAILER_FLAGS= %s  您的参数”\n"
 "%s: 退出\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: 不存在您的用户名，退出\n"
 
-#: env.c:145
+#: env.c:147
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: 无法确认您的主机!"
 
-#: env.c:168
+#: env.c:170
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "%s 主机上 gethostbyname 函数出错\n"
 
-#: env.c:170
+#: env.c:172
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "无法在主机数据库中找到自己的主机来验证它！\n"
 
-#: env.c:174
+#: env.c:176
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -1575,55 +1575,55 @@ msgstr ""
 "\n"
 "遇到信号 SIGINT... 正在退出\n"
 
-#: gssapi.c:66
+#: gssapi.c:67
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "无法获得服务 [%s]\n"
 
-#: gssapi.c:71
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "正在使用服务 [%s]\n"
 
-#: gssapi.c:88
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "正在发送证书\n"
 
-#: gssapi.c:106
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "交换证书时出错\n"
 
-#: gssapi.c:151
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "无法解开加密数据\n"
 
-#: gssapi.c:156
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "证书交换完成\n"
 
-#: gssapi.c:160
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "服务器要求完整性和(或)隐私检查\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "解开的加密标识: %s%s%s\n"
 
-#: gssapi.c:173
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "最大 GSS 标识大小为 %ld\n"
 
-#: gssapi.c:186
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "创建加密请求时出错\n"
 
-#: gssapi.c:197
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "正在清空 GSS 证书\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "清空证书时出错\n"
 
@@ -1785,44 +1785,44 @@ msgstr "未找到以 %s 命名的网卡"
 msgid "No IP address found for %s"
 msgstr "未找到 %s 的 IP 地址"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "未找到 IP 地址\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "无效的 IP 地址\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "无效的 IP 地址掩码\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "%s 的活跃度为 %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "跳过 %s 收件，%s 关闭了\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "跳过 %s 收件，拒绝接受 %s 的 IP 地址\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "%s 的活跃度查为 %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "跳过 %s 收件，%s 未开启\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s 的活跃度以前是 %d，现在是 %d\n"
@@ -2391,179 +2391,179 @@ msgstr "正要重写 %s"
 msgid "Rewritten version is %s\n"
 msgstr "重写版本为 %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "成功"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "受限用户 (帐号有点问题)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "无效的用户 id 或是密码短语"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Deity error"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA 标识 2: BASE64 解码错误\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "服务选择了 RPA 版本 %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "服务请求 (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "服务时间戳 %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA 标识 2 长度错误\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "域列表: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "在“服务@域”字符串中有 RPA 错误\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA 标识 4: Base64 解码错误\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "用户验证 (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA 状态: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA 标识 4 长度错误\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA 拒绝您: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA 拒绝您: 原因不明\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA 用户验证长度错误: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA 会话密钥长度错误: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_auth 错误。要伪装服务器吗 ？\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "创建会话密钥:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA 授权完成\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "得到响应\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "得到响应返回 %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr 非 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "标识长度错误\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "标识长度 %d 不同于 rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "机制域错误\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "字符 %d 处有 deb64 错误: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "收到的二进制数据:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "送出数据:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA 字串太长\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "打开 /dev/urandom 时 RPA 失败。这应该不\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "影响您登入，但意味着您\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "无法确认您正在与\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "您想要的服务对话。可能您正被一个虚假的服务\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "进行回放操作，即受到攻击\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "用户请求:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "数据块使用了 MD5:\n"
 
-#: rpa.c:886
+#: rpa.c:887
 msgid "MD5 result is:\n"
 msgstr "MD5 值:\n"
 
@@ -2586,132 +2586,132 @@ msgstr "请把服务指定为十进制的端口号\n"
 msgid "forwarding to %s\n"
 msgstr "正在转发至 %s\n"
 
-#: sink.c:317
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (回送邮件内容)\n"
 
-#: sink.c:320
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "邮件从 %s 回送至 %s\n"
 
-#: sink.c:457
+#: sink.c:458
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "保留的错误仍然为 %d\n"
 
-#: sink.c:517 sink.c:616
+#: sink.c:518 sink.c:617
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP 出错: %s\n"
 
-#: sink.c:561
+#: sink.c:562
 msgid "SMTP server requires STARTTLS, keeping message.\n"
 msgstr "SMTP 服务器需要 STARTTLS 认证，正在保存邮件。\n"
 
-#: sink.c:741
+#: sink.c:742
 #, c-format
 msgid "BSMTP file open failed: %s\n"
 msgstr "打开 BSMTP 文件失败: %s\n"
 
-#: sink.c:787
+#: sink.c:788
 #, c-format
 msgid "BSMTP preamble write failed: %s.\n"
 msgstr "写入 BSMTP 报头失败: %s。\n"
 
-#: sink.c:1001
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP 端不认可收件人地址 “%s”\n"
 
-#: sink.c:1008
+#: sink.c:1009
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
 
-#: sink.c:1054
+#: sink.c:1055
 msgid "no address matches; no postmaster set.\n"
 msgstr "无匹配的地址；也无 postmaster 设置\n"
 
-#: sink.c:1066
+#: sink.c:1067
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "无法稳定发送至 %s！\n"
 
-#: sink.c:1072
+#: sink.c:1073
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "无匹配的地址；转发至 %s。\n"
 
-#: sink.c:1228
+#: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "即将用 %s 投递\n"
 
-#: sink.c:1239
+#: sink.c:1240
 #, fuzzy, c-format
 msgid "Cannot switch effective user id to %ld: %s\n"
 msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
 
-#: sink.c:1251
+#: sink.c:1252
 #, c-format
 msgid "Cannot switch effective user id back to original %ld: %s\n"
 msgstr ""
 
-#: sink.c:1258
+#: sink.c:1259
 msgid "MDA open failed\n"
 msgstr "打开 MDA 失败\n"
 
-#: sink.c:1297
+#: sink.c:1298
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP 连接至 %s 失败\n"
 
-#: sink.c:1321
+#: sink.c:1322
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "无法启动 MDA 代理；正在转到 MDA 代理 %s"
 
-#: sink.c:1379
+#: sink.c:1380
 #, c-format
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
 
-#: sink.c:1406
+#: sink.c:1407
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "写入 MDA 时出错: %s\n"
 
-#: sink.c:1409
+#: sink.c:1410
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA 被信号 %d 终止\n"
 
-#: sink.c:1412
+#: sink.c:1413
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA 返回非零值 %d\n"
 
-#: sink.c:1415
+#: sink.c:1416
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s，在 %s:%d 无法处理\n"
 
-#: sink.c:1440
+#: sink.c:1441
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 端拒绝投递\n"
 
-#: sink.c:1470
+#: sink.c:1471
 msgid "LMTP delivery error on EOM\n"
 msgstr "邮件结尾时用 LTMP 协议投递错误\n"
 
-#: sink.c:1473
+#: sink.c:1474
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
 
-#: sink.c:1628
+#: sink.c:1629
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2748,189 +2748,189 @@ msgstr "ESMTP LOGIN 验证...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
-#: socket.c:115 socket.c:141
+#: socket.c:110 socket.c:136
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc 失败\n"
 
-#: socket.c:173
+#: socket.c:168
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair 失败\n"
 
-#: socket.c:179
+#: socket.c:174
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork 失败\n"
 
-#: socket.c:186
+#: socket.c:181
 msgid "dup2 failed\n"
 msgstr "dup2 失败\n"
 
-#: socket.c:192
+#: socket.c:187
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "正在运行 %s (主机 %s 服务 %s)\n"
 
-#: socket.c:195
+#: socket.c:190
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) 失败\n"
 
-#: socket.c:286
+#: socket.c:281
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(“%s”，“%s”) 错误: %s\n"
 
-#: socket.c:289
+#: socket.c:284
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
 
-#: socket.c:300 socket.c:303
+#: socket.c:295 socket.c:298
 #, c-format
 msgid "unknown (%s)"
 msgstr "未知 (%s)"
 
-#: socket.c:306
+#: socket.c:301
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "正在尝试连接至 %s/%s..."
 
-#: socket.c:314
+#: socket.c:309
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-#: socket.c:330
+#: socket.c:325
 msgid "connection failed.\n"
 msgstr "连接失败。\n"
 
-#: socket.c:332
+#: socket.c:327
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:338
+#: socket.c:333
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:616
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:619
+#: socket.c:614
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:621
+#: socket.c:616
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:623
+#: socket.c:618
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者: %s\n"
 
-#: socket.c:626
+#: socket.c:621
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者名称太长 (可能截短)。\n"
 
-#: socket.c:628
+#: socket.c:623
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者名称\n"
 
-#: socket.c:632
+#: socket.c:627
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "服务器名: %s\n"
 
-#: socket.c:638
+#: socket.c:633
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 邮件标题太长!\n"
 
-#: socket.c:644
+#: socket.c:639
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题名中带有 NUL 字符，退出！\n"
 
-#: socket.c:665
+#: socket.c:660
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "邮件标题别名: %s\n"
 
-#: socket.c:671
+#: socket.c:666
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题别名带有 NUL 字符，退出！\n"
 
-#: socket.c:699
+#: socket.c:694
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器名不匹配: %s != %s\n"
 
-#: socket.c:706
+#: socket.c:701
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:711
+#: socket.c:706
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器名\n"
 
-#: socket.c:713
+#: socket.c:708
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:725
+#: socket.c:720
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:729
+#: socket.c:724
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:737
+#: socket.c:732
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:743
+#: socket.c:738
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:747
+#: socket.c:742
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:749
+#: socket.c:744
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:758
+#: socket.c:753
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:764
+#: socket.c:759
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "未知的发行者　(前 %d 个字符): %s\n"
 
-#: socket.c:851
+#: socket.c:846
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:867
+#: socket.c:862
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:943
+#: socket.c:938
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1021
+#: socket.c:1016
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1024
+#: socket.c:1019
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -2986,37 +2986,37 @@ msgstr "查找邮件头时发现不正确的行\n"
 msgid "line: %s"
 msgstr "行: %s"
 
-#: transact.c:1136
+#: transact.c:1137
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "无本地匹配的收件人，正在转发至 %s\n"
 
-#: transact.c:1151
+#: transact.c:1152
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "正在转发且由于 DNS 错误，删除被取消了\n"
 
-#: transact.c:1261
+#: transact.c:1262
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
 
-#: transact.c:1280
+#: transact.c:1281
 msgid "no recipient addresses matched declared local names"
 msgstr "收件人地址与本地已知的用户名不匹配"
 
-#: transact.c:1287
+#: transact.c:1288
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
 
-#: transact.c:1296
+#: transact.c:1297
 msgid "message has embedded NULs"
 msgstr "邮件嵌入了 NULs"
 
-#: transact.c:1304
+#: transact.c:1305
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP 端拒绝本地收件人地址:"
 
-#: transact.c:1443
+#: transact.c:1444
 msgid "error writing message text\n"
 msgstr "在写邮件文本时出错\n"