From 6289562c4c47bdbbafe1d93e8e4bde4961d7b08b Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 6 Jan 2006 13:28:53 +0000
Subject: Snapshot 6.3.2-rc1.

svn path=/branches/BRANCH_6-3/; revision=4608
---
 configure.ac |   2 +-
 po/ca.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/cs.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/es.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/fr.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/ja.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/pl.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/ru.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 po/sq.po     | 354 ++++++++++++++++++++++++++++++-----------------------------
 9 files changed, 1433 insertions(+), 1401 deletions(-)

diff --git a/configure.ac b/configure.ac
index fcbebaf7..51984601 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT([fetchmail],[6.3.2-pre1],[fetchmail-users@lists.berlios.de])
+AC_INIT([fetchmail],[6.3.2-rc1],[fetchmail-users@lists.berlios.de])
 AC_CONFIG_SRCDIR([fetchmail.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_LIBOBJ_DIR([.])
diff --git a/po/ca.po b/po/ca.po
index 90801a55..b94f2268 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.0\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-12-06 17:53+0100\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -936,280 +936,280 @@ msgstr ""
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "En mode dimoni les opcions `fetchall' i `keep on' s�n incompatibles!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogant %s (protocol %s) el %s: consulta iniciada\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no est� configurat.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no est� configurat.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no est� configurat.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no est� configurat.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no est� configurat.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no est� suportat.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogant %s (protocol %s) el %s: consulta finalitzada\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes �s de %d segons\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre �s %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions �s %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrar� via syslog\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascarar� i no generar� cap�aleres Recieved\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "El fetchmail mostrar� punts de progressi� �dhuc als fitxers de registre.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "El fetchmail enviar� els missatges multidrop mal adre�ats a %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigir� els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigir� els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a l'obtenci� de %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindr� via %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Aquest servidor es consultar� a cada interval.\n"
 msgstr[1] "  Aquest servidor es consultar� cada %d intervals.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom aut�ntic del servidor �s %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Aquest host no es consultar� quan no se'n hagi especificat cap altre.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Aquest host es consultar� quan no se'n hagi especificat cap altre.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanar� la contrasenya.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificaci� RPOP = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol �s KPOP amb autenticaci� per Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol �s %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'�s d'UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els m�todes d'autenticaci� disponibles.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per contrasenya.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per MSN.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligar� l'autenticaci� per Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat �s d'extrem a extrem.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu �s: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovaci� del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confian�a: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Empremta de la clau SSL (comprovada contra la clau del servidor): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El temps d'espera de la resposta del servidor �s de %d segons"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la b�stia per defecte.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Les b�sties seleccionades s�n:"
 
 # al tanto amb la substituci�
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Es descarregaran tots els missatges (--all on).\n"
 
 # al tanto amb la substituci�
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Nom�s es descarregaran els missatges nous (--all off).\n"
 
 # la substituci� �s: "<espai>/ no "
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Els missatges obtinguts no s'eliminaran del servidor (--keep on).\n"
 
 # la substituci� �s: "<espai>/ no "
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Els missatges obtinguts no es conservaran al servidor (--keep off).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Els missatges vells s'eliminaran abans d'obtenir el correu (--flush on).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Els missatges vells no s'eliminaran abans d'obtenir el correu (--flush "
 "off).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 "  Els missatges excessivament grans s'eliminaran abans d'obtenir el correu "
 "(--limitflush on).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1225,332 +1225,332 @@ msgstr ""
 "  Els missatges excessivament grans no s'eliminaran abans d'obtenir el "
 "correu (--limitflush off).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La reescriptura d'adreces locals est� habilitada (--norewrite off).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La reescriptura d'adreces locals est� deshabilitada (--norewrite on).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  L'eliminaci� de retorns de carro est� habilitada (stripcr on).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  L'eliminaci� de retorns de carro est� deshabilitada (stripcr off).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  L'inserci� de retorns de carro est� habilitada (forcecr on).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  L'inserci� de retorns de carro est� deshabilitada (forcecr off).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interpretaci� del Content-Transfer-Encoding est� deshabilitada "
 "(pass8bits on).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interpretaci� del Content-Transfer-Encoding est� habilitada (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  El desxifrat MIME est� habilitat (mimedecode on).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  El desxifrat MIME est� deshabilitat (mimedecode off).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  La pausa despr�s de cada obtenci� est� habilitada (idle on).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  La pausa despr�s de cada obtenci� est� deshabilitada (idle off).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Les l�nies Status que no estiguin en blanc es descartaran (dropstatus on)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Les l�nies Status que no estiguin en blanc es mantindran (dropstatus off)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les l�nies Delivered-To es descartaran (dropdelivered on)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les l�nies Delivered-To es mantindran (dropdelivered off)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  El l�mit de mida dels missatges �s de %d octets (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha l�mit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  L'interval d'avisos de missatges grans �s de %d segons (--warnings %d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de missatges grans a cada obtenci� (--warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  El l�mit de missatges obtinguts �s de %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha l�mit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  El l�mit de mida dels missatges �s de %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha l�mit de mida dels missatges (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Es far� una cerca bin�ria de UIDs a cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Es far� una cerca bin�ria de UIDs %d consultes de cada %d (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Es far� una cerca lineal de UIDs a cada consulta (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El l�mit de missatges enviats en s�rie �s de %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No hi ha l�mit de missatges enviats en s�rie (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  L'interval entre supressions �s de %d missatge(s) eliminat(s) (--expunge %"
 "d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins el final (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollir� el correu s�n:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (per omissi�)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Els missatges s'afegiran a %s com a BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El nom del host a la l�nia MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adre�a de les l�nies RCPT TO enviades per SMTP ser� %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam s�n:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam est� deshabilitat\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexi� amb el servidor s'iniciar� amb \"%s\".\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexi�.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexi� amb el servidor es finalitzar� amb \"%s\".\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexi�.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "S'ha reconegut %d nom local.\n"
 msgstr[1] "S'han reconegut %d noms locals.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop est� habilitada.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop est� deshabilitada.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Els �lies del servidor es compararan amb les adreces multidrop per adre�a "
 "IP.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Els �lies del servidor es compararan amb les adreces multidrop pel nom.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adre�a de l'embolcall est� deshabilitat.\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  S'assumeix que la cap�alera de l'embolcall �s: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nombre de cap�aleres de l'embolcall que s'ignoraran: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Es suprimir� el prefix %s del nom d'usuari\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimir� cap prefix\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  �lies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexi� s'establir� a trav�s de l'interf�cie %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interf�cie requerida.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorar� l'interf�cie %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interf�cie a monitorar.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Les connexions amb el servidor es faran via %s (--plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexi�.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Les connexions amb el receptor SMTP es faran via %s (--plugout %s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexi� per SMTP.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  S'afegir� el rastre de l'obtenci� a la cap�alera Received.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1558,7 +1558,7 @@ msgstr ""
 "  No s'afegir� el rastre de l'obtenci� a la cap�alera Received.\n"
 ".\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
@@ -1698,12 +1698,12 @@ msgstr[1] "hi ha %d missatges esperant despr
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �s no llegit\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �s el primer missatge no llegit\n"
@@ -2229,33 +2229,37 @@ msgstr "Petici
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessi� activa?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opci� --folder no est� suportada per POP3\n"
 
@@ -2516,96 +2520,96 @@ msgstr "No s'ha pogut resoldre el servei %s a un n
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Si us plau, especifiqueu el servei com a un n�mero decimal de port.\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviant a %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cos del missatge retornat)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correu de %s retornat a %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'error desat encara �s %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Ha fallat l'obertura del fitxer BSMTP o l'escriptura del pre�mbul\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adre�a del destinatari `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adre�a de destinaci� `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adre�a coincideix; el postmaster no est� definit.\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adre�a coincideix; reenviant a %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "no s'ha pogut executar l'MDA\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexi� %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no s'ha pogut lliurar via SMTP; recorrent a %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 "Estrany: La funci� pclose de l'MDA a retornat %d, no es pot continuar a %s:%"
 "d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ha fallat la terminaci� del missatge o el tancament del fitxer BSMTP\n"
 
@@ -2622,7 +2626,7 @@ msgstr "Error de lliurament LMTP a EOM\n"
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta no-503 inesperada al final del missatge LMTP: %s\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2630,32 +2634,32 @@ msgstr ""
 "-- \n"
 "El Dimoni Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticaci� CRAM-MD5 per ESMTP...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "El servidor ha rebutjat l'ordre AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "La resposta en base64 del servidor �s incorrecta.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Repte desxifrat com a %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autenticaci� per ESMTP sense xifrat...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticaci� de LOGIN per ESMTP...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "error de protocol del receptor smtp\n"
 
@@ -2788,24 +2792,24 @@ msgstr "Error en verificar el certificat del servidor: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emissor desconegut (primers %d car�cters): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor del fitxer fora d'abast per SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "El protocol SSL especificat `%s' no �s v�lid, s'usa SSLv23.\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La verificaci� del certificat o de l'empremta s'ha om�s!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
 
diff --git a/po/cs.po b/po/cs.po
index ba6ff1eb..d77a397a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.2.6.alpha1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-07-03 03:57+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -910,98 +910,98 @@ msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMT
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall a keep on zároveň v režimu démona je chyba!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukončen signálem %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování začato\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "Podpora POP2 není nastavena.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "Podpora POP3 není nastavena.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "Podpora IMAPu není nastavena.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "Podpora ETRN není nastavena.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "Podpora ODMR není nastavena.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "zvolen nepodporovaný protokol.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování dokončeno\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval stahování je %d sekund\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Soubor záznamů je %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Soubor ID je %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Zprávy o průběhu budou zaznamenávny pomocí syslogu\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se bude skrývat a nebude generovat Received\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazovat tečky průběhu i v souborech záznamů.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail bude přeposílat špatně adresované zprávy ze společných schránek na "
 "%s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude chybové zprávy posílát postmasterovi.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude chybové zprávy posílát odesílateli.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Možnosti pro stahování z %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude stahována z %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
@@ -1009,177 +1009,177 @@ msgstr[0] "  K stahování z tohoto serveru dojde každý %d interval.\n"
 msgstr[1] "  K stahování z tohoto serveru dojde každé %d intervaly.\n"
 msgstr[2] "  K stahování z tohoto serveru dojde každých %d intervalů.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skutečné jméno serveru je %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Pokud není zadán žádný počítač, nebude se stahovat z tohoto počítače.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Pokud není zadán žádný počítač, bude se stahovat z tohoto počítače.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  Bude požadováno heslo.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Tajemství APOP = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\"\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " Protokol je KPOP s autentizací Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr " Protokol je %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr "  (pomocí služby %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (pomocí implicitního portu)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr "  (vynuceně používám UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budou vyzkoušeny všechny dostupné metody autentizace.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace heslem.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Předpokládám šifrované spojení.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principal poštovní služby je: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sezení šifrovaná s SSL povolena.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL povolena.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresář důvěryhodných certifikátů SSL: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Otisk klíče SSL (porovnáván s klíčem serveru): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Čas čekání na odpověď serveru je %d sekund"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (implicitní).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  Zvolena implicitní poštovní schránka.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Zvolené poštovní schránky jsou:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Budou staženy všechny zprávy (--all zapnuto).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Budou staženy jen nové zprávy (--all vypnuto).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stažené zprávy budou ponechány na serveru (--keep zapnuto).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stažené zprávy nebudou ponechány na serveru (--keep vypnuto).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Před začátkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Před začátkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1187,7 +1187,7 @@ msgid ""
 msgstr ""
 "  Před začátkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1195,216 +1195,216 @@ msgid ""
 msgstr ""
 "  Před začátkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Přepisování adres místních naserveru je povoleno (--norewrite vypnuto).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Přepisování adres místních naserveru je zakázáno (--norewrite zapnuto).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Mazání CR je povoleno (stripcr zapnuto).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Mazání CR je zakázáno (stripcr vypnuto).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynucení CR je povoleno (forcecr zapnuto).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódování MIME je povoleno (mimedecode zapnuto).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódování MIME je zakázáno (mimedecode vypnuto).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nečinnost po stahování je povolena (idle zapnuto).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nečinnost po stahování je zakázána (idle vypnuto).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit velikosti zprávy je %d oktetů (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Žádný limit velikosti zprávy (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval varování o velikosti zpráv je %d vteřin (--warnings %d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varování o velikosti při každém stahování (--warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit přijatých zpráv je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Žádný Limit přijatých (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit velikosti stahovaných zpráv je %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Hledat UID při každém stahování binárně (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "  Hledat UID při binárně při %d z %d stahování (--fastuidl %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "  Hledat UID při každém stahování lineárně (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky zpráv SMTP je %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Žádný limit dávky zpráv SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Interval odstraňování mezi čištěním vynucen na %d (--expunge %d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Žádná vynucená čištění (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény, pro které se bude stahovat pošta, jsou:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (implicitní)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Zprávy budou připojeny k %s jako BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Zprávy budou doručeny pomocí \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Zprávy budou přeposlány pomocí %cMTP na:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Název počítače v řádku MAIL FROM bude %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznávané odpověďi serveru blokující spam jsou:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokování spamu zakázáno\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Připojení k serveru bude navázáno pomocí \"%s\"\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  Žádný příkaz před spojením.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Připojení k serveru bude ukončeno pomocí \"%s\"\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  Žádný příkaz po spojení.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nedeklarována žádná místní jména tohoto počítače.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  Režim společných schránek: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  Režim soukromých schránek: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1412,119 +1412,119 @@ msgstr[0] "Rozpoznáváno %d místní jméno.\n"
 msgstr[1] "Rozpoznávána %d místní jména.\n"
 msgstr[2] "Rozpoznáváno %d místních jmen.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy společných schránek je povoleno.s\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy společných schránek je zakázáno.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Přezdívky serveru budou porovnávány s adresami společných schránek podle "
 "IP adres.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Přezdívky serveru budou porovnávány s adresami společných schránek podle "
 "názvu.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Předpokládá se, že hlavička obálky je: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Počet hlaviček obálky, které zpracovávat: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Předpona %s bude odtržena od id uživatele\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  Žádné odtrhávání předpony\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Deklarované přezdívky poštovního serveru:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  Místní domény:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojení musí procházet přes %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  Nezadán žádný požadavek na rozhraní.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Stahovací smyčka bude sledovat %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  Nezadáno žádné sledované rozhraní.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Připojení k posluchači budou navazovány zásuvným modulem %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  Nezadán žádný příkaz výstupního zásuvného modulu.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Z tohoto počítače neukládána žádná UID.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Ukládáno %d UID.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Informace pro sledování stahování budou přidány do hlavičky Recieved.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 "  Informace pro sledování stahování nebudou přidány do hlavičky Recieved.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Předávané vlastnosti \"%s\".\n"
@@ -1667,12 +1667,12 @@ msgstr[2] "%d zpráv čeká po vyčištění\n"
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepřečtených zpráv selhalo\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla přečtena\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepřečtená\n"
@@ -2184,32 +2184,36 @@ msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 msgid "lock busy!  Is another session active?\n"
 msgstr "zamčeno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Přepínač --remote není s POP3 podporován\n"
@@ -2469,93 +2473,93 @@ msgstr ""
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "přeposílám na %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tělo hlášení o chybě)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "o zprávě od %s posláno hlášení o chybě %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Uložená chyba je stále %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Chyba %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "otevření souboru BSMTP nebo zápis preambule selhal\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "démonovi %cMTP se nelíbí adresa příjemce `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "démonovi %cMTP se opravdu nelíbí adresa příjemce `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "neodpovídá žádná adresa; nenastaven postmaster.\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nelze odeslat ani na %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "neodpovídá žádná adresa; přeposílám na %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "chystám se doručit pomocí: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "otevírání MDA sehalo\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "připojení%cMTP k %s selhalo\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "nemohu se spustit démona; nahrazuji jej %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA umřel na signál %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA vrátil nenulový stav %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Divné: pclose MDA vrátilo %d, neumím obsloužit na %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ukončení zprávy nebo zavření souboru BSMTP selhalo\n"
 
@@ -2572,7 +2576,7 @@ msgstr "Chyba doručování LMTP při EOM\n"
 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:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2580,32 +2584,32 @@ msgstr ""
 "-- \n"
 "Démon Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autentizace ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Server odmítl příkaz AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Špatné base64 odpovědi od serveru.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Výzva dekódována: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autentizace ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autentizace ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "chyba protokolu démona smtp\n"
 
@@ -2733,24 +2737,24 @@ msgstr "Chyba ověřování certifikátu serveru: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "neznámý vydavatel (prvních %d znaků): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "Deskriptor souboru mimo rozsah pro SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Zadán neplatný protokol SSL `%s', používám implicitní (SSLv23).\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Ověření certifikátu/otisku bylo nějak přeskočeno!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Další pokus čtení ze socektu Cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Další pokus čtení ze socektu Cygwin selhal!\n"
 
diff --git a/po/es.po b/po/es.po
index 6b029a5a..7a4fbb5f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6-pre8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-07-26 15:56-0300\n"
 "Last-Translator: Javier Kohen <jkohen@users.sourceforge.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -932,277 +932,277 @@ msgstr ""
 "¡Usar ‘fetchall’ junto a ‘keep’ en modo de ejecución en segundo plano es un "
 "error!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogando a %s (protocolo %s) en %s: consulta iniciada\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "fue seleccionado un protocolo no soportado.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogando %s (protocolo %s) en %s: consulta terminada\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso serán registrados vía syslog\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará ‘Received’\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes ‘multidrop’ mal direccionados a %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al ‘postmaster’.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo será recibido vía %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  La consulta de este servidor ocurrirá cada %d intervalo.\n"
 msgstr[1] "  La consulta de este servidor ocurrirá cada %d intervalos.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Esta máquina sólo será interrogada si una máquina es especificada.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta máquina será interrogada cuando no se especifique una máquina.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  La clave será pedida.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = “%s”.\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = “%s”.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Clave = “%s”.\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (usando puerto por defecto)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con clave.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones encriptadas con SSL activadas.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 "  Huella dactilar de la llave SSL (comprobada con la llave del servidor): %"
 "s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla por defecto está seleccionada.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes serán recibidos (--all on).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Los mensajes recibidos permanecerán en el servidor (--keep on).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Los mensajes recibidos se eliminarán del servidor (--keep off).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush "
 "on).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  No se eliminarán los mensajes viejos antes de recibir nuevos (--flush "
 "off).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1211,7 +1211,7 @@ msgstr ""
 "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush "
 "on).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1220,347 +1220,347 @@ msgstr ""
 "  No se eliminarán los mensajes viejos antes de recibir nuevos (--flush "
 "off).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro serán removidos (stripcr on).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se removerán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se agregarán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se agregarán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Se ignorará el contenido de «Content-Transfer-Encoding» (pass8bits on).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Se respetará el contenido de «Content-Transfer-Encoding» (pass8bits off).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Las líneas ‘Status’ que no estén vacías serán descartadas (dropstatus "
 "on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Las líneas ‘Status’ que no estén vacías serán conservadas (dropstatus "
 "off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán descartadas (dropdelivered on).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán conservadas (dropdelivered off).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  El tamaño de los mensajes está limitado a %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán cada %d segundos (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Los avisos sobre el tamaño de los mensajes se darán en cada consulta (--"
 "warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  El límite de tamaño para los mensajes recibidos es de %d (--fetchsizelimit "
 "%d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UIDs durante cada consulta (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Utilizar búsqueda binaria de UIDs durante %d de cada %d consultas (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Utilizar búsqueda lineal de UIDs durante cada conlusta (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensaje por lote SMTP es %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  El intervalo de borrado entre eliminaciones está forzado a %d (--expunge %"
 "d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Los mensajes serán anexados a %s como BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes serán entregados con “%s”.\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes serán reenviados con %cMTP a:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  El nombre de la máquina en la línea ‘MAIL FROM’ será %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  La dirección a poner en las líneas RCPT TO enviadas al STMP será %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de ‘spam’ son:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de ‘spam’ está desactivado\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La conexión al servidor será iniciada con “%s”.\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  No hay comando de pre-conexión.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La conexión al servidor será terminada con “%s”.\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  No hay comando posconexión.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para esta máquina.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  Modo ‘multi-drop’: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  Modo ‘single-drop’: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nombre local reconocido.\n"
 msgstr[1] "%d nombres locales reconocidos.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Se comparará la dirección IP de los alias del servidor contra las "
 "direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Se comparará el nombre de los alias del servidor contra las direcciones "
 "‘multidrop’.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Se asume que el encabezado de la envoltura es: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número del encabezado de la envoltura a ser procesado: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  El prefijo %s será removido del nombre de usuario\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  Ningún prefijo será removido\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La conexión debe ser a través de la interfaz %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificó alguna interfaz requerida.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta monitoreará %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitoreo.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Las conexiones al servidor se llevarán a cabo a través del ‘plugin’ %s (--"
 "plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugin’.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Las conexiones al cliente se llevarán a cabo a través del ‘plugout’ %s (--"
 "plugout %s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugout’.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UIDs guardadas de esta máquina.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs guardadas.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1568,7 +1568,7 @@ msgstr ""
 "  No se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso “%s”.\n"
@@ -1707,12 +1707,12 @@ msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
@@ -2246,33 +2246,37 @@ msgstr "Pedido de protocolo indefinido en POP3_auth\n"
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDLs\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --remote no es soportada con POP3\n"
@@ -2533,95 +2537,95 @@ msgstr ""
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "El error guardado es aún %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "Fallo en la apertura del archivo de BSMTP o en la escritura del preámbulo\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Al servidor %cMTP no le gusta la dirección de recipiente ‘%s’\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "Al servidor %cMTP realmente no le gusta la dirección de recipiente ‘%s’\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "El MDA murió por la señal %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "El MDA devolvió un estado distinto a cero %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Extraño: pclose del MDA devolvió %d, no se puede manejar en %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
 
@@ -2638,7 +2642,7 @@ msgstr "Error de entrega de LMTP en EOM\n"
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2646,32 +2650,32 @@ msgstr ""
 "-- \n"
 "El Daemon Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticación ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "El servidor rechazó el comando AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Mala respuesta base64 del server.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Desafío decodificado: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autenticación ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticación ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "error de protocolo en el servidor smtp\n"
 
@@ -2804,26 +2808,26 @@ msgstr "Falló la verificación del certificado del servidor: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "El protocolo SSL ‘%s’ especificado es inválido, usando el defecto (SSLv23).\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "¡La verificación de certificado/huella digital fue de algún modo saltada!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del ‘socket’ cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del ‘socket’ cygwin\n"
 
diff --git a/po/fr.po b/po/fr.po
index 4b7bda90..a2343b8c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-12-18 11:50+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -941,99 +941,99 @@ msgstr ""
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Utiliser «fetchall» et «keep» ensemble en mode démon est une erreur!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminé par un signal %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interroge %s (protocole %s) à %s : récupération en cours\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "Le support de POP2 n'est pas configuré.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "Le support de POP3 n'est pas configuré.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "Le support d'IMAP n'est pas configuré.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "Le support d'ETRN n'est pas configuré.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "Le support de ODMR n'est pas configuré.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "protocole sélectionné non supporté.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interroge %s (protocole %s) à %s : interrogation finie\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervalle entre les réceptions est de %d secondes\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Le fichier de traces est %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Le fichier des identificateurs est %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Les messages de progression sont enregistrés via syslog\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail va se masquer et ne générer aucun «Received»\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail affichera des points de progression, même dans le journal\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail réexpédiera les messages «multidrop» mal aiguillés vers %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 "Fetchmail expédiera les erreurs de messagerie\n"
 "au maître de poste.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail expédiera les erreur de messagerie à l'envoyeur\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options pour la réception depuis %s@%s :\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le courrier sera reçu via %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
@@ -1041,176 +1041,176 @@ msgstr[0] "  La réception depuis ce serveur s'opérera tout %d intervalle.\n"
 msgstr[1] ""
 "  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Le vrai nom du serveur est %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Cet hôte ne sera pas interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Cet hôte sera interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  Le mot de passe sera requis.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identification RPOP = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mot de passe = \"%s\".\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Le protocole est KPOP avec authentification Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Le protocole est %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (utilisant le service %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (utilisant le port par défaut)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (forçant l'usage des UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Toutes les méthodes d'authentification vont être essayées.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "Authentification par mot de passe forcé.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "L'authentification MSN forcée.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "L'authentification NTLM forcée.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Authentification OTP forcée.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Authentification CRAM-Md5 forcée.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Authentification GSSAPI forcée.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Authentification de Kerberos V4 forcée.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " Authentification de Kerberos V5 forcée.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  cryptage «End-to-end» assumé.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Le principal service de mail est: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Les sessions encryptée SSL sont supportées.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocole SSL: %s\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Activation de la vérification des certificats du serveur SSL.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Répertoire des certificats SSL surs: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Signature de la clé SSL (vérifié via le serveur de clés): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Le délai d'attente d'une réponse du serveur est de %d secondes"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (par défaut).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  La boîte aux lettres par défaut est sélectionnée.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Les boîtes aux lettres sélectionnées sont :"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tous les messages seront reçus (--all on).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Seulement des messages nouveaux seront reçus (--all off).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Tout message récupéré sera conservé sur le serveur (--keep on).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush "
 "off).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1218,7 +1218,7 @@ msgstr ""
 "  Tout message trop grand sera éliminé avant relève du courrier (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1226,339 +1226,339 @@ msgstr ""
 "  Tout ancien trop grand ne sera pas éliminé avant relève du courrier (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  La ré-écriture des adresses locales est activée (--norewrite off).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La ré-écriture des adresses locales est inactivée (--norewrite on).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La suppression des retour-chariots est activé (stripcr on).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  La suppression des retour-chariots est inactivée (stripcr off).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Le forçage des retour-chariots est activé (forcecr on).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Le forçage des retour-chariots est inactivé (forcecr off).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est inactivée (pass8bits "
 "on).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est activée (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Le décodage MIME est activé (mimedecode on).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Le décodage MIME est inactivé (mimedecode off).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  L'inoccupation après la réception est activé (idle on).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  L'inoccupation après la réception est inactivé (idle off).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Les lignes «Status» non vides seront ignorés (dropstatus on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Les lignes «Status» non vides seront conservées (dropstatus off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront ignorées (dropdelivered on).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront conservées (dropdelivered "
 "off).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  La taille des messages est limitée à %d octets (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  La taille des messages n'est pas limitée (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Alertes sur la taille des messages toutes les %d secondes (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Le nombre de messages reçu est limité à %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Le nombre de messages reçu n'est pas limité (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  La limite de taille de récupération de messages est %d (--fetchsizelimit %"
 "d)\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 "  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Le nombre de messages expédiés est limité à %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Aucune purge forcée n'aura lieu (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domaines pour lesquels le mail est récupéré :"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (par défaut)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Les messages seront ajoutés après %s en tant que BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Les messages seront acheminés avec \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Les messages seront réexpédiés via %cMTP vers :"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Le nom de la machine sur la ligne «MAIL FROM» sera %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adresse placée après la commande SMTP 'RCPT TO' sera %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les réponses du serveur reconnaissant des blocs de «spam» sont :"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  Le blocage du «spam» est inactivé\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexion au serveur sera initiée avec \"%s\".\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  Aucune commande de pré-connexion définie.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexion au serveur sera terminée avec \"%s\".\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  Aucune commande de post-connexion définie.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  Aucun nom local déclaré pour cet hôte.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  Mode «multi-drop»: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  Mode «single-drop»: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nom local reconnu.\n"
 msgstr[1] "%d noms locaux reconnus.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est activée.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est inactivée.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs adresses IP.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs noms.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Le routage vers l'adresse d'enveloppe est inactivé\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'en-tête d'enveloppe est pris comme étant : %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numéro de l'en-tête d'enveloppe devant être traité : %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Le préfixe %s sera soustrait des id d'utilisateur\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  Aucun préfixe ne sera soustrait\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias pré-déclarés du serveur de courrier :"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  Domaines locaux :"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexion se fera via l'interface %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  Aucun choix d'interface n'a été spécifié.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  La boucle de réception observera %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  Aucune interface à observer n'a été spécifiée.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Connexions au serveur à travers le «plugin» %s (--plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  Aucune commande de «plugin» n'a été spécifiée.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Connexions au client à travers le «plugout» %s (--plugout %s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  Aucune commande de «plugout» n'a été spécifiée.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Aucun UID n'a été enregistré sur cet hôte.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs enregistrés.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Information de traçage de la réception ajoutée aux en-têtes Received.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1566,7 +1566,7 @@ msgstr ""
 "  Aucune ajout d'information de traçage de la réception aux en-têtes "
 "Received.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriétés du passage \"%s\".\n"
@@ -1705,12 +1705,12 @@ msgstr[1] "%d messages en attente après la purge\n"
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
@@ -2235,32 +2235,36 @@ msgstr "Requête de protocole indéfinie dans POP3_auth\n"
 msgid "lock busy!  Is another session active?\n"
 msgstr "Fichier verrou en service. Y'a-t-il une autre session active ?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Ne peux pas manier la réponse UIDL du serveur.\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serveur répondait avec UID d'un faux message.\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "erreur de protocole\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erreur de protocole durant la réception des UIDLs\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'option --folder n'est pas supportée avec POP3\n"
 
@@ -2522,94 +2526,94 @@ msgstr "Ne peux pas résoudre service %s dans un numéro de port.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Prière d'indiquer le service comme numéro décimal.\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "réexpédition vers %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (corps du message ayant rebondi)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "message depuis %s ayant rebondi sur %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'erreur mémorisée est toujours %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erreur %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Échec d'ouverture du fichier BSMTP ou à l'écriture du préambule\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse de destinataire `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse du destinataire `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "les adresses ne correspondent pas ; pas de postmaster\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "il n'est même pas possible d'expédier vers %s\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "aucune correspondance dans les adresses ; réexpédition vers %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "sur le point de délivrer le courrier à : %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "Échec d'ouverture MDA\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Échec de connexion %cMTP avec %s\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ne peut relever l'agent ; se replie sur %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, 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:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA a retourné un état non nul (%d)\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 "Etrange : le MDA a retourné %d lors du pclose; cas impossible à gérer %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Échec à la terminaison du message ou à la fermeture de BSMTP\n"
 
@@ -2626,7 +2630,7 @@ msgstr "Erreur de délivrance LMTP en EOM\n"
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Réponse non-503 inattendue à un ordre LMTP EOM: %s\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2634,32 +2638,32 @@ msgstr ""
 "-- \n"
 "Le Démon Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Authentification ESMTP CRAM-Md5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Le serveur a refusé la commande AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Mauvaise réponse en base 64 du serveur.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Challenge décodé: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autentification ESMTP PLAIN ...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autentification ESMTP LOGIN ...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "erreur de protocole avec le serveur smtp\n"
 
@@ -2791,26 +2795,26 @@ msgstr "Erreur de vérification du certificat du serveur : %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "expéditeur inconnu (%d premiers caractères) : %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "Descripteur de fichier inaccessible pour SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Le protocole SSL «%s» spécifié est invalide, le protocole par défaut "
 "(SSLv23) est utilisé.\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La vérification du certificat ou de la signature n'a pas été faite!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Nouvel essai de lecture sur la socket Cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Le nouvel essai de lecture sur la socket Cygwin a échoué!\n"
 
diff --git a/po/ja.po b/po/ja.po
index 4bf7bdee..8a775c7b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-11-26 01:20+0900\n"
 "Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -941,277 +941,277 @@ msgstr ""
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall と keep オプションはデーモンモードで設定できません。\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "シグナル %d で終了しました。\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s は %s とプロトコル %s を用いて %s に交信しています。交信が開始されまし"
 "た。\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 に対応した設定が行われておりません。\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 に対応した設定が行われておりません。\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP に対応した設定が行われておりません。\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN に対応した設定が行われておりません。\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR に対応した設定が行われておりません。\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "対応していないプロトコルが選択されました。\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s は %s とプロトコル %s を用いて %s に交信しています。交信が終了しました。\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "交信間隔は %d 秒です。\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "ログファイルは %s です。\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID ファイルは %s です。\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "進行状況のメッセージは syslog を通して記録されます。\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail はアドレスを書き換え、Received を生成しません。\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail はログファイル中にも進行状況を示す . を書き込みます。\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail は誤った宛先の書かれたメッセージを %s に転送します。\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail は postmaster 宛にエラーメールを送信します。\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail は送り主にエラーメッセージを送信します。\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "アカウント %s@%s でのオプションです。\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  メールはホスト %s を介してやりとりされます。\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  このサーバに対してのアクセスは %d の間隔で行われます。\n"
 msgstr[1] "  このサーバに対してのアクセスは %d の間隔で行われます。\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  サーバの本名は %s です。\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  このホストはホストが指示されない場合にはアクセスされません。\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  このホストはホストが指示されない場合にアクセスされます。\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  パスワード入力が必要です。\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  パスワード = \"%s\"\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Kerberos %s 認証による KPOP プロトコルを利用します。"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  %s プロトコルを利用します。"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s サービスを利用します)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (デフォルトのポートを利用します)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (UIDL の利用を強制します)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  利用可能な全ての認証方式を試みます。\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  パスワードによる認証を強制的に行います。\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN 認証を強制的に行います。\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM 認証を強制的に行います。\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP による認証を強制的に行います。\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 方式による認証を強制的に行います。\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI 方式による認証を強制的に行います。\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 方式による認証を強制的に行います。\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 方式による認証を強制的に行います。\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end 暗号化であるとします。\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  メールサービスは %s によって行われます。\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL による暗号化通信が行われます。\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL プロトコル %s。\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL サーバ証明書の確認が設定されました。\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL 信用可能証明書は %s に格納されています。\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL key fingerprint (server key と照合されました): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  サーバの応答制限時間は %d 秒です。"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (デフォルト)。\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  デフォルトのメールボックスが選択されました。\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  選択されたメールボックス:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  すべてのメッセージを取得します。 (--all on)\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  新しいメッセージだけを取得します。 (--all off)\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  取得したメッセージをサーバにも保持します。 (--keep on)\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  取得したメッセージはサーバに保持しません (--keep off)\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  古いメッセージは取得の前に消去されます。 (--flush on)\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  メッセージ取得の前に古いメッセージを消去しません。 (--flush off)\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr "  容量超過したメッセージは取得の前に消去されます。 (--limitflush on)\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1219,323 +1219,323 @@ msgstr ""
 "  メッセージ取得の前に容量超過したメッセージを消去しません。 (--limitflush "
 "off)\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local アドレスへの書き換えを行います。 (--norewrite off)\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  server-local アドレスへの書き換えを行いません。 (--norewrite on)\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  改行記号の除去を行います。 (stripcr on)\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  改行記号の除去を行いません。 (stripcr off)\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  改行記号の追加を行います。 (forcecr on)\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  改行記号の追加を行いません。 (forcecr off)\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding の変換を行いません。 (pass8bits on)\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding の変換を行います。 (pass8bits off)\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME のデコードを行います。 (mimedecode on)\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME のデコードを行いません。 (mimedecode off)\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  サーバアクセス後の待機を行います。 (idle on)\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  サーバアクセス後の待機を行いません。 (idle off)\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  記述のある Status 行を破棄します。 (dropstatus on)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  記述のある Status 行を保持します。 (dropstatus off)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To 行を保持します。 (dropdelivered on)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To 行を破棄します。 (dropdelivered off)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  メッセージの大きさの最大 %d バイトに制限されます。 (--limit %d)\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  メッセージの大きさに制限はありません。 (--limit 0)\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  メッセージの大きさに対する警告は %d 秒毎に行われます。 (--warnings %d)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  サーバアクセスの度にメッセージの大きさの警告を行います。 (--warnings 0)\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  一回の接続で取得できるメッセージは %d 通に制限されます。(--fetchlimit %d)\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  一回の接続で取得できるメッセージの数に制限はありません。 (--fetchlimit 0)\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  取得できるメッセージのサイズは %d に制限されます。(--fetchsizelimit %d)\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  メッセージの大きさに制限はありません。 (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "接続ごとに UID の二分木検索を行います。(--fastuidl 1)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "%d 回 (%d 接続のうち) UID の二分木検索を行います。(--fastuidl %d)\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "接続ごとに UID の線形検索を行います。(--fastuidl 0)\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  一回の接続で転送できるメッセージは %d 通に制限されます。\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  一回の接続で転送できるメッセージの数に制限はありません。 (--batchlimit 0)\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  メッセージは %d 通毎に削除されます。 (--expunge %d)\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  メッセージを削除する間隔は設定されておりません。 (--expunge 0)\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  メールを取得するドメインは : "
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ファイル %s に BSMTP 形式でメッセージが追記されます。\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  アプリケーション\"%s\"によってメッセージが送信されます。\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  受信したメッセージは %cMTP によって次に示すサーバへ転送されます :"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ホストの MAIL FROM 行のアドレスは %s です。\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  SMTP によって配信される RCPT TO 行に記されたアドレスは %s です。\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  送信先のスパムブロックに対する応答は : "
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  スパムブロックは行われません。\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  サーバとの接続は\"%s\"によって行われます。\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  接続前に実行する命令はありません。\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  サーバとの接続は\"%s\"によって切断されます。\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  接続終了時に行う命令はありません。\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  このホストに対する localname は宣言されていません。\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  `multi-drop' モード: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  `single-drop' モード: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d 個の localname が存在します。\n"
 msgstr[1] "%d 個の localname が存在します。\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  multidrop アドレスを検索する DNS が有効です。\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  multidrop アドレスを検索する DNS が無効です。\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  サーバの別名は multidrop アドレスと IP アドレスで比較されます。\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  サーバの別名は multidrop アドレスとホスト名で比較されます。\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address によるルーティングは行われません。\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header は %s とされます。\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  %d 個を超える Envelope header はスキップされます。\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s はユーザ ID から除去されます。\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  Prefix は除去されません。\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  予め宣言されたメールサーバの別名:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  ローカルドメイン:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  接続はインターフェイス %s を通して行われます。\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  接続に利用すべきインターフェイスの指定はありません。\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  接続は %s の状態を監視して行われます。\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  状態を監視して接続はおこないません。\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  サーバとの接続にはプラグイン \"%s\" を利用します。(--plugin %s)\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  サーバとの接続に利用するプラグインの指定はありません。\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  アプリケーションとの接続にはプラグアウト\"%s\"を利用します。(--plugout %"
 "s)\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  アプリケーションとの接続に利用するプラグアウトの指定はありません。\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  このホストからの UID は記録されていません。\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d 個の UID が記録されています。\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  接続情報は Received ヘッダに追加されます。\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1543,7 +1543,7 @@ msgstr ""
 "  接続情報は Received ヘッダに追加されません。\n"
 "\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  プロパティ \"%s\" は無視されます。\n"
@@ -1683,12 +1683,12 @@ msgstr[1] "削除の後、%d 通のメッセージが残っています。\n"
 msgid "search for unseen messages failed\n"
 msgstr "未読メッセージの検索に失敗しました。\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u は未読です。\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u は最初の未読メッセージです。\n"
@@ -2208,33 +2208,37 @@ msgstr "POP3_auth 中で定義されていないプロトコルが要求され
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "上流サーバからの UIDL 応答に対応できません。\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "サーバが誤ったメッセージの UID に応答しました。\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n"
 
-#: pop3.c:816
+#: pop3.c:822
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "サーバリストにメッセージが挿入されています。取り扱うことができません。\n"
 
-#: pop3.c:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "プロトコルエラーです。\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL を取り込み中にプロトコルエラーが発生しました。\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 では --folder オプションは利用できません。\n"
 
@@ -2496,98 +2500,98 @@ msgstr "サービス %s のためのポートがわかりません。\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "10 進数のポート番号で指定してください。\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s へ転送します。\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (転送されたメッセージの本体)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s からのメールを %s に転送します。\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "エラーはまだ %d です。\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP エラー: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "BSMTP ファイルのオープン、または、プリアンブルの書き込みに失敗しました。\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 "%cMTP 送信先のアプリケーションが `%s' という受け手のアドレスを受け付けませ"
 "ん。\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "%cMTP 送信先のアプリケーションが `%s' という受け手のアドレスを受け付けませ"
 "ん。\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "アドレスが一致しません。postmaster が設定されていません。\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "%s に対してさえ送信できません。\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "アドレスが一致しません。%s へ転送します。\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "%s を利用した配信について\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "MDA の起動に失敗しました。\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP による %s への接続に失敗しました。\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "通信先のアプリケーションと交信できません。%s と交信します。"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA が %d 番の信号を受信したため終了しました。\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA が 0 以外のステータス %d を返して終了しました。\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "異常: MDA の pclose が %d を返しました。%s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "メッセージの終了、または、BSMTP ファイルの終了に失敗しました。\n"
 
@@ -2604,7 +2608,7 @@ msgstr "LMTP の EOM における配信エラーです。\n"
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM に対して 503 以外の予期せぬ応答 %s がありました。\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2612,32 +2616,32 @@ msgstr ""
 "-- \n"
 "Fetchmail デーモン"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5 方式による認証を強制的に行います...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "サーバが AUTH コマンドを拒絶しました。\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "サーバから誤った base64 の返答を得ました。\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "%s とデコードされました。\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP で PLAIN 認証をします...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP で LOGIN 認証をします...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "SMTP リスナでプロトコルエラーが発生しました。\n"
 
@@ -2767,26 +2771,26 @@ msgstr "サーバ証明書検証エラー: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "不明な発行者 (はじめの %d 文字): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "ファイル識別子が SSL としては長過ぎます。"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "無効な SSL プロトコル `%s' が指定されたため、デフォルト (SSLv23)を利用しま"
 "す。\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "証明書/fingerprint 検証が幾つか飛ばされました。\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin ソケット読み込み リトライ\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n"
 
diff --git a/po/pl.po b/po/pl.po
index 606eef00..501ce20d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-11-18 20:54+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -928,98 +928,98 @@ msgstr ""
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Jednoczesne fetchall i keep w trybie demona to b��d!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "przerwany sygna�em %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s ��czy si� z %s (protok� %s) o godzinie %s: odpytywanie rozpocz�te\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "obs�uga protoko�u POP2 nie zosta�a wkompilowana.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "obs�uga protoko�u POP3 nie zosta�a wkompilowana.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "obs�uga protoko�u IMAP nie zosta�a wkompilowana.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "obs�uga polecenia ETRN nie zosta�a wkompilowana.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "obs�uga protoko�u ODMR nie zosta�a wkompilowana.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "Wybrany protok� nie jest obs�ugiwany przez fetchmaila.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s ��czy si� z %s (protok� %s) o godzinie %s: odpytywanie zako�czone\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Czas mi�dzy sprawdzaniem skrzynek wynosi %d sekund\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Plik diagnostyczny to %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Plik identyfikacyjny to %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Komunikaty o post�pach po��czenia b�d� zg�aszane przez sysloga\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail b�dzie si� ukrywa� i nie wygeneruje nag��wka Received\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail b�dzie pokazywa� znaki post�pu nawet w plikach log�w.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail wy�le �le zaadresowane listy do %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail przekieruje poczt� z b��dami do postmastera.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail przekieruje poczt� z b��dami do nadawcy.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Poczta b�dzie pobierana przez %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
@@ -1027,180 +1027,180 @@ msgstr[0] "  Po
 msgstr[1] "  Po��czenie z tym serwerem odb�dzie si� co %d okresy.\n"
 msgstr[2] "  Po��czenie z tym serwerem odb�dzie si� co %d okres�w.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Z tym serwerem nie b�d� si� ��czy� je�li nie zostanie podany �aden inny "
 "serwer.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Z tym serwerem b�d� si� ��czy� je�li nie zostanie podany �aden inny "
 "serwer.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  B�d� pyta� o has�o.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Has�o APOP = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  U�ytkownik RPOP = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Has�o = \"%s\".\n"
 
 # %s zawiera numer wersji protoko�u -PK
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  U�ywam protoko�u KPOP z uwierzytelnieniem przez Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  U�ywam protoko�u %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (us�uga %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (po��czenie na domy�lny port)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (b�d� stosowane UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  B�d� pr�bowane wszystkie dost�pne metody uwierzytelnienia.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie przy pomocy has�a.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie MSN.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Zak�adam szyfrowanie end-to-end.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Zarz�dc� us�ugi pocztowej jest: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesje kodowane SSL w��czone.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protok� SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Sprawdzanie certyfikatu SSL serwera w��czone.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog zaufanego certyfikatu SSL: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odcisk klucza SSL (sprawdzony z kluczem serwera): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limit czasu na odpowied� serwera wynosi %d sekund"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (domy�lne).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  Wybrana jest domy�lna skrzynka odbiorcza.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Wybrano nast�puj�ce skrzynki:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Zostan� pobrane wszystkie listy (--all w��czone).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Zostan� pobrane tylko nowe listy (--all wy��czone).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Pobrane listy b�d� pozostawione na serwerze (--keep w��czone).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Pobrane listy nie b�d� pozostawione na serwerze (--keep wy��czone).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Stare listy b�d� kasowane przed pobraniem poczty (--flush w��czone).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Stare listy nie b�d� kasowane przed pobraniem poczty (--flush wy��czone).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1208,7 +1208,7 @@ msgstr ""
 "  Zbyt du�e listy b�d� kasowane przed pobraniem poczty (--limitflush "
 "w��czone).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1216,234 +1216,234 @@ msgstr ""
 "  Zbyt du�e listy nie b�d� kasowane przed pobraniem poczty (--limitflush "
 "wy��czone).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Przepisywanie adres�w na posta� lokaln� jest w��czone (--norewrite "
 "wy��czone).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Przepisywanie adres�w na posta� lokaln� jest wy��czone (--norewrite "
 "w��czone).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr ""
 "  Usuwanie znak�w CR z ko�c�w linii jest w��czone (stripcr w��czone).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 "  Usuwanie znak�w CR z ko�c�w linii jest wy��czone (stripcr wy��czone).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr ""
 "  Dodawanie znak�w CR na ko�cach linii jest w��czone (forcecr w��czone).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 "  Dodawanie znak�w CR na ko�cach linii jest wy��czone (forcecr wy��czone).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretowanie nag��wka Content-Transfer-Encoding jest wy��czone "
 "(pass8bits w��czone).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretowanie nag��wka Content-Transfer-Encoding jest w��czone "
 "(pass8bits wy��czone).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekodowanie MIME jest w��czone (mimedecode w��czone).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekodowanie MIME jest wy��czone (mimedecode wy��czone).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Zw�oka po odpytaniu jest w��czona (idle w��czone).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Zw�oka po odpytaniu jest wy��czona (idle wy��czone).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niepuste nag��wki Status b�d� usuwane (dropstatus w��czone).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niepuste nag��wki Status b�d� zachowane (dropstatus wy��czone).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Linie Delivered-To b�d� usuwane (dropdelivered w��czone).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Linie Delivered-To b�d� zachowane (dropdelivered wy��czone).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit wielko�ci listu wynosi %d bajt�w (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Limit wielko�ci listu nie jest ustawiony (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Ostrze�enia o wielko�ci listu b�d� wy�wietlane co %d sekund (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Ostrze�enia o wielko�ci b�d� wy�wietlane przy ka�dym ��czeniu (--warnings "
 "0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit ilo�ci otrzymanych list�w wynosi %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  Limit ilo�ci otrzymanych list�w nie jest ustawiony (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit wielko�ci listu wynosi %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Limit wielko�ci listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Binarne przeszukiwanie UID-�w przy ka�dym �ci�ganiu (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Binarne przeszukiwanie UID-�w przy %d z %d �ci�ga� (--fastuidl %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Liniowe przeszukiwanie UID-�w przy ka�dym �ci�ganiu (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Listy b�d� wysy�ane przez SMTP w grupach po %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  Limit ilo�ci list�w wysy�anych przez SMTP nie ustawiony (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Odst�p mi�dzy kasowaniem list�w wymuszony na %d (--expunge %d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Listy nie b�d� kasowane (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeny dla kt�rych poczta b�dzie �ci�gana to:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (domy�ny)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Listy b�d� dopisywane do %s jako BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Listy b�d� lokalne dor�czane przy u�yciu \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Listy b�d� przes�ane przy pomocy %cMTP do:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Nazwa hosta w MAIL FROM jest ustawiona na %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP b�dzie %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznawane odpowiedzi blokad antyspamowych to:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokowanie spamu wy��czone\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Po��czenie do serwera zostanie nawi�zane przy pomocy \"%s\".\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  Przed po��czeniem nie b�dzie wykonywane �adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Po��czenie z serwerem zostanie zamkni�te przy pomocy \"%s\".\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr ""
 "  Po zamkni�ciu po��czenia nie b�dzie wykonywane �adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  Brak nazw lokalnych ustawionych dla tego hosta.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  Tryb wielu skrzynek: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  Tryb jednej skrzynki: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1451,108 +1451,108 @@ msgstr[0] "%d znana nazwa lokalna.\n"
 msgstr[1] "%d znane nazwy lokalne.\n"
 msgstr[2] "%d znanych nazw lokalnych.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Odpytywanie DNS dla adres�w wieloskrzynkowych jest w��czone.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Odpytywanie DNS dla adres�w wieloskrzynkowych jest wy��czone.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Aliasy serwera b�d� por�wnywane z adresami skrzynek po adresie IP.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Aliasy serwera b�d� por�wnywane z adresami skrzynek po nazwie.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Obs�uga poczty wed�ug adres�w w kopercie jest wy��czone\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag��wek koperty zosta� ustawiony na: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Liczba nag��wk�w koperty do pomini�cia: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Przedrostek %s b�dzie usuwany z nazwy u�ytkownika\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  �adne przedrostki nie b�d� usuwane\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Zadeklarowane aliasy serwera pocztowego:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  Domeny lokalne:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Po��czenia b�d� nawi�zywane tylko przez interfejs %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  Nie jest okre�lony �aden obowi�zkowy interfejs.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Podczas pr�b po��czenia w p�tli b�dzie monitorowany %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  �aden interfejs nie b�dzie monitorowany.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Po��czenia z serwerem b�d� nawi�zywane przez wtyczk� %s (--plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  Nie jest skonfigurowane �adne polecenie nawi�zuj�ce po��czenie\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Po��czenie z serwerem odbiorcy zostanie nawi�zane programem %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  Nie jest skonfigurowane �adne polecenie zamykaj�ce po��czenie.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  �adne UID-y nie zosta�y zachowane z sesji z tym hostem.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Zachowano %d UID-�w.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Informacje o �ledzeniu po��czenia b�d� dodane do nag��wka Received.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1561,7 +1561,7 @@ msgstr ""
 ".\n"
 
 # XXX -PK
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  W�asno�ci przepuszczania \"%s\".\n"
@@ -1705,12 +1705,12 @@ msgstr[2] "%d list
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nie przeczytanych list�w nie powiod�o si�\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nie przeczytany\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nie przeczytanym\n"
@@ -2238,33 +2238,37 @@ msgstr "Pro
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Nie mo�na obs�u�y� odpowiedzi UIDL od serwera.\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serwer odpowiedzia� z UID-em dla niew�a�ciwego listu.\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "b��d protoko�u\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b��d protoko�u podczas pobierania UIDL\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opcja --folder nie dzia�a z POP3\n"
 
@@ -2524,93 +2528,93 @@ msgstr "Nie mo
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Prosz� poda� us�ug� jako dziesi�tny numer portu.\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "przesy�anie do %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cia�o odbitego listu)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "poczta od %s odbita do %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Zachowany b��d to nadal %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "b��d %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP: otwarcie pliku lub zapis nag��wka nie powi�d� si�\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "demon %cMTP nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "demon %cMTP naprawd� nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "brak pasuj�cych adres�w; postmaster nie ustawiony.\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nie mog� wys�a� poczty nawet do %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "brak pasuj�cych lokalnych adres�w, przesy�am do %s\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "list zostanie dor�czony przy pomocy: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "b��d podczas uruchamiania MDA (programu dor�czaj�cego poczt�)\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "po��czenie %cMTP z %s nie powiod�o si�\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "nie mo�na podnie�� procesu s�uchaj�cego; powr�t do %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna� %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwr�ci� niezerowy kod b��du %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Dziwne: MDA pclose zwr�ci�o %d, nie mo�na obs�u�y� w %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Zako�czenie listu lub zamkni�cie pliku BSMTP nie powiod�o si�\n"
 
@@ -2627,7 +2631,7 @@ msgstr "B
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Niespodziewana odpowied� inna ni� 503 na LSTMP EOM: %s\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2635,32 +2639,32 @@ msgstr ""
 "-- \n"
 "Demon Fetchmaila"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Serwer odrzuci� polecenie AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "B��dna odpowied� base64 z serwera.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Wywo�anie rozkodowane: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "b��d protoko�u serwera smtp\n"
 
@@ -2788,24 +2792,24 @@ msgstr "B
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "nieznany wystawca (pierwsze %d znak�w): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "Deskryptor pliku poza zakresem dla SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Podano b��dny protok� SSL `%s', u�ywam domy�lnego (SSLv23).\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiego� powodu pomini�ta!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego nie powiod�o si�!\n"
 
diff --git a/po/ru.po b/po/ru.po
index fd6e96db..fa21726a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-11-21 16:26+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -944,272 +944,272 @@ msgstr ""
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "��������� fetchall, �������� ��� ��� ���� � ������ ������, ������!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "�������� �� ������� %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ����������� %s (�������� %s) �� %s: ����� �����\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "��������� POP2 �� ���������.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "��������� POP3 �� ���������.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "��������� IMAP �� ���������.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "��������� ETRN �� ���������.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "��������� ODMR �� ���������.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "������ ���������������� ��������.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ����������� %s (�������� %s) �� %s: ����� ��������\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "�������� ������ - %d ������\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "���-���� - %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-���� - %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "��������� ��������� ����� ���������������� ����� syslog\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ���������� � �� ������� Received\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail ����� ���������� �������� ������ ��������� ���� � log-������.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ������������ �������������� ��������� ��� ������ �� %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail �������� ��������� ������ �����������.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail �������� ��������� ������ �����������.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "��������� ��� ��������� �� %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ����� ����� �������� ����� %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  ����� ����� ������� ����� ����������� � ���������� %d.\n"
 msgstr[1] "  ����� ����� ������� ����� ����������� � ����������� %d.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  ��������� ��� ������ - %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ����� ���� �� ������, ���� ���� �� ����� ��������.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ����� ���� �� ������, ����� �������� ���� ����.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  ����� ���������� ������.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ������ APOP = \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ������ = \"%s\".\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  �������� - KPOP � ��������������� Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  �������� - %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (������������ ������ %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (������������ ���� �� ���������)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (������������� ������������ UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ����� ����������� ��� ��������� ������� ��������������.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� � �������.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� MSN.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  ����� ������������ �������������� �������������� Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ����������� ����������� ����������.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ��������� �������� ������: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  �������� ������, ������������� SSL.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  �������� SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  �������� �������� ����������� ������� SSL.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ������� ���������� ������������ SSL: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ��������� ����� SSL (��������� � ������ �������): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ������� �������� ������� - %d ������"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (�� ���������).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  ������ �������� ���� �� ���������.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  ��������� �������� �����:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  ����� �������� ��� ��������� (--all on).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  ����� �������� ������ ����� ��������� (--all off).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  ��������� ��������� ����� ��������� �� ������� (--keep on).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  ��������� ��������� ����� ������� � ������� (--keep off).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  ������ ��������� ����� ������� ����� ���������� ��������� (--flush on).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  ������ ��������� �� ����� ������� ����� ���������� ��������� (--flush "
 "off).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 "  ��������� ����������� ������� ����� ������� ����� ���������� ��������� (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1225,331 +1225,331 @@ msgstr ""
 "  ��������� ����������� ������� �� ����� ������� ����� ���������� ��������� "
 "(--limitflush  off).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  ���������� ��������� ������� ������� �������� (--norewrite off).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  ���������� ��������� ������� ������� ��������� (--norewrite on).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  �������� �������� ������� �������� (stripcr on).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  �������� �������� ������� ��������� (stripcr off).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  �������������� ������� ������� ������� (forcecr on).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  �������������� ������� ������� �������� (forcecr off).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  ������������� ��������� ������������� �������� ��������� (pass8bits on).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  ������������� ��������� ������������� �������� �������� (pass8bits off).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-������������� �������� (mimedecode on).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-������������� ��������� (mimedecode off).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ������� ����� ������ ������� (idle on).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ������� ����� ������ �������� (idle off).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  �������� ������ ��������� ����� ������� (dropstatus on)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  �������� ������ ��������� ����� ��������� (dropstatus off)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  ������ Delivered-To ����� ������� (dropdelivered on)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  ������ Delivered-To ����� ��������� (dropdelivered off)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ����������� �� ������ ��������� - %d ������� (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ��� ����������� �� ������ ��������� (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  �������� ����� ���������������� � ������� ��������� - %d ������ (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  �������������� � ������� ��� ������ ������ (--warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ����������� �� ���������� ��������� - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  ��� ����������� �� ���������� ��������� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  ����������� �� ������ ������� ��������� - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ��� ����������� �� ������ ������� ��������� (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  ��������� �������� ����� UID'�� �� ����� ������� ������ (--fastuidl -1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  ��������� �������� ����� UID'�� �� ����� %d �� %d ������� (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   ��������� �������� ����� UID'�� �� ����� ������� ������ (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ����������� �� ����� SMTP-��������� - %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  ��� ����������� �� ����� SMTP-��������� (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  �������� ����� ���������� ������������� ���������� � %d (--expunge %d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ��� �������������� �������� (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  ������, ��� ������� ����� ����������� ������� �����:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (�� ���������)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ��������� ����� ����������� � %s ��� BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  ��������� ����� ���������� � \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  ��������� ����� �������������� �� %cMTP ��:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ����� ����� �� ������ MAIL FROM ����� %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  �����, ����������� � ������ RCPT TO, ������������ �� SMTP, ����� %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  �������� �������� �� ������������ ���������� ����-�����:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  ���������� ����� ���������\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ����������� � ������� ����� ����������� � \"%s\".\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  ��� �������, ����������� �� ����������.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ����������� � ������� ����� ��������� � \"%s\".\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  ��� �������, ����������� ����� ����������.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  ��� ��������� ����, ����������� ��� ����� �����.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  �������������� �����:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  ������������� �����: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "���������� %d ��������� ���.\n"
 msgstr[1] "���������� %d ��������� �ͣ�.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-������ ��� �������������� ������� �������.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-������ ��� �������������� ������� ��������.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  ����� ������� ����� �������� � ��������������� �������� �� IP-������.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  ����� ������� ����� �������� � ��������������� �������� �� �����.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ������������� ������������� ������ ���������\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  ������������ ��������� ������ ����: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  ���������� ������������ ������������ ����������: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  ������� %s ����� ������ �� id ������������\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  ��� �������� ��������\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  ����� ����������� ������ ��������� �������:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  ��������� ������:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  ����������� ������ ���� ����� ��������� %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  �� ������� ���������� ����������.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ���� ������ ����� ��������� �� %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  �� ������ ��������� ��������.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  ����������� � ������� ����� ����������� ����������� ������� %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  �� ������� ������� �������.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  ����������� ��������� ����� ����������� ����� plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  �� ������� ������� plugout'�.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  � ����� ����� ��� ����������� UID'��.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  ��������� %d UID'��.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  ���������� � ������������ ������ ����� ��������� � ��������� Received.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1557,7 +1557,7 @@ msgstr ""
 "  ���������� � ������������ ������ �� ����� ��������� � ��������� Received.\n"
 ".\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  �������� ������������ \"%s\".\n"
@@ -1696,12 +1696,12 @@ msgstr[1] "
 msgid "search for unseen messages failed\n"
 msgstr "����� �� ������������� ��������� ���������� ��������\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �� �����������\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ������ �� �������������\n"
@@ -2227,32 +2227,36 @@ msgstr "
 msgid "lock busy!  Is another session active?\n"
 msgstr "���������� ���������!  ����� ������� ������ �����?\n"
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "���������� ���������� UIDL-����� upstream-�������.\n"
 
-#: pop3.c:687
+#: pop3.c:693
 msgid "Server responded with UID for wrong message.\n"
 msgstr "������ ��������� ����� � UID ��� ��������� ���������.\n"
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (�����=%d) ���� �������, �� ��� ��� ������������!\n"
 
-#: pop3.c:816
+#: pop3.c:822
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "��������� ��������� � ������ �� �������. ��������� ����������.\n"
 
-#: pop3.c:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "������ ���������\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "������ ��������� ��� ������� UIDL'��\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "����� --folder �� �������������� � POP3\n"
 
@@ -2511,93 +2515,93 @@ msgstr "
 msgid "Please specify the service as decimal port number.\n"
 msgstr "����������, ������� ������ � ���� ����������� ������ �����.\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "������������������ �� %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (���� ���������-��������)\n"
 
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "������ �� %s ���������� ��������� �� %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "����������� ������ ��� ��� %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "������ %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "�������� ����� BSMTP ��� ������ ��������� ����������� ��������\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "��������� %cMTP �� ���������� ����� ���������� `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "��������� %cMTP � ����� ���� �� ���������� ����� ���������� `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "��� �������������� �������; ���������� �� ����������.\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "���� ���������� ��������� �� %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "��� �������������� �������; ������������������ �� %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "����� ��������� �: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "�������� MDA ����������� ��������\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-����������� � %s ����������� ��������\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "���������� ��������� ���������; ����� �� %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA �������� �� ������� %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ��������� ��������� ������ %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "�������: MDA pclose ��������� %d, ���������� ���������� � %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "�������� ��������� ��� �������� ����� BSMTP ����������� ��������\n"
 
@@ -2614,7 +2618,7 @@ msgstr "
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "����������� ��-503 ����� ��� LMTP EOM: %s\n"
 
-#: sink.c:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2622,32 +2626,32 @@ msgstr ""
 "--\n"
 "����� Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "�������������� ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "������ ������ ������� AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "�������� ����� base64 � �������.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "�������������� ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "�������������� ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "������ ��������� ��������� smtp\n"
 
@@ -2778,26 +2782,26 @@ msgstr "
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "����������� ������������� ������� (������ %d ��������): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "���������� ����� ��� ��������� SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "������ �������� �������� SSL '%s', ������������ �������� �� ��������� "
 "(SSLv23).\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "�������� �����������/��������� ���� ���-�� ���������!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "��������� ������� ������ ������ Cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������� ������� ������ ������ Cygwin ����������� ��������!\n"
 
diff --git a/po/sq.po b/po/sq.po
index eccc6d62..f633ad27 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-12-18 11:42+0100\n"
+"POT-Creation-Date: 2006-01-06 14:21+0100\n"
 "PO-Revision-Date: 2005-11-18 22:25+0200\n"
 "Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -932,273 +932,273 @@ msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr ""
 "\"fetchall\" e nj�koh�sisht \"keep on\" gjat� m�nyr�s demon p�rb�n gabim!\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "p�rfunduar me sinjal %d\n"
 
-#: fetchmail.c:1354
+#: fetchmail.c:1353
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s po k�rkon %s (protokolli %s) te %s: vjelja filloi\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1378
 msgid "POP2 support is not configured.\n"
 msgstr "Nuk �sht� form�suar mbulim p�r POP2.\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1390
 msgid "POP3 support is not configured.\n"
 msgstr "Nuk �sht� form�suar mbulim p�r POP3.\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1400
 msgid "IMAP support is not configured.\n"
 msgstr "Nuk �sht� form�suar mbulim p�r IMAP.\n"
 
-#: fetchmail.c:1407
+#: fetchmail.c:1406
 msgid "ETRN support is not configured.\n"
 msgstr "Nuk �sht� form�suar mbulim p�r ETRN.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1414
 msgid "ODMR support is not configured.\n"
 msgstr "Nuk �sht� form�suar mbulim p�r ODMR.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1421
 msgid "unsupported protocol selected.\n"
 msgstr "p�rzgjedhur protokoll i pambuluar.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1431
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s po k�rkon %s (protokolli %s) te %s: vjelja u plot�sua\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1448
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervali i vjeljes �sht� %d sekonda\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1450
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Jet�gjat�sia e regjistrit �sht� %s\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1452
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile �sht� %s\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1455
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesazhe ecurie do t� regjistrohen p�rmes syslog\n"
 
-#: fetchmail.c:1459
+#: fetchmail.c:1458
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail do t� kryej� maskim dhe nuk do t� prodhoj� T� Marr�\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1460
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail-i do t� tregoj� pika ecurie edhe n� kartela regjistrimesh.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1462
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail-i do t� p�rcjell� mesazhe t� keqadresuar me shp�rndarje t� "
 "shum�fisht� te %s.\n"
 
-#: fetchmail.c:1467
+#: fetchmail.c:1466
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail-i do t� drejtoj� gabime poste drejt ustait t� post�s.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1468
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail-i do t� drejtoj� gabime poste te d�rguesi.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1475
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Mund�si p�r marrje prej %s@%s:\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1479
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do t� merret p�rmes %s\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1482
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Vjelja e k�tij sh�rbyesi do t� ngjas� �do %d interval.\n"
 msgstr[1] "  Vjelja e k�tij sh�rbyesi do t� ngjas� �do %d intervale.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1486
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i v�rtet� i sh�rbyesit �sht� %s.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1489
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Kjo streh� nuk do pyetet kur nuk ka streh� t� treguar.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1490
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Kjo streh� do t� pyetet kur nuk ka streh� t� treguar.\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1494
 msgid "  Password will be prompted for.\n"
 msgstr "  Do t� k�rkohet fjal�kalim.\n"
 
-#: fetchmail.c:1499
+#: fetchmail.c:1498
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Sekret APOP= \"%s\".\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1501
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1504
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjal�kalim = \"%s\".\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1513
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli �sht� KPOP me mir�fillt�sim Kerberos %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1516
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll �sht� %s"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr " (po p�rdor sh�rbim %s)"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1520
 msgid " (using default port)"
 msgstr " (po p�rdor port� parazgjedhje)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1522
 msgid " (forcing UIDL use)"
 msgstr " (po detyroj p�rdorim UIDL)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1528
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Do t� provohen t�r� metodat e mundshme p�r mir�fillt�sim.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1531
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim me fjal�kalim.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1534
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim MSN.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1537
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim NTLM.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1540
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim OTP.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1543
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim CRAM-Md5.\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1546
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim GSSAPI.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1549
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim Kerberos V4.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1552
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do t� detyrohet mir�fillt�sim Kerberos V5.\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1555
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  N�nkuptohet kodim cep-m�-cep.\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1559
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Par�sori i sh�rbimit postar �sht�: %s\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1562
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Mund�suar sesione SSL t� koduar.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1564
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1566
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Mund�suar kontroll d�shmie sh�rbyesi SSL.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1568
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  drejtori d�shmish SSL t� besueshme: %s\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  shenj� gishtash ky�i SSL (kontrolluar kundrejt ky�i sh�rbyesi): %s\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1574
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mosp�rgjigjes s� sh�rbyesit �sht� %d sekonda"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1583
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e p�rzgjedhur.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1588
 msgid "  Selected mailboxes are:"
 msgstr "  Kutit� postare t� p�rzgjedhura jan�:"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Do t� merren t�r� mesazhet (--all on).\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1595
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Do t� merren vet�m mesazhet e rinj (--all off).\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1597
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesazhet e sjell� %s do t� mbahen n� sh�rbyes (--keep on).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesazhet e sjell� nuk do t� mbahen n� sh�rbyes (--keep off).\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1600
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mesazhet e vjet�r do t� zbrazen para marrjes s� mesazheve (--flush on).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Mesazhet e vjet�r nuk do t� zbrazen para marrjes s� mesazheve (--flush "
 "off).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1603
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "  Mesazhet tej mas�s do t� zbrazen para marrjes s� mesazheve (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1214,340 +1214,340 @@ msgstr ""
 "  Mesazhet tej mas�s nuk do t� zbrazen para marrjes s� mesazheve (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Rishkrimi i vendndodhjeve vendore t� sh�rbyesit �sht� veprues (--norewrite "
 "off).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1607
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  Rishkrimi i vendndodhjeve vendore t� sh�rbyesit �sht� joveprues (--"
 "norewrite on).\n"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1609
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Heqja e \"carriage-return\"-it �sht� vepruese (stripcr on).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1610
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e \"carriage-return\"-it �sht� jovepruese (stripcr off).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1612
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "Detyrimi i \"carriage-return\"-it �sht� veprues (forcecr on).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "Detyrimi i \"carriage-return\"-it �sht� joveprues (forcecr off).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1615
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretimi i Kodimit t� Shp�rnguljes s� P�rmbajtjes �sht� joveprues "
 "(pass8bits on).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1616
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretimi i Kodimit t� Shp�rnguljes s� P�rmbajtjes �sht� veprues "
 "(pass8bits off).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  �kodimi MIME �sht� veprues (mimedecode on).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1619
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  �kodimi MIME �sht� joveprues (mimedecode off).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1621
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "Plog�shtia pas vjeljes �sht� vepruese (idle on).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1622
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "Plog�shtia pas vjeljes �sht� jovepruese (idle off).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 "  Nuk do t� merren parasysh rreshta Gjendjeje Joboshe (dropstatus on)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 "  Do t� merren parasysh rreshta Gjendjeje Joboshe do t� jen� (dropstatus "
 "off)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Rreshtat Nisur P�r nuk do t� merren parasysh (dropdelivered on)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur P�r do t� merren parasysh (dropdelivered off)\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Kufiri i madh�sis� s� mesazheve �sht� %d tet�she (--limit %d).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa kufi madh�sie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Intervali i sinjalizimit t� madh�sis� s� mesazheve �sht� %d sekonda (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madh�sie n� �do vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Kufiri p�r mesazhe t� marr� �sht� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa kufi p�r mesazhe t� marr� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Kufi madh�sie mesazhesh q� sillen �sht� %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa kufi madh�sie mesazhesh q� sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Kryej k�rkim dyor t� UID-ve gjat� �do vjeljeje (--fastuidl 1).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Kryej k�rkim dyor t� UID-ve gjat� %d prej %d vjeljeve (--fastuidl %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Kryej k�rkim linear t� UID-ve gjat� �do vjeljeje (--fastuidl 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Kufiri p�r tuf� mesazhesh SMTP �sht� %d.\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa kufi p�r tuf� mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval fshirjesh nd�rmjet shuarjesh detyruar n� %d (--expunge %d).\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje t� detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  P�rkat�sit� p�r t� cilat do t� jepet post� jan�:"
 
-#: fetchmail.c:1683 fetchmail.c:1703
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesazhet do t� varg�zohen te %s si BSMTP\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do t� shp�rndahen me \"%s\".\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do t� p�rcillen si %cMTP te:"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pjesa streh� e rreshtit POST� PREJ do t� jet� %s\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Vendndodhja q� do vendoset tek rreshtat RCPT TO t� d�rguar te SMTP do t� "
 "jet� %s\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr "  P�rgjigje t� pranuara blloqesh spam d�gjuesi jan�:"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokim spamesh i �aktivizuar\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Lidhja me sh�rbyesin do t� sillet me \"%s\".\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdh�r para-lidhjeje.\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Lidhja me sh�rbyesin do t� lihet me \"%s\".\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdh�r pas-lidhjeje.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendor� t� deklaruar p�r k�t� streh�.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr "  M�nyr� shp�rndarje e shum�fisht�: "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr "  M�nyr� shp�rndarje nj�she: "
 
-#: fetchmail.c:1754
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d em�r vendor i pranuar.\n"
 msgstr[1] "%d emra vendor� t� pranuar.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1768
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 "  K�rkimi DNS p�r vendndodhje shp�rndarjesh t� shum�fishta �sht� veprues.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1769
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 "  K�rkimi DNS p�r vendndodhje shp�rndarjesh t� shum�fishta �sht� joveprues.\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1773
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Aliase sh�rbyesish do t� krahasohen me vendndodhje shp�rndarjesh t� "
 "shum�fishta prej vendndodhjes IP.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1775
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Aliase sh�rbyesish do t� krahasohen me vendndodhje shp�rndarjesh t� "
 "shum�fishta prej emrit.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  P�rcjellje vendndodhjesh zarf �sht� �aktivizuar\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Titulli zarf n�nkuptohet t� jet�: %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Num�r titujsh zarf p�r t'u anashkaluar: %d\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Parashtesa %s do t� hiqet prej id-je p�rdoruesi\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash sh�rbyesi t� paradeklaruar:"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr "  P�rkat�si vendore:"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet t� jet� p�rmes nd�rfaqes %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht t� p�rcaktuar rreth nd�rfaqes.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do t� mbikqyr� %s.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa nd�rfaqe mbikqyrjeje t� p�rcaktuar.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Lidhjet me sh�rbyesin do t� kryhen p�rmes shtojc�s %s (--plugin %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdh�r shtojce t� p�rcaktuar.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Lidhje d�gjuesi do t� kryhen p�rmes shtojce daljeje %s (--plugout %s).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdh�r shtojce daljeje t� p�rcaktuar.\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID t� ruajtura prej k�saj strehe.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID t� ruajtur.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  T� dh�na gjurmimi vjeljeje do t� shtohen te titulli T� Marr�.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1555,7 +1555,7 @@ msgstr ""
 "  Nuk do t� shtohen t� dh�na gjurmimi vjeljeje te titulli T� Marr�.\n"
 ".\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-n�p�r \"%s\".\n"
@@ -1694,12 +1694,12 @@ msgstr[1] "%d mesazhe n
 msgid "search for unseen messages failed\n"
 msgstr "k�rkimi p�r mesazhe t� pav�rejtur d�shtoi\n"
 
-#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:729 pop3.c:741 pop3.c:963 pop3.c:970
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �sht� i pav�rejtur\n"
 
-#: imap.c:801 pop3.c:744
+#: imap.c:801 pop3.c:750
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �sht� i pari i pav�rejtur\n"
@@ -2211,33 +2211,37 @@ msgstr "K
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:664
+#: pop3.c:617
+msgid "Warning: Maillennium POP3/PROXY server found, using RETR command.\n"
+msgstr ""
+
+#: pop3.c:670
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:693
 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:714 pop3.c:948
+#: pop3.c:720 pop3.c:954
 #, 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:816
+#: pop3.c:822
 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:902
+#: pop3.c:908
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:917
+#: pop3.c:923
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjat� sjelljes s� UIDL-ve\n"
 
-#: pop3.c:1276
+#: pop3.c:1282
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mund�sia --dosje nuk mbulohet me POP3\n"
 
@@ -2497,95 +2501,95 @@ msgstr "Nuk e shoh sh
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Ju lutemi jepeni sh�rbimin si num�r dhjetor porte.\n"
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "po p�rcjell te %s\n"
 
-#: sink.c:311
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst mesazhi k�rcimesh)\n"
 
 #  this will usually go to sylog...
 #  this will usually go to sylog...
-#: sink.c:314
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "post� prej %s k�rceu p�r te %s\n"
 
-#: sink.c:446
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gabimi i ruajtur �sht� ende %d\n"
 
-#: sink.c:506 sink.c:590
+#: sink.c:502 sink.c:586
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "gabim %cMTP: %s\n"
 
-#: sink.c:751
+#: sink.c:747
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "D�shtoi hapja e kartel�s BSMTP ose shkrimi i parath�nies\n"
 
-#: sink.c:964
+#: sink.c:962
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "D�gjesi %cMTP nuk e p�lqen vendndodhjen e marr�sit `%s'\n"
 
-#: sink.c:971
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "d�gjuesi %cMTP nuk e ka dhe aq qejf vendndodhjen e marr�sit `%s'\n"
 
-#: sink.c:1012
+#: sink.c:1010
 msgid "no address matches; no postmaster set.\n"
 msgstr "pa p�rputhje vendndodhjesh; s'�sht� caktuar \"postmaster\".\n"
 
-#: sink.c:1024
+#: sink.c:1022
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "s'mund as t� d�rgoj te %s!\n"
 
-#: sink.c:1030
+#: sink.c:1028
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "pa p�rputhje vendndodhjesh; po p�rcjell drejt %s.\n"
 
-#: sink.c:1184
+#: sink.c:1183
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "gati p�r t� shp�rndar� me: %s\n"
 
-#: sink.c:1208
+#: sink.c:1207
 msgid "MDA open failed\n"
 msgstr "Hapja e MDA-s d�shtoi\n"
 
-#: sink.c:1245
+#: sink.c:1244
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Lidhja %cMTP me %s d�shtoi\n"
 
-#: sink.c:1269
+#: sink.c:1268
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "s'ia dal dot me d�gjuesin; po rikthehem te %s"
 
-#: sink.c:1325
+#: sink.c:1324
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1328
+#: sink.c:1327
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA riktheu gjendje jo zero %d\n"
 
-#: sink.c:1331
+#: sink.c:1330
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "�udi: MDA pclose riktheu %d, nuk mund t� trajtoj� %s:%d\n"
 
-#: sink.c:1352
+#: sink.c:1351
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "D�shtoi p�rfundim mesazhi ose mbyllje e kartel�s BSMTP\n"
 
@@ -2602,7 +2606,7 @@ msgstr "Gabim shp
 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:1560
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2610,32 +2614,32 @@ msgstr ""
 "-- \n"
 "Demoni Fetchmail"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Mir�fillt�sim ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Sh�rbyesi hodhi posht� urdhrin AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "P�rgjigje base64 e gabuar prej sh�rbyesit.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Mir�fillt�sim ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Mir�fillt�sim ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "gabim protokolli d�gjuesi smtp\n"
 
@@ -2765,26 +2769,26 @@ msgstr "Gabim verifikim d
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "l�shues i panjohur (%d g�rmat e para): %s\n"
 
-#: socket.c:805
+#: socket.c:809
 msgid "File descriptor out of range for SSL"
 msgstr "P�rshkrues kartele jasht� intervali p�r SSL"
 
-#: socket.c:822
+#: socket.c:826
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Treguar protokoll SSL i pavlefsh�m '%s', po p�rdor t� parazgjedhurin "
 "(SSLv23).\n"
 
-#: socket.c:885
+#: socket.c:889
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikimi i d�shmis�/gjurm�s s� gishtave pak a shum� u anashkalua!\n"
 
-#: socket.c:959
+#: socket.c:963
 msgid "Cygwin socket read retry\n"
 msgstr "Riprov� p�r lexim prej nj� \"socket\"-i Cygwin\n"
 
-#: socket.c:962
+#: socket.c:966
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Riprova p�r lexim prej nj� \"socket\"-i Cygwin d�shtoi!\n"
 
-- 
cgit v1.2.3