Snapshot fetchmail 6.3.6-rc5.

svn path=/branches/BRANCH_6-3/; revision=4999

10 files changed, 4189 insertions, 3494 deletions

diff --git a/po/ca.po b/po/ca.po
index 44437bbf..f3e9703e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-08-31 19:22+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -124,34 +124,34 @@ msgstr " (%d octets)"
 msgid " (%d header octets)"
 msgstr " (capçalera de %d octets) "
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (cos de %d octets) "
 
-#: driver.c:743
+#: driver.c:741
 #, 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:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " retingut\n"
 
 # lliurat, expedit, despatxat, esborrat, eliminat...
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " eliminat\n"
 
 # ídem
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " no eliminat\n"
 
 # traducció de "fetchlimit"
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -161,36 +161,36 @@ msgstr[0] ""
 msgstr[1] ""
 "assolit el límit de %d missatge(s); en queden %d al servidor %s compte %s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, 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:880
+#: driver.c:878
 #, 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:884
+#: driver.c:882
 #, 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:889
+#: driver.c:887
 #, 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:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "temps d'espera esgotat després de %d segons.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail: S'esgota el temps d'espera molt sovint"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -199,7 +199,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:911
+#: driver.c:909
 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"
@@ -216,73 +216,73 @@ msgstr ""
 "El fetchmail no tornarà a comprovar més aquesta bústia fins que el\n"
 "reinicieu.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "l'ordre de preconnexió ha fallat amb estat %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, 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:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "El servidor principal no té nom.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, fuzzy, 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)\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "la connexió %s amb %s ha fallat"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: fetchmail: Servidor inaccessible."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "La conexió SSL ha fallat.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Bloqueig temporal de la bústia per a %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Servidor ocupat per a %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "L'autorització per a %s@%s%s ha fallat\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (prèviament autoritzat)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail: L'autenticació per a %s@%s ha fallat"
 
-#: driver.c:1186
+#: driver.c:1184
 #, 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:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -296,7 +296,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:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -315,7 +315,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:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -334,170 +334,170 @@ 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:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Es torna a recollir el correu immediatament de %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, 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:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorització reeixida per a %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail: Autenticació reeixida per a %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, 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:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "El servei s'ha restablert.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionant o re-examinant la carpeta %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionant o re-examinant la carpeta per omissió\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s a %s (carpeta %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Consultant %s\n"
 
 # seen
-#: driver.c:1323
+#: driver.c:1321
 #, 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:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "vist"
 msgstr[1] "vistos"
 
-#: driver.c:1329
+#: driver.c:1327
 #, 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:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hi ha correu per a %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "recompte de missatges erroni!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "de socket"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "de capçalera RFC822"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "de MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "de sincronització client/servidor"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "de protocol client/servidor"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "de bloqueig temporal al servidor"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "de transacció SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "de consulta DNS"
 
 # aquest missatge va directe a stderr
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "no identificat"
 
-#: driver.c:1547
+#: driver.c:1545
 #, 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:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "desconegut"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "error %s en recollir el correu de %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "l'ordre de postconnexió ha fallat amb estat %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "El suport per Kerberos V4 no està enllaçat.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "El suport per Kerberos V5 no està enllaçat.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "L'opció --flush no està suportada per %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "L'opció --all no està suportada per %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "L'opció --limit no està suportada per %s\n"
@@ -629,7 +629,7 @@ msgstr "L'opció --folder no està suportada per ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'opció --check no està suportada per ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -641,7 +641,7 @@ msgstr ""
 "Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -652,66 +652,66 @@ msgstr ""
 "condicions. Per a més detalls, vegeu el fitxer COPYING en el directori on\n"
 "hi ha la documentació o en el codi font.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ATENCIÓ: Executar fetchmail com a root no és recomanable.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocat amb"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "no s'ha pogut determinar quin és el directori actual\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Això és el fetchmail, versió %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Obtenint les opcions de la línia d'ordres%s%s\n"
 
 # després d'això vé el nom d'un fitxer
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " i de "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hi ha cap servidor de correu configurat. Potser falta el %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no heu especificat cap servidor de correu.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no hi ha cap altre fetchmail funcionant\n"
 
 # bailing out
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error finalitzant el fetchmail %s a %d; es deixa estar.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "en segon terme"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "en primer terme"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: el fetchmail %s a %d ha estat finalitzat.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -719,7 +719,7 @@ msgstr ""
 "fetchmail: no es pot comprovar el correu mentre funcioni un altre procés del "
 "fetchmail.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -727,205 +727,220 @@ msgstr ""
 "fetchmail: no es poden consultar els hosts especificats amb un altre "
 "fetchmail funcionant a %d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: hi ha un altre fetchmail funcionant en primer terme a %d.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: no es poden acceptar opcions mentre funcioni un altre fetchmail "
 "en segon terme.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 "fetchmail: el fetchmail funcionant en segon terme a %d s'ha despertat.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: un procés anterior ha finalitzat misteriosament a %d.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no s'ha trobat cap contrasenya per a %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entreu la contrasenya per a %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: Atenció: es registra tant via syslog com en un fitxer dedicat.\n"
 "\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr ""
 "fetchmail: No s'ha pogut passar a segon terme. S'aborta.\n"
 "\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciant el dimoni fetchmail %s \n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, 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:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no s'ha pogut verificar la data de %s (error %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciant fetchmail (%s ha canviat)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "l'intent de reexecució pot fallar ja que el directori no ha estat restaurat\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "l'intent de reexecutar el fetchmail ha fallat\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "s'ha omès la consulta de %s (error d'autenticació o massa temps d'espera "
 "excedits)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "no s'ha completat l'interval, no es consultarà %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estat de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estat de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estat de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estat de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estat de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estat de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estat de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estat de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estat de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estat de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estat de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Estat de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estat de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estat de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estat de la consulta=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Totes les connexions estan bloquejades. Sortint.\n"
 
 # %s és la sortida de timestamp()
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "dormint el %s\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertat per %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertat per un senyal %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertat el %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "finalització normal, estat %d\n"
 
 # nota: run-control és fitxer de control (i.e. .fetchmailrc)
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 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:1039
+#: fetchmail.c:1066
 #, 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:1072
+#: fetchmail.c:1099
 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:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "El suport per SSL no està compilat.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "El suport per SSL no està compilat.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "El suport per SSL no està compilat.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "El suport per SSL no està compilat.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -933,16 +948,16 @@ msgstr ""
 "fetchmail: atenció: cap DNS disponible per verificar les obtencions "
 "multidrop de %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, 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:1237
+#: fetchmail.c:1282
 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:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -951,298 +966,298 @@ msgstr ""
 "fetchmail: la configuració de %s no és vàlida, el port no pot ser número "
 "negatiu\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, 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:1279
+#: fetchmail.c:1324
 #, 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:1293
+#: fetchmail.c:1338
 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:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, 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:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no està configurat.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no està configurat.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no està configurat.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no està configurat.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no està configurat.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no està suportat.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, 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:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes és de %d segons\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre és %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions és %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrarà via syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascararà i no generarà capçaleres Recieved\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 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:1500
+#: fetchmail.c:1545
 #, 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:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a l'obtenció de %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindrà via %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom autèntic del servidor és %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 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:1528
+#: fetchmail.c:1573
 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:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanarà la contrasenya.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificació RPOP = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol és KPOP amb autenticació per Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol és %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'ús d'UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els mètodes d'autenticació disponibles.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per contrasenya.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat és d'extrem a extrem.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu és: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovació del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confiança: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, 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:1612
+#: fetchmail.c:1657
 #, 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:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la bústia per defecte.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Les bústies seleccionades són:"
 
 # al tanto amb la substitució
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 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:1633
+#: fetchmail.c:1678
 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:1635
+#: fetchmail.c:1680
 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:1636
+#: fetchmail.c:1681
 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:1638
+#: fetchmail.c:1683
 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:1639
+#: fetchmail.c:1684
 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:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1250,7 +1265,7 @@ msgstr ""
 "  Els missatges excessivament grans s'eliminaran abans d'obtenir el correu "
 "(--limitflush on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1258,332 +1273,332 @@ msgstr ""
 "  Els missatges excessivament grans no s'eliminaran abans d'obtenir el "
 "correu (--limitflush off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està habilitada (--norewrite off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està deshabilitada (--norewrite on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  L'eliminació de retorns de carro està habilitada (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  L'eliminació de retorns de carro està deshabilitada (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  L'inserció de retorns de carro està habilitada (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  L'inserció de retorns de carro està deshabilitada (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 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:1654
+#: fetchmail.c:1699
 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:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  El desxifrat MIME està habilitat (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  El desxifrat MIME està deshabilitat (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  La pausa després de cada obtenció està habilitada (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  La pausa després de cada obtenció està deshabilitada (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 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:1663
+#: fetchmail.c:1708
 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:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les línies Delivered-To es descartaran (dropdelivered on)\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les línies Delivered-To es mantindran (dropdelivered off)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, 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:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, 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:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de missatges grans a cada obtenció (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, 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:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha límit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, 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:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 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:1695
+#: fetchmail.c:1740
 #, 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:1698
+#: fetchmail.c:1743
 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:1700
+#: fetchmail.c:1745
 #, 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:1702
+#: fetchmail.c:1747
 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:1706
+#: fetchmail.c:1751
 #, 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:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins el final (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollirà el correu són:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (per omissió)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, 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:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, 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:1748
+#: fetchmail.c:1793
 #, 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:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam són:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam està deshabilitat\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, 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:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexió.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, 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:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexió.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, 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:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està habilitada.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està deshabilitada.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 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:1813
+#: fetchmail.c:1858
 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:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adreça de l'embolcall està deshabilitat.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, 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:1822
+#: fetchmail.c:1867
 #, 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:1825
+#: fetchmail.c:1870
 #, 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:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimirà cap prefix\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Àlies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, 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:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interfície requerida.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorarà l'interfície %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interfície a monitorar.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, 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:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, 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:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió per SMTP.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 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:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1591,7 +1606,7 @@ msgstr ""
 "  No s'afegirà el rastre de l'obtenció a la capçalera Received.\n"
 ".\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
@@ -1666,102 +1681,102 @@ msgstr "Error quan s'enviaven les credencials GSS\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: procés dormint durant %d segons.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "es farà una pausa després de l'obtenció\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: actualització oportunista a TLS.\n"
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: actualització oportunista a TLS.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: actualització oportunista a TLS.\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:650
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "la re-obtenció ha fallat\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "hi ha %d missatge esperant després de la re-obtenció\n"
 msgstr[1] "hi ha %d missatges esperant després de la re-obtenció\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecció de bústia\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "hi ha %d missatge esperant després de la primera obtenció\n"
 msgstr[1] "hi ha %d missatges esperant després de la primera obtenció\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "la supressió de missatges ha fallat\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "hi ha %d missatge esperant després de la supressió\n"
 msgstr[1] "hi ha %d missatges esperant després de la supressió\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:871
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu és no llegit\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge no llegit\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1962,7 +1977,7 @@ msgstr "recv fatal del servidor\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No s'ha pogut desxifrar la codificació OTP\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
@@ -2277,7 +2292,7 @@ msgstr ""
 "      --showdots    mostra punts de progressió àdhuc als fitxers de "
 "registre\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2285,60 +2300,72 @@ msgstr ""
 "Atenció: s'ha detectat un \"Maillennium POP3/PROXY server\", s'usa RETR en "
 "lloc de TOP.\n"
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: actualització oportunista a TLS.\n"
 
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
 # timestamp: marca horària
-#: pop3.c:603
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No s'ha trobat la marca horària APOP requerida a la salutació\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxi en la marca horària de la salutació\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petició de protocol indefinida a POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessió activa?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (núm=%d) s'ha esborrat, però encara està present!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u és no llegit\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Els missatges estan inserits a la llista del servidor. No es pot continuar.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opció --folder no està suportada per POP3\n"
 
@@ -2627,66 +2654,66 @@ msgstr "Error %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Ha fallat l'obertura del fitxer BSMTP o l'escriptura del preàmbul\n"
 
-#: sink.c:967
+#: sink.c:966
 #, 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:974
+#: sink.c:973
 #, 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:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adreça coincideix; el postmaster no està definit.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adreça coincideix; reenviant a %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "no s'ha pogut executar l'MDA\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexió %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1279
+#: sink.c:1278
 #, 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:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error en escriure a l'MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2694,24 +2721,24 @@ 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:1372
+#: sink.c:1371
 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:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, 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:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/cs.po b/po/cs.po
index c64fa47f..4ddcbb54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.2.6.alpha1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2005-07-03 03:57+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -120,12 +120,12 @@ msgstr " (%d oktetů)"
 msgid " (%d header octets)"
 msgstr " (%d oktetů v hlavi�ce)"
 
-#: driver.c:682
+#: driver.c:680
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetů v těle)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -133,19 +133,19 @@ msgstr ""
 "zpráva %s@%s:%d nemá o�ekávanou velikost (%d ve skute�nosti != %d "
 "o�ekáváno)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " zachována\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " smazána\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " nesmazána\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -157,36 +157,36 @@ msgstr[1] ""
 msgstr[2] ""
 "limit stahování %d dosažen; %d zpráv ponecháno na serveru %s ú�et %s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "po %d sekundách vypršel �as při připojování k serveru %s.\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "po %d sekundách vypršel �as při �ekání na server %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "po %d sekundách vypršel �as při �ekání na %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "po %d sekundách vypršel �as při �ekání odpově� poslucha�e.\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "po %d sekundách vypršel �as.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmailu opakovaně vypršel �as"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -194,7 +194,7 @@ msgid ""
 msgstr ""
 "Fetchmailu vypršel �as více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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,73 +209,73 @@ msgstr ""
 "\n"
 "Fetchmail již nebude vybírat z této schránky, dokud jej znovu nespustíte.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "příkaz před spojením selhal se stavem %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nemohu najít schránku HESIOD %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Vedoucí server nemá jméno.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nemohu najít kanonické DNS jméno %s (%s)\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "spojení %s k %s selhalo"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Varování fetchmailu o nedostupnosti serveru."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Spojení SSL selhalo.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Chyba \"zámek se používá\" na %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba \"server zaneprázdněn\" na %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autorizace na %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (dříve autorizován)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Předmět: autentizace fetchmailu selhala na %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohl stáhnout poštu z %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -296,7 +296,7 @@ msgstr ""
 "Démon fetchmail bude pokra�ovat v �innosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1196
+#: driver.c:1194
 #, fuzzy
 msgid ""
 "\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Démon fetchmail bude pokra�ovat v �innosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -339,60 +339,60 @@ msgstr ""
 "Démon fetchmail bude pokra�ovat v �innosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okamžitě znovu kontroluji %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Neznámá chyba při přihlášení nebo autentizaci na %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Úspěšná autorizace na %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Předmět: Autentizace fetchmailu úspěšná na %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail se úspěšně přihlásil k %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Služba byla obnovena.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vybírám nebo znovu kontroluji složku %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "vybírám nebo znovu kontroluji implicitní složku\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (složka %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Stahuji z %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -400,14 +400,14 @@ msgstr[0] "%d zpráva (%d %s) pro %s"
 msgstr[1] "%d zprávy (%d %s) pro %s"
 msgstr[2] "%d zpráv (%d %s) pro %s"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "pře�tena"
 msgstr[1] "pře�teny"
 msgstr[2] "pře�teno"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -415,96 +415,96 @@ msgstr[0] "%d zpráva pro %s"
 msgstr[1] "%d zprávy pro %s"
 msgstr[2] "%d zpráv pro %s"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetů).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Žádná pošta pro %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "nesmyslný po�et zpráv!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "socketu"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "hlavi�ky RFC822"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "synchronizace mezi klientem a serverem"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "protokolu klient/server"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "zámku na serveru"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "transakce SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "hledání v DNS"
 
-#: driver.c:1541
+#: driver.c:1539
 #, fuzzy
 msgid "undefined"
 msgstr "nedefinované\n"
 
-#: driver.c:1547
+#: driver.c:1545
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "při odesílání po�íta�i SMTP %2$s došlo k chybě %1$s\n"
 
-#: driver.c:1549
+#: driver.c:1547
 #, fuzzy
 msgid "unknown"
 msgstr "po�íta� není znám."
 
-#: driver.c:1551
+#: driver.c:1549
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "při stahování z %2$s došlo k chybě %1$s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "příkaz po spojení selhal se stavem %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 není podporován.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 není podporován.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Přepína� --flush není s %s podporován\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Přepína� --all není s %s podporován\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Přepína� --limit nepodporuje argument %s\n"
@@ -634,7 +634,7 @@ msgstr "Přepína� --flush není s ETRN podporován.\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Přepína� --check není s ETRN podporován.\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -642,71 +642,71 @@ msgid ""
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: spuštěn s"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "nemohu získat aktuální pracovní adresář\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Toto je fetchmail verze %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Zpracovávám přepína�e z příkazového řádku%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " a "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nenastaven žádný poštovní server - možná chybí %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nebyl specifikován žádný poštovní server.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: žádný jiný fetchmail neběží\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: chyba při zabíjení fetchmailu %s v %d; kon�ím.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "na pozadí"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "v popředí"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail %s v %d byl zabit.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -714,7 +714,7 @@ msgstr ""
 "fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému "
 "po�íta�i.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -722,196 +722,211 @@ msgstr ""
 "fetchmail: nemohu stahovat ze zadaných serverů, když běží jiný fetchmail v %"
 "d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: v popředí běží jiný fetchmail v %d.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: neakceptuji přepína�e, když na fetchmail běží na pozadí.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail na pozadí v %d byl probuzen.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: starší proces v %d tajemně umřel.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nemohu najít heslo pro %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Zadejte heslo pro %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 #, fuzzy
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných "
 "schránek z %s\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 #, fuzzy
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: žádný jiný fetchmail neběží\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "spouštím démona fetchmail %s \n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nemohu otevřít %s, kam připojovat záznamy \n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nemohu zkontrolovat �as %s (chyba %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "znovu spouštím fetchmail (%s změněn)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus znovu se spustit může selhat, protože adresář nebyl obnoven\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus znovu spustit fetchmail selhal\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "stahování z %s přesko�eno (chyba autentizace nebo mnohokrát vypršel �as)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ještě nenastal �as, neptám se %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav spojení=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav spojení=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav spojení=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav spojení=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav spojení=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav spojení=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav spojení=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav spojení=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav spojení=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav spojení=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav spojení=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav spojení=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav spojení=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav spojení=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav spojení=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Žádné ze spojení není aktivní. Kon�ím.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "spím v %s\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "probuzen %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "probuzen signálem %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "probuzen v %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normální ukon�ení, stav %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "nemohu zkontrolovat �as konfigura�ního souboru\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varování: po�íta� %s je v konfigura�ním souboru zmíněn vícekrát\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Varování: po�íta� %s je v konfigura�ním souboru zmíněn vícekrát\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL není podporováno.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "SSL není podporováno.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "SSL není podporováno.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "SSL není podporováno.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -919,130 +934,130 @@ msgstr ""
 "fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných "
 "schránek z %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "varování: spole�né schránky pro %s vyžadují přepína� envelope!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "Nastavení pro %s není platné, �íslo portu nesmí být záporné.\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "Nastavení %s není platné, RPOP vyžaduje privilegovaný port\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMTP\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "fetchall a keep on zároveň v režimu démona je chyba!\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukon�en signálem %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování za�ato\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "Podpora POP2 není nastavena.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "Podpora POP3 není nastavena.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "Podpora IMAPu není nastavena.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "Podpora ETRN není nastavena.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "Podpora ODMR není nastavena.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "zvolen nepodporovaný protokol.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování dokon�eno\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval stahování je %d sekund\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Soubor záznamů je %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Soubor ID je %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Zprávy o průběhu budou zaznamenávny pomocí syslogu\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se bude skrývat a nebude generovat Received\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazovat te�ky průběhu i v souborech záznamů.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail bude přeposílat špatně adresované zprávy ze spole�ných schránek na "
 "%s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude chybové zprávy posílát postmasterovi.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude chybové zprávy posílát odesílateli.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Možnosti pro stahování z %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude stahována z %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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"
@@ -1050,177 +1065,177 @@ msgstr[0] "  K stahování z tohoto serveru dojde každý %d interval.\n"
 msgstr[1] "  K stahování z tohoto serveru dojde každé %d intervaly.\n"
 msgstr[2] "  K stahování z tohoto serveru dojde každých %d intervalů.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skute�né jméno serveru je %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Pokud není zadán žádný po�íta�, nebude se stahovat z tohoto po�íta�e.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Pokud není zadán žádný po�íta�, bude se stahovat z tohoto po�íta�e.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Bude požadováno heslo.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Tajemství APOP = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\"\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " Protokol je KPOP s autentizací Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr " Protokol je %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr "  (pomocí služby %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (pomocí implicitního portu)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr "  (vynuceně používám UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budou vyzkoušeny všechny dostupné metody autentizace.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace heslem.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Předpokládám šifrované spojení.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principal poštovní služby je: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sezení šifrovaná s SSL povolena.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL povolena.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresář důvěryhodných certifikátů SSL: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Otisk klí�e SSL (porovnáván s klí�em serveru): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Čas �ekání na odpově� serveru je %d sekund"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (implicitní).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Zvolena implicitní poštovní schránka.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Zvolené poštovní schránky jsou:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Budou staženy všechny zprávy (--all zapnuto).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Budou staženy jen nové zprávy (--all vypnuto).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stažené zprávy budou ponechány na serveru (--keep zapnuto).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stažené zprávy nebudou ponechány na serveru (--keep vypnuto).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1684
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1686
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1228,7 +1243,7 @@ msgid ""
 msgstr ""
 "  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1236,216 +1251,216 @@ msgid ""
 msgstr ""
 "  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Přepisování adres místních naserveru je povoleno (--norewrite vypnuto).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Přepisování adres místních naserveru je zakázáno (--norewrite zapnuto).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Mazání CR je povoleno (stripcr zapnuto).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Mazání CR je zakázáno (stripcr vypnuto).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynucení CR je povoleno (forcecr zapnuto).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1699
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódování MIME je povoleno (mimedecode zapnuto).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódování MIME je zakázáno (mimedecode vypnuto).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Ne�innost po stahování je povolena (idle zapnuto).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Ne�innost po stahování je zakázána (idle vypnuto).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit velikosti zprávy je %d oktetů (--limit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Žádný limit velikosti zprávy (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval varování o velikosti zpráv je %d vteřin (--warnings %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varování o velikosti při každém stahování (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit přijatých zpráv je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Žádný Limit přijatých (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit velikosti stahovaných zpráv je %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Hledat UID při každém stahování binárně (--fastuidl 1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "  Hledat UID při binárně při %d z %d stahování (--fastuidl %d).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "  Hledat UID při každém stahování lineárně (--fastuidl 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky zpráv SMTP je %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Žádný limit dávky zpráv SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Interval odstraňování mezi �ištěním vynucen na %d (--expunge %d).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Žádná vynucená �ištění (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény, pro které se bude stahovat pošta, jsou:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (implicitní)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Zprávy budou připojeny k %s jako BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Zprávy budou doru�eny pomocí \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Zprávy budou přeposlány pomocí %cMTP na:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Název po�íta�e v řádku MAIL FROM bude %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznávané odpově�i serveru blokující spam jsou:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokování spamu zakázáno\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Připojení k serveru bude navázáno pomocí \"%s\"\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  Žádný příkaz před spojením.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Připojení k serveru bude ukon�eno pomocí \"%s\"\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  Žádný příkaz po spojení.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nedeklarována žádná místní jména tohoto po�íta�e.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Režim spole�ných schránek: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Režim soukromých schránek: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1453,119 +1468,119 @@ msgstr[0] "Rozpoznáváno %d místní jméno.\n"
 msgstr[1] "Rozpoznávána %d místní jména.\n"
 msgstr[2] "Rozpoznáváno %d místních jmen.\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy spole�ných schránek je povoleno.s\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy spole�ných schránek je zakázáno.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
 "IP adres.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
 "názvu.\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Předpokládá se, že hlavi�ka obálky je: %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Po�et hlavi�ek obálky, které zpracovávat: %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Předpona %s bude odtržena od id uživatele\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Žádné odtrhávání předpony\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Deklarované přezdívky poštovního serveru:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Místní domény:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojení musí procházet přes %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  Nezadán žádný požadavek na rozhraní.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Stahovací smy�ka bude sledovat %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  Nezadáno žádné sledované rozhraní.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Připojení k poslucha�i budou navazovány zásuvným modulem %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  Nezadán žádný příkaz výstupního zásuvného modulu.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Z tohoto po�íta�e neukládána žádná UID.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Ukládáno %d UID.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Informace pro sledování stahování budou přidány do hlavi�ky Recieved.\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 "  Informace pro sledování stahování nebudou přidány do hlavi�ky Recieved.\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Předávané vlastnosti \"%s\".\n"
@@ -1639,61 +1654,61 @@ msgstr "Chyba při uvolňování ověření\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: vlákno spí na %d s.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "po stahování budu ne�inný\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:650
+#: imap.c:662
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "zpráva %s@%s:%d nemá o�ekávanou velikost (%d ve skute�nosti != %d "
 "o�ekáváno)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1701,12 +1716,12 @@ msgstr[0] "%d zpráva �eká po opětovném stahování\n"
 msgstr[1] "%d zprávy �ekají po opětovném stahování\n"
 msgstr[2] "%d zpráv �eká po opětovném stahování\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
 # c-format
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1714,11 +1729,11 @@ msgstr[0] "%d zpráva �eká po prvním stahování\n"
 msgstr[1] "%d zprávy �ekají po prvním stahování\n"
 msgstr[2] "%d zpráv �eká po prvním stahování\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "�ištění selhalo\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1726,21 +1741,21 @@ msgstr[0] "%d zpráva �eká po vy�ištění\n"
 msgstr[1] "%d zprávy �ekají po vy�ištění\n"
 msgstr[2] "%d zpráv �eká po vy�ištění\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepře�tených zpráv selhalo\n"
 
-#: imap.c:871
+#: imap.c:885
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u nebyla pře�tena\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepře�tená\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1937,7 +1952,7 @@ msgstr "od serveru přijato fatální\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Nemohu dekódovat výzvu OTP\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
@@ -2243,64 +2258,76 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    zobrazovat te�ky průběhu i v souborech se záznamy\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Požadovaný �asový údaj APOP nebyl v pozdravu nalezen\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaktická chyba v �asovém údaji z pozdravu\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "zam�eno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla pře�tena\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Přepína� --remote není s POP3 podporován\n"
@@ -2588,88 +2615,88 @@ msgstr "Chyba %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "otevření souboru BSMTP nebo zápis preambule selhal\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "démonovi %cMTP se nelíbí adresa příjemce `%s'\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "démonovi %cMTP se opravdu nelíbí adresa příjemce `%s'\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "neodpovídá žádná adresa; nenastaven postmaster.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nelze odeslat ani na %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "neodpovídá žádná adresa; přeposílám na %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "chystám se doru�it pomocí: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "otevírání MDA sehalo\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "připojení%cMTP k %s selhalo\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "nemohu se spustit démona; nahrazuji jej %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Chyba při odstraňování %s. %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA umřel na signál %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA vrátil nenulový stav %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Divné: pclose MDA vrátilo %d, neumím obsloužit na %s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ukon�ení zprávy nebo zavření souboru BSMTP selhalo\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "Démon SMTP odmítl doru�ení\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Chyba doru�ování LMTP při EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Neo�ekávaná odpově� na LMTP EOM jiná než 503: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/en_GB.po b/po/en_GB.po
index f0055c7c..11db17d4 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: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+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"
@@ -120,31 +120,31 @@ msgstr " (%d octets)"
 msgid " (%d header octets)"
 msgstr " (%d header octets)"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d body octets)"
 
-#: driver.c:743
+#: driver.c:741
 #, 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:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " retained\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " flushed\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " not flushed\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -152,36 +152,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:876
+#: driver.c:874
 #, 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:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "timeout after %d seconds waiting for server %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "timeout after %d seconds waiting for %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, 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:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "timeout after %d seconds.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail sees repeated timeouts"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -190,7 +190,7 @@ msgstr ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
 "s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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"
@@ -206,73 +206,73 @@ msgstr ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-connection command failed with status %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "couldn't find HESIOD pobox for %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Lead server has no name.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, 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:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s connection to %s failed"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail unreachable-server warning."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail could not reach the mail server %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "SSL connection failed.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-busy error on %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server busy error on %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authorisation failure on %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (previously authorised)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail authentication failed on %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail could not get mail from %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -286,7 +286,7 @@ msgstr ""
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
 "error message."
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -306,7 +306,7 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -326,167 +326,167 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Repoll immediately on %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unknown login or authentication error on %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authorisation OK on %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail authentication OK on %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail was able to log into %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Service has been restored.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecting or re-polling folder %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "selecting or re-polling default folder\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s at %s (folder %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polling %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, 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:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "seen"
 msgstr[1] "seen"
 
-#: driver.c:1329
+#: driver.c:1327
 #, 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:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No mail for %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "bogus message count!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "missing or bad RFC822 header"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "client/server synchronisation"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "client/server protocol"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "lock busy on server"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "SMTP transaction"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "DNS lookup"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "undefined"
 
-#: driver.c:1547
+#: driver.c:1545
 #, 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:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "unknown"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s error while fetching from %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "post-connection command failed with status %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 support not linked.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 support not linked.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush is not supported with %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all is not supported with %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit is not supported with %s\n"
@@ -618,7 +618,7 @@ msgstr "Option --folder is not supported with ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Option --check is not supported with ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -630,7 +630,7 @@ msgstr ""
 "Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -640,64 +640,64 @@ msgstr ""
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WARNING: Running as root is discouraged.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invoked with"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "This is fetchmail release %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -705,214 +705,226 @@ msgstr ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 msgstr ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: another foreground fetchmail is running at %d.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: can't find a password for %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "could not open %s to append logs to \n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "attempt to re-exec may fail as directory has not been restored\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "poll of %s skipped (failed authentication or too many timeouts)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, 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:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "KERBEROS v4 support is configured, but not compiled in.\n"
+
+#: fetchmail.c:1234
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "KERBEROS v5 support is configured, but not compiled in.\n"
+
+#: fetchmail.c:1240
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "GSSAPI support is configured, but not compiled in.\n"
+
+#: fetchmail.c:1270
 #, 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:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 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:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -921,284 +933,284 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, 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:1279
+#: fetchmail.c:1324
 #, 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:1293
+#: fetchmail.c:1338
 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:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, 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:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, 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:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 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:1528
+#: fetchmail.c:1573
 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:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, 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:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 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:1636
+#: fetchmail.c:1681
 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:1638
+#: fetchmail.c:1683
 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:1639
+#: fetchmail.c:1684
 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:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1206,7 +1218,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1214,319 +1226,319 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1699
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, 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:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 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:1695
+#: fetchmail.c:1740
 #, 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:1698
+#: fetchmail.c:1743
 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:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, 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:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, 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:1748
+#: fetchmail.c:1793
 #, 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:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, 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:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 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:1813
+#: fetchmail.c:1858
 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:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, 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:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, 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:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, 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:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 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:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1534,7 +1546,7 @@ msgstr ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -1608,102 +1620,102 @@ msgstr "Error releasing credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread sleeping for %d sec.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: upgrade to TLS succeeded.\n"
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: upgrade to TLS failed.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Required LOGIN capability not supported by server\n"
 
-#: imap.c:650
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message waiting after re-poll\n"
 msgstr[1] "%d messages waiting after re-poll\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message waiting after first poll\n"
 msgstr[1] "%d messages waiting after first poll\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message waiting after expunge\n"
 msgstr[1] "%d messages waiting after expunge\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:871
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is unseen\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1899,7 +1911,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Could not decode OTP challenge\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -2193,7 +2205,7 @@ msgstr "  -r, --folder      specify remote folder name\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    show progress dots even in logfiles\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2201,58 +2213,70 @@ msgstr ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Required APOP timestamp not found in greeting\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Timestamp syntax error in greeting\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Undefined protocol request in POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy!  Is another session active?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Cannot handle UIDL response from upstream server.\n"
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server responded with UID for wrong message.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) was deleted, but is still present!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is unseen\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "protocol error\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocol error while fetching UIDLs\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
@@ -2540,89 +2564,89 @@ msgstr "%cMTP error: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:974
+#: sink.c:973
 #, 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:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, 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:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Message termination or close of BSMTP file failed\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/es.po b/po/es.po
index 6cbf1833..c3caf903 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.4-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-09-15 11:52+0200\n"
 "Last-Translator: Héctor García <hector@el-mundo.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -132,12 +132,12 @@ msgstr " (%d octetos)"
 msgid " (%d header octets)"
 msgstr " (%d octetos en la cabecera) "
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octetos en el cuerpo)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -145,19 +145,19 @@ msgstr ""
 "el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d "
 "esperada)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " retenido\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " eliminado\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " no eliminado\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -169,39 +169,39 @@ msgstr[1] ""
 "límite de %1$d mensajes alcanzado; se dejaron %2$d mensajes en la cuenta %4"
 "$s del servidor %3$s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, 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:880
+#: driver.c:878
 #, 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:884
+#: driver.c:882
 #, 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:889
+#: driver.c:887
 #, 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:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tiempo agotado después de %d segundos.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ve repetidos excesos del tiempo de espera"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -210,7 +210,7 @@ msgstr ""
 "Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba "
 "obtener correo de %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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,73 +225,73 @@ msgstr ""
 "para diagnosticar el problema.\n"
 "Fetchmail no inquirirá esta casilla hasta que lo reinicie.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "el comando preconexión falló con estado %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no fue posible encontrar casilla HESIOD para %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "El servidor líder no tiene nombre.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "no fue posible encontrar el nombre DNS canónico de %s (%s)\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Fallo la conexión de %s a %s"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: aviso de server fuera de alcance de fetchmail."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Error ‘lock-busy’ en %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Error: servidor ocupado en %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallo de autorización en %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (previamente autorizado)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: la autenticación de fetchmail falló en %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail no pudo obtener correo de %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -305,7 +305,7 @@ msgstr ""
 "ocupado) que fetchmail no puede distinguir porque el servido no envió\n"
 "un mensaje de error útil"
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -325,7 +325,7 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio sea restablecido."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -346,168 +346,168 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio sea restablecido."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Reinquirir inmediatamente %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, 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:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorización exitosa en %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: autenticación de fetchmail aprobada en %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail pudo registrarse en %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "El servicio ha sido reestablecido.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionando o re-inquiriendo la carpeta %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionando o re-inquiriendo la carpeta por defecto\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Inquiriendo %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, 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:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "visto"
 msgstr[1] "vistos"
 
-#: driver.c:1329
+#: driver.c:1327
 #, 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:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "el encabezado RFC822 falta o está arruinado"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "sincronización cliente/servidor"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "bloqueo ocupado en el servidor"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "Transacción SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "búsqueda en DNS"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "no definido"
 
-#: driver.c:1547
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 "error %s durante la recepción de %s@%s y la entrega al servidor SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "desconocido"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "error %s recibiendo de %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "el comando posconexión falló con estado %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Soporte de Kerberos V4 no incluido.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Soporte de Kerberos V5 no incluido.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opción --flush no soportada con %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opción --all no soportada con %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opción --limit no soportada con %s\n"
@@ -640,7 +640,7 @@ msgstr "La opción --folder no está soportada con ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "La opción --check no es soportada con ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -652,7 +652,7 @@ msgstr ""
 "Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -663,64 +663,64 @@ msgstr ""
 "por favor lee el archivo COPYING en el directorio de fuentes o "
 "documentación.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ADVERTENCIA: Se recomienda no ejecutar esta aplicación como root.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocado con"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "no fue posible obtener el directorio de trabajo actual\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Esta es la versión de fetchmail %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Tomando opciones de la línea de comandos%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " y "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hay servidores de correo configurados -- ¿por ahí falta %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no han sido especificados servidores de correo.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ningún otro fetchmail está siendo ejecutando\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "primer plano"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminando.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -728,7 +728,7 @@ msgstr ""
 "fetchmail: no es posible verificar el correo mientras otro fetchmail está en "
 "ejecución hacia la misma máquina\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -736,201 +736,216 @@ msgstr ""
 "fetchmail: no es posible inquirir las máquinas especificadas con otro "
 "fetchmail (%d) en ejecución.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: otro fetchmail (%d) está en ejecución en primer plano.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: no es posible aceptar opciones mientras un fetchmail está en "
 "ejecución en segundo plano.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: proceso hijo más antiguo (%d) murió misteriosamente.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no se puede encontrar una clave para %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Ingrese clave para %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: cuidado: están espeficicados tanto syslog como un archivo de "
 "registro.¡Compruebe ambos registros!\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: no puedo pasar a asegundo plano. Abortando.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, 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:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no se pudo temporizar %s (error %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s cambió)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "el intento de re-ejectuar puede fallar dado que el directorio no ha sido "
 "restaurado\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "el intento de re-ejecutar fetchmail falló\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "no se consulta %s (fallo en la autenticación o demasiados excesos de "
 "espera)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo no alcanzado, no se interrogará %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado de la consulta=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas las conexiones están trabadas. Saliendo.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "durmiendo en %s\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertado por %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertado por señal %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertado en %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 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:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Cuidado: múltiple mención de la máquina %s en el archivo de configuración\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Error: múltiples entradas \"defaults\" en el archivo de "
 "configuración.\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no fue compilado.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "El soporte de SSL no fue compilado.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "El soporte de SSL no fue compilado.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "El soporte de SSL no fue compilado.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -938,18 +953,18 @@ msgstr ""
 "fetchmail: cuidado: no hay DNS disponible para verificar recepciones "
 "‘multidrop’ de %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cuidado: ¡‘multidrop’ para %s requiere la opción envelope!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "cuidado: ¡no pida soporte técnico si todo el correo es dirigido al "
 "postmaster!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -958,295 +973,295 @@ msgstr ""
 "fetchmail: La configuración %s es inválida, especifique un número de puerto "
 "positivo para el servicio o puerto\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: configuración de %s inválida, RPOP requiere un puerto "
 "privilegiado\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, 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 por defecto\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "¡Usar «fetchall» junto a «keep» en modo demonio o en modo pausa es un "
 "error!\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogando a %s (protocolo %s) en %s: consulta iniciada\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "fue seleccionado un protocolo no soportado.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, 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:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso serán registrados vía syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará ‘Received’\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 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:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes ‘multidrop’ mal direccionados a %s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al ‘postmaster’.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo será recibido vía %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Esta máquina sólo será interrogada si una máquina es especificada.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta máquina será interrogada cuando no se especifique una máquina.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  La clave será pedida.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = “%s�.\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = “%s�.\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Clave = “%s�.\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (usando puerto por defecto)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con clave.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones encriptadas con SSL activadas.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Huella dactilar de la llave SSL (comprobada con la llave del servidor): %"
 "s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla por defecto está seleccionada.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes serán recibidos (--all on).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 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:1636
+#: fetchmail.c:1681
 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:1638
+#: fetchmail.c:1683
 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:1639
+#: fetchmail.c:1684
 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:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1254,7 +1269,7 @@ msgstr ""
 "  Los mensajes demasiado grandes serán eliminados antes de recibir nuevos (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1262,347 +1277,347 @@ msgstr ""
 "  No se eliminarán los mensajes demasiado grandes antes de recibir nuevos (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro serán removidos (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se removerán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se agregarán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se agregarán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 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:1654
+#: fetchmail.c:1699
 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:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Las líneas ‘Status’ que no estén vacías serán descartadas (dropstatus "
 "on).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Las líneas ‘Status’ que no estén vacías serán conservadas (dropstatus "
 "off).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán descartadas (dropdelivered on).\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán conservadas (dropdelivered off).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, 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:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, 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:1678
+#: fetchmail.c:1723
 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:1681
+#: fetchmail.c:1726
 #, 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:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, 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:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UIDs durante cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UIDs durante %d de cada %d consultas (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Utilizar búsqueda lineal de UIDs durante cada conlusta (--fastuidl 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensaje por lote SMTP es %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, 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:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, 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:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes serán entregados con “%s�.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes serán reenviados con %cMTP a:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El nombre de la máquina en la línea ‘MAIL FROM’ será %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, 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:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de ‘spam’ son:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de ‘spam’ está desactivado\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La conexión al servidor será iniciada con “%s�.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  No hay comando de pre-conexión.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La conexión al servidor será terminada con “%s�.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  No hay comando posconexión.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para esta máquina.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Modo ‘multi-drop’: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Modo ‘single-drop’: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, 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:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 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:1813
+#: fetchmail.c:1858
 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:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, 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:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número de cabeceras a saltar: %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  El prefijo %s será removido del nombre de usuario\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Ningún prefijo será removido\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, 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:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificó alguna interfaz requerida.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta monitoreará %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitoreo.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, 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 ‘plugin’ %s (--"
 "plugin %s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugin’.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, 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:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugout’.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UIDs guardadas de esta máquina.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs guardadas.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1610,7 +1625,7 @@ msgstr ""
 "  No se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso “%s�.\n"
@@ -1684,102 +1699,102 @@ msgstr "Error largando las credenciales\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: la tarea dormirá por %d segundos\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "descansará después de inquirir\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: actualización oportunista a TLS.\n"
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: actualización oportunista a TLS.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: actualización oportunista a TLS.\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
 
-#: imap.c:650
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "inconsistencia en borrado de mensajes (%d actual != %d esperado)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
 msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
 msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
 msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:871
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu no fue visto\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1979,7 +1994,7 @@ msgstr "fatal recv del server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
@@ -2303,7 +2318,7 @@ msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
 "registro\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2311,59 +2326,71 @@ msgstr ""
 "Aviso: encontrado \"Maillennium POP3/PROXY server\", usando el comando RETR "
 "en lugar de TOP.\n"
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: actualización oportunista a TLS.\n"
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Estampa de tiempo APOP requerida no encontrada en el saludo\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la estampa de tiempo en el saludo\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pedido de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDLs\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está soportada con POP3\n"
 
@@ -2652,66 +2679,66 @@ msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "Fallo en la apertura del archivo de BSMTP o en la escritura del preámbulo\n"
 
-#: sink.c:967
+#: sink.c:966
 #, 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:974
+#: sink.c:973
 #, 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:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error escribiendo a MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "El MDA murió por la señal %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "El MDA devolvió un estado distinto a cero %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2719,24 +2746,24 @@ msgstr ""
 "Curioso: pclose en el MDA devolvió %d y errno %d/%s, no se puede manejar en %"
 "s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 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:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, 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:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/fr.po b/po/fr.po
index 746678a3..fd7ac55c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2005-12-18 11:50+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -134,12 +134,12 @@ msgstr " (%d octets)"
 msgid " (%d header octets)"
 msgstr " (%d octets dans l'en-tête)"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octets dans le corps)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -147,19 +147,19 @@ msgstr ""
 "le message %s@%s:%d n'est pas de la longueur attendue (%d actuelle != %d "
 "attendue)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " conservé\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " éliminé\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " non éliminé\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -169,40 +169,40 @@ msgstr[0] ""
 msgstr[1] ""
 "fetchlimit %d atteinte; %d messages demeurent sur le serveur %s (compte %s)\n"
 
-#: driver.c:876
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "délai dépassé après %d secondes d'attente d'une connexion avec le serveur %"
 "s.\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "délai dépassé après %d secondes d'attente du serveur %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "délai dépassé après %d secondes d'attente de %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "délai dépassé après %d secondes d'attente de la réponse du client.\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "délai d'attente dépassé après %d secondes.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Subject: fetchmail a rencontré des dépassements de délais à plusieurs "
 "reprises"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -211,7 +211,7 @@ msgstr ""
 "Fetchmail a rencontré plus de %d dépassements de délais en récupérant du "
 "courrier depuis %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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,74 +229,74 @@ msgstr ""
 "Fetchmail n'interrogera pas de nouveau cette boîte aux lettres\n"
 "tant que vous ne l'aurez pas redémarré.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "la commande de pré-connexion a échoué avec l'état %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "impossible de trouver la boîte HESIOD pour %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Le serveur principal n'a pas de nom\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "impossible de trouver le nom canonique DNS de %s (%s) : %s\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Échec de connexion %s avec %s"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: avertissement de serveur non accessible par Fetchmail."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Échec de la connexion SSL\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erreur «lock-busy» sur %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erreur «busy» sur %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Échec de l'autorisation sur %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (précédemment autorisée)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: l'authentification de fetchmail a échoué sur %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s@%s.\n"
 
 # XXX FIXME
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -310,7 +310,7 @@ msgstr ""
 "de celle-ci car ils n'envoient pas de messages d'erreur utiles\n"
 "en cas d'échec du login."
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -330,7 +330,7 @@ msgstr ""
 "a chaque réveil. Il n'y aura plus d'autre notifications jusqu'à ce que\n"
 "le service soit réactivé."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -351,168 +351,168 @@ msgstr ""
 "a chaque réveil. Il n'y aura plus d'autre notifications jusqu'à ce que\n"
 "le service soit réactivé."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Re-récupération immédiate sur %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erreur de login ou d'identification inconnue pour %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorisation OK sur %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: l'authentification de fetchmail a réussie sur %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail n'a pu enregistrer dans le journal (%s@%s).\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Le service a été réactivé\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "sélection ou re-réception du dossier %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "sélection ou re-réception du dossier par défaut\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s dans %s (dossier %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s dans %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Réception de %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d message (%d %s) pour %s"
 msgstr[1] "%d messages (%d %s) pour %s"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "déjà vu"
 msgstr[1] "déjà vus"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d message pour %s"
 msgstr[1] "%d messages pour %s"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Aucun message pour %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "nombre de messages erroné !"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "l'en-tête RFC822 est manquant ou endommagé"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "synchronisation client/serveur"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "protocole client/serveur"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "verrou occupé sur le serveur"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "Transaction SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "requête au DNS"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "non définie"
 
-#: driver.c:1547
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 "erreur %s durant la réception de %s@%s et l'envoi vers le serveur SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "inconnu"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erreur %s durant la réception de %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "la commande de post-connexion a échoué avec l'état %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Support de Kerberos V4 non inclus.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Support de Kerberos V5 non inclus.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush non supportée avec %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all non supportée avec %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit non supportée avec %s\n"
@@ -646,7 +646,7 @@ msgstr "L'option --folder n'est pas supportée avec ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'option --check n'est pas supportée avec ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -658,7 +658,7 @@ msgstr ""
 "Wilson\n"
 "Copyright © 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -670,65 +670,65 @@ msgstr ""
 "savoir\n"
 "plus, voyez le fichier COPYING s'il vous plaît.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 "Avertissement: appeler fetchmail avec privilèges root est déconseille.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail appellé avec"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "impossible de trouver le répertoire de travail courrant\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ceci est fetchmail, version %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Lecture des options sur la ligne de commande %s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " et "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Pas de serveur de courrier paramétré -- %s est peut-être manquant ?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: aucun serveur de courrier n'a été spécifié.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: aucun autre fetchmail n'est en cours d'exécution\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erreur en terminant %s fetchmail (%d); abandon.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "tâche de fond"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "premier plan"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminé.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -736,7 +736,7 @@ msgstr ""
 "fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est "
 "exécuté sur le même hôte\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -744,203 +744,220 @@ msgstr ""
 "fetchmail: impossible de récupérer le courrier si un autre fetchmail est "
 "exécuté sur %d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 "fetchmail: un autre fetchmail, au premier plan, est en exécution sur %d.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne "
 "en tâche de fond.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail en tâche de fond (%d) a été réactivé.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: processus fils plus ancien (%d) terminé mystérieusement.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: ne trouve pas de mot de passe pour %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entrez le mot de passe pour %s@%s : "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: attention: syslog et logfile sont activés. Voir tous les deux "
 "pour des messages !\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: impossible de détacher en tâche de fond. Terminé.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "démarrage de fetchmail %s en tâche de fond \n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "impossible d'ouvrir %s pour y ajouter les messages\n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "«time-check» %s impossible (erreur %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "redémarrage de fetchmail (%s  a changé)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "la tentative de réexécution peut échouer car le répertoire n'a pas été "
 "recréé\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "la tentative d'exécuter à nouveau fetchmail a échoué\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "réception de %s ignorée (authentification échouée ou dépassements de "
 "délais)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalle non atteint, pas de requête vers %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "État de la requête=0 (SUCCES)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "État de la requête=1 (PAS DE MAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "État de la requête=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "État de la requête=3 (ECHEC DE L'AUTHENTIFICATION)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "État de la requête=4 (PROTOCOLE)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "État de la requête=5 (SYNTAXE)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "État de la requête=6 (ERREUR E/S)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "État de la requête=7 (ERREUR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "État de la requête=8 (EXCLU)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "État de la requête=9 (verrou déjà pris)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "État de la requête=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "État de la requête=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "État de la requête=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "État de la requête=13 (NOMBRE MAXIMUM DE MESSAGES ATTEINT)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "État de la requête=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Toutes les connexions sont établies. Terminé.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "mise en sommeil à %s pour %d secondes\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "réveillé par %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "réveillé par un signal %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "réveillé à %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminaison normale, état %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "impossible de «time-check» le fichier run-control\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Attention : plusieurs mentions de l'hôte %s dans le fichier de "
 "configuration\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Erreur: plusieurs blocs \"defaults\" dans le fichier de "
 "configuration\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "Le support de SSL n'est pas été activé à la compilation.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr ""
+"Le support de KERBEROS v4 est configuré, mais pas été activé à la "
+"compilation.\n"
+
+#: fetchmail.c:1234
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr ""
+"Le support de KERBEROS v5 est configuré, mais pas été activé à la "
+"compilation.\n"
+
+#: fetchmail.c:1240
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr ""
+"Le support de GSSAPI est configuré, mais pas été activé à la compilation.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -948,20 +965,20 @@ msgstr ""
 "fetchmail: attention: aucun DNS disponible pour vérifier les réceptions "
 "«multidrop» depuis %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 "attention: des réceptions «multidrop» depuis %s exigent l'option "
 "«envelope»!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "attention: Ne chercher pas de l'aide si tout mail est expédié au "
 "postmaster!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -970,117 +987,117 @@ msgstr ""
 "fetchmail: configuration de %s invalide, service requiert un numéro de port "
 "positif\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: configuration de %s invalide, RPOP requiert un port privilégié\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuration de %s invalide, LMTP ne peut utiliser le port SMTP par défaut\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Utiliser «fetchall» et «keep» ensemble en mode démon ou mode idle est une "
 "erreur!\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminé par un signal %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interroge %s (protocole %s) à %s : récupération en cours\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "Le support de POP2 n'est pas configuré.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "Le support de POP3 n'est pas configuré.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "Le support d'IMAP n'est pas configuré.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "Le support d'ETRN n'est pas configuré.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "Le support de ODMR n'est pas configuré.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "protocole sélectionné non supporté.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interroge %s (protocole %s) à %s : interrogation finie\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervalle entre les réceptions est de %d secondes\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Le fichier de traces est %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Le fichier des identificateurs est %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Les messages de progression sont enregistrés via syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail va se masquer et ne générer aucun «Received»\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail affichera des points de progression, même dans le journal\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail réexpédiera les messages «multidrop» mal aiguillés vers %s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 "Fetchmail expédiera les erreurs de messagerie\n"
 "au maître de poste.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail expédiera les erreur de messagerie à l'envoyeur\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options pour la réception depuis %s@%s :\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le courrier sera reçu via %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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"
@@ -1088,176 +1105,176 @@ msgstr[0] "  La réception depuis ce serveur s'opérera tout %d intervalle.\n"
 msgstr[1] ""
 "  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Le vrai nom du serveur est %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Cet hôte ne sera pas interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Cet hôte sera interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Le mot de passe sera requis.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identification RPOP = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mot de passe = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Le protocole est KPOP avec authentification Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Le protocole est %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (utilisant le service %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (utilisant le port par défaut)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (forçant l'usage des UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Toutes les méthodes d'authentification vont être essayées.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "Authentification par mot de passe forcé.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "L'authentification MSN forcée.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "L'authentification NTLM forcée.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Authentification OTP forcée.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Authentification CRAM-Md5 forcée.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Authentification GSSAPI forcée.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Authentification de Kerberos V4 forcée.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " Authentification de Kerberos V5 forcée.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  cryptage «End-to-end» assumé.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Le principal service de mail est: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Les sessions encryptée SSL sont supportées.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocole SSL: %s\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Activation de la vérification des certificats du serveur SSL.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Répertoire des certificats SSL surs: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Signature de la clé SSL (vérifié via le serveur de clés): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Le délai d'attente d'une réponse du serveur est de %d secondes"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (par défaut).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  La boîte aux lettres par défaut est sélectionnée.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Les boîtes aux lettres sélectionnées sont :"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tous les messages seront reçus (--all on).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Seulement des messages nouveaux seront reçus (--all off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Tout message récupéré sera conservé sur le serveur (--keep on).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1684
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush "
 "off).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1265,7 +1282,7 @@ msgstr ""
 "  Tout message trop grand sera éliminé avant relève du courrier (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1273,339 +1290,339 @@ msgstr ""
 "  Tout ancien trop grand ne sera pas éliminé avant relève du courrier (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  La ré-écriture des adresses locales est activée (--norewrite off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La ré-écriture des adresses locales est inactivée (--norewrite on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La suppression des retour-chariots est activé (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  La suppression des retour-chariots est inactivée (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Le forçage des retour-chariots est activé (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Le forçage des retour-chariots est inactivé (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est inactivée (pass8bits "
 "on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1699
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est activée (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Le décodage MIME est activé (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Le décodage MIME est inactivé (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  L'inoccupation après la réception est activé (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  L'inoccupation après la réception est inactivé (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Les lignes «Status» non vides seront ignorés (dropstatus on).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Les lignes «Status» non vides seront conservées (dropstatus off).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront ignorées (dropdelivered on).\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront conservées (dropdelivered "
 "off).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  La taille des messages est limitée à %d octets (--limit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  La taille des messages n'est pas limitée (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Alertes sur la taille des messages toutes les %d secondes (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Le nombre de messages reçu est limité à %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Le nombre de messages reçu n'est pas limité (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  La limite de taille de récupération de messages est %d (--fetchsizelimit %"
 "d)\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 "  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Le nombre de messages expédiés est limité à %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Aucune purge forcée n'aura lieu (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domaines pour lesquels le mail est récupéré :"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (par défaut)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Les messages seront ajoutés après %s en tant que BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Les messages seront acheminés avec \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Les messages seront réexpédiés via %cMTP vers :"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Le nom de la machine sur la ligne «MAIL FROM» sera %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adresse placée après la commande SMTP 'RCPT TO' sera %s\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les réponses du serveur reconnaissant des blocs de «spam» sont :"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Le blocage du «spam» est inactivé\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexion au serveur sera initiée avec \"%s\".\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  Aucune commande de pré-connexion définie.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexion au serveur sera terminée avec \"%s\".\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  Aucune commande de post-connexion définie.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  Aucun nom local déclaré pour cet hôte.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Mode «multi-drop»: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Mode «single-drop»: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nom local reconnu.\n"
 msgstr[1] "%d noms locaux reconnus.\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est activée.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est inactivée.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs adresses IP.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs noms.\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Le routage vers l'adresse d'enveloppe est inactivé\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'en-tête d'enveloppe est pris comme étant : %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numéro de l'en-tête d'enveloppe devant être traité : %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Le préfixe %s sera soustrait des id d'utilisateur\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Aucun préfixe ne sera soustrait\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias pré-déclarés du serveur de courrier :"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Domaines locaux :"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexion se fera via l'interface %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  Aucun choix d'interface n'a été spécifié.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  La boucle de réception observera %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  Aucune interface à observer n'a été spécifiée.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Connexions au serveur à travers le «plugin» %s (--plugin %s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  Aucune commande de «plugin» n'a été spécifiée.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Connexions au client à travers le «plugout» %s (--plugout %s).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  Aucune commande de «plugout» n'a été spécifiée.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Aucun UID n'a été enregistré sur cet hôte.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs enregistrés.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Information de traçage de la réception ajoutée aux en-têtes Received.\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1613,7 +1630,7 @@ msgstr ""
 "  Aucune ajout d'information de traçage de la réception aux en-têtes "
 "Received.\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriétés du passage \"%s\".\n"
@@ -1687,103 +1704,103 @@ msgstr "Erreur de relarguage des credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: mise en sommeil du thread pour %d secondes.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocole identifié comme étant IMAP4 rev \n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocole identifié comme étant IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "attendra après la réception\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité OTP requise n'est pas supportée par fetchmail\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
 
-#: imap.c:650
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "pas de concordance de la punge des messages (%d effectiv != %d attendue)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "échec durant la re-réception\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message en attente après le nouveau poll\n"
 msgstr[1] "%d messages en attente après le nouveau poll\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "échec de la sélection de boîte aux lettres\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message en attente après le premier poll\n"
 msgstr[1] "%d messages en attente après le premier poll\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "échec de la purge\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message en attente après la purge\n"
 msgstr[1] "%d messages en attente après la purge\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:871
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu n'est pas vu\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1981,7 +1998,7 @@ msgstr "erreur fatale de recv serveur\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossible de décoder le challenge OTP\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Phrase de passe secrète : "
 
@@ -2299,7 +2316,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    affiche des points de progression, même dans le journal\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2307,58 +2324,70 @@ msgstr ""
 "Avertissement: trouvé «Maillennium POP3/PROXY server», la commande RETR est "
 "utilisé au lieu de TOP.\n"
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "L'horodatage APOP requis est absent du message d'invitation\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Requête de protocole indéfinie dans POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "Fichier verrou en service. Y'a-t-il une autre session active ?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Ne peux pas manier la réponse UIDL du serveur.\n"
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serveur répondait avec UID d'un faux message.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) a été effacé, mais est toujours présent !\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages insérés dans une liste du serveur. Impossible de gérer ça.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "erreur de protocole\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erreur de protocole durant la réception des UIDLs\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'option --folder n'est pas supportée avec POP3\n"
 
@@ -2648,65 +2677,65 @@ msgstr "Erreur %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Échec d'ouverture du fichier BSMTP ou à l'écriture du préambule\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse de destinataire `%s'\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse du destinataire `%s'\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "les adresses ne correspondent pas ; pas de postmaster\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "il n'est même pas possible d'expédier vers %s\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "aucune correspondance dans les adresses ; réexpédition vers %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "sur le point de délivrer le courrier à : %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "Échec d'ouverture MDA\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Échec de connexion %cMTP avec %s\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ne peut relever l'agent ; se replie sur %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erreur envoyant à l'MDA : %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "le programme de livraison du courrier a été tué par un signal %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA a retourné un état non nul (%d)\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2714,24 +2743,24 @@ msgstr ""
 "Etrange : le MDA a retourné %d et errno %d/%s lors du pclose; cas impossible "
 "à gérer %s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Échec à la terminaison du message ou à la fermeture de BSMTP\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "Le serveur SMTP a refusé de délivrer le courrier\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erreur de délivrance LMTP en EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Réponse non-503 inattendue à un ordre LMTP EOM: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/ja.po b/po/ja.po
index 7969a6da..be57cfc2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.6-rc4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-27 04:04+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-12-01 23:45+0900\n"
 "Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -66,12 +66,16 @@ msgstr "Subject: Fetchmail サイズ超�メッセージ 警告"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �削除�れ��� :"
+msgstr ""
+"以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �削除�れ"
+"��� :"
 
 #: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr "以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �残����� :"
+msgstr ""
+"以下�示�容�を超���メッセージ�メールサー� %s アカウント %s �残���"
+"�� :"
 
 #: driver.c:362
 #, c-format
@@ -81,7 +85,8 @@ msgstr "  %d 番目ã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸(%d bytes ã�®é•·ã�•ã�Œã�‚ã‚Šã�¾ã�™)ã�¯å‰Šé™
 #: driver.c:366
 #, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
-msgstr "  %d 番目�メッセージ(%d �イト �長���り��)�読�飛��れ���。"
+msgstr ""
+"  %d 番目�メッセージ(%d �イト �長���り��)�読�飛��れ���。"
 
 #: driver.c:501
 #, c-format
@@ -91,7 +96,8 @@ msgstr "%s@%s å®›ã�«å±Šã�„ã�Ÿ %d 番目ã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’読ã�¿é£›ã�°ã�—ã�¦ã�
 #: driver.c:555
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
-msgstr "%s@%s 宛�届�� %d 番目�メッセージ (%d �イト) を読�飛������。"
+msgstr ""
+"%s@%s 宛�届�� %d 番目�メッセージ (%d �イト) を読�飛������。"
 
 #: driver.c:571
 msgid " (length -1)"
@@ -104,7 +110,9 @@ msgstr " (容�超�)"
 #: driver.c:589
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr "%s@%s 宛�届�� %d 番目�メッセージ(%d �イト) �ヘッダを読�出���ん���。\n"
+msgstr ""
+"%s@%s 宛�届�� %d 番目�メッセージ(%d �イト) �ヘッダを読�出���ん��"
+"�。\n"
 
 #: driver.c:606
 #, c-format
@@ -121,69 +129,80 @@ msgstr " (%d �イト)"
 msgid " (%d header octets)"
 msgstr " (%d �イト (ヘッダ) )"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (本文 %d オクテット)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "%s@%s 宛�届�� %d 番目�メッセージ�大�������ん (%d (実際) != %d (予想)) \n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"%s@%s 宛�届�� %d 番目�メッセージ�大�������ん (%d (実際) != %d (予"
+"想)) \n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " メッセージ�サー����������り��。\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " サー��らメッセージを削除����。\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " サー��らメッセージを削除���ん���。\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "最大�り込�数��る %d 通������; メッセージ� %d 通�サー� %s �アカウント %s 宛�残�れ����。\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"最大�り込�数��る %d 通������; メッセージ� %d 通�サー� %s �アカ"
+"ウント %s 宛�残�れ����。\n"
 
-#: driver.c:876
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "%d 秒間サー� %s �接続応答を待�����制�時間を超�����。\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "%d 秒間サー� %s �応答を待�����制�時間を超�����。\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%d 秒間 %s �応答を待�����制�時間を超�����。\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr "転�先�プログラム�応答を %d 秒間待�����制�時間を超�����。\n"
+msgstr ""
+"転�先�プログラム�応答を %d 秒間待�����制�時間を超�����。\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d 秒間待機�����制�時間を超�����。\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail 実行中�制�時間�超��繰り返�発生����"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail 実行中� %d 回以上�%s@%s 宛�届��メール�信を試��������度�制�時間を超�����。\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail 実行中� %d 回以上�%s@%s 宛�届��メール�信を試��������"
+"度�制�時間を超�����。\n"
 
-#: driver.c:911
+#: driver.c:909
 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"
@@ -199,73 +218,75 @@ msgstr ""
 "�起動����り fetchmail ���メールボックスより\n"
 "メールを�り出���ん��注���下��。\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
-msgstr "サー���接続開始��実行��コマンド�ステータス %d を返��終了����。\n"
+msgstr ""
+"サー���接続開始��実行��コマンド�ステータス %d を返��終了���"
+"�。\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s ��る�� HESIOD pobox ��り��ん。\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Lead server �����り��ん。\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "%s � 公� DNS �(%s)を検索����ん���: %s\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s プロトコルを利用�� %s ��接続�失敗����。"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail 警告 : サー��交信�能"
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail 実行中�メールサー� %s �交信����ん���:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "SSL �よる接続�失敗����。\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "アカウント %s@%s � Lock-busy 状態��。\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s �サー�� busy 状態��。\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s ��証�失敗����\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr "(以���証�れ���)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail 実行中 %s@%s ��証�失敗"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail 実行中� %s@%s 宛�届��メールを�り出���ん���。\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -278,7 +299,7 @@ msgstr ""
 "他��因�よるも���る���れ����何故 login �失敗����\n"
 "サー��ら有益�情報��信�れ�������fetchmail ��判断�����。"
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -297,7 +318,7 @@ msgstr ""
 "fetchmail デーモン�引続�接続を試���。\n"
 "サービス�復旧����り何も通知�出�れ����を了承願���。"
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -309,170 +330,178 @@ msgid ""
 "is restored."
 msgstr ""
 "�証�失敗����。\n"
-"�れ��ら��貴方�パスワード�有効��������。����サー��よ���何故 login �失敗����サー��ら有益�情報��信�れ�����\n"
-"fetchmail ��サー��何�障害�発生���る場�� 区別��������り��。\n"
+"�れ��ら��貴方�パスワード�有効��������。����サー��よ��"
+"�何故 login �失敗����サー��ら有益�情報��信�れ�����\n"
+"fetchmail ��サー��何�障害�発生���る場�� 区別��������り�"
+"�。\n"
 "\n"
 "fetchmail デーモン�引続�接続を試���。\n"
 "サービス�復旧����り何も通知�出�れ����を了承願���。"
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "��� %s@%s 宛メッセージ���得を試���\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s �対�る�明�ログイン���証�エラー��。\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s �対�る�証�行�れ���。\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail %s@%s �証完了"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
-msgstr "%s@%s �ログイン�完了� fetchmail �よるアクセス��能��り���。\n"
+msgstr ""
+"%s@%s �ログイン�完了� fetchmail �よるアクセス��能��り���。\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "サービス�復帰����。\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
-msgstr "�択を��下��。�択�れ��場��フォルダ %s ��度アクセス���。\n"
+msgstr ""
+"�択を��下��。�択�れ��場��フォルダ %s ��度アクセス���。\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
-msgstr "�択を��下��。�択�れ��場��デフォルト�フォルダ��度アクセス���。\n"
+msgstr ""
+"�択を��下��。�択�れ��場��デフォルト�フォルダ��度アクセス��"
+"�。\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "アカウント %s , サー� %s (フォルダ %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "アカウント %s , サー� %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s �アクセス�����。\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d 通�メッセージ (���� %d 通� %s) �%s宛�届�����"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "既�読�込ん����"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d 通�メッセージ� %s 宛�届�����"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d �イト)\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s 宛�メッセージ�届�����ん。\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "�造�れ�メッセージ数!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ヘッダ�欠��誤謬"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "クライアント/サー��期"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "クライアント/サー�プロトコル"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "サー�� lock busy"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "SMTP 通信"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "DNS �照"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "�明�エラー"
 
-#: driver.c:1547
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr "%sエラー�発生����。%s@%s�らメールを�信� SMTP サー� %s ��信���る������。\n"
+msgstr ""
+"%sエラー�発生����。%s@%s�らメールを�信� SMTP サー� %s ��信���る"
+"������。\n"
 
-#: driver.c:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "(�明�ホスト)"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%sエラー� %s@%s よりメールを�信���る最中�発生����。\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "接続終了後�実行�るコマンド�ステータス %d を返����。\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 ��対応���り��ん。\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 ��対応���り��ん。\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "オプション --flush � %s ��時�設定����ん。\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "オプション --all � %s ��時�設定����ん。\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "オプション --limit � %s ��時�設定����ん。\n"
@@ -497,20 +526,24 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s: NULLMAILER_FLAGS 環境変数�設定�れ����。\n"
 "nullmailer-inject や nullmailer � senmail wrapper �よ��\n"
-"ヘッダ� From: や Message-ID:�Return-Path: �改謬�行�れる�れ��り��険��。\n"
-"\"env NULLMAILER_FLAGS= %s (����利用���るエージェント)\" ���下��。\n"
+"ヘッダ� From: や Message-ID:�Return-Path: �改謬�行�れる�れ��り��険"
+"��。\n"
+"\"env NULLMAILER_FLAGS= %s (����利用���るエージェント)\" ���下�"
+"�。\n"
 "%s: 終了���。\n"
 
 #: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
-msgstr "%s: 貴様�アカウント�存在���。����立�去り二度�戻���る�。\n"
+msgstr ""
+"%s: 貴様�アカウント�存在���。����立�去り二度�戻���る�。\n"
 
 #: env.c:145
 #, c-format
@@ -529,11 +562,13 @@ msgstr "hosts データベース���ホスト自身を確�����ん
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "ホスト�未確����続行���。\n"
-"Received: ヘッダ, HELO/EHLO 行���異常�出る�も�れ��ん。�れら�����グ報告を��������。\n"
+"Received: ヘッダ, HELO/EHLO 行���異常�出る�も�れ��ん。�れら����"
+"�グ報告を��������。\n"
 "/etc/hosts, DNS, NIS ��� LDAP ��題を修正������。\n"
 
 #: etrn.c:49 odmr.c:60
@@ -600,17 +635,19 @@ msgstr "オプション --folder ã�¯ ETRN ã�¨ã�¯å�Œæ™‚ã�«åˆ©ç”¨ã�§ã��ã�¾ã�›ã‚“ã€
 msgid "Option --check is not supported with ETRN\n"
 msgstr "オプション --check � ETRN ���時�利用����ん。\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -620,859 +657,926 @@ msgstr ""
 "������件を満�����布�大歓迎��。\n"
 "詳����COPYING ファイルを見�����。\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "警告: root アカウント��実行��薦�����ん。\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: 次�物を�用�����。"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "カレントディレクトリを�得����ん\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail リリース %s "
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "コマンドライン%s%sよりオプションを設定���。\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr "��"
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "メールサー��準備�整���ん -- ��ら� %s �存在�������\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: メールサー��指定�れ��り��ん。\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: 他� fetchmail �実行�れ����ん。\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: エラー�発生�より%s fetchmail (PID=%d)を終了���。\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "�ックグラウンド�"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "フォアグラウンド�"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (PID=%d) �終了����。\n"
 
-#: fetchmail.c:460
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: ��ホスト�対��別� fetchmail �交信���る��メール�確��出���ん。\n"
+#: fetchmail.c:471
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: ��ホスト�対��別� fetchmail �交信���る��メール�確��"
+"出���ん。\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: 他� fetchmail (PID=%d) �実行中���指定�れ�ホスト�接続����ん。\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: 他� fetchmail (PID=%d) �実行中���指定�れ�ホスト�接続���"
+"�ん。\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: 他� fetchmail (PID=%d) �フォアグラウンド動作中��。\n"
 
-#: fetchmail.c:483
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: �ックグラウンド� fetchmail �動作中���オプション���付�られ��ん。\n"
+#: fetchmail.c:494
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: �ックグラウンド� fetchmail �動作中���オプション���付�ら"
+"れ��ん。\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
-msgstr "fetchmail: �ックグラウンド� fetchmail (PID=%d) �動作を�開����。\n"
+msgstr ""
+"fetchmail: �ックグラウンド� fetchmail (PID=%d) �動作を�開����。\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: �時�動作���� fetchmail (PID=%d) ��然消滅����。\n"
+msgstr ""
+"fetchmail: �時�動作���� fetchmail (PID=%d) ��然消滅����。\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s �ログイン�る���パスワード��り��ん。\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s �ログイン�る���パスワードを入力��下�� : "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: 警告 : syslog �ログファイル�設定�れ���。ログ���らを見�����。\n"
+msgstr ""
+"fetchmail: 警告 : syslog �ログファイル�設定�れ���。ログ���らを見��"
+"���。\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: �ックグラウンド�移れ��ん。終了���。\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s デーモンを動作開始���。\n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "ログを追加�る��� %s を開����出���ん���\n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "%s �編集�れ�時間を調�る�������ん。(エラー %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "%s �編集�れ��� fetchmail を�起動���。\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "ディレクトリ�回復��������実行�失敗�る��ょ�。\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail ��起動�失敗����。\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "�証失敗�制�時間超��頻発���� %s ��交信を飛����。\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "時間間隔��������� %s �一時�管を行���ん。\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "全��接続�動作�全�陥��������。終了���。\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "%s �休眠状態��り %d秒経�����。\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s 信�を�信����動作を�開����。\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d 番�信�を�信����動作を�開����。\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s �動作を�開����。\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "通常�終了��。status %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "動作制御ファイル�編集時間を確��る�������ん���。\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告 : 設定ファイル中�ホスト %s を複数回記述�����\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: エラー : 設定ファイル中� \"defaults\" を複数回記述�����\n"
+msgstr ""
+"fetchmail: エラー : 設定ファイル中� \"defaults\" を複数回記述�����\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 対応�コンパイル�時点�有効��れ��り��ん。\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "SSL 対応�コンパイル�時点�有効��れ��り��ん。\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "SSL 対応�コンパイル�時点�有効��れ��り��ん。\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "SSL 対応�コンパイル�時点�有効��れ��り��ん。\n"
+
+#: fetchmail.c:1270
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: 警告 : %s より multidrop fetch を確��る��� DNS �有効��り��ん。\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: 警告 : %s より multidrop fetch を確��る��� DNS �有効��り�"
+"�ん。\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
-msgstr "警告: %s ��マル�ドロップを行���エンベロープオプション�必���!\n"
+msgstr ""
+"警告: %s ��マル�ドロップを行���エンベロープオプション�必���!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "警告: ����メール� postmaster 宛�フォワード�れ�����能性��り��!\n"
+msgstr ""
+"警告: ����メール� postmaster 宛�フォワード�れ�����能性��り�"
+"�!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: サー� %s �設定�無効��。サービス番���ート番��負�数������ん。\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: サー� %s �設定�無効��。サービス番���ート番��負�数���"
+"���ん。\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: サー� %s �設定�無効��。 RPOP �� privileged port を利用�る必���り��。\n"
+msgstr ""
+"fetchmail: サー� %s �設定�無効��。 RPOP �� privileged port を利用�る"
+"必���り��。\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "サー� %s �設定�無効��。LMTP �デフォルト� SMTP �ートを利用����ん。\n"
+msgstr ""
+"サー� %s �設定�無効��。LMTP �デフォルト� SMTP �ートを利用����"
+"ん。\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "fetchall � keep オプション�デーモンモード�休止モード���時�指定����ん。\n"
+msgstr ""
+"fetchall � keep オプション�デーモンモード�休止モード���時�指定����"
+"ん。\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "シグナル %d �終了����。\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
-msgstr "%s � %s �プロトコル %s を用�� %s �交信�����。交信�開始�れ���。\n"
+msgstr ""
+"%s � %s �プロトコル %s を用�� %s �交信�����。交信�開始�れ��"
+"�。\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 �対応��設定�行�れ��り��ん。\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 �対応��設定�行�れ��り��ん。\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP �対応��設定�行�れ��り��ん。\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN �対応��設定�行�れ��り��ん。\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR �対応��設定�行�れ��り��ん。\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "対応�����プロトコル��択�れ���。\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
-msgstr "%s � %s �プロトコル %s を用�� %s �交信�����。交信�終了����。\n"
+msgstr ""
+"%s � %s �プロトコル %s を用�� %s �交信�����。交信�終了����。\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "交信間隔� %d 秒��。\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "ログファイル� %s ��。\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID ファイル� %s ��。\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "進行状��メッセージ� syslog を通��記録�れ��。\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail �アドレスを書����Received を生����ん。\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail �ログファイル中�も進行状�を示� . を書�込���。\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail �誤��宛先�書�れ�メッセージを %s �転����。\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail � postmaster 宛�エラーメールを�信���。\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ��り主�エラーメッセージを�信���。\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "アカウント %s@%s ��オプション��。\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  メール�ホスト %s を介��やり�り�れ��。\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  ��サー��対���アクセス� %d �間隔�行�れ��。\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  サー��本�� %s ��。\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ��ホスト�ホスト�指示�れ��場���アクセス�れ��ん。\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ��ホスト�ホスト�指示�れ��場��アクセス�れ��。\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  パスワード入力�必���。\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  パスワード = \"%s\"\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Kerberos %s �証�よる KPOP プロトコルを利用���。"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  %s プロトコルを利用���。"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s サービスを利用���)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (デフォルト��ートを利用���)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (UIDL �利用を強制���)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  利用�能�全���証方�を試���。\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  パスワード�よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN �証を強制的�行���。\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM �証を強制的�行���。\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP �よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 方��よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI 方��よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 方��よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 方��よる�証を強制的�行���。\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end 暗�化��る����。\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  メールサービス� %s �よ��行�れ��。\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL �よる暗�化通信�行�れ��。\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL プロトコル %s。\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL サー�証明書�確��設定�れ���。\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL 信用�能証明書� %s �格��れ����。\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL key fingerprint (server key �照��れ���): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  サー��応答制�時間� %d 秒��。"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (デフォルト)。\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  デフォルト�メールボックス��択�れ���。\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  �択�れ�メールボックス:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  ����メッセージを�得���。 (--all on)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  新��メッセージ��を�得���。 (--all off)\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  �得��メッセージをサー��も�����。 (--keep on)\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  �得��メッセージ�サー�������ん (--keep off)\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  ��メッセージ��得���消去�れ��。 (--flush on)\n"
 
-#: fetchmail.c:1639
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1684
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  メッセージ�得�����メッセージを消去���ん。 (--flush off)\n"
 
-#: fetchmail.c:1641
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+#: fetchmail.c:1686
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
 msgstr "  容�超���メッセージ��得���消去�れ��。 (--limitflush on)\n"
 
-#: fetchmail.c:1642
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  メッセージ�得���容�超���メッセージを消去���ん。 (--limitflush off)\n"
+#: fetchmail.c:1687
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  メッセージ�得���容�超���メッセージを消去���ん。 (--limitflush "
+"off)\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local アドレス��書���を行���。 (--norewrite off)\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  server-local アドレス��書���を行���ん。 (--norewrite on)\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  改行記��除去を行���。 (stripcr on)\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  改行記��除去を行���ん。 (stripcr off)\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  改行記��追加を行���。 (forcecr on)\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  改行記��追加を行���ん。 (forcecr off)\n"
 
-#: fetchmail.c:1653
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1698
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding �変�を行���ん。 (pass8bits on)\n"
 
-#: fetchmail.c:1654
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1699
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding �変�を行���。 (pass8bits off)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME �デコードを行���。 (mimedecode on)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME �デコードを行���ん。 (mimedecode off)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  サー�アクセス後�休止���。 (idle on)\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  サー�アクセス後�休止���ん。 (idle off)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  記述��る Status 行を破棄���。 (dropstatus on)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  記述��る Status 行を�����。 (dropstatus off)\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To 行を�����。 (dropdelivered on)\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To 行を破棄���。 (dropdelivered off)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  メッセージ�大���最大 %d �イト�制��れ��。 (--limit %d)\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  メッセージ�大���制���り��ん。 (--limit 0)\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  メッセージ�大���対�る警告� %d 秒毎�行�れ��。 (--warnings %d)\n"
+msgstr ""
+"  メッセージ�大���対�る警告� %d 秒毎�行�れ��。 (--warnings %d)\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr "  サー�アクセス�度�メッセージ�大���警告を行���。 (--warnings 0)\n"
+msgstr ""
+"  サー�アクセス�度�メッセージ�大���警告を行���。 (--warnings 0)\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
-msgstr "  一回�接続��得��るメッセージ� %d 通�制��れ��。(--fetchlimit %d)\n"
+msgstr ""
+"  一回�接続��得��るメッセージ� %d 通�制��れ��。(--fetchlimit %d)\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr "  一回�接続��得��るメッセージ�数�制���り��ん。 (--fetchlimit 0)\n"
+msgstr ""
+"  一回�接続��得��るメッセージ�数�制���り��ん。 (--fetchlimit 0)\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr "  �得��るメッセージ�サイズ� %d �制��れ��。(--fetchsizelimit %d)\n"
+msgstr ""
+"  �得��るメッセージ�サイズ� %d �制��れ��。(--fetchsizelimit %d)\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  メッセージ�大���制���り��ん。 (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "接続��� UID �二分木検索を行���。(--fastuidl 1)\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "%d 回 (%d 接続���) UID �二分木検索を行���。(--fastuidl %d)\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "接続��� UID �線形検索を行���。(--fastuidl 0)\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  一回�接続�転���るメッセージ� %d 通�制��れ��。\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr "  一回�接続�転���るメッセージ�数�制���り��ん。 (--batchlimit 0)\n"
+msgstr ""
+"  一回�接続�転���るメッセージ�数�制���り��ん。 (--batchlimit 0)\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  メッセージ� %d 通毎�削除�れ��。 (--expunge %d)\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  メッセージを削除�る間隔�設定�れ��り��ん。 (--expunge 0)\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  メールを�得�るドメイン� : "
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ファイル %s � BSMTP 形��メッセージ�追記�れ��。\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  アプリケーション\"%s\"�よ��メッセージ��信�れ��。\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �信��メッセージ� %cMTP �よ��次�示�サー��転��れ�� :"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ホスト� MAIL FROM 行�アドレス� %s ��。\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  SMTP �よ���信�れる RCPT TO 行�記�れ�アドレス� %s ��。\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  �信先�スパムブロック�対�る応答� : "
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  スパムブロック�行�れ��ん。\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  サー���接続�\"%s\"�よ��行�れ��。\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  接続��実行�る命令��り��ん。\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  サー���接続�\"%s\"�よ��切断�れ��。\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  接続終了時�行�命令��り��ん。\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  ��ホスト�対�る localname �宣言�れ����ん。\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  `multi-drop' モード: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  `single-drop' モード: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d 個� localname �存在���。\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  multidrop アドレスを検索�る DNS �有効��。\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  multidrop アドレスを検索�る DNS �無効��。\n"
 
-#: fetchmail.c:1811
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1856
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  サー��別�� multidrop アドレス� IP アドレス�比較�れ��。\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  サー��別�� multidrop アドレス�ホスト��比較�れ��。\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address �よるルーティング�行�れ��ん。\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header � %s ��れ��。\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  %d 個を超�る Envelope header �スキップ�れ��。\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s �ユーザ ID �ら除去�れ��。\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Prefix �除去�れ��ん。\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  予�宣言�れ�メールサー��別�:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  ローカルドメイン:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  接続�インターフェイス %s を通��行�れ��。\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  接続�利用���インターフェイス�指定��り��ん。\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  接続� %s �状態を監視��行�れ��。\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  状態を監視��接続�������ん。\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  サー���接続��プラグイン \"%s\" を利用���。(--plugin %s)\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  サー���接続�利用�るプラグイン�指定��り��ん。\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  アプリケーション��接続��プラグアウト\"%s\"を利用���。(--plugout %s)\n"
+msgstr ""
+"  アプリケーション��接続��プラグアウト\"%s\"を利用���。(--plugout %"
+"s)\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  アプリケーション��接続�利用�るプラグアウト�指定��り��ん。\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ��ホスト�ら� UID �記録�れ����ん。\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d 個� UID �記録�れ����。\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  接続情報� Received ヘッダ�追加�れ��。\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1480,7 +1584,7 @@ msgstr ""
 "  接続情報� Received ヘッダ�追加�れ��ん。\n"
 "\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  プロパティ \"%s\" �無視�れ��。\n"
@@ -1554,105 +1658,111 @@ msgstr "証明書�発行エラー��。\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: スレッド� %d 秒間スリープ���。\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "プロトコル� IMAP4 rev 1 ��識�れ���。\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "プロトコル� IMAP4 rev 0 ��識�れ���。\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "プロトコル� IMAP2 �� IMAP2BIS ��識�れ���。\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "接続�後�休止���。\n"
 
-#: imap.c:431 pop3.c:501
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: TLS ��アップグレード��功。\n"
 
-#: imap.c:440 pop3.c:510
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: TLS ��アップグレード�失敗。\n"
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: TLS ����的アップグレード�失敗�継続�能�試�����\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
-msgstr "OTP ��求�れ�����fetchmail � OTP 対応�コンパイル�れ����ん。\n"
+msgstr ""
+"OTP ��求�れ�����fetchmail � OTP 対応�コンパイル�れ����ん。\n"
 
-#: imap.c:577 pop3.c:380
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "�求�れ� NTLM 処�能力� fetchmail �組�込�れ����ん。\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "�求�れ� LOGIN 処�能力�サー��サ�ート�れ����ん。\n"
 
-#: imap.c:652
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "メッセージ�大�������ん (%d (実際) != %d (予想)) \n"
 
-#: imap.c:756 imap.c:815
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "�アクセス�失敗����。\n"
 
-#: imap.c:764 imap.c:820
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d 通�メッセージ��アクセス�後�存在���。\n"
 
-#: imap.c:781
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "メールボックス��択�失敗����\n"
 
-#: imap.c:785
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "最��アクセス�ら %d 通�メッセージ��り��。\n"
 
-#: imap.c:799
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "削除�失敗����。\n"
 
-#: imap.c:803
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "削除�後�%d 通�メッセージ�残�����。\n"
 
-#: imap.c:845
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "未読メッセージ�検索�失敗����。\n"
 
-#: imap.c:873
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu �未読��。\n"
 
-#: imap.c:885 pop3.c:842
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �最��未読メッセージ��。\n"
 
-#: imap.c:976
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "警告: サー��らメッセージサイズ���報告�れ�数値���切�����無視���。\n"
+#: imap.c:988
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"警告: サー��らメッセージサイズ���報告�れ�数値���切�����無視�"
+"��。\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "kvm インターフェイスを開���ん���。fetchmail � SGID kmem ��る�確�������。"
+msgstr ""
+"kvm インターフェイスを開���ん���。fetchmail � SGID kmem ��る�確��"
+"�����。"
 
 #: interface.c:396
 #, c-format
@@ -1735,7 +1845,8 @@ msgstr "Initial BASE64 challenge をデコード����ん���。\n"
 #: kerberos.c:139
 #, c-format
 msgid "principal %s in ticket does not match -u %s\n"
-msgstr "Ticket 中��る本人 %s � -u オプション�指定�れ� %s �一致���ん。\n"
+msgstr ""
+"Ticket 中��る本人 %s � -u オプション�指定�れ� %s �一致���ん。\n"
 
 #: kerberos.c:147
 #, c-format
@@ -1840,7 +1951,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge �デコード�出���ん���。\n"
 
-#: opie.c:64 pop3.c:593
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -1890,7 +2001,8 @@ msgstr "  -V, --version     �ージョン情報を表示���\n"
 
 #: options.c:590
 msgid "  -c, --check       check for messages without fetching\n"
-msgstr "  -c, --check       メッセージ�有無を調���(データ��り出���ん)\n"
+msgstr ""
+"  -c, --check       メッセージ�有無を調���(データ��り出���ん)\n"
 
 #: options.c:591
 msgid "  -s, --silent      work silently\n"
@@ -1917,7 +2029,9 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ログを書�出�ファイルを指定���\n"
 
 #: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
 "      --syslog      デーモン���動作��る場�� syslog(3) を通��\n"
 "                    大��メッセージを書�出���\n"
@@ -1975,12 +2089,15 @@ msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath SSL � client certificate ファイルを指定���\n"
 
 #: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
 msgstr "      --sslfingerprint サー��証明書�一致�る�� fingerprint\n"
 
 #: options.c:615
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr "      --sslproto    SSL �プロトコルを強制的�指定��� (SSL2/SSL3/TLS1)\n"
+msgstr ""
+"      --sslproto    SSL �プロトコルを強制的�指定��� (SSL2/SSL3/TLS1)\n"
 
 #: options.c:617
 msgid "      --plugin      specify external command to open connection\n"
@@ -1988,7 +2105,8 @@ msgstr "      --plugin      接続用�外部コマンドを指定���\n"
 
 #: options.c:618
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     SMTP �よる交信を行����外部コマンドを指定���\n"
+msgstr ""
+"      --plugout     SMTP �よる交信を行����外部コマンドを指定���\n"
 
 #: options.c:620
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
@@ -2002,11 +2120,16 @@ msgstr "  -U, --uidl        UIDL を強制的ã�«åˆ©ç”¨ã�—ã�¾ã�™ (POP3 ã�®ã�¿æœ‰å
 
 #: options.c:622
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        接続�利用�る TCP �ートを指定��� (��オプション��。--service を使������)\n"
+msgstr ""
+"      --port        接続�利用�る TCP �ートを指定��� (��オプション�"
+"�。--service を使������)\n"
 
 #: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     接続�る TCP サービス� (数字� TCP �ートを指定�る��も����)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     接続�る TCP サービス� (数字� TCP �ートを指定�る��"
+"も����)\n"
 
 #: options.c:624
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
@@ -2066,7 +2189,8 @@ msgstr "  -l, --limit       指定ã�•ã‚Œã�Ÿå¤§ã��ã�•ä»¥ä¸Šã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å
 
 #: options.c:639
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr "  -w, --warnings    容�超��メール����警告を発�る間隔を指定���\n"
+msgstr ""
+"  -w, --warnings    容�超��メール����警告を発�る間隔を指定���\n"
 
 #: options.c:641
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
@@ -2074,7 +2198,8 @@ msgstr "  -S, --smtphost    転�先� SMTP ホストを指定���\n"
 
 #: options.c:642
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr "      --fetchdomains 一回�接続�メールを�得���ドメイン�を指定���\n"
+msgstr ""
+"      --fetchdomains 一回�接続�メールを�得���ドメイン�を指定���\n"
 
 #: options.c:643
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
@@ -2082,7 +2207,9 @@ msgstr "  -D, --smtpaddress SMTP ã�«ã‚ˆã‚‹è»¢é€�ã�§åˆ©ç”¨ã�™ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³å��ã‚
 
 #: options.c:644
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr "      --smtpname    SMTP 転��利用�るフル�ーム username@domain を指定���\n"
+msgstr ""
+"      --smtpname    SMTP 転��利用�るフル�ーム username@domain を指定��"
+"�\n"
 
 #: options.c:645
 msgid "  -Z, --antispam,   set antispam response values\n"
@@ -2090,15 +2217,19 @@ msgstr "  -Z, --antispam    スパムメール対策ã�®å¿œç­”を指定ã�—ã�¾ã�™ã
 
 #: options.c:646
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  一回� SMTP 転���信�れるメール�最大数を設定���\n"
+msgstr ""
+"  -b, --batchlimit  一回� SMTP 転���信�れるメール�最大数を設定���\n"
 
 #: options.c:647
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  一回�サー���交信��得��るメール�最大数を設定���。\n"
+msgstr ""
+"  -B, --fetchlimit  一回�サー���交信��得��るメール�最大数を設定��"
+"�。\n"
 
 #: options.c:648
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr "      --fetchsizelimit �得��るメッセージ�サイズ�上�を指定���\n"
+msgstr ""
+"      --fetchsizelimit �得��るメッセージ�サイズ�上�を指定���\n"
 
 #: options.c:649
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2114,7 +2245,8 @@ msgstr "  -m, --mda         メール�信プログラムを指定���\n"
 
 #: options.c:652
 msgid "      --bsmtp       set output BSMTP file\n"
-msgstr "      --bsmtp       �り込ん�メールを書�出� BSMTP ファイルを指定���。\n"
+msgstr ""
+"      --bsmtp       �り込ん�メールを書�出� BSMTP ファイルを指定���。\n"
 
 #: options.c:653
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
@@ -2129,65 +2261,80 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ログファイル�も進行状�を示� . を書�込���\n"
 
 #: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "警告: Maillennium POP3/プロクシサー���。TOP �代�り� RETR コマンドを使用���。\n"
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"警告: Maillennium POP3/プロクシサー���。TOP �代�り� RETR コマンドを使用"
+"���。\n"
+
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
 
-#: pop3.c:521
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: TLS ����的アップグレード�失敗�継続�能�試�����。\n"
 
-#: pop3.c:615
+#: pop3.c:619
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr "使用を許��れ������証手段を試���������失敗����。実行を継続����ん。\n"
+msgstr ""
+"使用を許��れ������証手段を試���������失敗����。実行を継"
+"続����ん。\n"
 
-#: pop3.c:640
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting 中� APOP timestamp �存在���ん。\n"
 
-#: pop3.c:649
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中� timestamp ��正��。\n"
 
-#: pop3.c:675
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中�定義�れ����プロトコル��求�れ���。\n"
 
-#: pop3.c:683
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy 状態��。別�交信�行�れ�����確���下��。\n"
 
-#: pop3.c:762
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "上�サー��ら� UIDL 応答�対応����ん。\n"
 
-#: pop3.c:785
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "サー��誤��メッセージ� UID �応答����。\n"
 
-#: pop3.c:812 pop3.c:1058
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) �削除�れ�������存在�����!\n"
 
-#: pop3.c:821 pop3.c:833 pop3.c:1067 pop3.c:1074
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �未読��。\n"
 
-#: pop3.c:918
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "サー�リスト�メッセージ�挿入�れ����。�り扱��������ん。\n"
+msgstr ""
+"サー�リスト�メッセージ�挿入�れ����。�り扱��������ん。\n"
 
-#: pop3.c:1010
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "プロトコルエラー��。\n"
 
-#: pop3.c:1026
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL を�り込�中�プロトコルエラー�発生����。\n"
 
-#: pop3.c:1396
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 �� --folder オプション�利用����ん。\n"
 
@@ -2200,12 +2347,20 @@ msgid "SDPS not enabled."
 msgstr "SDPS �利用����ん。"
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: interface オプション� Linux (IPv6 �利用����ん) �FreeBSD ���利用�能��。\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: interface オプション� Linux (IPv6 �利用����ん) �FreeBSD �"
+"��利用�能��。\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: monitor オプション� Linux (IPv6 �利用����ん) �FreeBSD ���利用�能��。\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: monitor オプション� Linux (IPv6 �利用����ん) �FreeBSD ��"
+"�利用�能��。\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
@@ -2218,7 +2373,9 @@ msgstr "入力�終端"
 #: rcfile_y.y:419
 #, c-format
 msgid "File %s must be a regular file.\n"
-msgstr "%s �通常ファイル��る必���り��（シンボリックリンク���������ん）。\n"
+msgstr ""
+"%s �通常ファイル��る必���り��（シンボリックリンク���������"
+"ん）。\n"
 
 #: rcfile_y.y:429
 #, c-format
@@ -2465,89 +2622,97 @@ msgstr "%cMTP エラー: %s\n"
 
 #: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
-msgstr "BSMTP ファイル�オープン�����プリアンブル�書�込��失敗����。\n"
+msgstr ""
+"BSMTP ファイル�オープン�����プリアンブル�書�込��失敗����。\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
-msgstr "%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���ん。\n"
+msgstr ""
+"%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���"
+"ん。\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr "%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���ん。\n"
+msgstr ""
+"%cMTP �信先�アプリケーション� `%s' �����手�アドレスを��付���"
+"ん。\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "アドレス�一致���ん。postmaster �設定�れ����ん。\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "%s �対�����信����ん。\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "アドレス�一致���ん。%s �転����。\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "%s を利用���信����\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "MDA �起動�失敗����。\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP �よる %s ��接続�失敗����。\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "通信先�アプリケーション�交信����ん。%s �交信���。"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "MDA��書�込��エラー�発生����: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA � %d 番�信�を�信����終了����。\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA � 0 以外�ステータス %d を返��終了����。\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "異常: MDA � pclose � %d を返����。エラー番�%d/%s ����������り��ん。ファイル %s:%d 行\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"異常: MDA � pclose � %d を返����。エラー番�%d/%s ����������"
+"り��ん。ファイル %s:%d 行\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "メッセージ�終了�����BSMTP ファイル�終了�失敗����。\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 通信先�アプリケーション��信を拒����。\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP � EOM ���る�信エラー��。\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM �対�� 503 以外�予期��応答 %s ��り���。\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2617,7 +2782,8 @@ msgstr "getaddrinfo(\"%s\",\"%s\") エラー: %s\n"
 
 #: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr "オプション --service を足��試������(FAQ � R12 も�照���)。\n"
+msgstr ""
+"オプション --service を足��試������(FAQ � R12 も�照���)。\n"
 
 #: socket.c:296 socket.c:299
 #, c-format
@@ -2667,7 +2833,8 @@ msgstr "発行元� CommonName: %s\n"
 
 #: socket.c:668
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "警告 : 発行元� CommonName �長����。 (�造�れ��能性��り��)\n"
+msgstr ""
+"警告 : 発行元� CommonName �長����。 (�造�れ��能性��り��)\n"
 
 #: socket.c:670
 msgid "Unknown Issuer CommonName\n"
@@ -2743,7 +2910,9 @@ msgstr "ファイル識別�� SSL ����長����。"
 #: socket.c:891
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "無効� SSL プロトコル `%s' �指定�れ����デフォルト (SSLv23)を利用���。\n"
+msgstr ""
+"無効� SSL プロトコル `%s' �指定�れ����デフォルト (SSLv23)を利用��"
+"�。\n"
 
 #: socket.c:964
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
@@ -2898,7 +3067,9 @@ msgstr "fetchids ファイルを書�込�中��。\n"
 #: uid.c:643
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "fetchids ファイル %s �書込��エラー�発生����。��ファイル�残�����。\n"
+msgstr ""
+"fetchids ファイル %s �書込��エラー�発生����。��ファイル�残����"
+"�。\n"
 
 #: uid.c:647
 #, c-format
@@ -2908,7 +3079,8 @@ msgstr "fetchids ファイル���を変更����ん。%s �ら %s�
 #: uid.c:651
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
-msgstr "fetchids ファイル %s を書込�����開������������ん���: %s\n"
+msgstr ""
+"fetchids ファイル %s を書込�����開������������ん���: %s\n"
 
 #: xmalloc.c:33
 msgid "malloc failed\n"
diff --git a/po/pl.po b/po/pl.po
index 7f397c5d..4811c540 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.6-rc4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-27 04:04+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-12-01 17:03+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: checkalias.c:174
 #, c-format
@@ -66,12 +67,15 @@ msgstr "Subject: Ostrze¿enie fetchmaila o zbyt du¿ych listach"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Nastêpuj±ce zbyt du¿e listy zosta³y usuniête z konta %2$s na serwerze poczty %1$s:"
+msgstr ""
+"Nastêpuj±ce zbyt du¿e listy zosta³y usuniête z konta %2$s na serwerze poczty "
+"%1$s:"
 
 #: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr "Nastêpuj±ce zbyt du¿e listy pozosta³y na koncie %2$s na serwerze poczty %1$s:"
+msgstr ""
+"Nastêpuj±ce zbyt du¿e listy pozosta³y na koncie %2$s na serwerze poczty %1$s:"
 
 #: driver.c:362
 #, c-format
@@ -121,71 +125,84 @@ msgstr " (%d bajtów)"
 msgid " (%d header octets)"
 msgstr " (%d bajtów nag³ówka)"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d bajtów tre¶ci)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "d³ugo¶æ listu %s@%s:%d nie odpowiada d³ugo¶ci zg³oszonej przez serwer (%d != %d)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"d³ugo¶æ listu %s@%s:%d nie odpowiada d³ugo¶ci zg³oszonej przez serwer (%d != "
+"%d)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " zachowany\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " skasowany\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " nie zosta³ skasowany\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "limit pobranych listów %d osi±gniêty: %d pozosta³ na serwerze %s na koncie %s\n"
-msgstr[1] "limit pobranych listów %d osi±gniêty: %d pozosta³y na serwerze %s na koncie %s\n"
-msgstr[2] "limit pobranych listów %d osi±gniêty: %d pozosta³o na serwerze %s na koncie %s\n"
-
-#: driver.c:876
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³ na serwerze %s na koncie %"
+"s\n"
+msgstr[1] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³y na serwerze %s na koncie %"
+"s\n"
+msgstr[2] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³o na serwerze %s na koncie %"
+"s\n"
+
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na po³±czenie z %s.\n"
+msgstr ""
+"limit czasu %d sekund przekroczony podczas oczekiwania na po³±czenie z %s.\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na serwer %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "przekroczony czas oczekiwania na odpowied¼ po %d sekundach.\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "przekroczony czas oczekiwania po %d sekundach.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail zg³asza wielokrotne przekroczenie czasu oczekiwania"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
 msgstr "Po %d timeoutach fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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"
@@ -201,73 +218,73 @@ msgstr ""
 "\n"
 "Fetchmail nie bêdzie sprawdza³ tej skrzynki do czasu restartu.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "polecenie do uruchomienia przed po³±czeniem wysz³o z b³êdem %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nie mogê znale¼æ skrzynki HESIOD dla %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Serwer prowadz±cy nie ma nazwy.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nie mogê znale¼æ kanonicznej nazwy DNS %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "po³±czenie %s z %s nie powiod³o siê"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Ostrze¿enie fetchmaila o nieosi±galnym serwerze."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nie móg³ po³±czyæ siê z serwerem poczty %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "po³±czenie SSL nie powiod³o siê.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "B³±d blokady pliku dla %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Serwer zajêty dla %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "B³±d autoryzacji dla %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (poprzednio zautoryzowano)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: b³±d uwierzytelnienia fetchmaila dla %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -281,7 +298,7 @@ msgstr ""
 "którego fetchmail nie mo¿e rozró¿niæ, poniewa¿ serwer nie wys³a³\n"
 "przydatnego komunikatu o b³êdzie."
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -300,7 +317,7 @@ msgstr ""
 "Demon fetchmaila bêdzie nadal próbowa³ siê po³±czyæ w ka¿dym cyklu.\n"
 "Dalsze powiadomienia do czasu odzyskania us³ugi nie bêd± wysy³ane."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -319,60 +336,60 @@ msgstr ""
 "Demon fetchmaila bêdzie nadal próbowa³ siê po³±czyæ w ka¿dym cyklu.\n"
 "Dalsze powiadomienia do czasu wznowienia us³ugi nie bêd± wysy³ane."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Natychmiastowe ponowne ¶ci±ganie z %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Nieznany login lub b³±d uwierzytelniania dla %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autoryzacja powiod³a siê dla %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: uwierzytelnienie fetchmaila powiod³o siê dla %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail móg³ zalogowaæ siê na %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Us³uga zosta³a wznowiona.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "ponowna próba po³±czenia z folderem %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "ponowna próba po³±czenia z domy¶lnym folderem\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (folder %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Próba po³±czenia z %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -380,14 +397,14 @@ msgstr[0] "%d list (%d %s) dla %s"
 msgstr[1] "%d listy (%d %s) dla %s"
 msgstr[2] "%d listów (%d %s) dla %s"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "widziany"
 msgstr[1] "widziane"
 msgstr[2] "widzianych"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -395,94 +412,94 @@ msgstr[0] "%d list dla %s"
 msgstr[1] "%d listy dla %s"
 msgstr[2] "%d listów dla %s"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr "(%d bajtów).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nie ma poczty dla %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "b³êdna liczba listów!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "gniazda"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "w nag³ówkach RFC822 (brak lub b³êdne)"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "synchronizacji miêdzy serwerem i klientem"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "protoko³u miêdzy serwerem i klientem"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "plik zablokowany na serwerze"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "transakcji SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "DNS-u"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "nieokre¶lony"
 
-#: driver.c:1547
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "b³±d %s podczas pobierania z %s@%s i dostarczania po SMTP do %s\n"
 
-#: driver.c:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "nieznany"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "b³±d %s podczas pobierania listów z %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "polecenie wykonane po pobraniu poczty zwróci³o b³±d %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Obs³uga Kerberosa V4 nie zosta³a do³±czona do programu.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Obs³uga Kerberosa V5 nie zosta³a do³±czona do programu.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opcja --flush nie dzia³a z %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opcja --all nie dzia³a za %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opcja --limit nie dzia³a z %s\n"
@@ -497,7 +514,8 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Zmienna ¶rodowiskowa QMAILINJECT jest ustawiona.\n"
-"Jest to niebezpieczne, poniewa¿ mo¿e spowodowaæ, ¿e qmail-inject lub qmailowy\n"
+"Jest to niebezpieczne, poniewa¿ mo¿e spowodowaæ, ¿e qmail-inject lub "
+"qmailowy\n"
 "zastêpnik sendmaila namiesza z nag³ówkami From: lub Message-ID:.\n"
 "Proszê spróbowaæ \"env QMAILINJECT= %s W£ASNE PARAMETRY\"\n"
 "%s: Przerwano.\n"
@@ -507,7 +525,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -540,7 +559,8 @@ msgstr "Nie mo¿na odnale¼æ w³asnej nazwy hosta w bazie danych hosts!\n"
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Próba kontynuacji z nierozwi±zan± nazw± hosta.\n"
@@ -612,397 +632,441 @@ msgstr "Opcja --folder nie dzia³a z ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Opcja --check nie dzia³a z ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
-"Fetchmail jest dostarczany BEZ JAKIEJKOLWIEK GWARANCJI. Jest to oprogramowanie\n"
+"Fetchmail jest dostarczany BEZ JAKIEJKOLWIEK GWARANCJI. Jest to "
+"oprogramowanie\n"
 "darmowe i mo¿na je rozpowszechniaæ pod pewnymi warunkami. Szczegó³y mo¿na\n"
 "znale¼æ w pliku COPYING w ¼ród³ach lub katalogu z dokumentacj±.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "UWAGA: Uruchamianie jako root jest niezalecane.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: uruchomiony z"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "nie mo¿na uzyskaæ bie¿±cego katalogu\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Tu fetchmail, wersja %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Pobieram opcje z linii poleceñ%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " i "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Brak skonfigurowany serwerów pocztowych -- mo¿e brakuje %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nie podano ¿adnych serwerów pocztowych.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nie dzia³a ¿aden inny proces fetchmaila\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: wyst±pi³ b³±d podczas próby zabicia %s fetchmaila, PID %d.\n"
+msgstr ""
+"fetchmail: wyst±pi³ b³±d podczas próby zabicia %s fetchmaila, PID %d.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "dzia³aj±cego w tle"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "dzia³aj±cego na terminalu"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: zabito %s fetchmaila o numerze procesu %d.\n"
 
-#: fetchmail.c:460
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: nie mogê sprawdziæ poczty, bo dzia³a inny fetchmail do tego serwera\n"
+#: fetchmail.c:471
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: nie mogê sprawdziæ poczty, bo dzia³a inny fetchmail do tego "
+"serwera\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: nie mogê po³±czyæ siê z podanym hostem, bo dzia³a inny fetchmail (proces %d).\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: nie mogê po³±czyæ siê z podanym hostem, bo dzia³a inny fetchmail "
+"(proces %d).\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: dzia³a inny chodz±cy z konsoli fetchmail (proces %d).\n"
 
-#: fetchmail.c:483
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: nie mogê przyjmowaæ opcji, poniewa¿ inny fetchmail dzia³a ju¿ w tle.\n"
+#: fetchmail.c:494
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: nie mogê przyjmowaæ opcji, poniewa¿ inny fetchmail dzia³a ju¿ w "
+"tle.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: chodz±cy w tle fetchmail (proces %d) zosta³ uaktywniony.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: starszy proces %d zgin±³ w niewyja¶nionych okoliczno¶ciach.\n"
+msgstr ""
+"fetchmail: starszy proces %d zgin±³ w niewyja¶nionych okoliczno¶ciach.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nie mo¿na znale¼æ has³a dla %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Podaj has³o dla %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Uwaga: ustawiono sysloga i plik loga. Logów nale¿y szukaæ w obu!\n"
+msgstr ""
+"fetchmail: Uwaga: ustawiono sysloga i plik loga. Logów nale¿y szukaæ w obu!\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Nie mo¿na przej¶æ w t³o. Zakoñczenie.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "startuje fetchmail %s w trybie demona\n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nie mo¿na otworzyæ %s w celu do³±czania logów \n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nie mo¿na sprawdziæ czasu %s (b³±d %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restart fetchmaila (zmieniono %s)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "próba restartu mo¿e siê nie udaæ, poniewa¿ katalog nie zosta³ odtworzony\n"
+msgstr ""
+"próba restartu mo¿e siê nie udaæ, poniewa¿ katalog nie zosta³ odtworzony\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "próba ponownego uruchomienia fetchmaila nie powiod³a siê\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "po³±czenie z %s pominiête (b³êdy autoryzacji lub timeouty)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "fetchmail: nie nadszed³ jeszcze czas na po³±czenie z %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Wynik zapytania=0 (SUKCES)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Wynik zapytania=1 (BRAK POCZTY)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Wynik zapytania=2 (GNIAZDO)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Wynik zapytania=3 (B£¡D AUTORYZACJI)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Wynik zapytania=4 (PROTOKÓ£)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Wynik zapytania=5 (SK£ADNIA)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Wynik zapytania=6 (B£¡D IO)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Wynik zapytania=7 (B£¡D)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Wynik zapytania=8 (WY£¡CZENIE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Wynik zapytania=9 (BLOKADA)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Wynik zapytania=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Wynik zapytania=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Wynik zapytania=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Wynik zapytania=13 (MAKSIMUM POBRANO)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Wynik zapytania=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Nie mogê pobraæ poczty z ¿adnego serwera. Koñczê pracê.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "usypiam o godzinie %s na %d sekund\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "uaktywniony przez %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "uaktywniony przez sygna³ %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "uaktywniony o %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "praca zakoñczona poprawnie, kod wyj¶cia %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "nie mo¿na sprawdziæ czasu pliku kontroli uruchomienia\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Uwaga: host %s wystêpuje wielokrotnie w pliku konfiguracyjnym\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: B³±d: wiele rekordów \"defaults\" w pliku konfiguracyjnym.\n"
+msgstr ""
+"fetchmail: B³±d: wiele rekordów \"defaults\" w pliku konfiguracyjnym.\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
+
+#: fetchmail.c:1270
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: uwaga: brak serwera DNS potrzebnego do sprawdzenia %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "uwaga: multidrop dla %s wymaga opcji envelope!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "uwaga: Nie pro¶ o pomoc je¶li ca³a poczta pójdzie do postmastera!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: konfiguracja dla %s jest b³êdna - nale¿y podaæ dodatni numer portu\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: konfiguracja dla %s jest b³êdna - nale¿y podaæ dodatni numer "
+"portu\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego portu\n"
+msgstr ""
+"fetchmail: konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego "
+"portu\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "konfiguracja dla %s jest b³êdna - LMTP nie u¿ywa domy¶lnego portu SMTP\n"
+msgstr ""
+"konfiguracja dla %s jest b³êdna - LMTP nie u¿ywa domy¶lnego portu SMTP\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Jednoczesne fetchall i keep w trybie demona lub bezczynno¶ci to b³±d!\n"
+msgstr ""
+"Jednoczesne fetchall i keep w trybie demona lub bezczynno¶ci to b³±d!\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "przerwany sygna³em %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
-msgstr "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie rozpoczête\n"
+msgstr ""
+"%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie rozpoczête\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "obs³uga protoko³u POP2 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "obs³uga protoko³u POP3 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "obs³uga protoko³u IMAP nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "obs³uga polecenia ETRN nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "obs³uga protoko³u ODMR nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "Wybrany protokó³ nie jest obs³ugiwany przez fetchmaila.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
-msgstr "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie zakoñczone\n"
+msgstr ""
+"%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie zakoñczone\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Czas miêdzy sprawdzaniem skrzynek wynosi %d sekund\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Plik diagnostyczny to %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Plik identyfikacyjny to %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Komunikaty o postêpach po³±czenia bêd± zg³aszane przez sysloga\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail bêdzie siê ukrywa³ i nie wygeneruje nag³ówka Received\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bêdzie pokazywa³ znaki postêpu nawet w plikach logów.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail wy¶le ¼le zaadresowane listy do %s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do postmastera.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do nadawcy.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Poczta bêdzie pobierana przez %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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"
@@ -1010,382 +1074,423 @@ msgstr[0] "  Po³±czenie z tym serwerem odbêdzie siê co %d okres.\n"
 msgstr[1] "  Po³±czenie z tym serwerem odbêdzie siê co %d okresy.\n"
 msgstr[2] "  Po³±czenie z tym serwerem odbêdzie siê co %d okresów.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr "  Z tym serwerem nie bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny serwer.\n"
+msgstr ""
+"  Z tym serwerem nie bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny "
+"serwer.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
-msgstr "  Z tym serwerem bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny serwer.\n"
+msgstr ""
+"  Z tym serwerem bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny "
+"serwer.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Bêdê pyta³ o has³o.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Has³o APOP = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  U¿ytkownik RPOP = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Has³o = \"%s\".\n"
 
 # %s zawiera numer wersji protoko³u -PK
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  U¿ywam protoko³u KPOP z uwierzytelnieniem przez Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  U¿ywam protoko³u %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (us³uga %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (po³±czenie na domy¶lny port)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (bêd± stosowane UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Bêd± próbowane wszystkie dostêpne metody uwierzytelnienia.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie przy pomocy has³a.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Zak³adam szyfrowanie end-to-end.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Zarz±dc± us³ugi pocztowej jest: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesje kodowane SSL w³±czone.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokó³ SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Sprawdzanie certyfikatu SSL serwera w³±czone.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog zaufanego certyfikatu SSL: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odcisk klucza SSL (sprawdzony z kluczem serwera): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limit czasu na odpowied¼ serwera wynosi %d sekund"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (domy¶lne).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Wybrana jest domy¶lna skrzynka odbiorcza.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Wybrano nastêpuj±ce skrzynki:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Zostan± pobrane wszystkie listy (--all w³±czone).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Zostan± pobrane tylko nowe listy (--all wy³±czone).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Pobrane listy bêd± pozostawione na serwerze (--keep w³±czone).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr "  Pobrane listy nie bêd± pozostawione na serwerze (--keep wy³±czone).\n"
+msgstr ""
+"  Pobrane listy nie bêd± pozostawione na serwerze (--keep wy³±czone).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Stare listy bêd± kasowane przed pobraniem poczty (--flush w³±czone).\n"
+msgstr ""
+"  Stare listy bêd± kasowane przed pobraniem poczty (--flush w³±czone).\n"
 
-#: fetchmail.c:1639
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Stare listy nie bêd± kasowane przed pobraniem poczty (--flush wy³±czone).\n"
+#: fetchmail.c:1684
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Stare listy nie bêd± kasowane przed pobraniem poczty (--flush wy³±czone).\n"
 
-#: fetchmail.c:1641
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Zbyt du¿e listy bêd± kasowane przed pobraniem poczty (--limitflush w³±czone).\n"
+#: fetchmail.c:1686
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Zbyt du¿e listy bêd± kasowane przed pobraniem poczty (--limitflush "
+"w³±czone).\n"
 
-#: fetchmail.c:1642
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Zbyt du¿e listy nie bêd± kasowane przed pobraniem poczty (--limitflush wy³±czone).\n"
+#: fetchmail.c:1687
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Zbyt du¿e listy nie bêd± kasowane przed pobraniem poczty (--limitflush "
+"wy³±czone).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Przepisywanie adresów na postaæ lokaln± jest w³±czone (--norewrite wy³±czone).\n"
+msgstr ""
+"  Przepisywanie adresów na postaæ lokaln± jest w³±czone (--norewrite "
+"wy³±czone).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Przepisywanie adresów na postaæ lokaln± jest wy³±czone (--norewrite w³±czone).\n"
+msgstr ""
+"  Przepisywanie adresów na postaæ lokaln± jest wy³±czone (--norewrite "
+"w³±czone).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  Usuwanie znaków CR z koñców linii jest w³±czone (stripcr w³±czone).\n"
+msgstr ""
+"  Usuwanie znaków CR z koñców linii jest w³±czone (stripcr w³±czone).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr "  Usuwanie znaków CR z koñców linii jest wy³±czone (stripcr wy³±czone).\n"
+msgstr ""
+"  Usuwanie znaków CR z koñców linii jest wy³±czone (stripcr wy³±czone).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
-msgstr "  Dodawanie znaków CR na koñcach linii jest w³±czone (forcecr w³±czone).\n"
+msgstr ""
+"  Dodawanie znaków CR na koñcach linii jest w³±czone (forcecr w³±czone).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
-msgstr "  Dodawanie znaków CR na koñcach linii jest wy³±czone (forcecr wy³±czone).\n"
+msgstr ""
+"  Dodawanie znaków CR na koñcach linii jest wy³±czone (forcecr wy³±czone).\n"
 
-#: fetchmail.c:1653
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretowanie nag³ówka Content-Transfer-Encoding jest wy³±czone (pass8bits w³±czone).\n"
+#: fetchmail.c:1698
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Interpretowanie nag³ówka Content-Transfer-Encoding jest wy³±czone "
+"(pass8bits w³±czone).\n"
 
-#: fetchmail.c:1654
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretowanie nag³ówka Content-Transfer-Encoding jest w³±czone (pass8bits wy³±czone).\n"
+#: fetchmail.c:1699
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretowanie nag³ówka Content-Transfer-Encoding jest w³±czone "
+"(pass8bits wy³±czone).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekodowanie MIME jest w³±czone (mimedecode w³±czone).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekodowanie MIME jest wy³±czone (mimedecode wy³±czone).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Zw³oka po odpytaniu jest w³±czona (idle w³±czone).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Zw³oka po odpytaniu jest wy³±czona (idle wy³±czone).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niepuste nag³ówki Status bêd± usuwane (dropstatus w³±czone).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niepuste nag³ówki Status bêd± zachowane (dropstatus wy³±czone).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Linie Delivered-To bêd± usuwane (dropdelivered w³±czone).\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Linie Delivered-To bêd± zachowane (dropdelivered wy³±czone).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit wielko¶ci listu wynosi %d bajtów (--limit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Ostrze¿enia o wielko¶ci listu bêd± wy¶wietlane co %d sekund (--warnings %d).\n"
+msgstr ""
+"  Ostrze¿enia o wielko¶ci listu bêd± wy¶wietlane co %d sekund (--warnings %"
+"d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr "  Ostrze¿enia o wielko¶ci bêd± wy¶wietlane przy ka¿dym ³±czeniu (--warnings 0).\n"
+msgstr ""
+"  Ostrze¿enia o wielko¶ci bêd± wy¶wietlane przy ka¿dym ³±czeniu (--warnings "
+"0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit ilo¶ci otrzymanych listów wynosi %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr "  Limit ilo¶ci otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
+msgstr ""
+"  Limit ilo¶ci otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit wielko¶ci listu wynosi %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Binarne przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 1).\n"
+msgstr ""
+"  Binarne przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Binarne przeszukiwanie UID-ów przy %d z %d ¶ci±gañ (--fastuidl %d).\n"
+msgstr ""
+"  Binarne przeszukiwanie UID-ów przy %d z %d ¶ci±gañ (--fastuidl %d).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Liniowe przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 0).\n"
+msgstr ""
+"   Liniowe przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Listy bêd± wysy³ane przez SMTP w grupach po %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr "  Limit ilo¶ci listów wysy³anych przez SMTP nie ustawiony (--batchlimit 0).\n"
+msgstr ""
+"  Limit ilo¶ci listów wysy³anych przez SMTP nie ustawiony (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Odstêp miêdzy kasowaniem listów wymuszony na %d (--expunge %d).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Listy nie bêd± kasowane (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeny dla których poczta bêdzie ¶ci±gana to:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (domy¶ny)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Listy bêd± dopisywane do %s jako BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Listy bêd± lokalne dorêczane przy u¿yciu \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Listy bêd± przes³ane przy pomocy %cMTP do:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Nazwa hosta w MAIL FROM jest ustawiona na %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP bêdzie %s\n"
+msgstr ""
+"  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP bêdzie %s\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznawane odpowiedzi blokad antyspamowych to:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokowanie spamu wy³±czone\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Po³±czenie do serwera zostanie nawi±zane przy pomocy \"%s\".\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  Przed po³±czeniem nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Po³±czenie z serwerem zostanie zamkniête przy pomocy \"%s\".\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
-msgstr "  Po zamkniêciu po³±czenia nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
+msgstr ""
+"  Po zamkniêciu po³±czenia nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  Brak nazw lokalnych ustawionych dla tego hosta.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Tryb wielu skrzynek: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Tryb jednej skrzynki: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1393,103 +1498,108 @@ msgstr[0] "%d znana nazwa lokalna.\n"
 msgstr[1] "%d znane nazwy lokalne.\n"
 msgstr[2] "%d znanych nazw lokalnych.\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest w³±czone.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest wy³±czone.\n"
 
-#: fetchmail.c:1811
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1856
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Aliasy serwera bêd± porównywane z adresami skrzynek po adresie IP.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Aliasy serwera bêd± porównywane z adresami skrzynek po nazwie.\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Obs³uga poczty wed³ug adresów w kopercie jest wy³±czone\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag³ówek koperty zosta³ ustawiony na: %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Liczba nag³ówków koperty do pominiêcia: %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Przedrostek %s bêdzie usuwany z nazwy u¿ytkownika\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  ¯adne przedrostki nie bêd± usuwane\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Zadeklarowane aliasy serwera pocztowego:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Domeny lokalne:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Po³±czenia bêd± nawi±zywane tylko przez interfejs %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  Nie jest okre¶lony ¿aden obowi±zkowy interfejs.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Podczas prób po³±czenia w pêtli bêdzie monitorowany %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  ¯aden interfejs nie bêdzie monitorowany.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Po³±czenia z serwerem bêd± nawi±zywane przez wtyczkê %s (--plugin %s).\n"
+msgstr ""
+"  Po³±czenia z serwerem bêd± nawi±zywane przez wtyczkê %s (--plugin %s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie nawi±zuj±ce po³±czenie\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Po³±czenie z serwerem odbiorcy zostanie nawi±zane programem %s (--plugout %s).\n"
+msgstr ""
+"  Po³±czenie z serwerem odbiorcy zostanie nawi±zane programem %s (--plugout %"
+"s).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie zamykaj±ce po³±czenie.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¯adne UID-y nie zosta³y zachowane z sesji z tym hostem.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Zachowano %d UID-ów.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr "  Informacje o ¶ledzeniu po³±czenia bêd± dodane do nag³ówka Received.\n"
+msgstr ""
+"  Informacje o ¶ledzeniu po³±czenia bêd± dodane do nag³ówka Received.\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1498,7 +1608,7 @@ msgstr ""
 ".\n"
 
 # XXX -PK
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  W³asno¶ci przepuszczania \"%s\".\n"
@@ -1574,59 +1684,59 @@ msgstr "Wyst±pi³ b³±d podczas zwalniania uprawnieñ\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: usypiam na %d sekund.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokó³ rozpoznany jako IMAP2 lub IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
 
-#: imap.c:431 pop3.c:501
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: przej¶cie na TLS powiod³o siê.\n"
 
-#: imap.c:440 pop3.c:510
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: przej¶cie na TLS nie powiod³o siê.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: zgodne przej¶cie na TLS nie powiod³o siê, próba kontynuacji\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:577 pop3.c:380
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:652
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "niezgodno¶æ przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n"
 
-#: imap.c:756 imap.c:815
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "ponowne po³±czenie nie powiod³o siê\n"
 
-#: imap.c:764 imap.c:820
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1634,11 +1744,11 @@ msgstr[0] "%d list oczekuj±cy po ponownym pobraniu\n"
 msgstr[1] "%d listy oczekuj±ce po ponownym pobraniu\n"
 msgstr[2] "%d listów oczekuj±cych po ponownym pobraniu\n"
 
-#: imap.c:781
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
 
-#: imap.c:785
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1646,11 +1756,11 @@ msgstr[0] "%d list oczekuj±cy po pierwszym pobraniu\n"
 msgstr[1] "%d listy oczekuj±ce po pierwszym pobraniu\n"
 msgstr[2] "%d listów oczekuj±cych po pierwszym pobraniu\n"
 
-#: imap.c:799
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod³o siê\n"
 
-#: imap.c:803
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1658,27 +1768,31 @@ msgstr[0] "%d list oczekuj±cy po usuwaniu\n"
 msgstr[1] "%d listy oczekuj±ce po usuwaniu\n"
 msgstr[2] "%d listów oczekuj±cych po usuwaniu\n"
 
-#: imap.c:845
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nieprzeczytanych listów nie powiod³o siê\n"
 
-#: imap.c:873
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu jest nieprzeczytany\n"
 
-#: imap.c:885 pop3.c:842
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nieprzeczytanym\n"
 
-#: imap.c:976
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Uwaga: zignorowano nieprawdziwe dane o rozmiarze wiadomo¶ci zwrócone przez serwer.\n"
+#: imap.c:988
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Uwaga: zignorowano nieprawdziwe dane o rozmiarze wiadomo¶ci zwrócone przez "
+"serwer.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "Nie mo¿na otworzyæ interfejsu kvm. Byæ mo¿e fetchmail nie jest SGID kmem."
+msgstr ""
+"Nie mo¿na otworzyæ interfejsu kvm. Byæ mo¿e fetchmail nie jest SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1868,7 +1982,7 @@ msgstr "recv z serwera nie powiod³o siê\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Rozkodowanie wyzwania OTP by³o niemo¿liwe\n"
 
-#: opie.c:64 pop3.c:593
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Tajne has³o: "
 
@@ -1945,12 +2059,17 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     podaje nazwê pliku kroniki\n"
 
 #: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      w³±cza wy¶wietlanie wiêkszo¶ci komunikatów przez syslog(3)\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      w³±cza wy¶wietlanie wiêkszo¶ci komunikatów przez syslog"
+"(3)\n"
 
 #: options.c:598
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   w³±cza udawanie hosta i nie dodaje nag³ówków Received\n"
+msgstr ""
+"      --invisible   w³±cza udawanie hosta i nie dodaje nag³ówków Received\n"
 
 #: options.c:599
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
@@ -1994,15 +2113,20 @@ msgstr "      --sslcert     certyfikat klienta ssl\n"
 
 #: options.c:612
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   dok³adne sprawdzanie certyfikatu serwera (zalecane)\n"
+msgstr ""
+"      --sslcertck   dok³adne sprawdzanie certyfikatu serwera (zalecane)\n"
 
 #: options.c:613
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ¶cie¿ka do certyfikatów ssl\n"
 
 #: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint odcisk, który musi pasowaæ do odcisku certyfikatu serwera.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint odcisk, który musi pasowaæ do odcisku certyfikatu "
+"serwera.\n"
 
 #: options.c:615
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
@@ -2010,15 +2134,21 @@ msgstr "      --sslproto    wymusza protokó³ ssl (SSL2/SSL3/TLS1)\n"
 
 #: options.c:617
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      ¶cie¿ka do zewnêtrznego polecenia otwieraj±cego po³±czenie\n"
+msgstr ""
+"      --plugin      ¶cie¿ka do zewnêtrznego polecenia otwieraj±cego "
+"po³±czenie\n"
 
 #: options.c:618
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     ¶cie¿ka do zewn. polecenia otwieraj±cego po³±czenie smtp\n"
+msgstr ""
+"      --plugout     ¶cie¿ka do zewn. polecenia otwieraj±cego po³±czenie "
+"smtp\n"
 
 #: options.c:620
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr "  -p, --protocol    okre¶la protokó³ którym bêd± pobierane listy (patrz manual)\n"
+msgstr ""
+"  -p, --protocol    okre¶la protokó³ którym bêd± pobierane listy (patrz "
+"manual)\n"
 
 #: options.c:621
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
@@ -2026,15 +2156,22 @@ msgstr "  -U, --uidl        wymusza u¿ywanie UIDL (tylko POP3)\n"
 
 #: options.c:622
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        ³±czenie z portem TCP (przestarza³e, nale¿y u¿ywaæ --service)\n"
+msgstr ""
+"      --port        ³±czenie z portem TCP (przestarza³e, nale¿y u¿ywaæ --"
+"service)\n"
 
 #: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     ³±czenie z podan± us³ug± TCP (mo¿e byæ numerem portu TCP)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     ³±czenie z podan± us³ug± TCP (mo¿e byæ numerem portu "
+"TCP)\n"
 
 #: options.c:624
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
-msgstr "      --auth        okre¶la metodê uwierzytelnienia (has³o/Kerberos/ssh/otp)\n"
+msgstr ""
+"      --auth        okre¶la metodê uwierzytelnienia (has³o/Kerberos/ssh/"
+"otp)\n"
 
 #: options.c:625
 msgid "  -t, --timeout     server nonresponse timeout\n"
@@ -2042,11 +2179,13 @@ msgstr "  -t, --timeout     limit czasu oczekiwania na odpowied¼ serwera\n"
 
 #: options.c:626
 msgid "  -E, --envelope    envelope address header\n"
-msgstr "  -E, --envelope    okre¶la nazwê nag³ówka zawieraj±cego adres z koperty\n"
+msgstr ""
+"  -E, --envelope    okre¶la nazwê nag³ówka zawieraj±cego adres z koperty\n"
 
 #: options.c:627
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr "  -Q, --qvirtual    przedrostek, który bêdzie usuwany z nazwy u¿ytkownika\n"
+msgstr ""
+"  -Q, --qvirtual    przedrostek, który bêdzie usuwany z nazwy u¿ytkownika\n"
 
 #: options.c:628
 msgid "      --principal   mail service principal\n"
@@ -2054,7 +2193,8 @@ msgstr "      --principal   zarz±dca us³ugi pocztowej\n"
 
 #: options.c:629
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  dodaje informacje o ¶ledzeniu po³±czenia do Received\n"
+msgstr ""
+"      --tracepolls  dodaje informacje o ¶ledzeniu po³±czenia do Received\n"
 
 #: options.c:631
 msgid "  -u, --username    specify users's login on server\n"
@@ -2094,7 +2234,8 @@ msgstr "  -w, --warnings    czas miêdzy powiadomieniami o poczcie\n"
 
 #: options.c:641
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
-msgstr "  -S, --smtphost    okre¶la nazwê hosta SMTP przesy³aj±cego nasze listy\n"
+msgstr ""
+"  -S, --smtphost    okre¶la nazwê hosta SMTP przesy³aj±cego nasze listy\n"
 
 #: options.c:642
 msgid "      --fetchdomains fetch mail for specified domains\n"
@@ -2102,7 +2243,9 @@ msgstr "      --fetchdomains pobiera pocztê dla podanych domen\n"
 
 #: options.c:643
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress okre¶la nazwê domeny SMTP u¿ywan± przy dorêczaniu poczty\n"
+msgstr ""
+"  -D, --smtpaddress okre¶la nazwê domeny SMTP u¿ywan± przy dorêczaniu "
+"poczty\n"
 
 #: options.c:644
 msgid "      --smtpname    set SMTP full name username@domain\n"
@@ -2114,11 +2257,13 @@ msgstr "  -Z, --antispam    okre¶la odpowiedzi blokad antyspamowych\n"
 
 #: options.c:646
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  okre¶la limit listów wys³anych w jednym po³±czeniu SMTP\n"
+msgstr ""
+"  -b, --batchlimit  okre¶la limit listów wys³anych w jednym po³±czeniu SMTP\n"
 
 #: options.c:647
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  okre¶la limit listów pobieranych w jednym po³±czeniu\n"
+msgstr ""
+"  -B, --fetchlimit  okre¶la limit listów pobieranych w jednym po³±czeniu\n"
 
 #: options.c:648
 msgid "      --fetchsizelimit set fetch message size limit\n"
@@ -2130,11 +2275,13 @@ msgstr "      --fastuidl    wykonuje binarne poszukiwanie UIDL-i\n"
 
 #: options.c:650
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     liczba skasowanych listów miêdzy czyszczeniem skrzynki\n"
+msgstr ""
+"  -e, --expunge     liczba skasowanych listów miêdzy czyszczeniem skrzynki\n"
 
 #: options.c:651
 msgid "  -m, --mda         set MDA to use for forwarding\n"
-msgstr "  -m, --mda         okre¶la ¶cie¿kê do MDA dorêczaj±cego pobrane listy\n"
+msgstr ""
+"  -m, --mda         okre¶la ¶cie¿kê do MDA dorêczaj±cego pobrane listy\n"
 
 #: options.c:652
 msgid "      --bsmtp       set output BSMTP file\n"
@@ -2150,68 +2297,83 @@ msgstr "  -r, --folder      okre¶la nazwê skrzynki na serwerze\n"
 
 #: options.c:655
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
+msgstr ""
+"      --showdots    pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
 
 #: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", u¿ycie polecenia RETR zamiast TOP.\n"
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", u¿ycie polecenia RETR "
+"zamiast TOP.\n"
 
-#: pop3.c:521
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: zgodne przej¶cie na TLS nie powiod³o siê, próba kontynuacji.\n"
 
-#: pop3.c:615
+#: pop3.c:619
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr "Wyczerpano dozwolone sposoby uwierzytelnienia, nie mo¿na kontynuowaæ.\n"
+msgstr ""
+"Wyczerpano dozwolone sposoby uwierzytelnienia, nie mo¿na kontynuowaæ.\n"
 
-#: pop3.c:640
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
 
-#: pop3.c:649
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "B³±d sk³adni znacznika czasu w powitaniu\n"
 
-#: pop3.c:675
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pro¶ba o nieznany protokó³ w POP3_auth\n"
 
-#: pop3.c:683
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:762
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Nie mo¿na obs³u¿yæ odpowiedzi UIDL od serwera.\n"
 
-#: pop3.c:785
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serwer odpowiedzia³ z UID-em dla niew³a¶ciwego listu.\n"
 
-#: pop3.c:812 pop3.c:1058
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) zosta³ skasowany, ale nadal istnieje!\n"
 
-#: pop3.c:821 pop3.c:833 pop3.c:1067 pop3.c:1074
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nieprzeczytany\n"
 
-#: pop3.c:918
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
+msgstr ""
+"Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
 
-#: pop3.c:1010
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "b³±d protoko³u\n"
 
-#: pop3.c:1026
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b³±d protoko³u podczas pobierania UIDL\n"
 
-#: pop3.c:1396
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opcja --folder nie dzia³a z POP3\n"
 
@@ -2224,12 +2386,20 @@ msgid "SDPS not enabled."
 msgstr "SDPS nie w³±czone."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: opcja interface jest obs³ugiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: opcja interface jest obs³ugiwana tylko pod Linuksem (bez IPv6) i "
+"FreeBSD\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: opcja monitor jest obs³ugiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: opcja monitor jest obs³ugiwana tylko pod Linuksem (bez IPv6) i "
+"FreeBSD\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
@@ -2491,88 +2661,90 @@ msgstr "b³±d %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "demon %cMTP nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "demon %cMTP naprawdê nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "brak pasuj±cych adresów; postmaster nie ustawiony.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nie mogê wys³aæ poczty nawet do %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "brak pasuj±cych lokalnych adresów, przesy³am do %s\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "list zostanie dorêczony przy pomocy: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "b³±d podczas uruchamiania MDA (programu dorêczaj±cego pocztê)\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "po³±czenie %cMTP z %s nie powiod³o siê\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "nie mo¿na podnie¶æ procesu s³uchaj±cego; powrót do %s"
 
 # XXX
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "B³±d podczas pisania do MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna³ %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwróci³ niezerowy kod b³êdu %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Dziwne: MDA pclose zwróci³o %d a errno %d/%s, nie mo¿na obs³u¿yæ w %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"Dziwne: MDA pclose zwróci³o %d a errno %d/%s, nie mo¿na obs³u¿yæ w %s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Zakoñczenie listu lub zamkniêcie pliku BSMTP nie powiod³o siê\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "serwer SMTP odmówi³ dostarczenia listu\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "B³±d podczas dorêczania LMTP w momencie wykonywania komendy EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Niespodziewana odpowied¼ inna ni¿ 503 na LSTMP EOM: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2924,7 +3096,8 @@ msgstr "Zapisujê plik fetchids.\n"
 #: uid.c:643
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "B³±d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
+msgstr ""
+"B³±d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
 
 #: uid.c:647
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 7243d20e..a79e7362 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.6-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-11-21 20:59+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -127,12 +127,12 @@ msgstr " (%d октетов)"
 msgid " (%d header octets)"
 msgstr " (%d октетов в заголовке)"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d октетов в теле)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -140,19 +140,19 @@ msgstr ""
 "длина �ообщени� %s@%s:%d не �овпала � ожидаемой (%d на �амом деле != %d "
 "ожидало�ь)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " задержано\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " пропущено\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " не пропущено\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -164,36 +164,36 @@ msgstr[1] ""
 "До�тигнут предел извлечени� %d; о�тало�ь %d �ообщений, �ервер %s, учётна� "
 "запи�ь %s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� подключени� к �ерверу %s.\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� �ервера %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "таймаут по�ле %d �екунд ожидани� ответа от �лушател�.\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "таймаут по�ле %d �екунд.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Тема: fetchmail наблюдает повтор�ющие�� тайм-ауты"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -202,7 +202,7 @@ msgstr ""
 "Fetchmail обнаружил более %d тайм-аутов при попытке получени� почты из %s@%"
 "s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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,73 +220,73 @@ msgstr ""
 "Fetchmail не будет опрашивать �тот почтовый �щик до тех\n"
 "пор, пока вы его не перезапу�тите.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "�бой команды, выполн�емой до �оединени�; �тату�: %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "невозможно было найти HESIOD pobox дл� %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Ведущий �ервер без имени.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "невозможно было найти канониче�кое им� DNS %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "�бой %s-подключени� к %s"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Тема: Предупреждение Fetchmail о недо�тупно�ти �ервера."
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail не �мог у�тановить �в�зь � почтовым �ервером %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Сбой подключени� через SSL.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Ошибка блокировки зан�то�ти дл� %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Ошибка зан�то�ти �ервера дл� %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Ошибка авторизации дл� %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (ранее авторизовано)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Тема: Ошибка аутентификации fetchmail дл� %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail не �мог получить почту из %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -300,7 +300,7 @@ msgstr ""
 "fetchmail не �мог ра�познать из-за того, что �ервер не отправил\n"
 "�ообщение об ошибке."
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -320,7 +320,7 @@ msgstr ""
 "подключить��. В дальнейшем уведомлени� отправл�ть�� не будут до тех\n"
 "пор, пока �лужба не будет во��тановлена."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -343,167 +343,167 @@ msgstr ""
 "отправл�ть�� не будут до тех пор, пока �лужба не будет\n"
 "во��тановлена."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "�емедленно повторить опро� дл� %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "�еизве�тный логин или ошибка аутентификации дл� %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "�вторизаци� выполнена дл� %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Тема: Выполнена авторизаци� fetchmail дл� %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail вошел в �и�тему %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Служба была во��тановлена.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "выбирает�� или повтор�ет�� опро� каталога %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "выбирает�� или повтор�ет�� опро� каталога по умолчанию\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s на %s (каталог %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Опрашивает�� %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, 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:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "про�мотрено"
 msgstr[1] "про�мотрено"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d �ообщение дл� %s"
 msgstr[1] "%d �ообщений дл� %s"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d октетов).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Дл� %s почты нет\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "фиктивное количе�тво �ообщений!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "�окет"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "от�ут�твует или неверный заголовок RFC822"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "�инхронизаци� клиент/�ервер"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "протокол клиент/�ервер"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "блокировка зан�то�ти на �ервере"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "SMTP-транзакци�"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "DNS-запро�"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "неопределённый"
 
-#: driver.c:1547
+#: driver.c:1545
 #, 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:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "неизв."
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Ошибка %s при выборке из %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "�бой команды, выполн�емой по�ле �оединени�; �тату�: %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Поддержка Kerberos V4 не �в�зана.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Поддержка Kerberos V5 не �в�зана.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Опци� --flush не поддерживает�� � %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Опци� --all не поддерживает�� � %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Опци� --limit не поддерживает�� � %s\n"
@@ -638,7 +638,7 @@ msgstr "Опци� --folder не поддерживает�� � ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Опци� --check не поддерживает�� � ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -650,7 +650,7 @@ msgstr ""
 "Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -661,65 +661,65 @@ msgstr ""
 "�облюдении определённых у�ловий. Подробно�ти �мотрите в файле COPYING\n"
 "в каталоге � документацией или и�ходными тек�тами.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: Запу�к под root'ом не привет�твует��.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: запущен �"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "невозможно было получить текущий рабочий каталог\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Это fetchmail вер�ии %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Опции берут�� из командной �троки %s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " и "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "�ет на�троенных почтовых �ерверов -- может от�ут�твует %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: не были указаны почтовые �ерверы.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: другие запущенные fetchmail от�ут�твуют\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr ""
 "fetchmail: ошибка о�тановки %s fetchmail на %d; вынужденное завершение.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "фоновый режим"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "приоритетный режим"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail на %d о�тановлен.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -727,7 +727,7 @@ msgstr ""
 "fetchmail: невозможно проверить почту, пока на том же хо�те запущен другой "
 "fetchmail.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -735,197 +735,212 @@ msgstr ""
 "fetchmail: невозможно опро�ить указанные хо�ты из-за другого fetchmail, "
 "запущенного на %d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: на %d запущен другой приоритетный fetchmail.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: на %d из фонового режима вернул��  fetchmail.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: на %d неожиданно завершил�� более �тарший проце�� того же "
 "уровн�.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: невозможно найти пароль дл� %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Введите пароль дл� %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: Предупреждение: на�троено и�пользование syslog и logfile. "
 "Провер�йте оба журнала!\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "запу�кает�� демон fetchmail %s\n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "невозможно было открыть %s дл� добавлени� запи�ей\n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "невозможно было проверить врем� %s (ошибка %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail перезапу�кает�� (%s изменен)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "возможен �бой при перезапу�ке, т.к. каталог не был во��тановлен\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "�бой перезапу�ка fetchmail\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "опро� %s пропущен (ошибка аутентификации или �лишком много тайм-аутов)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "интервал не до�тигнут, %s не запрашивает��\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Стату� запро�а=0 (SUCCESS)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Стату� запро�а=1 (NOMAIL)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Стату� запро�а=2 (SOCKET)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Стату� запро�а=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Стату� запро�а=4 (PROTOCOL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Стату� запро�а=5 (SYNTAX)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Стату� запро�а=6 (IOERR)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Стату� запро�а=7 (ERROR)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Стату� запро�а=8 (EXCLUDE)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Стату� запро�а=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Стату� запро�а=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Стату� запро�а=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Стату� запро�а=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Стату� запро�а=13 (MAXFETCH)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Стату� запро�а=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "В�е �оединени� перегружены.  Завершение работы.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "в �п�щем режиме в %s на %d �екунд\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "разбужен %s'ом\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "разбужен по �игналу %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "разбужен на %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "нормальное завершение, �тату� %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "невозможно было проверить врем� файла контрол� запу�ка\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Предупреждение: многократные ��ылки на хо�т %s в файле на�тройки\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Ошибка: многократные запи�и \"defaults\" в файле на�тройки.\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "Поддержка SSL не была включена при компил�ции.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "Поддержка SSL не была включена при компил�ции.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "Поддержка SSL не была включена при компил�ции.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "Поддержка SSL не была включена при компил�ции.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -933,18 +948,18 @@ msgstr ""
 "fetchmail: предупреждение: не до�тупен DNS дл� проверки многоканальной "
 "выборки из %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "предупреждение: multidrop дл� %s требует опцию envelope!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "предупреждение: �е про�ите техниче�кой поддержки, е�ли в�е �ообщени� "
 "отправл�ют�� по�тма�теру!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -953,291 +968,291 @@ msgstr ""
 "fetchmail: конфигураци� %s не верна, укажите положительный номер порта дл� "
 "�лужбы\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: конфигураци� %s не верна, дл� RPOP требует�� привилегированный "
 "порт\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "конфигураци� %s не верна, LMTP не может и�пользовать порт SMTP по умолчанию\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 "Запу�кать fetchall, о�тавл�� его при �том в режиме демона или про�то�, "
 "нельз�!\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "завершен по �игналу %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опро� начат\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "Поддержка POP2 не на�троена.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "Поддержка POP3 не на�троена.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "Поддержка IMAP не на�троена.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "Поддержка ETRN не на�троена.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "Поддержка ODMR не на�троена.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "выбран неподдерживаемый протокол.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опро� завершен\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал опро�а - %d �екунд\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Лог-файл - %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-файл - %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Обработка �ообщений будет реги�трировать�� через syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail �ымитирует и не �озда�т Received\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail будет отображать точечную �троку прогре��а даже в log-файлах.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail переадре�ует многоканальные �ообщени� без адре�а на %s.\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail направит ошибочное пи�ьмо по�тма�теру.\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail направит ошибочное пи�ьмо отправителю.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Параметры дл� получени� из %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Почта будет получена через %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, 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:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  �а�то�щее им� �евера - %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Когда хо�т не указан, �тот хо�т не будет запрошен.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Когда хо�т не указан, будет запрошен �тот хо�т.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Будет затребован пароль.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Секрет APOP = \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Пароль = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол - KPOP � аутентификацией Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол - %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (и�пользует�� �лужба %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (и�пользует�� порт по умолчанию)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (принудительно и�пользует�� UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Будут и�пробованы в�е до�тупные �по�обы аутентификации.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� � паролем.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Допу�кает�� оперативное шифрование.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Принципал почтовой �лужбы: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Включены �е��ии, зашифрованные SSL.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Протокол SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Включена проверка �ертификата �ервера SSL.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Каталог доверенных �ертификатов SSL: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Отпечаток ключа SSL (�веренный � ключом �ервера): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Таймаут молчани� �ервера - %d �екунд"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (по умолчанию).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Выбран почтовый �щик по умолчанию.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Выбранные почтовые �щики:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Будут получены в�е �ообщени� (--all on).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Будут получены только новые �ообщени� (--all off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Выбранные �ообщени� будут о�тавлены на �ервере (--keep on).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Выбранные �ообщени� будут удалены � �ервера (--keep off).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Старые �ообщени� будут удалены перед получением �ообщени� (--flush on).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1684
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Старые �ообщени� не будут удалены перед получением �ообщени� (--flush "
 "off).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1245,7 +1260,7 @@ msgstr ""
 "  Сообщени� завышенного размера будут удалены перед получением �ообщени� (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1253,331 +1268,331 @@ msgstr ""
 "  Сообщени� завышенного размера не будут удалены перед получением �ообщени� "
 "(--limitflush  off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Перезапи�ь локальных адре�ов �ервера включена (--norewrite off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Перезапи�ь локальных адре�ов �ервера выключена (--norewrite on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Удаление возврата каретки включено (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Удаление возврата каретки выключено (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Принудительный возврат каретки включен (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Принудительный возврат каретки выключен (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Интерпретаци� кодировки передаваемого контента выключена (pass8bits on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1699
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Интерпретаци� кодировки передаваемого контента включена (pass8bits off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-декодирование включено (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-декодирование выключено (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Про�той по�ле опро�а включен (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Про�той по�ле опро�а выключен (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  �епу�тые �троки �о�то�ни� будут удалены (dropstatus on)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  �епу�тые �троки �о�то�ни� будут �охранены (dropstatus off)\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Строки Delivered-To будут удалены (dropdelivered on)\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Строки Delivered-To будут �охранены (dropdelivered off)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничение на размер �ообщени� - %d октетов (--limit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �ет ограничени� на размер �ообщени� (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Интервал между предупреждени�ми о размере �ообщени� - %d �екунд (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Предупреждени� о размере при каждом опро�е (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничение на полученные �ообщени� - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  �ет ограничени� на полученные �ообщени� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Ограничение на размер выборки �ообщений - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  �ет ограничени� на размер выборки �ообщений (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Выполн�ть двоичный пои�к UID'ов во врем� каждого опро�а (--fastuidl -1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, 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:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Выполн�ть линейный пои�к UID'ов во врем� каждого опро�а (--fastuidl 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничение на пакет SMTP-�ообщений - %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  �ет ограничени� на пакет SMTP-�ообщений (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Интервал между удалени�ми принудительно у�тановлен в %d (--expunge %d).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  �ет принудительных удалений (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домены, дл� которых будет выполн�ть�� выборка почты:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (по умолчанию)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Сообщени� будут прикреплены к %s как BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Сообщени� будут до�тавлены � \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Сообщени� будут переадре�ованы по %cMTP на:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Ча�ть хо�та из �троки MAIL FROM будет %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, 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:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Ответные дей�тви� на ра�познанные �лушателем �пам-блоки:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокировка �пама отключена\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Подключение к �ерверу будет у�тановлено � \"%s\".\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  �ет команды, выполн�емой до �оединени�.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Подключение к �ерверу будет разорвано � \"%s\".\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  �ет команды, выполн�емой по�ле �оединени�.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  �ет локальных имен, объ�вленных дл� �того хо�та.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Многоканальный режим:"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Одноканальный режим: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, 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:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-запро� дл� многоканальных адре�ов включен.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-запро� дл� многоканальных адре�ов выключен.\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1856
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  �ли�ы �ервера будут �равнены � многоканальными адре�ами по IP-адре�у.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  �ли�ы �ервера будут �равнены � многоканальными адре�ами по имени.\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Маршрутизаци� охватывающего адре�а отключена\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Охватывающий заголовок должен быть: %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Количе�тво пропу�каемых охватывающих заголовков: %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префик� %s будет удален из id пользовател�\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  �ет разборки префик�а\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Ранее объ�вленные алиа�ы почтового �ервера:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Локальные домены:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Подключение должно быть через интерфей� %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  �е указаны требовани� интерфей�а.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Цикл опро�а будет наблюдать за %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  �е указан интерфей� монитора.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Подключени� к �ерверу будут выполн�ть�� по�ред�твом плагина %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  �е указана команда плагина.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Подключени� �лушател� будут выполн�ть�� через plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  �е указана команда plugout'а.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  С �того хо�та нет �охраненных UID'ов.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Сохранено %d UID'ов.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Информаци� � тра��ировкой опро�а будет добавлена в заголовок Received.\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1585,7 +1600,7 @@ msgstr ""
 "  Информаци� � тра��ировкой опро�а не будет добавлена в заголовок Received.\n"
 ".\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свой�тва ретран�л�ции \"%s\".\n"
@@ -1659,104 +1674,104 @@ msgstr "Ошибка Ñ�озданиÑ� идентификационных данÐ
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: поток прио�тановлен в течение %d �екунд.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Протокол идентифицирован как IMAP2 или IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "будет прио�тановлен по�ле опро�а\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: обновление до TLS выполнено у�пешно.\n"
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: �бой обновлени� до TLS.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
 "работу\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки OTP\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки NTLM\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Требуема� опци� LOGIN не поддерживает�� �ервером\n"
 
-#: imap.c:650
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "разногла�ие при удалении пи�ем (%d на �амом деле != %d ожидало�ь)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "не удало�ь повторить опро�\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "ожидает�� %d �ообщение по�ле повторного опро�а\n"
 msgstr[1] "ожидает�� %d �ообщений по�ле повторного опро�а\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "не удало�ь выбрать почтовый �щик\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ожидает�� %d �ообщение по�ле первого опро�а\n"
 msgstr[1] "ожидает�� %d �ообщений по�ле первого опро�а\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "не удало�ь удалить\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "ожидает�� %d �ообщение по�ле удалени�\n"
 msgstr[1] "ожидает�� %d �ообщений по�ле удалени�\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "�бой пои�ка непро�мотренных �ообщений\n"
 
-#: imap.c:871
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu не про�мотрено\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u первое не про�мотренное\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1955,7 +1970,7 @@ msgstr "�ервер прекратил получение\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "�евозможно было декодировать запро� OTP\n"
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Секретна� идентификационна� фраза:"
 
@@ -2272,7 +2287,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    отображение точечной �троки прогре��а даже в log-файлах\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2280,60 +2295,72 @@ msgstr ""
 "Предупреждение: найден POP3/PROXY-�ервер Maillennium; вме�то TOP "
 "и�пользует�� команда RETR.\n"
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
 "работу.\n"
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В привет�твии не найдена требуема� временна� метка APOP\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "В привет�твии ошибка �интак�и�а временной метки\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�еопределенный запро� протокола в POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "блокировка зан�то�ти!  Может активен другой �еан�?\n"
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "�евозможно обработать UIDL-ответ upstream-�ервера.\n"
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Сервер возвратил ответ � UID дл� неверного �ообщени�.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но в�е еще при�ут�твует!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u не про�мотрено\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Сообщени� добавлены в �пи�ок на �ервере. Обработка невозможна.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "ошибка протокола\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ошибка протокола при выборке UIDL'ов\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опци� --folder не поддерживает�� � POP3\n"
 
@@ -2620,65 +2647,65 @@ msgstr "Ошибка %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "�е удало�ь открыть файл BSMTP или запи�ать заголовок\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Слушателю %cMTP не понравил�� адре� получател� `%s'\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Слушателю %cMTP в �амом деле не понравил�� адре� получател� `%s'\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "нет �опо�тавленных адре�ов; по�тма�тер не у�тановлен.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "даже невозможно отправить на %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "нет �опо�тавленных адре�ов; переадре�овывает�� на %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "будет отправлен �: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "�е удало�ь открыть MDA\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Сбой %cMTP-подключени� к %s\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "невозможно запу�тить �лушател�; откат на %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Ошибка запи�и в MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA завершен по �игналу %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA возвратил ненулевой �тату� %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2686,24 +2713,24 @@ msgstr ""
 "Странно: MDA pclose возвратил %d и ошибку � номером %d/%s, невозможно "
 "обработать в %s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "�е удало�ь удалить �ообщение или закрыть файл BSMTP\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "Слушатель SMTP отказал в до�тавке\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ошибка до�тавки LMTP на EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�еожиданный не-503 ответ дл� LMTP EOM: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/sq.po b/po/sq.po
index f48db2f7..95e7397e 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-25 10:23+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2005-11-18 22:25+0200\n"
 "Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -123,31 +123,31 @@ msgstr " (%d oktete)"
 msgid " (%d header octets)"
 msgstr " (%d tetëshe titulli) "
 
-#: driver.c:682
+#: driver.c:680
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d tetëshe trupi) "
 
-#: driver.c:743
+#: driver.c:741
 #, 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:774
+#: driver.c:772
 msgid " retained\n"
 msgstr "mbjatur\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " zbrazur\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " i pa zbrazur\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -157,37 +157,37 @@ msgstr[0] ""
 msgstr[1] ""
 "mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, 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:880
+#: driver.c:878
 #, 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:884
+#: driver.c:882
 #, 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:889
+#: driver.c:887
 #, 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:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "mbarim kohe pas %d sekondash.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjekt: fetchmail-i sheh mbarime të përsëritur kohe"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -196,7 +196,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:911
+#: driver.c:909
 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"
@@ -213,73 +213,73 @@ msgstr ""
 "\n"
 "Fetchmail-i nuk do të vjelë sërish prej kësaj kutie para se ta rinisni.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "urdhri para-lidhje dështoi me përfundim %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nuk munda të gjej kuti postare HESIOD for %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Shërbyesi udhëheqës nuk ka emër.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, 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:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "lidhja %s me %s dështoi"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subjekt: Sinjalizim Fetchmail për shërbyes të pakapshëm."
 
-#: driver.c:1070
+#: driver.c:1068
 #, 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:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gabim duket-i-zënë te %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gabim shërbyes i zënë te %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Dështim autorizimi te %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (autorizuar dikur)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subjekt: mirëfilltësimi fetchmail dështoi te %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, 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:1190
+#: driver.c:1188
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -303,7 +303,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1196
+#: driver.c:1194
 #, fuzzy
 msgid ""
 "\n"
@@ -330,7 +330,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -351,169 +351,169 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Rivil menjëherë te %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, 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:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "OK autorizimi te %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subjekt: OK mirëfilltësimi fetchmail-i te %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail-i mundi të hyjë te %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Shërbimi është rivendosur.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "po përzgjedh ose vjel prej dosjes %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "po përzgjedh ose vjel prej dosjes parazgjedhje\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s te %s (dosja %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s te %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "Po mbledh %s\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mesazh (%d %s) për %s"
 msgstr[1] "%d mesazhe (%d %s) për %s"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "parë"
 msgstr[1] "parë"
 
-#: driver.c:1329
+#: driver.c:1327
 #, 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:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktete).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Pa postë për %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "numërim i gabuar mesazhesh!"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "\"socket\""
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "titull RFC822 mungues ose i dëmtuar"
 
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "njëkohësim klient/server"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "protokoll klient/server"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr ""
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "shkëmbim SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "kërkim DNS"
 
-#: driver.c:1541
+#: driver.c:1539
 #, fuzzy
 msgid "undefined"
 msgstr "gabim i papërcaktuar\n"
 
-#: driver.c:1547
+#: driver.c:1545
 #, 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:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "i/e panjohur"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "gabim %s gjatë sjelljes prej %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "urdhër pas-lidhjeje dështoi me gjendje %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr ""
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr ""
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Mundësia --zbrazje nuk mbulohet me %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Mundësia --all nuk mbulohet me %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Mundësi --limit nuk mbulohet me %s\n"
@@ -648,7 +648,7 @@ msgstr "Mundësia --check nuk mbulohet me ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Mundësia --check nuk mbulohet me ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -656,73 +656,73 @@ msgid ""
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "KUJDES: Xhirimi si rrënjë nuk është i këshillueshëm.\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: thirrur me"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "nuk munda të kem drejtori punuese të çastit\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ky është versioni %s i fetchmail-it"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Po marr mundësi prej rresht urdhrash%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " dhe "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nuk ka shërbyesa poste të rregulluar -- mundet mungon %s?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nuk janë treguar shërbyesa poste.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nuk po xhiron tjetër fetchmail\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr ""
 "fetchmail: gabim gjatë asgjësimit të %s fetchmail te %d; po qërohem që "
 "këtej.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "prapaskenë"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "paraskenë"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail te %d u asgjësua.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -730,7 +730,7 @@ msgstr ""
 "fetchmail: nuk mund kontrolloj për postë kur një tjetër fetchmail xhiron te "
 "e njëjta strehë.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -738,199 +738,214 @@ msgstr ""
 "fetchmail: nuk mund të vjel prej strehëve të treguara me një tjetër "
 "fetchmail në xhirim e sipër në to %d.\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: një tjetër fetchmail xhiron në paraskenë te %d.\n"
 
-#: fetchmail.c:483
+#: fetchmail.c:494
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: nuk mund të pranoj mundësira kur një fetchmail xhiron në "
 "prapaskenë.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail-i në prapaskenë te %d u përmend.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: vëllam më i vjetër te %d vdiq misteriozisht.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nuk mund të gjej fjalëkalim për %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Jepni fjalëkalim për %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 #, fuzzy
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 msgstr ""
 "fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje "
 "shpërndarjesh të shumëfishta %s\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 #, fuzzy
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: nuk po xhiron tjetër fetchmail\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "po nis demon fetchmail-i %s\n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, 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:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "s'munda të kontrolloj kohën e %s (gabim %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "po rinis fetchmail (%s ndryshoi)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "përpjekja për rinisje mund të dështojë ngaqë drejtoria nuk është rikthyer\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "përpjekja për rinisje të fetchmail-it dështoi\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval që nuk kapet, nuk po kërkoj %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Gjendje kërkimi=0 (SUKSES)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Gjendje kërkimi=1 (PAPOSTË)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Gjendje kërkimi=2 (\"SOCKET\")\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Gjendje kërkimi=3 (DËSHTMIR)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Gjendje kërkimi=4 (PROTOKOLL)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Gjendje kërkimi=5 (SYNTAKSË)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Gjendje kërkimi=6 (GABIO)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Gjendje kërkimi=7 (GABIM)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Gjendje kërkimi=8 (PËRJASHTO)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Gjendje kërkimi=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Gjendje kërkimi=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Gjendje kërkimi=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Gjendje kërkimi=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Gjendje kërkimi=13 (MAKSJELL)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Gjendje kërkimi=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tërë lidhjet janë bllokur.  Po dal.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "gjumë më %s\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "përmendur prej %s\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "përmendur prej sinjali %d\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "përmendur më %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "përfundim normal, gjendje %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 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:1039
+#: fetchmail.c:1066
 #, 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:1072
+#: fetchmail.c:1099
 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:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
+
+#: fetchmail.c:1270
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -938,17 +953,17 @@ msgstr ""
 "fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje "
 "shpërndarjesh të shumëfishta %s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 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:1254
+#: fetchmail.c:1299
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -957,292 +972,292 @@ msgstr ""
 "fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për "
 "shërbimin ose portën\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, 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:1279
+#: fetchmail.c:1324
 #, 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:1293
+#: fetchmail.c:1338
 #, 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:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "përfunduar me sinjal %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, 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:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP2.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP3.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për IMAP.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ETRN.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ODMR.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "përzgjedhur protokoll i pambuluar.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, 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:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervali i vjeljes është %d sekonda\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Jetëgjatësia e regjistrit është %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile është %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesazhe ecurie do të regjistrohen përmes syslog\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 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:1498
+#: fetchmail.c:1543
 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:1500
+#: fetchmail.c:1545
 #, 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:1504
+#: fetchmail.c:1549
 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:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Mundësi për marrje prej %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do të merret përmes %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Vjelja e këtij shërbyesi do të ngjasë çdo %d interval.\n"
 msgstr[1] "  Vjelja e këtij shërbyesi do të ngjasë çdo %d intervale.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i vërtetë i shërbyesit është %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 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:1528
+#: fetchmail.c:1573
 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:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Do të kërkohet fjalëkalim.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Sekret APOP= \"%s\".\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjalëkalim = \"%s\".\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli është KPOP me mirëfilltësim Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll është %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (po përdor shërbim %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (po përdor portë parazgjedhje)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (po detyroj përdorim UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 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:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim me fjalëkalim.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Nënkuptohet kodim cep-më-cep.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Parësori i shërbimit postar është: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Mundësuar sesione SSL të koduar.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Mundësuar kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  drejtori dëshmish SSL të besueshme: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, 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:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mospërgjigjes së shërbyesit është %d sekonda"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e përzgjedhur.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Kutitë postare të përzgjedhura janë:"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Do të merren tërë mesazhet (--all on).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Do të merren vetëm mesazhet e rinj (--all off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesazhet e sjellë %s do të mbahen në shërbyes (--keep on).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 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:1638
+#: fetchmail.c:1683
 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:1639
+#: fetchmail.c:1684
 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:1641
+#: fetchmail.c:1686
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1250,7 +1265,7 @@ msgstr ""
 "  Mesazhet tej masës do të zbrazen para marrjes së mesazheve (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1687
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1258,340 +1273,340 @@ msgstr ""
 "  Mesazhet tej masës nuk do të zbrazen para marrjes së mesazheve (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 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:1645
+#: fetchmail.c:1690
 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:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Heqja e \"carriage-return\"-it është vepruese (stripcr on).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e \"carriage-return\"-it është jovepruese (stripcr off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është veprues (forcecr on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është joveprues (forcecr off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1698
 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:1654
+#: fetchmail.c:1699
 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:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Çkodimi MIME është veprues (mimedecode on).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Çkodimi MIME është joveprues (mimedecode off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "Plogështia pas vjeljes është vepruese (idle on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "Plogështia pas vjeljes është jovepruese (idle off).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Nuk do të merren parasysh rreshta Gjendjeje Joboshe (dropstatus on)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 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:1665
+#: fetchmail.c:1710
 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:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur Për do të merren parasysh (dropdelivered off)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, 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:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, 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:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madhësie në çdo vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, 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:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa kufi për mesazhe të marrë (--fetchlimit 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, 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:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh që sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 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:1695
+#: fetchmail.c:1740
 #, 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:1698
+#: fetchmail.c:1743
 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:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Kufiri për tufë mesazhesh SMTP është %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa kufi për tufë mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, 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:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje të detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Përkatësitë për të cilat do të jepet postë janë:"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, 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:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do të shpërndahen me \"%s\".\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do të përcillen si %cMTP te:"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, 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:1748
+#: fetchmail.c:1793
 #, 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:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Përgjigje të pranuara blloqesh spam dëgjuesi janë:"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokim spamesh i çaktivizuar\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, 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:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdhër para-lidhjeje.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, 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:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdhër pas-lidhjeje.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendorë të deklaruar për këtë strehë.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Mënyrë shpërndarje e shumëfishtë: "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Mënyrë shpërndarje njëshe: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d emër vendor i pranuar.\n"
 msgstr[1] "%d emra vendorë të pranuar.\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 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:1807
+#: fetchmail.c:1852
 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:1811
+#: fetchmail.c:1856
 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 prej vendndodhjes IP.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 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:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Përcjellje vendndodhjesh zarf është çaktivizuar\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Titulli zarf nënkuptohet të jetë: %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, 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:1825
+#: fetchmail.c:1870
 #, 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:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash shërbyesi të paradeklaruar:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Përkatësi vendore:"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet të jetë përmes ndërfaqes %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht të përcaktuar rreth ndërfaqes.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do të mbikqyrë %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa ndërfaqe mbikqyrjeje të përcaktuar.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, 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:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, 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:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdhër shtojce daljeje të përcaktuar.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID të ruajtura prej kësaj strehe.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID të ruajtur.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 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:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1599,7 +1614,7 @@ msgstr ""
 "  Nuk do të shtohen të dhëna gjurmimi vjeljeje te titulli Të Marrë.\n"
 ".\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-nëpër \"%s\".\n"
@@ -1673,103 +1688,103 @@ msgstr "Gabim dhënieje kredencialesh\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: rrjedhë e përgjumur për %d sek.\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "do të rrijë bosh pas vjeljeje\n"
 
-#: imap.c:431 pop3.c:473
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:440 pop3.c:482
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme OTP e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:577 pop3.c:374
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
 
-#: imap.c:650
+#: imap.c:662
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: imap.c:754 imap.c:813
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "rivjelja dështoi\n"
 
-#: imap.c:762 imap.c:818
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d mesazh në pritje pas rivjeljes\n"
 msgstr[1] "%d mesazhe në pritje pas rivjeljes\n"
 
-#: imap.c:779
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "përzgjedhja e kutisë postare dështoi\n"
 
-#: imap.c:783
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d mesazh në pritje pas vjeljes së parë\n"
 msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n"
 
-#: imap.c:797
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "shuarja dështoi\n"
 
-#: imap.c:801
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d mesazh në pritje pas shuarjes\n"
 msgstr[1] "%d mesazhe në pritje pas shuarjes\n"
 
-#: imap.c:843
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
 
-#: imap.c:871
+#: imap.c:885
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:883 pop3.c:801
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\n"
 
-#: imap.c:974
+#: imap.c:988
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1965,7 +1980,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:565
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Frazë pass sekrete: "
 
@@ -2272,65 +2287,77 @@ msgstr "  -r, --folder      cakto emër dosjeje të largët\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika përparimi edhe në kartela regjistrimi\n"
 
-#: pop3.c:344
+#: pop3.c:350
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:493
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:603
+#: pop3.c:619
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
 
-#: pop3.c:612
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore në përshëndetje\n"
 
-#: pop3.c:634
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
 
-#: pop3.c:642
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:721
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:744
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n"
 
-#: pop3.c:771 pop3.c:1017
+#: pop3.c:816 pop3.c:1062
 #, fuzzy, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:780 pop3.c:792 pop3.c:1026 pop3.c:1033
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: pop3.c:877
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
 
-#: pop3.c:969
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:985
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 
-#: pop3.c:1355
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
 
@@ -2620,88 +2647,88 @@ msgstr "gabim %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
 
-#: sink.c:967
+#: sink.c:966
 #, 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:974
+#: sink.c:973
 #, 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:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "pa përputhje vendndodhjesh; s'është caktuar \"postmaster\".\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "s'mund as të dërgoj te %s!\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "pa përputhje vendndodhjesh; po përcjell drejt %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "gati për të shpërndarë me: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "Hapja e MDA-s dështoi\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Lidhja %cMTP me %s dështoi\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, 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:1341
+#: sink.c:1340
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gabim në fshirjen e kartelës \"%s\": %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA riktheu gjendje jo zero %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, 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:1372
+#: sink.c:1371
 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:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Gabim shpërndarjeje LMTP në EOM\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, 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:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/vi.po b/po/vi.po
index a27723e0..9874b9a9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.6-rc4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-27 04:04+0100\n"
+"POT-Creation-Date: 2006-12-19 01:19+0100\n"
 "PO-Revision-Date: 2006-12-01 22:01+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -32,12 +32,14 @@ msgstr "Không phải, hai địa chỉ IP không trùng\n"
 #: checkalias.c:198
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s: %s\n"
+msgstr ""
+"trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s: %s\n"
 
 #: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr "trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s.\n"
+msgstr ""
+"trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s.\n"
 
 #: cram.c:95
 msgid "could not decode BASE64 challenge\n"
@@ -65,7 +67,8 @@ msgstr "Chủ đ� : cảnh báo Fetchmail v� thư quá lớn"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Những thư quá lớn theo đây đã bị xoá b� trên máy phục vụ %s tài khoản %s:"
+msgstr ""
+"Những thư quá lớn theo đây đã bị xoá b� trên máy phục vụ %s tài khoản %s:"
 
 #: driver.c:343
 #, c-format
@@ -120,69 +123,73 @@ msgstr " (%d octet)"
 msgid " (%d header octets)"
 msgstr " (%d octet dòng đầu)"
 
-#: driver.c:682
+#: driver.c:680
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octet thân)"
 
-#: driver.c:743
+#: driver.c:741
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "thư %s@%s:%d không có độ dài đã ng� (%d thật != %d đã ng�)\n"
 
-#: driver.c:774
+#: driver.c:772
 msgid " retained\n"
 msgstr " vẫn giữ\n"
 
-#: driver.c:784
+#: driver.c:782
 msgid " flushed\n"
 msgstr " đã xoá sạch\n"
 
-#: driver.c:801
+#: driver.c:799
 msgid " not flushed\n"
 msgstr " chưa xoá sạch\n"
 
-#: driver.c:819
+#: driver.c:817
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "tới hạn lấy %d; %d thư còn lại trên máy phục vụ %s tài khoản %s\n"
 
-#: driver.c:876
+#: driver.c:874
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "quá gi� sau %d giây đợi kết nối đến máy phục vụ %s.\n"
 
-#: driver.c:880
+#: driver.c:878
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "quá gi� sau %d giây đợi máy phục vụ %s.\n"
 
-#: driver.c:884
+#: driver.c:882
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "quá gi� sau %d giây đợi %s.\n"
 
-#: driver.c:889
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "quá gi� sau %d giây đợi bộ lắng nghe đáp ứng.\n"
 
-#: driver.c:892
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "quá gi� sau %d giây.\n"
 
-#: driver.c:904
+#: driver.c:902
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Chủ đ� : fetchmail thấy nhi�u việc quá gi�"
 
-#: driver.c:907
+#: driver.c:905
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
 msgstr "Fetchmail thấy hơn %d việc quá gi� trong khi cố lấy thư từ %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:909
 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"
@@ -191,77 +198,79 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị h�ng do lỗi trình phục vụ. Bạn có thể chạy lệnh « fetchmail -v -v » để chẩn đoán vấn đ� này.\n"
+"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối "
+"thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị h�ng do lỗi trình phục "
+"vụ. Bạn có thể chạy lệnh « fetchmail -v -v » để chẩn đoán vấn đ� này.\n"
 "\n"
 "Fetchmail sẽ không thăm dò hộp thư này cho đến khi bạn khởi động nó.\n"
 
-#: driver.c:936
+#: driver.c:934
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "lệnh ti�n kết nối đã thất bại với trạng thái là %d\n"
 
-#: driver.c:960
+#: driver.c:958
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "không tìm thấy pobox HESIOD cho %s\n"
 
-#: driver.c:981
+#: driver.c:979
 msgid "Lead server has no name.\n"
 msgstr "Máy phục vụ đi trước không có tên.\n"
 
-#: driver.c:1005
+#: driver.c:1003
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "không tìm thấy tên DNS đúng tiêu chuẩn của %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1050
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "kết nối %s đến %s bị lỗi"
 
-#: driver.c:1068
+#: driver.c:1066
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Chủ đ� : cảnh báo Fetchmail v� máy phục vụ không tới được"
 
-#: driver.c:1070
+#: driver.c:1068
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail không thể tới máy phục vụ thư %s:"
 
-#: driver.c:1096
+#: driver.c:1094
 msgid "SSL connection failed.\n"
 msgstr "Kết nối SSL đã thất bại.\n"
 
-#: driver.c:1149
+#: driver.c:1147
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu khoá-bận trên %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1151
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu máy phục vụ bận trên %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1156
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Việc xác thực bị lỗi trên %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1159
 msgid " (previously authorized)"
 msgstr " (đã cho quy�n trước này)"
 
-#: driver.c:1182
+#: driver.c:1180
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Chủ đ� : việc xác thực fetchmail bị lỗi trên %s@%s"
 
-#: driver.c:1186
+#: driver.c:1184
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail không thể lấy thư từ %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1188
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -274,7 +283,7 @@ msgstr ""
 "chế độ thất bại khác (v.d. máy phục vụ bận tạm) mà fetchmail\n"
 "không thể phân biệt vì máy phục vụ chưa gởi thông điệp lỗi hữu ích."
 
-#: driver.c:1196
+#: driver.c:1194
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -293,7 +302,7 @@ msgstr ""
 "Trình n�n fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1206
+#: driver.c:1204
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -312,165 +321,165 @@ msgstr ""
 "Trình n�n fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1222
+#: driver.c:1220
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Thăm dò lại ngay trên %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1225
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Lỗi đăng nhập hay xác thực không rõ trên %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1249
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "�ã được quy�n trên %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1255
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Chủ đ� : fetchmail đã được quy�n trên %s@%s"
 
-#: driver.c:1261
+#: driver.c:1259
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail đã đăng nhập được vào %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1263
 msgid "Service has been restored.\n"
 msgstr "Dịch vụ đã được phục hồi.\n"
 
-#: driver.c:1297
+#: driver.c:1295
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "đang ch�n hoặc thăm dò thư mục %s\n"
 
-#: driver.c:1299
+#: driver.c:1297
 msgid "selecting or re-polling default folder\n"
 msgstr "đang ch�n hoặc thăm dò thư mục mặc định\n"
 
-#: driver.c:1311
+#: driver.c:1309
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s lúc %s (thư mục %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1312 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s lúc %s"
 
-#: driver.c:1319
+#: driver.c:1317
 #, c-format
 msgid "Polling %s\n"
 msgstr "�ang thăm dò %s...\n"
 
-#: driver.c:1323
+#: driver.c:1321
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d thÆ° (%d %s) cho %s"
 
-#: driver.c:1326
+#: driver.c:1324
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "đã thấy"
 
-#: driver.c:1329
+#: driver.c:1327
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d thÆ° cho %s"
 
-#: driver.c:1336
+#: driver.c:1334
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octet).\n"
 
-#: driver.c:1342
+#: driver.c:1340
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Không có thư cho %s\n"
 
-#: driver.c:1375 imap.c:89
+#: driver.c:1373 imap.c:90
 msgid "bogus message count!"
 msgstr "số đếm thư giả !"
 
-#: driver.c:1517
+#: driver.c:1515
 msgid "socket"
 msgstr "ổ cắm"
 
-#: driver.c:1520
+#: driver.c:1518
 msgid "missing or bad RFC822 header"
 msgstr "dòng đầu RFC822 xấu hay còn thiếu"
 
 # Name: don't translate / Tên: đừng dịch
-#: driver.c:1523
+#: driver.c:1521
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1524
 msgid "client/server synchronization"
 msgstr "đồng bộ hoá ứng dụng khách/trình phục vụ"
 
-#: driver.c:1529
+#: driver.c:1527
 msgid "client/server protocol"
 msgstr "giao thức ứng dụng khách/trình phục vụ"
 
-#: driver.c:1532
+#: driver.c:1530
 msgid "lock busy on server"
 msgstr "khoá bận trên máy phục vụ"
 
-#: driver.c:1535
+#: driver.c:1533
 msgid "SMTP transaction"
 msgstr "giao tác SMTP"
 
-#: driver.c:1538
+#: driver.c:1536
 msgid "DNS lookup"
 msgstr "Tra cứu DNS"
 
-#: driver.c:1541
+#: driver.c:1539
 msgid "undefined"
 msgstr "chưa xác định"
 
-#: driver.c:1547
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s và phát cho máy SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1547
 msgid "unknown"
 msgstr "không rõ"
 
-#: driver.c:1551
+#: driver.c:1549
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1560
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "lệnh cuối cùng kết nối đã thất bại với trạng thái là %d\n"
 
-#: driver.c:1581
+#: driver.c:1579
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V4.\n"
 
-#: driver.c:1589
+#: driver.c:1587
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V5.\n"
 
-#: driver.c:1600
+#: driver.c:1598
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Không hỗ trợ tùy ch�n « --flush » (xoá sạch) với %s\n"
 
-#: driver.c:1606
+#: driver.c:1604
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Không hỗ trợ tùy ch�n « --all » (tất cả) với %s\n"
 
-#: driver.c:1615
+#: driver.c:1613
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Không hỗ trợ tùy ch�n « --limit » (hạn chế) với %s\n"
@@ -496,7 +505,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -525,12 +535,14 @@ msgstr "Việc gethostbyname (lấy máy theo tên) bị lỗi cho %s\n"
 
 #: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó.\n"
+msgstr ""
+"Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó.\n"
 
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "�ang cố tiếp tục với tên máy không có đủ khả năng.\n"
@@ -602,17 +614,19 @@ msgstr "Không hỗ trợ tùy ch�n « --folder » (thư mục) đối với E
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Không hỗ trợ tùy ch�n « --check » (kiểm tra) đối với ETRN\n"
 
-#: fetchmail.c:132
+#: fetchmail.c:137
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 msgstr ""
 "Bản quy�n © năm 2002, 2003 của Eric S. Raymond\n"
-"Bản quy�n © năm 2004 của Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Bản quy�n © năm 2004 của Matthias Andree, Eric S. Raymond, Rob F. Funk, "
+"Graham Wilson\n"
 "Bản quy�n © năm 2005-2006 của Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:136
+#: fetchmail.c:141
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -623,865 +637,947 @@ msgstr ""
 "�ể tìm thấy thông tin thêm thì hãy xem tập tin có tên COPYING (sao chép)\n"
 "trong thư mục nguồn hay tài liệu.\n"
 
-#: fetchmail.c:170
+#: fetchmail.c:175
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "CẢNH B�O : khuyên bạn không chạy với tư cách ngư�i chủ (root).\n"
 
-#: fetchmail.c:182
+#: fetchmail.c:187
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: được g�i bằng"
 
-#: fetchmail.c:206
+#: fetchmail.c:211
 msgid "could not get current working directory\n"
 msgstr "không thể lấy thư mục hoạt động hiện có\n"
 
-#: fetchmail.c:268
+#: fetchmail.c:279
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "�ây là fetchmail bản phát hành %s"
 
-#: fetchmail.c:383
+#: fetchmail.c:394
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "�ang lấy các tùy ch�n trên dòng lệnh%s%s\n"
 
-#: fetchmail.c:384
+#: fetchmail.c:395
 msgid " and "
 msgstr " và "
 
-#: fetchmail.c:389
+#: fetchmail.c:400
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Chưa thiết lập trình phục vụ thư nào — có lẽ còn thiếu %s ?\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: chưa xác định trình phục vụ thư.\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:433
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: không có thẻ hiện fetchmail khác đang chạy\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:439
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %d nên hủy b�.\n"
+msgstr ""
+"fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %d nên hủy b�.\n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "background"
 msgstr "n�n"
 
-#: fetchmail.c:429 fetchmail.c:438
+#: fetchmail.c:440 fetchmail.c:449
 msgid "foreground"
 msgstr "cảnh gần"
 
-#: fetchmail.c:437
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail %s tại %d được buộc kết thúc.\n"
 
-#: fetchmail.c:460
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail khác đang chạy tới cùng một máy.\n"
+#: fetchmail.c:471
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail "
+"khác đang chạy tới cùng một máy.\n"
 
-#: fetchmail.c:466
+#: fetchmail.c:477
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: không thể thăm dò các máy đã xác định khi có thể hiện fetchmail khác chạy tại %d\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: không thể thăm dò các máy đã xác định khi có thể hiện fetchmail "
+"khác chạy tại %d\n"
 
-#: fetchmail.c:473
+#: fetchmail.c:484
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: một thể hiện fetchmail cảnh gần khác đang chạy tại %d.\n"
 
-#: fetchmail.c:483
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: không thể chấp nhận tùy ch�n trong khi một thể hiện fetchmail n�n đang chạy.\n"
+#: fetchmail.c:494
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: không thể chấp nhận tùy ch�n trong khi một thể hiện fetchmail n�n "
+"đang chạy.\n"
 
-#: fetchmail.c:489
+#: fetchmail.c:500
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: thể hiện fetchmail n�n tại %d đã được kích hoạt.\n"
 
-#: fetchmail.c:501
+#: fetchmail.c:512
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: tiến trình ngang hàng tại %d đã kết thúc bất thư�ng.\n"
 
-#: fetchmail.c:516
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: không tìm thấy mật khẩu cho %s@%s.\n"
 
-#: fetchmail.c:520
+#: fetchmail.c:531
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Hãy gõ mật khẩu cho %s@%s: "
 
-#: fetchmail.c:545 fetchmail.c:581
+#: fetchmail.c:556 fetchmail.c:592
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: cảnh báo : cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi lưu) đ�u đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
+msgstr ""
+"fetchmail: cảnh báo : cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi "
+"lưu) đ�u đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:568
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: không thể tháo b� vào n�n nên hủy b�.\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:572
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "đang khởi chạy trình n�n fetchmail %s...\n"
 
-#: fetchmail.c:577 fetchmail.c:579
+#: fetchmail.c:588 fetchmail.c:590
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "không thể mở %s để phụ thêm các bản ghi vào nó\n"
 
-#: fetchmail.c:618
+#: fetchmail.c:629
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "không thể kiểm tra gi� %s (lỗi %d)\n"
 
-#: fetchmail.c:623
+#: fetchmail.c:634
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "đang khởi chạy lại fetchmail (%s đã được thay đổi)\n"
 
-#: fetchmail.c:628
+#: fetchmail.c:639
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "việc cố thực hiện lại có thể thất bại vì thư mục chưa được phục hồi\n"
 
-#: fetchmail.c:655
+#: fetchmail.c:666
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "việc cố thực hiện lại fetchmail đã thất bại\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:710
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "việc thăm dò %s bị b� qua (xác thực đã thất bại hoặc quá gi� quá nhi�u lần)\n"
+msgstr ""
+"việc thăm dò %s bị b� qua (xác thực đã thất bại hoặc quá gi� quá nhi�u lần)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:722
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "Chưa tới khoảng nên không truy vấn %s\n"
 
-#: fetchmail.c:733
+#: fetchmail.c:760
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Trạng thái truy vấn=0 (THÀNH CÔNG)\n"
 
-#: fetchmail.c:735
+#: fetchmail.c:762
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Trạng thái truy vấn=1 (KHÔNG THƯ)\n"
 
-#: fetchmail.c:737
+#: fetchmail.c:764
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Trạng thái truy vấn=2 (Ổ CẮM)\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:766
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Trạng thái truy vấn=3 (X�C THỰC THẤT BẠI)\n"
 
-#: fetchmail.c:741
+#: fetchmail.c:768
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Trạng thái truy vấn=4 (GIAO THỨC)\n"
 
-#: fetchmail.c:743
+#: fetchmail.c:770
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Trạng thái truy vấn=5 (CÚ PH�P)\n"
 
-#: fetchmail.c:745
+#: fetchmail.c:772
 msgid "Query status=6 (IOERR)\n"
 msgstr "Trạng thái truy vấn=6 (LỖI NHẬP/XUẤT)\n"
 
-#: fetchmail.c:747
+#: fetchmail.c:774
 msgid "Query status=7 (ERROR)\n"
 msgstr "Trạng thái truy vấn=7 (LỖI)\n"
 
-#: fetchmail.c:749
+#: fetchmail.c:776
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Trạng thái truy vấn=8 (LOẠI TRỪ)\n"
 
-#: fetchmail.c:751
+#: fetchmail.c:778
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Trạng thái truy vấn=9 (KHO� BẬN)\n"
 
-#: fetchmail.c:753
+#: fetchmail.c:780
 msgid "Query status=10 (SMTP)\n"
 msgstr "Trạng thái truy vấn=10 (SMTP)\n"
 
-#: fetchmail.c:755
+#: fetchmail.c:782
 msgid "Query status=11 (DNS)\n"
 msgstr "Trạng thái truy vấn=11 (DNS)\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:784
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Trạng thái truy vấn=12 (BSMTP)\n"
 
-#: fetchmail.c:759
+#: fetchmail.c:786
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Trạng thái truy vấn=13 (LẤY T�I �A)\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:788
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Trạng thái truy vấn=%d\n"
 
-#: fetchmail.c:807
+#: fetchmail.c:834
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "M�i sự kết nối là bế tắc nên thoát.\n"
 
-#: fetchmail.c:814
+#: fetchmail.c:841
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "đang ngủ tại %s trong %d giây\n"
 
-#: fetchmail.c:838
+#: fetchmail.c:865
 #, c-format
 msgid "awakened by %s\n"
 msgstr "bị %s kích hoạt lại\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:868
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "bị tín hiệu %d kích hoạt lại\n"
 
-#: fetchmail.c:848
+#: fetchmail.c:875
 #, c-format
 msgid "awakened at %s\n"
 msgstr "được kích hoạt lại tại %s\n"
 
-#: fetchmail.c:854
+#: fetchmail.c:881
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "đã kết thúc chuẩn, trạng thái %d\n"
 
-#: fetchmail.c:1006
+#: fetchmail.c:1033
 msgid "couldn't time-check the run-control file\n"
 msgstr "không thể kiểm tra gi� của tập tin đi�u kiển việc chạy (run-control)\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1066
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Cảnh báo : gặp tên máy %s nhi�u lần trong tập tin cấu hình\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1099
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: lỗi : gặp nhi�u mục ghi « mặc định » trong tập tin cấu hình.\n"
+msgstr ""
+"fetchmail: lỗi : gặp nhi�u mục ghi « mặc định » trong tập tin cấu hình.\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1221
 msgid "SSL support is not compiled in.\n"
 msgstr "Chưa biên dịch cách hỗ trợ SSL.\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1228
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "Chưa biên dịch cách hỗ trợ SSL.\n"
+
+#: fetchmail.c:1234
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "Chưa biên dịch cách hỗ trợ SSL.\n"
+
+#: fetchmail.c:1240
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "Chưa biên dịch cách hỗ trợ SSL.\n"
+
+#: fetchmail.c:1270
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: cảnh báo : không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: cảnh báo : không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %"
+"s\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1281
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cảnh báo : việc đa thả cho %s cần thiết tùy ch�n bao b�c (envelope).\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1282
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "cảnh báo : đừng yêu cầu sự hỗ trợ nếu m�i thư được phát cho postmaster (giám đốc sở bưu điện).\n"
+msgstr ""
+"cảnh báo : đừng yêu cầu sự hỗ trợ nếu m�i thư được phát cho postmaster (giám "
+"đốc sở bưu điện).\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1299
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: cấu hình %s không hợp lệ; hãy xác định số hiệu cổng dương cho dịch vụ hay cổng\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: cấu hình %s không hợp lệ; hãy xác định số hiệu cổng dương cho "
+"dịch vụ hay cổng\n"
 
-#: fetchmail.c:1261
+#: fetchmail.c:1306
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: cấu hình %s không hợp lệ; RPOP cần thiết một cổng có quy�n đặc biệt\n"
+msgstr ""
+"fetchmail: cấu hình %s không hợp lệ; RPOP cần thiết một cổng có quy�n đặc "
+"biệt\n"
 
-#: fetchmail.c:1279
+#: fetchmail.c:1324
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "cấu hình %s không hợp lệ; LMTP không thể sử dụng cổng SMTP mặc định\n"
 
-#: fetchmail.c:1293
+#: fetchmail.c:1338
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình n�n là trư�ng hợp xấu.\n"
+msgstr ""
+"Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình n�n là "
+"trư�ng hợp xấu.\n"
 
-#: fetchmail.c:1318
+#: fetchmail.c:1363
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "đã kết thúc với tín hiệu %d\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1436
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã khởi chạy\n"
 
-#: fetchmail.c:1416
+#: fetchmail.c:1461
 msgid "POP2 support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ POP2.\n"
 
-#: fetchmail.c:1428
+#: fetchmail.c:1473
 msgid "POP3 support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ POP3.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1483
 msgid "IMAP support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ IMAP.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1489
 msgid "ETRN support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ ETRN.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1497
 msgid "ODMR support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ ODMR.\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1504
 msgid "unsupported protocol selected.\n"
 msgstr "đã ch�n giao thức không được hỗ trợ.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1514
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã chạy xong\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1531
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Khoảng thăm dò là %d giây\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1533
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Tập tin bản ghi là %s\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1535
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Tập tin Id là %s\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1538
 msgid "Progress messages will be logged via syslog\n"
-msgstr "Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
+msgstr ""
+"Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1541
 msgid "Fetchmail will masquerade and will not generate Received\n"
-msgstr "Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu « Received » (đã nhận)\n"
+msgstr ""
+"Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu « Received » (đã nhận)\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1543
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr "Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
+msgstr ""
+"Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1545
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail sẽ chuyển tiếp các thư đa thả có địa chỉ sai tới %s\n"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1549
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới postmaster (giám đốc sở bưu điện).\n"
 
-#: fetchmail.c:1506
+#: fetchmail.c:1551
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới ngư�i gởi.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1558
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tùy ch�n v� việc lấy từ %s@%s:\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Thư sẽ được lấy bằng %s\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1565
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Máy phục vụ này sẽ được thăm dò mỗi %d khoảng.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1569
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Tên đúng của máy phục vụ là %s.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1572
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Máy này sẽ không được truy vấn khi chưa xác định máy nào.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1573
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Máy này sẽ được truy vấn khi chưa xác định máy nào.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1577
 msgid "  Password will be prompted for.\n"
 msgstr "  Sẽ nhắc với mật khẩu.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1581
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Bí mất APOP = « %s ».\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1584
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  ID RPOP = « %s ».\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1587
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mật khẩu = « %s ».\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1596
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Giao thức là KPOP cùng với sự xác thực Kerberos %s"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1599
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Giao thức là %s"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1601
 #, c-format
 msgid " (using service %s)"
 msgstr " (dùng dịch vụ %s)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1603
 msgid " (using default port)"
 msgstr " (dùng cổng mặc định)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1605
 msgid " (forcing UIDL use)"
 msgstr " (buộc dùng UIDL)"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1611
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Sẽ cố dùng m�i phương pháp xác thực sẵn sàng.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1614
 msgid "  Password authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức bằng mật khẩu.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1617
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức MSN.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1620
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức NTLM.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1623
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức OTP.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1626
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức CRAM-Md5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1629
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức GSSAPI.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1632
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức Kerberos V4.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1635
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức Kerberos V5.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1638
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  GIả sử sự mật mã cuối đến cuối.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1642
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  �i�u chính trong dịch vụ thư là : %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1645
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Phiên chạy đã mật mã bằng SSL đã được bật.\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1647
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Giao thức SSL: %s\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1649
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Khả năng kiểm tra chứng nhận máy phục vụ SSL đã được bật.\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1651
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Thư mục chứng nhận đáng tin SSL: %s\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1654
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Vân tay khoá SSL (so sánh với khoá máy phục vụ): %s\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1657
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Th�i hạn không đáp ứng của máy phục vụ là %d giây"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1659
 msgid " (default).\n"
 msgstr " (mặc định).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1666
 msgid "  Default mailbox selected.\n"
 msgstr "  Hộp thư mặc định đã được ch�n.\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1671
 msgid "  Selected mailboxes are:"
 msgstr "  Các hộp thư đã ch�n là :"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1677
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  M�i thư sẽ được lấy (« --all » bật).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1678
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Chỉ thư mới sẽ được lấy (« --all » tắt).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1680
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Các thư đã lấy sẽ được giữ lại trên máy phục vụ (« --keep » bật).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1681
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr "  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (« --keep » tắt).\n"
+msgstr ""
+"  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (« --keep » tắt).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1683
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Các thư cũ sẽ được xoá sạch trước khi lấy thư (« --flush » bật).\n"
 
-#: fetchmail.c:1639
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (« --flush » tắt).\n"
+#: fetchmail.c:1684
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (« --flush » tắt).\n"
 
-#: fetchmail.c:1641
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (« --limitflush » bật).\n"
+#: fetchmail.c:1686
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (« --limitflush » "
+"bật).\n"
 
-#: fetchmail.c:1642
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (« --limitflush » tắt).\n"
+#: fetchmail.c:1687
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (« --limitflush » "
+"tắt).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1689
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (« --norewrite » tắt).\n"
+msgstr ""
+"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (« --"
+"norewrite » tắt).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1690
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (« --norewrite » bật).\n"
+msgstr ""
+"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (« --"
+"norewrite » bật).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1692
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được bật (« stripcr » bật).\n"
+msgstr ""
+"  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được bật (« stripcr » bật).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1693
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr "  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được tắt (« stripcr » tắt).\n"
+msgstr ""
+"  Khả năng gỡ b� m�i ký tự v� đầu dòng đã được tắt (« stripcr » tắt).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1695
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Việc buộc ký tự v� đầu dòng đã được bật (« forcecr » bật).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1696
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Việc buộc ký tự v� đầu dòng đã được tắt (« forcecr » tắt).\n"
 
-#: fetchmail.c:1653
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truy�n) đã được tắt (« pass8bits » bật).\n"
+#: fetchmail.c:1698
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
+"truy�n) đã được tắt (« pass8bits » bật).\n"
 
-#: fetchmail.c:1654
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truy�n) đã được bật (« pass8bits » tắt).\n"
+#: fetchmail.c:1699
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
+"truy�n) đã được bật (« pass8bits » tắt).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1701
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Khả năng giải mã MIME đã được bật (« mimedecode » bật).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1702
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Khả năng giải mã MIME đã được tắt (« mimedecode » tắt).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1704
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được bật (nghỉ bật).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1705
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được tắt (nghỉ tắt).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1707
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Các dòng Trạng thái sẽ được hủy (« dropstatus » bật).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1708
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Các dòng Status (Trạng thái) sẽ được giữ (« dropstatus » tắt).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1710
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr "  Các dòng Delivered-To (�ược phát cho) sẽ được hủy (« dropdelivered » bật).\n"
+msgstr ""
+"  Các dòng Delivered-To (�ược phát cho) sẽ được hủy (« dropdelivered » "
+"bật).\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1711
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr "  Các dòng Delivered-To (�ược phát cho) sẽ được giữ (« dropdelivered » tắt).\n"
+msgstr ""
+"  Các dòng Delivered-To (�ược phát cho) sẽ được giữ (« dropdelivered » "
+"tắt).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1715
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Giới hạn kích cỡ thư là %d octet (« --limit » %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1718
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư (« --limit » 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1720
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Khoảng cảnh báo kích cỡ thư là %d giây (« --warnings » %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1723
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Cảnh báo v� kích cỡ mỗi lần thăm dò (« --warnings » 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1726
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Giới hạn thư đã nhận là %d (« --fetchlimit » %d).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1729
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Không có giới hạn thư đã nhận (« --fetchlimit » 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1731
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Giới hạn kích cỡ thư lấy là %d (« (--fetchsizelimit » %d).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1734
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư lấy (« (--fetchsizelimit » 0).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1738
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (« --fastuidl » 1).\n"
+msgstr ""
+"  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (« --fastuidl » 1).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1740
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (« --fastuidl » %d).\n"
+msgstr ""
+"  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (« --fastuidl "
+"» %d).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1743
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (« --fastuidl » 0).\n"
+msgstr ""
+"   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (« --fastuidl » 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1745
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Giới hạn bó thư SMTP là %d.\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1747
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Không có giới hạn bó thư SMTP (« --batchlimit » 0).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1751
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Khoảng xoá b� giữa hai lần xoá hẳn đã được buộc thành %d (« --expunge » %d).\n"
+msgstr ""
+"  Khoảng xoá b� giữa hai lần xoá hẳn đã được buộc thành %d (« --expunge » %"
+"d).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1753
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Không có việc xoá hẳn đã buộc) (« --expunge » 0).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1760
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Các mi�n cho đó sẽ lấy thư là :"
 
-#: fetchmail.c:1720 fetchmail.c:1740
+#: fetchmail.c:1765 fetchmail.c:1785
 msgid " (default)"
 msgstr " (mặc định)"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1770
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Các thư sẽ được phụ thêm vào %s là BSMTP\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1772
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Các thư sẽ được phát bằng « %s ».\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1779
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Các thư sẽ được chuyển tiếp %cMTP tới :"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1790
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Phần máy của dòng MAIL FROM (thư từ) sẽ là %s\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1793
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  �ịa chỉ cần chèn vào dòng RCPT TO được gởi cho SMTP sẽ là %s\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1802
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Các đáp ứng chặn thư rác đã nhận diện của bộ lắng nghe là :"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1808
 msgid "  Spam-blocking disabled\n"
 msgstr "  Khả năng chặn thư rác được tắt\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1811
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được tạo bằng « %s ».\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1814
 msgid "  No pre-connection command.\n"
 msgstr "  Không có lệnh ti�n kết nối.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1816
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được đóng bằng « %s ».\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1819
 msgid "  No post-connection command.\n"
 msgstr "  Không có lệnh hậu kết nối.\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1822
 msgid "  No localnames declared for this host.\n"
 msgstr "  Chưa xác định tên cục bộ (localname) cho máy này.\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1832
 msgid "  Multi-drop mode: "
 msgstr "  Chế độ đa thả : "
 
-#: fetchmail.c:1789
+#: fetchmail.c:1834
 msgid "  Single-drop mode: "
 msgstr "  Chế độ thả đơn: "
 
-#: fetchmail.c:1791
+#: fetchmail.c:1836
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "Chấp nhân %d tên cục bộ.\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1851
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được bật.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1852
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được tắt.\n"
 
-#: fetchmail.c:1811
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
+#: fetchmail.c:1856
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1858
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo tên.\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1861
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Khả năng định tuyến phong bì-địa chỉ đã được tắt\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1864
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Giả sử dòng đầu phong bì là : %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1867
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Số dòng đầu phong bì cần b� qua : %d\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1870
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Ti�n tố %s sẽ được gỡ b� ra ID ngư�i dùng\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1873
 msgid "  No prefix stripping\n"
 msgstr "  Không gỡ b� ti�n tố\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1880
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Các bí danh trình phục vụ thư xác định sẵn:"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1889
 msgid "  Local domains:"
 msgstr "  Mi�n cục bộ :"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1899
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Phải kết nối qua giao diện %s.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1901
 msgid "  No interface requirement specified.\n"
 msgstr "  Chưa xác định giao diện cần thiết.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1903
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Vòng lặp thăm dò sẽ theo dõi %s.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1905
 msgid "  No monitor interface specified.\n"
 msgstr "  Chưa xác định giao diện theo dõi.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1909
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Sẽ kết nối đến máy phục vụ bằng bộ cầm phít %s (« --plugin » %s).\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1911
 msgid "  No plugin command specified.\n"
 msgstr "  Chưa xác định lệnh bộ cầm phít.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1913
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Sẽ kết nối lắng nghe bằng bộ kéo phít %s (« --plugout » %s).\n"
 
-#: fetchmail.c:1870
+#: fetchmail.c:1915
 msgid "  No plugout command specified.\n"
 msgstr "  Chưa xác định lệnh bộ kéo phít.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1920
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Không có UID được lưu từ máy này.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1929
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID đã được lưu.\n"
 
-#: fetchmail.c:1892
+#: fetchmail.c:1937
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1939
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-msgstr "  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
+msgstr ""
+"  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
 
-#: fetchmail.c:1897
+#: fetchmail.c:1942
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Tài sản gởi qua « %s ».\n"
@@ -1555,101 +1651,106 @@ msgstr "Gặp lỗi khi phát hành thông tin xác thực\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: nhánh ngủ trong %d giây\n"
 
-#: imap.c:316
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Giao thức được phát hiện là IMAP4 rev 1\n"
 
-#: imap.c:322
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Giao thức được phát hiện là IMAP4 rev 0\n"
 
-#: imap.c:329
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
 
-#: imap.c:344
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "sẽ nghỉ sau khi thăm dò\n"
 
-#: imap.c:431 pop3.c:501
+#: imap.c:441 pop3.c:505
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: việc nâng cấp lên TLS đã thành công.\n"
 
-#: imap.c:440 pop3.c:510
+#: imap.c:450 pop3.c:514
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: việc nâng cấp lên TLS bị lỗi.\n"
 
-#: imap.c:444
+#: imap.c:454
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
+msgstr ""
+"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
 
-#: imap.c:555
+#: imap.c:565
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:577 pop3.c:380
+#: imap.c:587 pop3.c:380
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:586
+#: imap.c:596
 msgid "Required LOGIN capability not supported by server\n"
-msgstr "Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
+msgstr ""
+"Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
 
-#: imap.c:652
+#: imap.c:662
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ng�)\n"
 
-#: imap.c:756 imap.c:815
+#: imap.c:768 imap.c:827
 msgid "re-poll failed\n"
 msgstr "việc thăm dò lại bị lỗi\n"
 
-#: imap.c:764 imap.c:820
+#: imap.c:776 imap.c:832
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lại\n"
 
-#: imap.c:781
+#: imap.c:793
 msgid "mailbox selection failed\n"
 msgstr "việc ch�n hộp thư bị lỗi\n"
 
-#: imap.c:785
+#: imap.c:797
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n"
 
-#: imap.c:799
+#: imap.c:811
 msgid "expunge failed\n"
 msgstr "việc xoá hẳn bị lỗi\n"
 
-#: imap.c:803
+#: imap.c:815
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d thư đợi sau khi xoá hẳn\n"
 
-#: imap.c:845
+#: imap.c:857
 msgid "search for unseen messages failed\n"
 msgstr "việc tìm kiếm các thư chưa xem bị lỗi\n"
 
-#: imap.c:873
+#: imap.c:885
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu chÆ°a xem\n"
 
-#: imap.c:885 pop3.c:842
+#: imap.c:897 pop3.c:846
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u là thư đầu chưa xem\n"
 
-#: imap.c:976
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Cảnh báo : đang b� qua dữ liệu giả v� kích cỡ các thư bị máy phục vụ trả v�.\n"
+#: imap.c:988
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Cảnh báo : đang b� qua dữ liệu giả v� kích cỡ các thư bị máy phục vụ trả "
+"v�.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1841,7 +1942,7 @@ msgstr "recv (nhận) của máy phục vụ là nghiêm tr�ng\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Không thể giải mã yêu cầu OTP\n"
 
-#: opie.c:64 pop3.c:593
+#: opie.c:64 pop3.c:597
 msgid "Secret pass phrase: "
 msgstr "Cụm từ mật khẩu bí mật: "
 
@@ -1918,32 +2019,41 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     xác định tên _tập tin ghi lưu_\n"
 
 #: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
-"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn thông điệp\n"
+"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn "
+"thông điệp\n"
 "\t\t\t\ttrong khi chạy là trình n�n\n"
 
 #: options.c:598
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
-"      --invisible   không ghi Received (dòng đầu �ã nhận) và bật khả năng ẩn máy đúng)\n"
+"      --invisible   không ghi Received (dòng đầu �ã nhận) và bật khả năng ẩn "
+"máy đúng)\n"
 "\t\t\t\t(_vô hình_)\n"
 
 #: options.c:599
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr "  -f, --fetchmailrc \t\txác định tập tin _đi�u khiển chạy_ (rc) xen kẽ\n"
+msgstr ""
+"  -f, --fetchmailrc \t\txác định tập tin _đi�u khiển chạy_ (rc) xen kẽ\n"
 
 #: options.c:600
 msgid "  -i, --idfile      specify alternate UIDs file\n"
-msgstr "  -i, --idfile      xác định _tập tin nhận diện_ ngư�i dùng (UID) xen kẽ\n"
+msgstr ""
+"  -i, --idfile      xác định _tập tin nhận diện_ ngư�i dùng (UID) xen kẽ\n"
 
 #: options.c:601
 msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr "      --pidfile     xác định _tập tin nhận diện tiến trình_ (PID) (khoá) xen kẽ\n"
+msgstr ""
+"      --pidfile     xác định _tập tin nhận diện tiến trình_ (PID) (khoá) xen "
+"kẽ\n"
 
 #: options.c:602
 msgid "      --postmaster  specify recipient of last resort\n"
-msgstr "      --postmaster  xác định ngư�i nhận cuối cùng (_giám đốc sở bưu điện_)\n"
+msgstr ""
+"      --postmaster  xác định ngư�i nhận cuối cùng (_giám đốc sở bưu điện_)\n"
 
 #: options.c:603
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
@@ -1973,14 +2083,18 @@ msgstr "      --sslcert     _chứng nhận_ ứng dụng khách SSL\n"
 
 #: options.c:612
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên dùng)\n"
+msgstr ""
+"      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên "
+"dùng)\n"
 
 #: options.c:613
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath \t_đư�ng dẫn đến các chứng nhận SSL_\n"
 
 #: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
 msgstr ""
 "      --sslfingerprint \t_vân tay SSL_ phải khớp đi�u trong chứng nhận\n"
 "\t\t\t\t\t\tcủa máy phục vụ\n"
@@ -1991,15 +2105,19 @@ msgstr "      --sslproto    buộc dùng _giao thức SSL_ (SSL2/SSL3/TLS1)\n"
 
 #: options.c:617
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      xác định lệnh bên ngoài để mở kết nối (_bộ cầm phít_)\n"
+msgstr ""
+"      --plugin      xác định lệnh bên ngoài để mở kết nối (_bộ cầm phít_)\n"
 
 #: options.c:618
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     xác định lệnh bên ngoài để mở kết nối SMTP (_bộ kéo phít_)\n"
+msgstr ""
+"      --plugout     xác định lệnh bên ngoài để mở kết nối SMTP (_bộ kéo "
+"phít_)\n"
 
 #: options.c:620
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr "  -p, --protocol    xác định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
+msgstr ""
+"  -p, --protocol    xác định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
 
 #: options.c:621
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
@@ -2007,11 +2125,16 @@ msgstr "  -U, --uidl        buộc dùng UIDL (chỉ pop3)\n"
 
 #: options.c:622
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        _cổng_ TCP nơi cần kết nối (quá cũ, hãy dùng « --service »)\n"
+msgstr ""
+"      --port        _cổng_ TCP nơi cần kết nối (quá cũ, hãy dùng « --service "
+"»)\n"
 
 #: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP số)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP "
+"số)\n"
 
 #: options.c:624
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
@@ -2028,7 +2151,8 @@ msgstr "  -E, --envelope    dòng đầu địa chỉ _phong bì_\n"
 #: options.c:627
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
-"  -Q, --qvirtual    ti�n tố cần gỡ b� ra mã nhận diện ngư�i dùng (UID) cục bộ\n"
+"  -Q, --qvirtual    ti�n tố cần gỡ b� ra mã nhận diện ngư�i dùng (UID) cục "
+"bá»™\n"
 "\t\t\t\t(_q ảo_)\n"
 
 #: options.c:628
@@ -2071,7 +2195,8 @@ msgstr "  -n, --norewrite   _không ghi lại_ các địa chỉ dòng đầu\n"
 
 #: options.c:638
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr "  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
+msgstr ""
+"  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
 
 #: options.c:639
 msgid "  -w, --warnings    interval between warning mail notification\n"
@@ -2083,7 +2208,8 @@ msgstr "  -S, --smtphost    đặt _máy_ chuyển tiếp SMTP\n"
 
 #: options.c:642
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr "      --fetchdomains \t_lấy_ thư chỉ cho _những mi�n_ đã xác định này\n"
+msgstr ""
+"      --fetchdomains \t_lấy_ thư chỉ cho _những mi�n_ đã xác định này\n"
 
 #: options.c:643
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
@@ -2103,7 +2229,8 @@ msgstr "  -b, --batchlimit  \tđặt _hạn chế bó_ thư cho sự kết nối
 
 #: options.c:647
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
+msgstr ""
+"  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
 
 #: options.c:648
 msgid "      --fetchsizelimit set fetch message size limit\n"
@@ -2115,7 +2242,8 @@ msgstr "      --fastuidl    tìm kiếm UIDL một cách nhị phân (_nhanh_)\n
 
 #: options.c:650
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     đặt số thư đã xoá b� tối đa giữa hai lần _xoá hẳn_\n"
+msgstr ""
+"  -e, --expunge     đặt số thư đã xoá b� tối đa giữa hai lần _xoá hẳn_\n"
 
 #: options.c:651
 msgid "  -m, --mda         set MDA to use for forwarding\n"
@@ -2135,68 +2263,86 @@ msgstr "  -r, --folder      xác định tên _thư mục_ từ xa\n"
 
 #: options.c:655
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
+msgstr ""
+"      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
 
 #: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR thay vào TOP.\n"
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR "
+"thay vào TOP.\n"
 
-#: pop3.c:521
+#: pop3.c:449
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:450
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:525
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục.\n"
+msgstr ""
+"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp "
+"tục.\n"
 
-#: pop3.c:615
+#: pop3.c:619
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Hết các bộ xác thực được phép nên không thể tiếp tục.\n"
 
-#: pop3.c:640
+#: pop3.c:644
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Không tìm thấy nhãn th�i gian APOP cần thiết trong l�i chào mừng\n"
 
-#: pop3.c:649
+#: pop3.c:653
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gặp lỗi cú pháp nhãn th�i gian trong l�i chào mừng\n"
 
-#: pop3.c:675
+#: pop3.c:679
 msgid "Undefined protocol request in POP3_auth\n"
-msgstr "Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
+msgstr ""
+"Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
 
-#: pop3.c:683
+#: pop3.c:687
 msgid "lock busy!  Is another session active?\n"
 msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n"
 
-#: pop3.c:762
+#: pop3.c:766
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n"
 
-#: pop3.c:785
+#: pop3.c:789
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n"
 
-#: pop3.c:812 pop3.c:1058
+#: pop3.c:816 pop3.c:1062
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (số=%d) đã được xoá b�, nhưng còn có.\n"
 
-#: pop3.c:821 pop3.c:833 pop3.c:1067 pop3.c:1074
+#: pop3.c:825 pop3.c:837 pop3.c:1071 pop3.c:1078
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u chÆ°a xem\n"
 
-#: pop3.c:918
+#: pop3.c:922
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trư�ng hợp này.\n"
+msgstr ""
+"Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trư�ng hợp "
+"này.\n"
 
-#: pop3.c:1010
+#: pop3.c:1014
 msgid "protocol error\n"
 msgstr "lỗi giao thức\n"
 
-#: pop3.c:1026
+#: pop3.c:1030
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
 
-#: pop3.c:1396
+#: pop3.c:1400
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Không hỗ trợ tùy ch�n « --folder » (thư mục) với POP3\n"
 
@@ -2209,12 +2355,20 @@ msgid "SDPS not enabled."
 msgstr "Chưa bật SDPS."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: tùy ch�n giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: tùy ch�n giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và "
+"FreeBSD (kiểu UNIX)\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: tùy ch�n theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: tùy ch�n theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và "
+"FreeBSD (kiểu UNIX)\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
@@ -2232,7 +2386,8 @@ msgstr "Tập tin %s phải là một tập tin chuẩn.\n"
 #: rcfile_y.y:429
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
-msgstr "Không cho phép tập tin %s có quy�n hạn lớn hơn « -rws--x--- » (0710).\n"
+msgstr ""
+"Không cho phép tập tin %s có quy�n hạn lớn hơn « -rws--x--- » (0710).\n"
 
 #: rcfile_y.y:441
 #, c-format
@@ -2476,87 +2631,90 @@ msgstr "Lá»—i  %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Tập tin BSMTP đã mở, hoặc việc ghi l�i mở đầu bị lỗi\n"
 
-#: sink.c:967
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Bộ lắng nghe %cMTP không chấp nhận địa chỉ ngư�i nhận « %s »\n"
 
-#: sink.c:974
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Bộ lắng nghe %cMTP không thật chấp nhận địa chỉ ngư�i nhận « %s »\n"
 
-#: sink.c:1020
+#: sink.c:1019
 msgid "no address matches; no postmaster set.\n"
 msgstr "không có địa chỉ khớp; chưa đặt giám đốc sở bưu điện.\n"
 
-#: sink.c:1032
+#: sink.c:1031
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "không thể gởi ngay cả cho %s.\n"
 
-#: sink.c:1038
+#: sink.c:1037
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "không có địa chỉ khớp; đang chuyển tiếp tới %s.\n"
 
-#: sink.c:1194
+#: sink.c:1193
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "sắp phát với: %s\n"
 
-#: sink.c:1218
+#: sink.c:1217
 msgid "MDA open failed\n"
 msgstr "Việc mở MDA bị lỗi\n"
 
-#: sink.c:1255
+#: sink.c:1254
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Việc kết nối %cMTP đến %s bị lỗi\n"
 
-#: sink.c:1279
+#: sink.c:1278
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "không thể liên lạc với bộ lắng nghe nên dự trữ v� %s"
 
-#: sink.c:1341
+#: sink.c:1340
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gặp lỗi khi ghi vào MDA: %s\n"
 
-#: sink.c:1344
+#: sink.c:1343
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA đã kết thúc vì tín hiệu %d\n"
 
-#: sink.c:1347
+#: sink.c:1346
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA đã trả v� trạng thái không phải số không %d\n"
 
-#: sink.c:1350
+#: sink.c:1349
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý tại %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý "
+"tại %s:%d\n"
 
-#: sink.c:1372
+#: sink.c:1371
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Việc kết thúc thư hay đóng tập tin BSMTP bị lỗi\n"
 
-#: sink.c:1394
+#: sink.c:1393
 msgid "SMTP listener refused delivery\n"
 msgstr "Bộ lắng nghe SMTP đã từ chối việc phát\n"
 
-#: sink.c:1424
+#: sink.c:1423
 msgid "LMTP delivery error on EOM\n"
 msgstr "Lỗi phát LMTP tại kết thúc thư\n"
 
-#: sink.c:1427
+#: sink.c:1426
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Gặp đáp ứng không phải 503 không mong đợi với kết thúc thư LMTP: %s\n"
 
-#: sink.c:1582
+#: sink.c:1581
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2626,7 +2784,9 @@ msgstr "Lá»—i getaddrinfo(\"%s\",\"%s\"): %s\n"
 
 #: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr "Hãy cố thêm tùy ch�n « --service » (dịch vụ) (xem cũng mục FAQ [H�i �áp] R12).\n"
+msgstr ""
+"Hãy cố thêm tùy ch�n « --service » (dịch vụ) (xem cũng mục FAQ [H�i �áp] "
+"R12).\n"
 
 #: socket.c:296 socket.c:299
 #, c-format
@@ -2752,7 +2912,8 @@ msgstr "Bộ mô tả tập tin ở ngoại phạm vị SSL"
 #: socket.c:891
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Xác định giao thức SSL không hợp lệ « %s » nên dùng mặc định (SSLv23).\n"
+msgstr ""
+"Xác định giao thức SSL không hợp lệ « %s » nên dùng mặc định (SSLv23).\n"
 
 #: socket.c:964
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
@@ -2907,7 +3068,8 @@ msgstr "�ang ghi tập tin fetchids (lấy các ID)...\n"
 #: uid.c:643
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
+msgstr ""
+"Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
 
 #: uid.c:647
 #, c-format