22 files changed, 1404 insertions, 1387 deletions

diff --git a/po/ca.po b/po/ca.po
index e043e122..1becab9e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.11\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2009-08-06 14:52+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -1197,7 +1197,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1710,48 +1711,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Enviant les credencials\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Error en l'intercanvi de credencials\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "No s'ha pogut desajustar el nivell de seguretat de dades\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "S'ha completat l'intercanvi de credencials\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "El servidor requereix integritat i/o privacitat\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Indicadors del nivell de seguretat desajustat: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "La mida màxima del component GSS és %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Error quan es creava la petició del nivell de seguretat\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Enviant les credencials GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Error quan s'enviaven les credencials GSS\n"
 
@@ -1775,114 +1776,114 @@ msgstr "recompte de missatges erroni!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "es farà una pausa després de l'obtenció\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: la promoció a TLS ha reeixit.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: la promoció a TLS a fallat.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: la promoció oportunista a TLS a fallat, intentant continuar.\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu és no llegit\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u és no llegit\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "la re-obtenció ha fallat\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecció de bústia\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "la supressió de missatges ha fallat\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge no llegit\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Atenció: s'ignoren les dades errònies sobre la mida dels missatges enviades "
 "pel servidor.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2081,7 +2082,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
@@ -2434,7 +2435,7 @@ msgstr ""
 "      --showdots    mostra punts de progressió àdhuc als fitxers de "
 "registre\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2442,77 +2443,77 @@ msgstr ""
 "Atenció: s'ha detectat un \"Maillennium POP3/PROXY server\", s'usa RETR en "
 "lloc de TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "Aquesta sessió requereix TLS, però el servidor no admet l'ordre CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "No obstant l'ordre CAPA és necessària per a TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: la promoció oportunista a TLS a fallat, intentant continuar.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "S'han esgotat els autenticadors permesos i no es pot continuar.\n"
 
 # timestamp: marca horària
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No s'ha trobat l'informació horària APOP requerida a la salutació\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxi en l'informació horària de la salutació\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Informació horària APOP errònia.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petició de protocol indefinida a POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessió activa?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (núm=%d) s'ha esborrat, però encara està present!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opció --folder no està suportada per POP3\n"
 
@@ -2871,22 +2872,22 @@ msgstr "no s'ha pogut lliurar via SMTP; recorrent a %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Ha fallat la terminació del missatge o el tancament del fitxer BSMTP\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error en escriure a l'MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2894,20 +2895,20 @@ msgstr ""
 "Estrany: La funció pclose de l'MDA a retornat %d i errno %d/%s, no es pot "
 "continuar a %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, 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:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/cs.po b/po/cs.po
index c5632d4c..9a5361df 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 19:52+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -1189,7 +1189,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1693,48 +1694,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Odesílám ověření\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Chyba při výměně ověření\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nemohu rozbalit zabezpe�ovací data\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Výměna ověření dokon�ena\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server vyžaduje integritu a/nebo soukromí\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Rozbalené příznaky úrovně zabezpe�ení: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximální velikost tokenu GSS je %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Chyba při vytváření požadavku na úroveň zabezpe�ení\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Uvolňuji ověření GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Chyba při uvolňování ověření\n"
 
@@ -1758,69 +1759,69 @@ msgstr "nesmyslný po�et zpráv v „%s“!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "nesmyslný po�et u EXPUNGE v „%s“!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "po stahování budu ne�inný\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: přechod do TLS uspěl.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: přechod do TLS se nezdařil.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokra�ovat\n"
 
-#: imap.c:637
+#: imap.c:593
 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:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 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:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mazání zpráv se neshoduje (%d ve skute�nosti != %d o�ekáváno)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu nebyla pře�tena\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla pře�tena\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1828,11 +1829,11 @@ 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1840,11 +1841,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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "�ištění selhalo\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1852,22 +1853,22 @@ 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepře�tených zpráv selhalo\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepře�tená\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Chybná odpově� FETCH: %s.\n"
@@ -2062,7 +2063,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
@@ -2406,7 +2407,7 @@ 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:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2414,75 +2415,75 @@ msgstr ""
 "VAROV�N�: Nalezen „Maillennium POP3/PROXY server“, použiji příkaz RETR "
 "namísto TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "Pro tuto relaci je TLS povinné, ale server odmítl příkaz CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Avšak příkaz CAPA je pro TLS nutný.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokra�ovat.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Vy�erpali jsme všechny povolené autentikátory, a tak nemůžeme pokra�ovat.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Požadovaný �asový údaj APOP nebyl v pozdravu nalezen\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaktická chyba v �asovém údaji z pozdravu\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Neplatné �asové razítko APOPu.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "zam�eno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Odpově� UIDL ze nadřazeného serveru nelze obsloužit.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server odpověděl s UID chybné zprávy.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) bylo odstraněno, ale je stále přítomno!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Přepína� --folder není s POP3 podporován\n"
 
@@ -2837,41 +2838,41 @@ msgstr "nemohu se spustit démona; nahrazuji jej %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Ukon�ení zprávy nebo zavření souboru BSMTP selhalo: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Chyba při zapisování do MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA umřel na signál %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA vrátil nenulový stav %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Záhada: MDA pclose vrátil %d a errno %d/%s, nezle zpracovat v %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Démon SMTP odmítl doru�ení\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Chyba doru�ování LMTP při EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, 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:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/da.po b/po/da.po
index c766776b..1440526f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2003-09-02 20:21+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1174,7 +1174,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er påkrævet.\n"
 
 #: fetchmail.c:1654
@@ -1688,48 +1689,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Sender akkreditiver\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Fejl ved udveksling af akkreditiver\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Akkreditiver udvekslet\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server kræver integritet og/eller hemmeligholdelse\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksimal GSS-symbolstørrelse er %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Frigiver GSS-akkreditiver\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
@@ -1753,112 +1754,112 @@ msgstr "falsk brev-tal!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "går i tomgang efter prøvning\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som påkrævet\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "brev %s@%s:%d havde ikke den forventede længde (%d != %d forventet)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "genprøvning mislykkedes\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d breve venter efter genprøvning\n"
 msgstr[1] "%d breve venter efter genprøvning\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d breve venter efter første prøvning\n"
 msgstr[1] "%d breve venter efter første prøvning\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "sletning (EXPUNGE) mislykkedes\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d breve venter efter sletning\n"
 msgstr[1] "%d breve venter efter sletning\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2055,7 +2056,7 @@ msgstr "fatal fejl ved læsning fra server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
@@ -2391,80 +2392,80 @@ msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Breve indsat på serverens liste. Kan ikke håndtere dette.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1448
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke understøttet med POP3\n"
@@ -2823,41 +2824,41 @@ msgstr "kan ikke få kontakt til modtager, bruger i stedet %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Underligt: MDA pclose returnede %d, kan ikke håndtere det i %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 #, fuzzy
 msgid ""
 "-- \n"
diff --git a/po/de.po b/po/de.po
index fbb557b3..1009e2c6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-27 13:38+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -1720,48 +1720,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr "Warnung: unpassende Challenge nach \"%s GSSAPI\" empfangen!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
+msgstr "Unpassende Challenge nach \"%s GSSAPI\" empfangen!\n"
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Schicke Beglaubigungen\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Fehler beim Austausch der Beglaubigungen\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Konnte Sicherheitsstufendaten nicht ermitteln\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Beglaubigungsaustausch vollzogen\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server erfordert Integrität und/oder Privatsphäre\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Ermittelte Sicherheitsstufen-Flags: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximale GSS-Tokengröße ist %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Fehler beim Erstellen der Sicherheitsstufenanfrage\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Gebe GSS-Beglaubigungen frei\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Fehler beim Freigeben der Beglaubigungen\n"
 
@@ -1785,113 +1785,113 @@ msgstr "ungültige Nachrichtenanzahl in \"%s\"!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "ungültige Zahl für EXPUNGE in \"%s\"!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokoll identifiziert als IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokoll identifiziert als IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "werde nach Abfrage untätig sein\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: Upgrade auf TLS erfolgreich.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: Upgrade auf TLS fehlgeschlagen.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: opportunistisches Upgrade auf TLS fehlgeschlagen, versuche Fortsetzung.\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benötigte LOGIN-Fähigkeit nicht vom Server unterstützt\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "unerwartete Expunge-Bestätigung (%d tatsächlich != %d erwartet)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu ist ungesehen\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ist ungesehen\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "erneute Abfrage fehlgeschlagen\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d Nachricht wartet nach erneuter Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach erneuter Abfrage\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "Postfach-Auswahl fehlgeschlagen\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d Nachricht wartet nach der ersten Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach der ersten Abfrage\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "Säubern fehlgeschlagen\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d Nachricht wartet nach dem Löschen\n"
 msgstr[1] "%d Nachrichten warten nach dem Löschen\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ist erste ungesehene\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Warnung: ignoriere falsche Größendaten vom Server.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Unpassende Antwort auf FETCH: %s.\n"
@@ -2088,7 +2088,7 @@ msgstr "Server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Konnte OTP-Herausforderung nicht dekodieren\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Geheime Passphrase: "
 
@@ -2431,7 +2431,7 @@ msgstr "  -r, --folder      Namen des entfernten Ordners angeben\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    Fortschrittspunkte auch in Log-Dateien zeigen\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2439,79 +2439,79 @@ msgstr ""
 "Warnung: „Maillennium POP3/PROXY-Server� gefunden, benutze RETR-Befehl statt "
 "TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS ist für diese Sitzung nötig, aber der Server hat den CAPA-Befehl "
 "abgelehnt.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Der CAPA-Befehl ist allerdings für TLS erforderlich.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: opportunistisches Upgrade auf TLS fehlgeschlagen, versuche Fortsetzung.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Keine weiteren Authentifizierungsverfahren verfügbar, Fortsetzung nicht "
 "möglich.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Erforderlicher APOP-Zeitstempel nicht in Begrüßung gefunden\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ungültiger APOP-Zeitstempel.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Anfrage nach undefiniertem Protokoll in POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Lock beschäftigt!  Ist eine weitere Sitzung aktiv?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Kann die UIDL-Antwort des Servers nicht verarbeiten.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server hat mit UID der falschen Nachricht geantwortet.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) wurde gelöscht, ist aber immer noch da!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Nachrichten in Liste auf Server eingefügt. Kann damit nicht umgehen.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "Protokollfehler\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "Protokollfehler beim Holen der UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) wurde gelöscht, ist aber immer noch da!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder wird mit POP3 nicht unterstützt\n"
 
@@ -2868,22 +2868,22 @@ msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 "Nachrichtenbeendigung oder Schließen der BSMTP-Datei fehlgeschlagen: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fehler beim Transport an den MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA starb durch Signal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA gab Status %d ungleich Null zurück\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2891,20 +2891,20 @@ msgstr ""
 "Merkwürdig: MDA pclose gab %d und errno %d/%s zurück, kann das nicht "
 "behandeln bei %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-Server verweigerte Auslieferung\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-Auslieferungsfehler bei EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unerwartete Nicht-503-Erwiderung auf LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/el.po b/po/el.po
index 2fc183c0..88bb1daa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1193,7 +1193,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1716,48 +1717,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "ÁðïóôïëÞ äéáðéóôåõôçñßùí\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "ÓöÜëìá óôçí áíôáëëáãÞ äéáðéóôåõôçñßùí\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Áäõíáìßá áðïêÜëõøçò äåäïìÝíùí åðéðÝäïõ áóöÜëåéáò\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Ïëïêëçñþèçêå ç áíôáëëáãÞ äéáðéóôåõôçñßùí\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Ï äéá÷åéñéóôÞò áðáéôåß áêåñáéüôçôá êáé/Þ ìõóôéêüôçôá\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "ÁðïêáëõöèÝíôåò óçìáßåò åðéðÝäïõ áóöÜëåéáò: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "ÌÝãéóôï ìÝãåèïò ôåêìçñßïõ GSS åßíáé %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "ÓöÜëìá óôç äçìéïõñãßá áßôçóçò åðéðÝäïõ áóöÜëåéáò\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "ÁðåëåõèÝñùóç äéáðéóôåõôçñßùí GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "ÓöÜëìá óôçí áðåëåõèÝñùóç äéáðéóôåõôçñßùí\n"
 
@@ -1781,114 +1782,114 @@ msgstr "åóöáëìÝíç ìÝôñçóç ìçíõìÜôùí!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP2 Þ IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "èá çñåìÞóåé ìåôÜ ôçí åñþôçóç\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá OTP äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá NTLM äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá LOGIN äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "ôï ìÞíõìá %s@%s:%d äåí åß÷å ôï áíáìåíüìåíï ìÞêïò(%d ðñáãìáôéêï !=%d "
 "áíáìåíüìåíï)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u äåí Ý÷åé åéäùèåß\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u äåí Ý÷åé åéäùèåß\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "åðáíåñþôçóç áðÝôõ÷å\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí áðáíåñþôçóç\n"
 msgstr[1] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí áðáíåñþôçóç\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "ç åðéëïãÞ ãñáììáôïêéâùôßïõ áðÝôõ÷å\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí ðñþôç åñþôçóç\n"
 msgstr[1] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí ðñþôç åñþôçóç\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "åîÜëåéøç áðÝôõ÷å\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí åîÜëåéøç\n"
 msgstr[1] "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí åîÜëåéøç\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "áíáæÞôçóç ãéá ìç éäùìÝíá ìçíýìáôá áðÝôõ÷å\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u åßíáé ôï ðñþôï ìç éäùìÝíï\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2087,7 +2088,7 @@ msgstr "äéá÷åéñéóôÞò Ýëáâå èáíÜóéìï\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Áäõíáìßá áðïêùäéêïðïßçóçò ðñüêëçóçò OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "ÌõóôéêÞ öñÜóç êëåéäß: "
 
@@ -2430,81 +2431,81 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    åìöÜíéóç ôåëåßùí ðñïüäïõ êáé óôá áñ÷åßá êáôáãñáöÞò\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Äå âñÝèçêå ç áðáéôïýìåíç ÷ñïíïëüãçóç óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Óõíôáêôéêü óöÜëìá ÷ñïíïëüãçóçò óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ìç ïñéóìÝíç áßôçóç ðñùôïêüëëïõ óôï POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "áðáó÷ïëçìÝíï êëåßäùìá!  Åßíáé åíåñãÞ êÜðïéá Üëëç óõíåäñßá;\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Ôá ìçíýìáôá åéóÝñ÷ïíôáé óå ëßóôá óôï äéá÷åéñéóôÞ. Áäõíáìßá ÷åéñéóìïý áõôïý.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "óöÜëìá ðñùôïêüëëïõ\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "óöÜëìá ðñùôïêüëëïõ êáôÜ ôç ëÞøç UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1448
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Ç åðéëïãÞ --remote äåí õðïóôçñßæåôáé ìå ôï POP3\n"
@@ -2862,41 +2863,41 @@ msgstr "áäõíáìßá áíýøùóçò áêñïáôÞ· ÷ñÞóç ôïõ %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Ôåñìáôéóìüò ìçíýìáôïò Þ êëåßóéìï ôïõ áñ÷åßïõ BSMTP áðÝôõ÷å\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "ðñïùèåßôáé óôï %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "ôï MDA áðåâßùóå áðü óÞìá %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "Ôï MDA åðÝóôñåøå ìç-ìçäåíéêÞ êáôÜóôáóç %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "ÐáñÜîåíï: ôï MDA pclose åðÝóôñåøå %d, áäõíáìßá ÷åéñéóìïý óôï %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Ï áêñïáôÞò SMTP áñíÞèçêå ôç äéáíïìÞ\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "ÓöÜëìá äéáíïìÞò LMTP óôï  EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Ìç áíáìåíüìåíç áðÜíôçóç ü÷é-503 óôï LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 #, fuzzy
 msgid ""
 "-- \n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5a9079b5..62c559ea 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -1649,48 +1649,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Sending credentials\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Error exchanging credentials\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Couldn't unwrap security level data\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Credential exchange complete\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server requires integrity and/or privacy\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Unwrapped security level flags: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximum GSS token size is %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Error creating security level request\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Releasing GSS credentials\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Error releasing credentials\n"
 
@@ -1714,113 +1714,113 @@ msgstr "bogus message count!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, fuzzy, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Required LOGIN capability not supported by server\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is unseen\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is unseen\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2015,7 +2015,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -2342,7 +2342,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:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2350,74 +2350,74 @@ msgstr ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Required APOP timestamp not found in greeting\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Timestamp syntax error in greeting\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Undefined protocol request in POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy!  Is another session active?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Cannot handle UIDL response from upstream server.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server responded with UID for wrong message.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) was deleted, but is still present!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "protocol error\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocol error while fetching UIDLs\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
@@ -2774,42 +2774,42 @@ msgstr "can't raise the listener; falling back to %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Message termination or close of BSMTP file failed\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, 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:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/es.po b/po/es.po
index 7136b29b..9246ab59 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.12\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2009-10-06 19:04+0200\n"
 "Last-Translator: Francisco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -1210,7 +1210,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1731,48 +1732,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Enviando credenciales\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Error intercambiando credenciales\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "No fue posible desenvolver los datos del nivel de seguridad\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Intercambio de credenciales completo\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "El servidor requiere integridad o privacidad\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Opciones de nivel de seguridad desenvueltas: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "El máximo tamaño del componente GSS es %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Error creando petición de nivel de seguridad\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando las credenciales GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Error liberando las credenciales\n"
 
@@ -1796,114 +1797,114 @@ msgstr "¡cantidad de mensajes incorrecta!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "descansará después de consultar\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: actualización a TLS correcta.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: falló la actualización a TLS.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: falló la actualización oportunista a TLS, intentando continuar\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no se compiló en fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no se compiló en fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "la eliminación de correo no coincide (%d actual != %d esperado)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu no fue visto\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no vistos falló\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Aviso: ignorando datos de errores para los tamaños de mensaje devueltos por "
 "el servidor.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2100,7 +2101,7 @@ msgstr "fatal recv del servidor\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
@@ -2462,7 +2463,7 @@ msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
 "registro\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2470,76 +2471,76 @@ msgstr ""
 "Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en "
 "vez de TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "La orden CAPA, no obstante, es necesaria para TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: la actualización oportunista a TLS falló, intentando continuar.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Hemos agotado los autenticadores permitidos y no puede continuar.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "El sello de tiempo APOP requerido no se ha encontrada en el saludo\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en el sello de tiempo en el saludo\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Sello de tiempo APOP inválido.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petición de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está permitida con POP3\n"
 
@@ -2897,42 +2898,42 @@ msgstr "no se puede despertar al servidor; recurriendo a %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error escribiendo a MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA murió por la señal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA devolvió un estado %d distinto de cero\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "Extraño: MDA pclose devolvió %d y errno %d/%s, no se puede manejar en %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/fi.po b/po/fi.po
index 4c6069ce..3cab584a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2007-11-06 01:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -1126,8 +1126,9 @@ msgid "  OTP authentication will be forced.\n"
 msgstr ""
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
-msgstr ""
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
+msgstr "Vaaditaan todennus.\n"
 
 #: fetchmail.c:1654
 msgid "  GSSAPI authentication will be forced.\n"
@@ -1610,48 +1611,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr ""
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr ""
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr ""
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr ""
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr ""
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr ""
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr ""
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr ""
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr ""
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr ""
 
@@ -1675,113 +1676,113 @@ msgstr ""
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr ""
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr ""
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr ""
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr ""
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr ""
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr ""
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d viesti odottamassa uudelleennoudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa uudelleennoudon jälkeen\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "postilaatikon valinta epäonnistui\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d viesti odottamassa ensimmäisen noudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa ensimmäisen noudon jälkeen\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr ""
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d viestiä odottamassa uudelleennoutoa\n"
 msgstr[1] "%d viestiä odottamassa uudelleennoutoa\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr ""
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr ""
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -1977,7 +1978,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr ""
 
@@ -2302,80 +2303,80 @@ msgstr ""
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "yhteyskäytäntövirhe\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr ""
 
@@ -2728,41 +2729,41 @@ msgstr ""
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr ""
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/fr.po b/po/fr.po
index ee87469b..f362b23a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-27 09:40+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -1214,8 +1214,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Authentification OTP forcée.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
-msgstr "  Authentification CRAM-Md5 forcée.\n"
+msgid "  CRAM-MD5 authentication will be forced.\n"
+msgstr "  Authentification CRAM-MD5 forcée.\n"
 
 #: fetchmail.c:1654
 msgid "  GSSAPI authentication will be forced.\n"
@@ -1730,48 +1730,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Envoi des références d'identification\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Erreur durant l'échange des références d'identification\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Impossible d'extraire les données du niveau de sécurité\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Échange des références d'identification terminé\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Le serveur requiert des échanges intègres ou privés\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Options du niveau de sécurité extraites : %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "La taille maximale du composant GSS est %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Erreur à la création de la requête de niveau de sécurité\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Libère les références d'identification GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Erreur de libération des références d'identification\n"
 
@@ -1795,115 +1795,115 @@ msgstr "nombre de messages erroné dans «%s» !"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "nombre de EXPUNGE erroné dans «%s» !"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocole identifié comme étant IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocole identifié comme étant IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "attendra après la réception\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: passage au TLS réussi.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: passage au TLS raté.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: échec de la négociation TLS mais on continue quand-même\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité OTP requise n'est pas compilée dans fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité NTLM requise n'est pas compilée dans fetchmail.\n"
 
-#: imap.c:666
+#: imap.c:622
 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:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "pas de concordance de la purge des messages (%d effectifs != %d attendus)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu n'est pas vu\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "échec durant la re-réception\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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 la re-réception\n"
 msgstr[1] "%d messages en attente après la re-réception\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "échec de la sélection de la boîte aux lettres\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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 la première réception\n"
 msgstr[1] "%d messages en attente après la première réception\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "échec de la purge\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Avertissement : des données farfelues retournées par le serveur pour la "
 "taille des messages sont ignorées.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Réponse FETCH incorrecte: %s.\n"
@@ -2100,7 +2100,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Mot de passe secret : "
 
@@ -2458,7 +2458,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:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2466,77 +2466,77 @@ msgstr ""
 "Avertissement: découverte d'un «Maillennium POP3/PROXY server», la commande "
 "RETR est utilisé au lieu de TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS est requis pour cette session mais le serveur refuse la commande CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "La commande CAPA est absolument nécessaire pour le TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: échec du passage en TLS mais on continue quand-même.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Nous avons épuisé toutes les techniques d'authentification permises et ne "
 "pouvons continuer.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "L'horodatage APOP requis est absent du message d'invitation\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "L'horodatage APOP n'est pas valable.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Requête de protocole non définie dans POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Fichier verrou en service. Y a-t-il une autre session active ?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Ne peux pas manier la réponse UIDL du serveur.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serveur a répondu avec l'UID d'un mauvais message.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) a été effacé mais est toujours présent !\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "erreur de protocole\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erreur de protocole durant la réception des UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'option --folder n'est pas supportée avec POP3\n"
 
@@ -2896,22 +2896,22 @@ msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 "Échec à la terminaison du message ou à la fermeture du fichier BSMTP: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erreur en envoyant au MDA : %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, 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:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA a retourné un état non nul (%d)\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2919,20 +2919,20 @@ msgstr ""
 "Étrange : le MDA a retourné %d et errno %d/%s lors du pclose; cas impossible "
 "à gérer %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Le serveur SMTP a refusé de délivrer le courrier\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erreur de délivrance LMTP en EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, 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:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/gl.po b/po/gl.po
index 2dbab562..ffa51f19 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.3.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2000-04-10 01:26+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -1177,7 +1177,7 @@ msgstr "Autenticación OTP soportada\n"
 
 #: fetchmail.c:1651
 #, fuzzy
-msgid "  CRAM-Md5 authentication will be forced.\n"
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "Autenticación CRAM-MD5 soportada\n"
 
 #: fetchmail.c:1654
@@ -1716,48 +1716,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Enviando credenciais\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Erro no troco de credenciais\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Non foi posible desempaquetar os datos do nivel de seguridade\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Troco de credenciais completo\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "O servidor require integridade e/ou privacidade\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempaquetadas as marcas do nivel de seguridade: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "O tamaño máximo do símbolo GSS é %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Erro ó crear a petición de nivel de seguridade\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando as credenciais GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Erro liberando as credenciais\n"
 
@@ -1781,115 +1781,115 @@ msgstr ""
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificabo como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "a mensaxe %d non tiña o tamaño agardado (%d real != %d agardado)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "a %u aínda foi lida\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "a %u aínda foi lida\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "fallou a nova tentativa de baixar mensaxes\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "fallou a selección de caixa de correo\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:1011
+#: imap.c:967
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "fallou o execl(%s)\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "fallou a busca de mensaxes non lidas\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "a %u aínda foi lida\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2093,7 +2093,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Non se puido decodificar o challenge OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Contrasinal segreda: "
 
@@ -2445,81 +2445,81 @@ msgstr "  -r, --folder      indicar o nome da carpeta remota\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Mostra da data de APOP requirida non atopada no saúdo\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na mostra da data no saúdo\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petición de protocolo indefinida en POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo activado!  ¿Hai outra sesión activa?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensaxes inseridas nunha lista no servidor. Non se pode manexar isto.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo ó obter os UIDLs\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1448
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "A opción --remote non está soportada con POP3\n"
@@ -2874,41 +2874,41 @@ msgstr ""
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erro liberando as credenciais\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "O MDA saiu anormalmente ou devolveu estado non cero\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "O receptor SMTP rexeitou a entrega\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta distinta de 503 non agardada ó LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/id.po b/po/id.po
index b89ce66a..4e4630f6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.17-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-05-03 05:29+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -1163,7 +1163,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Otentikasi OTP akan dipaksa.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Otentikasi CRAM-Md5 akan dipaksa.\n"
 
 #: fetchmail.c:1654
@@ -1657,48 +1658,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Mengirim kredensial\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Galat menukar kredential\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Tak dapat membongkar level keamanan data\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Penukaran kredensial selesai\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server memerlukan integritas dan/atau privasi\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Bendera level keamanan terbongkar: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Ukuran token GSS maksmimum adalah %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Galat membuat permintaan level kemanan.\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Membebaskan kredensial GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Galat membebaskan kredensial\n"
 
@@ -1722,111 +1723,111 @@ msgstr "jumlah pesan palsu di \"%s\"!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "jumlah EXPUNGE palsu di \"%s\"!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol teridentifkasi sebagai IMAP rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol teridentifikasi sebagai IMAP rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol teridentifkasi sebagai IMAP2 atau IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "akan siaga setelah penjajakan\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: pemutakhiran ke TLS sukses.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: pemutakhiran ke TLS gagal.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Kemampuan OTP yang diperlukan tidak dikompilasi ke fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Kemampuan NTLM yang diperlukan tidak dikompilasi ke fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Kemampuan LOGIN yang diperlukan tidak dikompilasi oleh server\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "penghapusan surat tidak cocok (%d sebenarnya != %d diharapkan)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu tak terlihat\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u sekarang tak terlihat\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "penjajakan ulang gagal\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d pesan menunggu setelah penjajakan ulang\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "pemilihan kotak surat gagal\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d pesan menunggu setelah penjajakan pertama\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "penghapusan gagal\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d pesan menunggu setelah penghapusan\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "penelusuran pesan tak terlihat gagal\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u pertama kali tak terlihat\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Peringatan: mengabaikan data palsu untuk ukuran pesan yang dikembalikan oleh "
 "server.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2021,7 +2022,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Tak dapat mengawasandi tantangan OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frasa sandi rahasia:"
 
@@ -2364,7 +2365,7 @@ msgstr "  -r, --folder      tentukan nama folder jarak jauh\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    tampilkan titik proses bahkan di berkas catatan\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2372,75 +2373,75 @@ msgstr ""
 "Peringatan: \"server Maillennium POP3/PROXY\" ditemukan, gunakan perintah "
 "RETR ketimbang TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS merupakan keharusan untuk sesi ini, tapi server menolak perintah CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Perintah CAPA diperlukan untuk TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Kami kehabisan otentikator yang diizinkan dan tak dapat melanjutkan.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Stempel waktu APOP yang diperlukan tak ditemukan dalam perkenalan\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Galat sintaks stempel waktu dalam perkenalan\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Stempel waktu APOP tidak sah.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Permintaan protokol tak didefinisikan di POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "kunci sibuk! Apakah sesi lain aktif?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Tak dapat menangani repson UIDL dari server upstream.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server menjawab dengan UID untuk pesan salah.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) dihapus, tapi masih ada!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Pesan dimasukkan dalam senarai pada server. Tak dapat menangani ini.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "galat protokol\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "galat protokol ketika mengambil UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) dihapus, tapi masih ada!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opsi --folder tidak didukung dengan POP3\n"
 
@@ -2796,22 +2797,22 @@ msgstr "tak dapat menaikkan pendengar; mengembalikan ke %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Penghapusan pesan atau penutupan berkas BSMTP gagal: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Galat menulis ke MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA mati karena sinyal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA mengembalikan status tidak nol %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2819,21 +2820,21 @@ msgstr ""
 "Aneh: MDA pclose mengembalikan %d dan errno %d/%s, tak dapat menangani di %s:"
 "%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Pendengar SMTP menolak kiriman.\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Galat kiriman LMTP pada akhir pesan\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 "Balasan bukan-503 yang tidak diharapkan terhadap akhir pesan LMTP: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/it.po b/po/it.po
index 59f68014..4ba3dbef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 19:54+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1214,7 +1214,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  L'autenticazione OTP sarà forzata.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  L'autenticazione CRAM-Md5 sarà forzata.\n"
 
 #: fetchmail.c:1654
@@ -1757,48 +1758,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Invio delle credenziali in corso\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Errore in fase di scambio delle credenziali\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Impossibile aprire i dati del livello di sicurezza\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Scambio di credenziali completato\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Il server richiede l'integrità, la riservatezza o entrambe\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Contrassegni del livello di sicurezza aperti: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "La dimensione massima del gettone GSS è %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Errore durante la creazione della richiesta del livello di sicurezza\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Rilascio delle credenziali GSS in corso\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Errore in fase di rilascio delle credenziali\n"
 
@@ -1822,117 +1823,117 @@ msgstr "conteggio di messaggi errato in %s."
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "conteggio di EXPUNGE errato in %s."
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocollo identificato come IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocollo identificato come IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocollo identificato come IMAP2 o IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "Entrata in inattività dopo l'interrogazione\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: aggiornamento a TLS effettuato con successo.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: aggiornamento a TLS fallito.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
 "corso\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacità OTP richiesta non è compilata nel programma\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacità NTLM richiesta non è compilata nel programma\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacità LOGIN richiesta non è supportata dal server\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu non è stato visto\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u non è stato visto\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "re-interrogazione fallita\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d messaggio in attesa dopo la re-interrogazione\n"
 msgstr[1] "%d messaggi in attesa dopo la re-interrogazione\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "selezione della casella di posta fallita\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d messaggio in attesa dopo la prima interrogazione\n"
 msgstr[1] "%d messaggi in attesa dopo la prima interrogazione\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "ripulitura fallita\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d messaggio in attesa dopo la ripulitura\n"
 msgstr[1] "%d messaggi in attesa dopo la ripulitura\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "ricerca di messaggi non visti fallita\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u è il primo non visto\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Avviso: i dati fasulli per le dimensioni dei messaggi restituiti dal server "
 "vengono ignorati.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Risposta FETCH non corretta: %s.\n"
@@ -2129,7 +2130,7 @@ msgstr "server recv fatale\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossibile decodificare la prova OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Passphrase segreta: "
 
@@ -2499,7 +2500,7 @@ msgstr ""
 "      --showdots        mostra i puntini di avanziamento anche nei file di "
 "registro\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2507,83 +2508,83 @@ msgstr ""
 "Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, "
 "anziché di TOP, in corso.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS è obbligatorio per questa sessione, ma il server rifiuta il comando "
 "CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Il comando CAPA è comunque necessario per TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
 "corso.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 "Data e ora APOP sono richieste, ma non sono state trovate nel messaggio di "
 "benvenuto\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Errore di sintassi di data e ora nel messaggio di benvenuto\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Data e ora APOP non valide.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Richiesto un protocollo non definito in POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Il blocco è occupato. Controllare se un'altra sessione è attiva.\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Impossibile gestire la risposta UIDL dal server upstream.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Il server ha risposto con UID per messaggio errato.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) è stato eliminato, ma è sempre presente.\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Messaggi inseriti nell'elenco sul server. Impossibile gestire questa "
 "situazione.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "errore di protocollo\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "errore di protocollo durante lo scaricamento degli UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) è stato eliminato, ma è sempre presente.\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opzione «--folder» non è supportata con POP3\n"
 
@@ -2944,22 +2945,22 @@ msgstr "impossibile raggiungere l'ascoltatore, ritorno su %s in corso"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Terminazione del messaggio o chiusura del file BSTMP fallita: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Errore durante la scrittura su MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA terminato da segnale %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ha ritornato uno stato %d diverso da zero\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2967,20 +2968,20 @@ msgstr ""
 "Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile "
 "trattare a %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "L'ascoltatore SMTP ha rifiutato la consegna\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Errore di consegna LMTP su EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Risposta differente da 503 inattesa a LTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/ja.po b/po/ja.po
index 6a4c0d0f..708bdf9e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 22:56+0700\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -1201,7 +1201,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP �よる�証を強制的�行���。\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 方��よる�証を強制的�行���。\n"
 
 #: fetchmail.c:1654
@@ -1691,48 +1692,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "証明書を�信���。\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "証明書交�エラー��。\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "セキュリティーレベルデータを変更����。\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "証明書�交��終了����。\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "サー�� integrity � privacy を�求�����\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "変更�れ��セキュリティーレベル�フラグ: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "最大 GSS トークン長� %ld ��\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "セキュリティーレベル��求�生�エラー��。\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "GSS 証明書を発行���。\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "証明書�発行エラー��。\n"
 
@@ -1756,112 +1757,112 @@ msgstr "\"%s\" 内�メッセージ数��造�れ����!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "\"%s\" 内�EXPUNGE�数��造�れ����!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "プロトコル� IMAP4 rev 1 ��識�れ���。\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "プロトコル� IMAP4 rev 0 ��識�れ���。\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "プロトコル� IMAP2 �� IMAP2BIS ��識�れ���。\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "接続�後�休止���。\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: TLS ��アップグレード��功。\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: TLS ��アップグレード�失敗。\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: TLS ����的アップグレード�失敗�継続�能�試�����\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 "OTP ��求�れ�����fetchmail � OTP 対応�コンパイル�れ����ん。\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "�求�れ� NTLM 処�能力� fetchmail �組�込�れ����ん。\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "�求�れ� LOGIN 処�能力�サー��サ�ート�れ����ん。\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "メッセージ�削除数�����ん (%d (実際) != %d (予想)) \n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu �未読��。\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �未読��。\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "�アクセス�失敗����。\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "メールボックス��択�失敗����\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "削除�失敗����。\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "削除�後�%d 通�メッセージ�残�����。\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "未読メッセージ�検索�失敗����。\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �最��未読メッセージ��。\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "警告: サー��らメッセージサイズ���報告�れ�数値���切�����無視�"
 "��。\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "正����FETCH応答�返������: %s\n"
@@ -2059,7 +2060,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge �デコード�出���ん���。\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -2407,7 +2408,7 @@ msgstr "  -r, --folder      サー��メールフォルダを指定���\
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ログファイル�も進行状�を示� . を書�込���\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2415,78 +2416,78 @@ msgstr ""
 "警告: Maillennium POP3/プロクシサー���。TOP �代�り� RETR コマンドを使用"
 "���。\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "��セッション�� TLS �必�����サー�� CAPA コマンドを拒�����。\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "CAPA コマンド� TLS ��必須��。\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: TLS ����的アップグレード�失敗�継続�能�試�����。\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "使用を許��れ������証手段を試���������失敗����。実行を継"
 "続����ん。\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting 中� APOP タイムスタンプ�存在���ん。\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中� タイムスタンプ��正��。\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "無効� APOP タイムスタンプ��。\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中�定義�れ����プロトコル��求�れ���。\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy 状態��。別�交信�行�れ�����確���下��。\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "上�サー��ら� UIDL 応答�対応����ん。\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "サー��誤��メッセージ� UID �応答����。\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) �削除�れ�������存在�����!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "サー�リスト�メッセージ�挿入�れ����。�り扱��������ん。\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "プロトコルエラー��。\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL を�り込�中�プロトコルエラー�発生����。\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) �削除�れ�������存在�����!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 �� --folder オプション�利用����ん。\n"
 
@@ -2849,22 +2850,22 @@ msgstr "通信先�アプリケーション�交信����ん。%s �交
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "メッセージ�終了 ��� BSMTP ファイルを閉�る際�失敗����。: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "MDA��書�込��エラー�発生����: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA � %d 番�信�を�信����終了����。\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA � 0 以外�ステータス %d を返��終了����。\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2872,20 +2873,20 @@ msgstr ""
 "異常: MDA � pclose � %d を返����。エラー番�%d/%s ����������"
 "り��ん。ファイル %s:%d 行\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 通信先�アプリケーション��信を拒����。\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP � EOM ���る�信エラー��。\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM �対�� 503 以外�予期��応答 %s ��り���。\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/nl.po b/po/nl.po
index 049f4532..edbf56dc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 18:15+0200\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -1176,7 +1176,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-authenticatie wordt afgedwongen.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-authenticatie wordt afgedwongen.\n"
 
 #: fetchmail.c:1654
@@ -1693,48 +1694,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Versturen van logingegevens\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Fout bij uitwisselen van login-gegevens\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kan beveiligingstunnel niet uitvouwen\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Login-gegevens succesvol uitgewisseld\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server vereist integriteit en/of privacy\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Eigenschappen van uitgevouwen beveiligingstunnel: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximale grootte van GSS-token is %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Fout bij het doen van beveiligingsverzoek\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "GSS-login-gegevens worden afgegeven\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Fout bij het afgeven van gegevens\n"
 
@@ -1758,112 +1759,112 @@ msgstr "onjuist berichtenaantal in \"%s\"!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "onjuist EXPUNGE-aantal in \"%s\"!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol herkend als IMAP4 revisie 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol herkend als IMAP4 revisie 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol herkend als IMAP2 of IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "zal nietsdoen na verzoek\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opwaardering naar TLS is geslaagd.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opwaardering naar TLS is mislukt.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benodigde OTP-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benodigde NTLM-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "bericht-expunge komt niet overeen (is %d, waar %d verwacht)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is ongelezen\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is ongelezen\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "opnieuw polsen is mislukt\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d bericht in wachtrij na nieuwe aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na nieuwe aanvraag\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "mailbox-selectie is mislukt\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d bericht in wachtrij na eerste aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na eerste aanvraag\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "expunge is mislukt\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d bericht in wachtrij na expunge\n"
 msgstr[1] "%d berichten in wachtrij na expunge\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "zoeken naar ongelezen berichten is mislukt\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is als eerste nog niet gelezen\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Waarschuwing: server geeft onzinnige berichtgrootten terug.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Onjuist FETCH-antwoord: %s.\n"
@@ -2058,7 +2059,7 @@ msgstr "server recv is mislukt\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Kan OTP-challenge niet decoderen\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Geheime wachtwoordzin: "
 
@@ -2401,7 +2402,7 @@ msgstr "  -r, --folder      te gebruiken map op server\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    voortgangspuntjes ook in logbestanden tonen\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2409,78 +2410,78 @@ msgstr ""
 "Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-"
 "commando in plaats van TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "De CAPA-opdracht is echter nodig voor TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Het maximum aantal toegestane authenticators is bereikt, kan niet verder "
 "gaan.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Vereiste APOP tijdstempel niet aangetroffen in begroeting\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tijdstempel syntaxfout in begroeting\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ongeldig APOP-tijdsstempel.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ongedefinieerd protocol-verzoek in POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "Vergrendeling actief!  Draait er nog een sessie?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "UIDL-respons van upstreamserver kan niet worden verwerkt.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server reageerde met UID voor verkeerd bericht.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) is al verwijderd, maar bestaat nog steeds!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "protocolfout\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocolfout tijdens het ophalen van UIDLs\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) is al verwijderd, maar bestaat nog steeds!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Optie '--folder' is niet mogelijk met POP3\n"
 
@@ -2842,22 +2843,22 @@ msgstr "kan geen contact krijgen met luisterend programma; valt terug naar %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Afbreken bericht of sluiten van BSMTP-bestand is mislukt: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Fout bij schrijven naar MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA is geëlimineerd door signaal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "afsluitwaarde van MDA is niet nul: %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2865,20 +2866,20 @@ msgstr ""
 "Vreemd: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
 "kan dit niet verwerken, op %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-programma weigert te bezorgen\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-bezorgfout op EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Onverwachte respons (niet 503) op LMTP-EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/pl.po b/po/pl.po
index efbc1afb..c6755458 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 19:20+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -1196,7 +1196,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1715,48 +1716,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Wysy³am dane uwierzytelniaj±ce\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Wyst±pi³ b³±d podczas wymiany danych uwierzytelniaj±cych\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nie mogê rozwin±æ danych poziomu bezpieczeñstwa\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Wymiana danych uwierzytelniaj±cych zosta³a zakoñczona\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Serwer wymaga zapewnionej integralno¶ci i/lub prywatno¶ci\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Rozwiniête flagi poziomu bezpieczeñstwa: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksymalny rozmiar symbolu GSS to %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Wyst±pi³ b³±d podczas budowania zapytania o poziom bezpieczeñstwa\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Zwalniam dane uwierzytelniaj±ce GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Wyst±pi³ b³±d podczas zwalniania danych uwierzytelniaj±cych\n"
 
@@ -1780,69 +1781,69 @@ msgstr "b³êdna liczba listów w \"%s\"!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "b³êdna liczba EXPUNGE w \"%s\"!"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokó³ rozpoznany jako IMAP2 lub IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: przej¶cie na TLS powiod³o siê.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: przej¶cie na TLS nie powiod³o siê.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, 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:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "niezgodno¶æ przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu jest nieprzeczytany\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nieprzeczytany\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "ponowne po³±czenie nie powiod³o siê\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1850,11 +1851,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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
 
-#: imap.c:997
+#: imap.c:953
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1862,11 +1863,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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod³o siê\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1874,23 +1875,23 @@ 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nieprzeczytanych listów nie powiod³o siê\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nieprzeczytanym\n"
 
-#: imap.c:1143
+#: imap.c:1099
 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:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "Niepoprawna odpowied¼ na FETCH: %s.\n"
@@ -2088,7 +2089,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Tajne has³o: "
 
@@ -2446,7 +2447,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2454,76 +2455,76 @@ msgstr ""
 "Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", u¿ycie polecenia RETR "
 "zamiast TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "TLS jest wymagany dla tej sesji, ale serwer odrzuci³ polecenie CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Polecenie CAPA jest jednak niezbêdne dla TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, 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:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 "Wyczerpano dozwolone sposoby uwierzytelnienia, nie mo¿na kontynuowaæ.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "B³±d sk³adni znacznika czasu w powitaniu\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "B³êdny znacznik czasu APOP.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pro¶ba o nieznany protokó³ w POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Nie mo¿na obs³u¿yæ odpowiedzi UIDL od serwera.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serwer odpowiedzia³ z UID-em dla niew³a¶ciwego listu.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%u) zosta³ skasowany, ale nadal istnieje!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "b³±d protoko³u\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b³±d protoko³u podczas pobierania UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opcja --folder nie dzia³a z POP3\n"
 
@@ -2882,42 +2883,42 @@ msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Zakoñczenie listu lub zamkniêcie pliku BSMTP nie powiod³o siê: %s\n"
 
 # XXX
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "B³±d podczas pisania do MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna³ %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwróci³ niezerowy kod b³êdu %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, 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"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "serwer SMTP odmówi³ dostarczenia listu\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "B³±d podczas dorêczania LMTP w momencie wykonywania komendy EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, 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:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 625656d6..a8db62eb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-5.4.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2000-07-28 09:40-03:00\n"
 "Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -1188,7 +1188,7 @@ msgstr "Autenticação OTP é suportada\n"
 
 #: fetchmail.c:1651
 #, fuzzy
-msgid "  CRAM-Md5 authentication will be forced.\n"
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "Autenticação CRAM-MD5 é suportada\n"
 
 #: fetchmail.c:1654
@@ -1719,48 +1719,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Enviando credenciais\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Erro na troca de credenciais\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Não foi possível desempacotar dados do nível de segurança\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Troca de credenciais completa\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Servidor requer integridade e/ou privacidade\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempacotadas marcas de nível de segurança: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Tamanho máximo do símbolo GSS é %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Erro criando solicitação de nível de segurança\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando credenciais GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Erro na liberação de credenciais\n"
 
@@ -1786,115 +1786,115 @@ msgstr ""
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mensagem %d não possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "nova tentativa de baixar mensagens falhou\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "seleção de caixa postal falhou\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:1011
+#: imap.c:967
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "falha na busca por mensagens não vistas\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Não foi possível decodificar o desafio OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frase-senha secreta: "
 
@@ -2456,80 +2456,80 @@ msgstr "  -r, --folder      especifica o nome da pasta remota\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Data/horário APOP exigidos não encontrados na saudação\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na data/horário da saudação\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Solicitação de protocolo não definida em POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "arquivo de travamento presente! Há outra sessão ativa?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Mensagens inseridas numa lista no servidor. Não posso tratar isso.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo durante a obtenção de UIDLs\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1448
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opção --remote não é compatível com POP3\n"
@@ -2885,42 +2885,42 @@ msgstr ""
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Erro na liberação de credenciais\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 "O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Cliente SMTP recusou a entrega\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta não-503 para o EOM LMTP: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/ru.po b/po/ru.po
index 93e8f589..16200f12 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2009-06-05 14:53+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -1193,7 +1193,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Будет и�пользована принудительна� аутентификаци� CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1698,48 +1699,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Отправл�ют�� идентификационные данные\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Ошибка обмена идентификационными данными\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "�евозможно было развернуть данные уровн� безопа�но�ти\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Обмен идентификационными данными завершен\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Серверу требуют�� цело�тно�ть и/или конфиденциально�ть\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Флаги развернутого уровн� безопа�но�ти: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Мак�имальный размер маркера GSS - %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Ошибка �оздани� запро�а уровн� безопа�но�ти\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Создают�� идентификационные данные GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Ошибка �оздани� идентификационных данных\n"
 
@@ -1763,116 +1764,116 @@ msgstr "фиктивное количе�тво �ообщений!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Протокол идентифицирован как IMAP4 ревизи� 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Протокол идентифицирован как IMAP2 или IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "будет прио�тановлен по�ле опро�а\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: обновление до TLS выполнено у�пешно.\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: �бой обновлени� до TLS.\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
 "работу\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки OTP\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail �компилирован без требуемой поддержки NTLM\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Требуема� опци� LOGIN не поддерживает�� �ервером\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "разногла�ие при удалении пи�ем (%d на �амом деле != %d ожидало�ь)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu не про�мотрено\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u не про�мотрено\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "не удало�ь повторить опро�\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "не удало�ь выбрать почтовый �щик\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "не удало�ь удалить\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "�бой пои�ка непро�мотренных �ообщений\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u первое не про�мотренное\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Предупреждение: игнорируют�� некорректные данные о размерах �ообщений, "
 "возвращённые �ервером.\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2069,7 +2070,7 @@ msgstr "�ервер прекратил получение\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "�евозможно было декодировать запро� OTP\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Секретна� идентификационна� фраза:"
 
@@ -2424,7 +2425,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    отображение точечной �троки прогре��а даже в log-файлах\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2432,78 +2433,78 @@ msgstr ""
 "Предупреждение: найден POP3/PROXY-�ервер Maillennium; вме�то TOP "
 "и�пользует�� команда RETR.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "Дл� �того �еан�а требует�� и�пользовать TLS, однако �ервер отклонил команду "
 "CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Команда CAPA необходима дл� TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 "%s: �бой принудительного обновлени� до TLS; выполн�ет�� попытка продолжить "
 "работу.\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Закончили�ь допу�тимые аутентификаторы, продолжение невозможно.\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В привет�твии не найдена требуема� временна� метка APOP\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "В привет�твии ошибка �интак�и�а временной метки\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "�едопу�тима� временна� метка APOP.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�еопределённый запро� протокола в POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "блокировка зан�то�ти!  Может активен другой �еан�?\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "�евозможно обработать UIDL-ответ upstream-�ервера.\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Сервер возвратил ответ � UID дл� неверного �ообщени�.\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но в�е еще при�ут�твует!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Сообщени� добавлены в �пи�ок на �ервере. Обработка невозможна.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "ошибка протокола\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ошибка протокола при выборке UIDL'ов\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но в�е еще при�ут�твует!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опци� --folder не поддерживает�� � POP3\n"
 
@@ -2859,22 +2860,22 @@ msgstr "невозможно запуÑ�тить Ñ�лушателÑ�; откат Ð
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "�е удало�ь удалить �ообщение или закрыть файл BSMTP\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Ошибка запи�и в MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA завершен по �игналу %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA возвратил ненулевой �тату� %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2882,20 +2883,20 @@ msgstr ""
 "Странно: MDA pclose возвратил %d и ошибку � номером %d/%s, невозможно "
 "обработать в %s:%d\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Слушатель SMTP отказал в до�тавке\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ошибка до�тавки LMTP на EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�еожиданный не-503 ответ дл� LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/sk.po b/po/sk.po
index 6853debe..4b09c742 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-26 18:23+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1204,7 +1204,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Bude vynútené overenie totožnosti CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1737,53 +1738,53 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 #, fuzzy
 msgid "Sending credentials\n"
 msgstr "Posielam osobné údaje\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 #, fuzzy
 msgid "Error exchanging credentials\n"
 msgstr "Chyba pri výmene osobných údajov\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 #, fuzzy
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nemôžem rozbaliť dáta bezpe�nostnej úrovne\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 #, fuzzy
 msgid "Credential exchange complete\n"
 msgstr "Výmena osobných údajov kompletná\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server vyžaduje integritu a/alebo súkromie\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, fuzzy, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Rozbalené príznaky bezpe�nostnej úrovne: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, fuzzy, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximálna veľkosť GSS symbolu je %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Chyba pri vytváraní žiadosti bezpe�nostnej úrovne\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 #, fuzzy
 msgid "Releasing GSS credentials\n"
 msgstr "Uvoľňujem osobné údaje GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 #, fuzzy
 msgid "Error releasing credentials\n"
 msgstr "Chyba pri uvoľňovaní osobných údajov\n"
@@ -1808,119 +1809,119 @@ msgstr "neplatný po�et správ!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identifikovaný ako IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identifikovaný ako IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identifikovaný ako IMAP2 alebo IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 #, fuzzy
 msgid "will idle after poll\n"
 msgstr "bude ne�inný po stiahnutí\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Požadovaná funkcia OTP nebola preložená do fetchmail-u\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Požadovaná funkcia NTLM nebola preložená do fetchmail-u\n"
 
-#: imap.c:666
+#: imap.c:622
 #, fuzzy
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Požadovaná funkcia LOGIN nie je podporovaná servrom\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "správa %s@%s:%d nemala o�akávanú dĺžku (%d aktuálne != %d o�akávané)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u je nepre�ítaných\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, fuzzy, c-format
 msgid "%u is unseen\n"
 msgstr "%u je nepre�ítaných\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 #, fuzzy
 msgid "re-poll failed\n"
 msgstr "stiahnutie zlyhalo\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d správ �aká po stiahnutí\n"
 msgstr[1] "%d správ �aká po stiahnutí\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "výber poštového prie�inka zlyhal\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d správ �aká po prvom stiahnutí\n"
 msgstr[1] "%d správ �aká po prvom stiahnutí\n"
 
-#: imap.c:1011
+#: imap.c:967
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "vymazanie zlyhalo\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d správ �aká po prvom vymazaní\n"
 msgstr[1] "%d správ �aká po prvom vymazaní\n"
 
-#: imap.c:1054
+#: imap.c:1010
 #, fuzzy
 msgid "search for unseen messages failed\n"
 msgstr "vyhľadávanie nepre�ítaných správ zlyhalo\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je prvá nepre�ítaná\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2121,7 +2122,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Nepodarilo sa dekódovať OTP výzvu\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
@@ -2450,80 +2451,80 @@ msgstr ""
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Voľba --folder nie je podporovaná s POP3\n"
 
@@ -2875,41 +2876,41 @@ msgstr ""
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr ""
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr ""
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/sq.po b/po/sq.po
index be6f1d87..9f1e6bfe 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2008-02-29 00:24+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -1205,7 +1205,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1719,48 +1720,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Po dërgoj kredenciale\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Gabim gjatë shkëmbimit të kredencialeve\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nuk munda të hap të dhëna niveli sigurie\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Shkëmbim kredencialesh i plotësuar\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Shërbyesi lyp integritet dhe/ose vetësi\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Hapa shenja niveli sigurie: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Madhësia më e madhe për \"token\" GSS është %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Gabim në krijim kërkese niveli sigurie\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "Po jap kredenciale GSS\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Gabim dhënieje kredencialesh\n"
 
@@ -1784,113 +1785,113 @@ msgstr "numërim mesazhesh me gabime!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokoll i identifikuar si IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "do të rrijë bosh pas vjeljeje\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme OTP e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
 
-#: imap.c:730
+#: imap.c:686
 #, 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:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "rivjelja dështoi\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "përzgjedhja e kutisë postare dështoi\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "shuarja dështoi\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2086,7 +2087,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Frazë pass sekrete: "
 
@@ -2426,7 +2427,7 @@ 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:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2434,75 +2435,75 @@ msgstr ""
 "Kujdes: U gjet \"Maillennium POP3/PROXY server\", po përdor urdhrin RETR në "
 "vend të TOP.\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore në përshëndetje\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 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:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
 
@@ -2861,41 +2862,41 @@ msgstr "s'ia dal dot me dëgjuesin; po rikthehem te %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Dështoi përfundim mesazhi ose mbyllje e kartelës BSMTP\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gabim në fshirjen e kartelës \"%s\": %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA riktheu gjendje jo zero %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, 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:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Gabim shpërndarjeje LMTP në EOM\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Përgjigje jo-503 e papritur për LMTP EOM: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/tr.po b/po/tr.po
index a5789d83..ec8e524d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2003-10-17 17:27+0200\n"
 "Last-Translator: Engin Gündüz <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -1220,7 +1220,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kanýtlamasý istenecek.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kanýtlamasý istenecek.\n"
 
 #: fetchmail.c:1654
@@ -1768,48 +1769,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "Credential'lar gönderiliyor\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Credential takasýnda hata\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Güvenlik düzeyi verisi elde edilemedi\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Crendential takasý tamamlandý\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Sunucu iç tutarlýlýk ve/ya da mahremiyet gerektiriyor\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Güvenlik düzeyi bayraklarý: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "En büyük GSS token boyutu %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Güvenlik düzeyi isteðini oluþtururken hata\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "GSS credential'larý býrakýlýyor\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Credential'lar býrakýlýrken hata\n"
 
@@ -1833,114 +1834,114 @@ msgstr "sahte ileti sayýsý!"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr ""
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol IMAP4 rev 1 olarak belirlendi\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol IMAP rev 0 olarak belirlendi.\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "yoklamadan sonra idle kalýnacak\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli OTP desteði ile derlenmemiþ\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli NTLM desteði ile derlenmemiþ\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yeteneðini desteklemiyor\n"
 
-#: imap.c:730
+#: imap.c:686
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "%s@%s:%d iletisinin uzunluðu beklendiði kadar deðil (gerçekte %d != beklenen "
 "%d)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u görülmemiþ\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u görülmemiþ\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama baþarýsýz oldu\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "yeniden yokladýktan sonra %d ileti bekliyor\n"
 msgstr[1] "yeniden yokladýktan sonra %d ileti bekliyor\n"
 
-#: imap.c:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu seçimi baþarýsýz oldu\n"
 
-#: imap.c:997
+#: imap.c:953
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ilk yoklamadan sonra %d ileti bekliyor\n"
 msgstr[1] "ilk yoklamadan sonra %d ileti bekliyor\n"
 
-#: imap.c:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "silme baþarýsýz oldu\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "silinmeden sonra %d ileti bekliyor\n"
 msgstr[1] "silinmeden sonra %d ileti bekliyor\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "görülmemiþ iletileri arama iþlemi baþarýsýz oldu\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ilk görülmemiþ\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2137,7 +2138,7 @@ msgstr "sunucu recv ölümcül\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'ýnýn kodu çözülemedi\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
@@ -2479,82 +2480,82 @@ msgstr ""
 "      --showdots    ilerlemeyi gösteren noktalarý kayýt dosyalarýnda bile "
 "göster\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
 # timestamp = zaman damgasý (zaman belirteci daha doðal olurdu bence ama böyle kullanýlmýþ
 # baþka yerlerde)
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgasý selamlama içerisinde bulunamadý\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama içindeki zaman damgasýnda sözdizim yanlýþý var\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tanýmlanmamýþ protokol isteði\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit meþgul!  Baþka bir oturum açýk olabilir\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:860
+#: pop3.c:836
 #, fuzzy, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) silinmiþti, fakat hala burada!\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmuþ. Bu durumu idare edemem.\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "protokol hatasý\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatasý\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) silinmiþti, fakat hala burada!\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "--remote seçeneði POP3 ile desteklenmiyor\n"
@@ -2920,41 +2921,41 @@ msgstr ""
 "Ýletiyi bitirme ya da BSMTP dosyasýný kapatma iþlemi baþarýsýzlýkla "
 "sonuçlandý\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, fuzzy, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile öldürüldü\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA sýfýrdan baþka bir durum kodu döndürdü (%d)\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, fuzzy, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Garip: MDA pclose durum kodu olarak %d döndürdü, %s:%d'de sorun\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi daðýtýmý reddetti\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ýleti sonunda LMTP daðýtým hatasý\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM'a beklenmeyen, 503 olmayan yanýt: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 #, fuzzy
 msgid ""
 "-- \n"
diff --git a/po/vi.po b/po/vi.po
index 4186ff86..4bd8ad48 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.17-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-05-03 18:18+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1167,7 +1167,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức OTP.\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức CRAM-Md5.\n"
 
 #: fetchmail.c:1654
@@ -1669,48 +1670,48 @@ msgstr ""
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "�ang gởi thông tin sác thực...\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "Gặp lỗi khi trao đổi thông tin xác thực\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "Không thể mở b�c dữ liệu cấp bảo mật\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "Việc trao đổi thông tin xác thực là hoàn thành\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Máy phục vụ cần thiết sự tích hợp và/hay sự riêng tự\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Các c� cấp bảo mật đã mở b�c: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Kích cỡ hiệu bài GSS tối đa là %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "Gặp lỗi khi tạo yêu cầu cấp bảo mật\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "�ang phát hành thông tin xác thực GSS...\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "Gặp lỗi khi phát hành thông tin xác thực\n"
 
@@ -1734,113 +1735,113 @@ msgstr "gặp số đếm thư giả trong « %s » !"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "gặp số đếm EXPUNGE sai trong « %s » !"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Giao thức được phát hiện là IMAP4 rev 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Giao thức được phát hiện là IMAP4 rev 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "sẽ nghỉ sau khi thăm dò\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, 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:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, 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:521
+#: imap.c:477
 #, 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"
 
-#: imap.c:637
+#: imap.c:593
 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:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 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:666
+#: imap.c:622
 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"
 
-#: imap.c:730
+#: imap.c:686
 #, 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:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu chÆ°a xem\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u chÆ°a xem\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "việc thăm dò lại bị lỗi\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "việc ch�n hộp thư bị lỗi\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "việc xoá hẳn bị lỗi\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, 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:1054
+#: imap.c:1010
 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:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u là thư đầu chưa xem\n"
 
-#: imap.c:1143
+#: imap.c:1099
 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:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr ""
@@ -2035,7 +2036,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:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "Cụm từ mật khẩu bí mật: "
 
@@ -2400,7 +2401,7 @@ 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"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2408,81 +2409,81 @@ 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:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 "Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối "
 "lệnh CAPA.\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Còn lệnh CAPA cần thiết cho TLS.\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, 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"
 
-#: pop3.c:647
+#: pop3.c:623
 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:661
+#: pop3.c:637
 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:670
+#: pop3.c:646
 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:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "Nhãn gi� APOP không hợp lệ.\n"
 
-#: pop3.c:710
+#: pop3.c:686
 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"
 
-#: pop3.c:731
+#: pop3.c:707
 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:810
+#: pop3.c:786
 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:833
+#: pop3.c:809
 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:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (số=%u) đã được xoá b�, nhưng còn có !\n"
 
-#: pop3.c:966
+#: pop3.c:942
 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"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "lỗi giao thức\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, 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:1448
+#: pop3.c:1424
 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"
 
@@ -2838,22 +2839,22 @@ msgstr "không thể liên lạc với bộ lắng nghe nên dự trữ v� %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "Việc kết thúc thư hay đóng tập tin BSMTP bị lỗi: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Gặp lỗi khi ghi vào MDA: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA đã kết thúc vì tín hiệu %d\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, 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:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2861,20 +2862,20 @@ 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:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "Bộ lắng nghe SMTP đã từ chối việc phát\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "Lỗi phát LMTP tại kết thúc thư\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, 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:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88dc7dc3..d9154526 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.18-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-09-27 13:36+0200\n"
+"POT-Creation-Date: 2010-10-09 13:33+0200\n"
 "PO-Revision-Date: 2010-09-19 14:34+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1130,7 +1130,8 @@ msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验�\n"
 
 #: fetchmail.c:1651
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr " 强制 CRAM-Md5 验�\n"
 
 #: fetchmail.c:1654
@@ -1611,48 +1612,48 @@ msgstr "如您想使用 GSSAPI，您首先需��书，也许�自 kinit。\n
 
 #: gssapi.c:158
 #, c-format
-msgid "Warning: received malformed challenge to \"%s GSSAPI\"!\n"
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
 msgstr ""
 
-#: gssapi.c:167
+#: gssapi.c:168
 msgid "Sending credentials\n"
 msgstr "正在���书\n"
 
-#: gssapi.c:197
+#: gssapi.c:199
 msgid "Error exchanging credentials\n"
 msgstr "交��书时出错\n"
 
-#: gssapi.c:239
+#: gssapi.c:241
 msgid "Couldn't unwrap security level data\n"
 msgstr "无法解开加密数�\n"
 
-#: gssapi.c:244
+#: gssapi.c:246
 msgid "Credential exchange complete\n"
 msgstr "�书交�完�\n"
 
-#: gssapi.c:248
+#: gssapi.c:250
 msgid "Server requires integrity and/or privacy\n"
 msgstr "�务器�求完整性和(或)��检查\n"
 
-#: gssapi.c:257
+#: gssapi.c:259
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "解开的加密标识: %s%s%s\n"
 
-#: gssapi.c:261
+#: gssapi.c:263
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "最大 GSS 标识大�为 %ld\n"
 
-#: gssapi.c:274
+#: gssapi.c:276
 msgid "Error creating security level request\n"
 msgstr "创建加密请求时出错\n"
 
-#: gssapi.c:285
+#: gssapi.c:287
 msgid "Releasing GSS credentials\n"
 msgstr "正在清空 GSS �书\n"
 
-#: gssapi.c:289
+#: gssapi.c:291
 msgid "Error releasing credentials\n"
 msgstr "清空�书时出错\n"
 
@@ -1676,109 +1677,109 @@ msgstr "�现伪造邮件\"%s\"�"
 msgid "bogus EXPUNGE count in \"%s\"!"
 msgstr "�现伪造的EXPUNGE \"%s\"�"
 
-#: imap.c:388
+#: imap.c:344
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "�议被识别为 IMAP4 版本 1\n"
 
-#: imap.c:394
+#: imap.c:350
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "�议被识别为 IMAP4 版本 0\n"
 
-#: imap.c:401
+#: imap.c:357
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "�议被识别为 IMAP2 或 IMAP2BIS\n"
 
-#: imap.c:416
+#: imap.c:372
 msgid "will idle after poll\n"
 msgstr "收件���至 idle 模�\n"
 
-#: imap.c:508 pop3.c:518
+#: imap.c:464 pop3.c:476
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: �功�级至 TLS �议。\n"
 
-#: imap.c:517 pop3.c:527
+#: imap.c:473 pop3.c:485
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: �级至 TLS �议失败。\n"
 
-#: imap.c:521
+#: imap.c:477
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: �时�级至 TLS �议失败，继续�试\n"
 
-#: imap.c:637
+#: imap.c:593
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "需�的 OTP 功能未被编译进 fetchmail\n"
 
-#: imap.c:657 pop3.c:385
+#: imap.c:613 pop3.c:560
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "需�的 NTLM 功能未被编译进 fetchmail\n"
 
-#: imap.c:666
+#: imap.c:622
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "需�的 LOGIN 功能未被编译进 fetchmail\n"
 
-#: imap.c:730
+#: imap.c:686
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "邮件删除数�相等 (实际删除 %d �!= 已删除 %d �)\n"
 
-#: imap.c:869
+#: imap.c:825
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu �未读\n"
 
-#: imap.c:933 pop3.c:869 pop3.c:881 pop3.c:1119 pop3.c:1126
+#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u 未读\n"
 
-#: imap.c:968 imap.c:1027
+#: imap.c:924 imap.c:983
 msgid "re-poll failed\n"
 msgstr "�新收件失败\n"
 
-#: imap.c:976 imap.c:1032
+#: imap.c:932 imap.c:988
 #, 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:993
+#: imap.c:949
 msgid "mailbox selection failed\n"
 msgstr "邮箱选择失败\n"
 
-#: imap.c:997
+#: imap.c:953
 #, 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:1011
+#: imap.c:967
 msgid "expunge failed\n"
 msgstr "删除�作失败\n"
 
-#: imap.c:1015
+#: imap.c:971
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "删除�作�有 %d �邮件等待收�\n"
 
-#: imap.c:1054
+#: imap.c:1010
 msgid "search for unseen messages failed\n"
 msgstr "查找未读邮件失败\n"
 
-#: imap.c:1059 pop3.c:890
+#: imap.c:1015 pop3.c:866
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
-#: imap.c:1143
+#: imap.c:1099
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "警告: 忽略�务器返回的邮件大�的无效数�。\n"
 
-#: imap.c:1241 imap.c:1248
+#: imap.c:1197 imap.c:1204
 #, c-format
 msgid "Incorrect FETCH response: %s.\n"
 msgstr "FETCH �应�正确: %s。\n"
@@ -1973,7 +1974,7 @@ msgstr "�务器 recv 错\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "无法解� OTP 请求\n"
 
-#: opie.c:64 pop3.c:611
+#: opie.c:64 pop3.c:587
 msgid "Secret pass phrase: "
 msgstr "密�短语:"
 
@@ -2295,80 +2296,80 @@ msgstr " -r, --folder\t指定远程邮箱�\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots\t�使在日志文件中也�显示进度�(以点的形�)\n"
 
-#: pop3.c:355
+#: pop3.c:328
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr "警告: �现“ POP3 代��务器�，用 RETR 命令代替 TOP。\n"
 
-#: pop3.c:454
+#: pop3.c:412
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "强制使用 TLS 会�，但�务器拒� CAPA 命令。\n"
 
-#: pop3.c:455
+#: pop3.c:413
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "而 CPAC 命令对于 TLS �议�说是必须�有的。\n"
 
-#: pop3.c:538
+#: pop3.c:496
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: �级到 TLS �议失败了，继续�试。\n"
 
-#: pop3.c:647
+#: pop3.c:623
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "我们已�用完了�用的验�方�，无法继续\n"
 
-#: pop3.c:661
+#: pop3.c:637
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在 greeting 中未�现所需的 APOP 时间戳\n"
 
-#: pop3.c:670
+#: pop3.c:646
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中时间戳语法错误\n"
 
-#: pop3.c:686
+#: pop3.c:662
 msgid "Invalid APOP timestamp.\n"
 msgstr "无效的 APOP 时间戳\n"
 
-#: pop3.c:710
+#: pop3.c:686
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中有未定义的�议请求\n"
 
-#: pop3.c:731
+#: pop3.c:707
 msgid "lock busy!  Is another session active?\n"
 msgstr "死��是�有�一个会�在�行？\n"
 
-#: pop3.c:810
+#: pop3.c:786
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "无法�作�自上游�务器的 UIDL �应。\n"
 
-#: pop3.c:833
+#: pop3.c:809
 msgid "Server responded with UID for wrong message.\n"
 msgstr "�应的�务器带有错误消�的 UID。\n"
 
-#: pop3.c:860
+#: pop3.c:836
 #, c-format
 msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (数�=%u �)已被删除，但�然存在�\n"
 
-#: pop3.c:966
+#: pop3.c:942
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "邮件被�入�务器列表。无法处�。\n"
 
-#: pop3.c:1062
+#: pop3.c:1038
 msgid "protocol error\n"
 msgstr "�议错\n"
 
-#: pop3.c:1078
+#: pop3.c:1054
 msgid "protocol error while fetching UIDLs\n"
 msgstr "正在读� UIDLs 时�议出错\n"
 
-#: pop3.c:1110
+#: pop3.c:1086
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id = %s (数� = %d �) 已被删除，但�然存在�\n"
 
-#: pop3.c:1448
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 �支� --folder 选项\n"
 
@@ -2720,41 +2721,41 @@ msgstr "无法�动 MDA 代�；正在转到 MDA 代� %s"
 msgid "Message termination or close of BSMTP file failed: %s\n"
 msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
 
-#: sink.c:1410
+#: sink.c:1408
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "写入 MDA 时出错: %s\n"
 
-#: sink.c:1413
+#: sink.c:1411
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA 被信� %d 终止\n"
 
-#: sink.c:1416
+#: sink.c:1414
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA 返回�零值 %d\n"
 
-#: sink.c:1419
+#: sink.c:1417
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s，在 %s:%d 无法处�\n"
 
-#: sink.c:1444
+#: sink.c:1442
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 端拒�投递\n"
 
-#: sink.c:1474
+#: sink.c:1472
 msgid "LMTP delivery error on EOM\n"
 msgstr "邮件结尾时用 LTMP �议投递错误\n"
 
-#: sink.c:1477
+#: sink.c:1475
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "邮件结尾时 LMTP �议的未知的� 503 �应: %s\n"
 
-#: sink.c:1632
+#: sink.c:1630
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"