Snapshot for 6.2.9-rc9.

svn path=/trunk/; revision=4459

13 files changed, 7073 insertions, 5792 deletions

diff --git a/po/ca.po b/po/ca.po
index 0ede2746..0daf27c4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-10 02:41+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+0100\n"
 "PO-Revision-Date: 2005-09-19 21:24+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -64,14 +64,14 @@ msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: fetchmail: Missatges excessivament grans"
 
 #: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr ""
 "Els següents missatges de mida excessiva s'han eliminat del servidor %s:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr ""
 "Els següents missatges superaven la limitació de mida i per tant\n"
 "no s'han descarregat del servidor %s:"
@@ -254,7 +254,7 @@ msgstr "Subject: fetchmail: Servidor inaccessible."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1099 imap.c:392 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "La conexió SSL ha fallat.\n"
 
@@ -419,7 +419,7 @@ msgstr " (%d octets).\n"
 msgid "No mail for %s\n"
 msgstr "No hi ha correu per a %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "recompte de missatges erroni!"
 
@@ -883,11 +883,11 @@ msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "Atenció: hi ha múltiples mencions del host %s en el fitxer de configuració\n"
 
-#: fetchmail.c:1151
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "El suport per SSL no està compilat.\n"
 
-#: fetchmail.c:1182
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -895,16 +895,16 @@ msgstr ""
 "fetchmail: atenció: cap DNS disponible per verificar les obtencions "
 "multidrop de %s\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "atenció: el sistema multidrop per a %s requereix l'opció envelope!\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "atenció: No demaneu ajuda si tot el correu va al postmaster!\n"
 
-#: fetchmail.c:1211
+#: fetchmail.c:1209
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -912,298 +912,298 @@ msgid ""
 msgstr ""
 "la configuració de %s no és vàlida, el port no pot ser número negatiu\n"
 
-#: fetchmail.c:1218
+#: fetchmail.c:1216
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "la configuració de %s no és vàlida, RPOP requereix un port privilegiat\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "la configuració de %s no és vàlida, LMTP no pot usar el port habitual "
 "d'SMTP\n"
 
-#: fetchmail.c:1250
+#: fetchmail.c:1248
 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:1300
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1385
+#: fetchmail.c:1383
 #, 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:1410
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no està configurat.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no està configurat.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no està configurat.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no està configurat.\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no està configurat.\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no està suportat.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1461
 #, 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:1480
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes és de %d segons\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre és %s\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions és %s\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrarà via syslog\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascararà i no generarà capçaleres Recieved\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1490
 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:1494
+#: fetchmail.c:1492
 #, 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:1498
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a l'obtenció de %s@%s:\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindrà via %s\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1512
 #, 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:1518
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom autèntic del servidor és %s.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1519
 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:1522
+#: fetchmail.c:1520
 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:1526
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanarà la contrasenya.\n"
 
-#: fetchmail.c:1530
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificació RPOP = \"%s\".\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol és KPOP amb autenticació per Kerberos %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol és %s"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'ús d'UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els mètodes d'autenticació disponibles.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per contrasenya.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1564
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per MSN.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per NTLM.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per OTP.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per CRAM-Md5.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per GSSAPI.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V4.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V5.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat és d'extrem a extrem.\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu és: %s\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovació del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confiança: %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1601
 #, 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:1606
+#: fetchmail.c:1604
 #, 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:1608
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la bústia per defecte.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Les bústies seleccionades són:"
 
 # al tanto amb la substitució
-#: fetchmail.c:1626
+#: fetchmail.c:1624
 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:1627
+#: fetchmail.c:1625
 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:1629
+#: fetchmail.c:1627
 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:1630
+#: fetchmail.c:1628
 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:1632
+#: fetchmail.c:1630
 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:1633
+#: fetchmail.c:1631
 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:1635
+#: fetchmail.c:1633
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "  Els missatges excessivament grans s'eliminaran abans d'obtenir el correu "
 "(--limitflush on).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1634
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1219,332 +1219,332 @@ msgstr ""
 "  Els missatges excessivament grans no s'eliminaran abans d'obtenir el "
 "correu (--limitflush off).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1636
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està habilitada (--norewrite off).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1637
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està deshabilitada (--norewrite on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1639
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  L'eliminació de retorns de carro està habilitada (stripcr on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1640
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  L'eliminació de retorns de carro està deshabilitada (stripcr off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1642
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  L'inserció de retorns de carro està habilitada (forcecr on).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1643
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  L'inserció de retorns de carro està deshabilitada (forcecr off).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1645
 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:1648
+#: fetchmail.c:1646
 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:1650
+#: fetchmail.c:1648
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  El desxifrat MIME està habilitat (mimedecode on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1649
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  El desxifrat MIME està deshabilitat (mimedecode off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1651
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  La pausa després de cada obtenció està habilitada (idle on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1652
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  La pausa després de cada obtenció està deshabilitada (idle off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1654
 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:1657
+#: fetchmail.c:1655
 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:1659
+#: fetchmail.c:1657
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les línies Delivered-To es descartaran (dropdelivered on)\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1658
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les línies Delivered-To es mantindran (dropdelivered off)\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1662
 #, 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:1667
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1667
 #, 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:1672
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de missatges grans a cada obtenció (--warnings 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1673
 #, 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:1678
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha límit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1678
 #, 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:1683
+#: fetchmail.c:1681
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1685
 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:1689
+#: fetchmail.c:1687
 #, 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:1692
+#: fetchmail.c:1690
 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:1694
+#: fetchmail.c:1692
 #, 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:1696
+#: fetchmail.c:1694
 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:1700
+#: fetchmail.c:1698
 #, 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:1702
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins el final (--expunge 0).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollirà el correu són:"
 
-#: fetchmail.c:1714 fetchmail.c:1734
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (per omissió)"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1717
 #, 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:1721
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1737
 #, 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:1742
+#: fetchmail.c:1740
 #, 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:1751
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam són:"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam està deshabilitat\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1758
 #, 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:1763
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexió.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1763
 #, 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:1768
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexió.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1785
+#: fetchmail.c:1783
 #, 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:1800
+#: fetchmail.c:1798
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està habilitada.\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està deshabilitada.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1803
 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:1807
+#: fetchmail.c:1805
 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:1810
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adreça de l'embolcall està deshabilitat.\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1811
 #, 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:1816
+#: fetchmail.c:1814
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  El nombre de capçaleres de l'embolcall que s'analitzaran és: %d\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1817
 #, 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:1822
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimirà cap prefix\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Àlies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1846
 #, 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:1850
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interfície requerida.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorarà l'interfície %s.\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interfície a monitorar.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1856
 #, 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:1860
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1860
 #, 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:1864
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió per SMTP.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1884
 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:1888
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1552,7 +1552,7 @@ msgstr ""
 "  No s'afegirà el rastre de l'obtenció a la capçalera Received.\n"
 ".\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
@@ -1627,77 +1627,77 @@ msgstr "Error quan s'enviaven les credencials GSS\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: procés dormint durant %d segons.\n"
 
-#: imap.c:298
+#: imap.c:306
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:312
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:319
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:334
 msgid "will idle after poll\n"
 msgstr "es farà una pausa després de l'obtenció\n"
 
-#: imap.c:482
+#: imap.c:490
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:512 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:513
+#: imap.c:521
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:682 imap.c:715
 msgid "re-poll failed\n"
 msgstr "la re-obtenció ha fallat\n"
 
-#: imap.c:682
+#: imap.c:690
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "hi ha %d missatge esperant després de la re-obtenció\n"
 msgstr[1] "hi ha %d missatges esperant després de la re-obtenció\n"
 
-#: imap.c:694
+#: imap.c:702
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecció de bústia\n"
 
-#: imap.c:698
+#: imap.c:706
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "hi ha %d missatge esperant després de la primera obtenció\n"
 msgstr[1] "hi ha %d missatges esperant després de la primera obtenció\n"
 
-#: imap.c:722
+#: imap.c:730
 msgid "expunge failed\n"
 msgstr "la supressió de missatges ha fallat\n"
 
-#: imap.c:726
+#: imap.c:734
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "hi ha %d missatge esperant després de la supressió\n"
 msgstr[1] "hi ha %d missatges esperant després de la supressió\n"
 
-#: imap.c:751
+#: imap.c:759
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u és no llegit\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:801 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge no llegit\n"
@@ -2510,113 +2510,113 @@ msgstr ""
 "No s'ha pogut resoldre el port pel servei %s. Especifiqueu un nombre decimal "
 "per al port.\n"
 
-#: sink.c:238
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviant a %s\n"
 
-#: sink.c:327
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cos del missatge retornat)\n"
 
-#: sink.c:330
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correu de %s retornat a %s\n"
 
-#: sink.c:462
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'error desat encara és %d\n"
 
-#: sink.c:522 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error %cMTP: %s\n"
 
-#: sink.c:766
+#: sink.c:752
 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:979
+#: sink.c:965
 #, 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:986
+#: sink.c:972
 #, 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:1027
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adreça coincideix; el postmaster no està definit.\n"
 
-#: sink.c:1039
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1045
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adreça coincideix; reenviant a %s.\n"
 
-#: sink.c:1198
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
-#: sink.c:1222
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "no s'ha pogut executar l'MDA\n"
 
-#: sink.c:1259
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexió %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1283
+#: sink.c:1270
 #, 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:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1345
+#: sink.c:1332
 #, 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:1366
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ha fallat la terminació del missatge o el tancament del fitxer BSMTP\n"
 
-#: sink.c:1387
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1417
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1420
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta no-503 inesperada al final del missatge LMTP: %s\n"
 
-#: sink.c:1574
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/cs.po b/po/cs.po
index eef05efe..aff42f8a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,5 +1,4 @@
 # Czech translation of fetchmail.
-# Copyright (C) 2005 fetchmail'S COPYRIGHT HOLDER.
 # Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>.
 #
 # Jiří Pavlovský <pavlovsk@ff.cuni.cz>, 1999 - 2001.
@@ -8,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-11-10 02:41+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+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"
@@ -65,12 +64,12 @@ msgstr "Subject: Varování fetchmail o příliš velkých zprávách"
 
 #: driver.c:341
 #, fuzzy, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr "Následující příliš velké zprávy zůstávají na serveru pošty %s:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr "Následující příliš velké zprávy zůstávají na serveru pošty %s:"
 
 #: driver.c:364
@@ -247,7 +246,7 @@ msgstr "Subject: Varování fetchmailu o nedostupnosti serveru."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1099 imap.c:392 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "Spojení SSL selhalo.\n"
 
@@ -413,7 +412,7 @@ msgstr " (%d oktetů).\n"
 msgid "No mail for %s\n"
 msgstr "Žádná pošta pro %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "nesmyslný po�et zpráv!"
 
@@ -867,11 +866,11 @@ msgstr "Varování: poÄ�ítaÄ� %s je v konfiguraÄ�ním souboru zmínÄ›n vícekrÃ
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Varování: po�íta� %s je v konfigura�ním souboru zmíněn vícekrát\n"
 
-#: fetchmail.c:1151
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL není podporováno.\n"
 
-#: fetchmail.c:1182
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -879,129 +878,129 @@ msgstr ""
 "fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných "
 "schránek z %s\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "varování: spole�né schránky pro %s vyžadují přepína� envelope!\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
 
-#: fetchmail.c:1211
+#: fetchmail.c:1209
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "Nastavení pro %s není platné, �íslo portu nesmí být záporné.\n"
 
-#: fetchmail.c:1218
+#: fetchmail.c:1216
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "Nastavení %s není platné, RPOP vyžaduje privilegovaný port\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMTP\n"
 
-#: fetchmail.c:1250
+#: fetchmail.c:1248
 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:1300
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukon�en signálem %d\n"
 
-#: fetchmail.c:1385
+#: fetchmail.c:1383
 #, 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:1410
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "Podpora POP2 není nastavena.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "Podpora POP3 není nastavena.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "Podpora IMAPu není nastavena.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "Podpora ETRN není nastavena.\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "Podpora ODMR není nastavena.\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "zvolen nepodporovaný protokol.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1461
 #, 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:1480
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval stahování je %d sekund\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Soubor záznamů je %s\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Soubor ID je %s\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Zprávy o průběhu budou zaznamenávny pomocí syslogu\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se bude skrývat a nebude generovat Received\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1490
 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:1494
+#: fetchmail.c:1492
 #, 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:1498
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude chybové zprávy posílát postmasterovi.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude chybové zprávy posílát odesílateli.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Možnosti pro stahování z %s@%s:\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude stahována z %s\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1512
 #, 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 +1008,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:1518
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skute�né jméno serveru je %s.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1519
 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:1522
+#: fetchmail.c:1520
 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:1526
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Bude požadováno heslo.\n"
 
-#: fetchmail.c:1530
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Tajemství APOP = \"%s\".\n"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\"\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " Protokol je KPOP s autentizací Kerberos %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr " Protokol je %s"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr "  (pomocí služby %s)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (pomocí implicitního portu)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr "  (vynuceně používám UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budou vyzkoušeny všechny dostupné metody autentizace.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace heslem.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1564
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace GSSAPI.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V4.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V5.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Předpokládám šifrované spojení.\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principal poštovní služby je: %s\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sezení šifrovaná s SSL povolena.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL povolena.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresář důvěryhodných certifikátů SSL: %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1601
 #, 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:1606
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Čas �ekání na odpově� serveru je %d sekund"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (implicitní).\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Zvolena implicitní poštovní schránka.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Zvolené poštovní schránky jsou:"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1624
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Budou staženy všechny zprávy (--all zapnuto).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1625
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Budou staženy jen nové zprávy (--all vypnuto).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1627
 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:1630
+#: fetchmail.c:1628
 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:1632
+#: fetchmail.c:1630
 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:1633
+#: fetchmail.c:1631
 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:1635
+#: fetchmail.c:1633
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1187,7 +1186,7 @@ msgid ""
 msgstr ""
 "  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1634
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1195,216 +1194,216 @@ msgid ""
 msgstr ""
 "  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1636
 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:1639
+#: fetchmail.c:1637
 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:1641
+#: fetchmail.c:1639
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Mazání CR je povoleno (stripcr zapnuto).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1640
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Mazání CR je zakázáno (stripcr vypnuto).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1642
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynucení CR je povoleno (forcecr zapnuto).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1643
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1645
 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:1648
+#: fetchmail.c:1646
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1648
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódování MIME je povoleno (mimedecode zapnuto).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1649
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódování MIME je zakázáno (mimedecode vypnuto).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1651
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Ne�innost po stahování je povolena (idle zapnuto).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1652
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Ne�innost po stahování je zakázána (idle vypnuto).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1654
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1655
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1657
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1658
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1662
 #, 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:1667
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Žádný limit velikosti zprávy (--limit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1667
 #, 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:1672
+#: fetchmail.c:1670
 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:1675
+#: fetchmail.c:1673
 #, 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:1678
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Žádný Limit přijatých (--fetchlimit 0).\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1678
 #, 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:1683
+#: fetchmail.c:1681
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1685
 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:1689
+#: fetchmail.c:1687
 #, 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:1692
+#: fetchmail.c:1690
 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:1694
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky zpráv SMTP je %d.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Žádný limit dávky zpráv SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1698
 #, 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:1702
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Žádná vynucená �ištění (--expunge 0).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény, pro které se bude stahovat pošta, jsou:"
 
-#: fetchmail.c:1714 fetchmail.c:1734
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (implicitní)"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1717
 #, 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:1721
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Zprávy budou doru�eny pomocí \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Zprávy budou přeposlány pomocí %cMTP na:"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1737
 #, 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:1742
+#: fetchmail.c:1740
 #, 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:1751
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznávané odpově�i serveru blokující spam jsou:"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokování spamu zakázáno\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1758
 #, 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:1763
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Žádný příkaz před spojením.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1763
 #, 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:1768
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Žádný příkaz po spojení.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nedeklarována žádná místní jména tohoto po�íta�e.\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Režim spole�ných schránek: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Režim soukromých schránek: "
 
-#: fetchmail.c:1785
+#: fetchmail.c:1783
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1412,119 +1411,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:1800
+#: fetchmail.c:1798
 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:1801
+#: fetchmail.c:1799
 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:1805
+#: fetchmail.c:1803
 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:1807
+#: fetchmail.c:1805
 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:1810
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1811
 #, 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:1816
+#: fetchmail.c:1814
 #, 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:1819
+#: fetchmail.c:1817
 #, 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:1822
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Žádné odtrhávání předpony\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Deklarované přezdívky poštovního serveru:"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Místní domény:"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojení musí procházet přes %s.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Nezadán žádný požadavek na rozhraní.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Stahovací smy�ka bude sledovat %s.\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Nezadáno žádné sledované rozhraní.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1856
 #, 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:1860
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1860
 #, 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:1864
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Nezadán žádný příkaz výstupního zásuvného modulu.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Z tohoto po�íta�e neukládána žádná UID.\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Ukládáno %d UID.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1884
 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:1888
+#: fetchmail.c:1886
 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:1891
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Předávané vlastnosti \"%s\".\n"
@@ -1598,39 +1597,39 @@ msgstr "Chyba při uvolňování ověření\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: vlákno spí na %d s.\n"
 
-#: imap.c:298
+#: imap.c:306
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:312
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:319
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:334
 msgid "will idle after poll\n"
 msgstr "po stahování budu ne�inný\n"
 
-#: imap.c:482
+#: imap.c:490
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:512 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n"
 
-#: imap.c:513
+#: imap.c:521
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:682 imap.c:715
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:682
+#: imap.c:690
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1638,12 +1637,12 @@ msgstr[0] "%d zpráva �eká po opětovném stahování\n"
 msgstr[1] "%d zprávy �ekají po opětovném stahování\n"
 msgstr[2] "%d zpráv �eká po opětovném stahování\n"
 
-#: imap.c:694
+#: imap.c:702
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
 # c-format
-#: imap.c:698
+#: imap.c:706
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1651,11 +1650,11 @@ msgstr[0] "%d zpráva �eká po prvním stahování\n"
 msgstr[1] "%d zprávy �ekají po prvním stahování\n"
 msgstr[2] "%d zpráv �eká po prvním stahování\n"
 
-#: imap.c:722
+#: imap.c:730
 msgid "expunge failed\n"
 msgstr "�ištění selhalo\n"
 
-#: imap.c:726
+#: imap.c:734
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1663,16 +1662,16 @@ msgstr[0] "%d zpráva �eká po vy�ištění\n"
 msgstr[1] "%d zprávy �ekají po vy�ištění\n"
 msgstr[2] "%d zpráv �eká po vy�ištění\n"
 
-#: imap.c:751
+#: imap.c:759
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepře�tených zpráv selhalo\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla pře�tena\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:801 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepře�tená\n"
@@ -2464,110 +2463,110 @@ msgstr ""
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:238
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "přeposílám na %s\n"
 
-#: sink.c:327
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tělo hlášení o chybě)\n"
 
-#: sink.c:330
+#: sink.c:315
 #, 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:462
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Uložená chyba je stále %d\n"
 
-#: sink.c:522 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Chyba %cMTP: %s\n"
 
-#: sink.c:766
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "otevření souboru BSMTP nebo zápis preambule selhal\n"
 
-#: sink.c:979
+#: sink.c:965
 #, 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:986
+#: sink.c:972
 #, 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:1027
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "neodpovídá žádná adresa; nenastaven postmaster.\n"
 
-#: sink.c:1039
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nelze odeslat ani na %s!\n"
 
-#: sink.c:1045
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "neodpovídá žádná adresa; přeposílám na %s.\n"
 
-#: sink.c:1198
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "chystám se doru�it pomocí: %s\n"
 
-#: sink.c:1222
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "otevírání MDA sehalo\n"
 
-#: sink.c:1259
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "připojení%cMTP k %s selhalo\n"
 
-#: sink.c:1283
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "nemohu se spustit démona; nahrazuji jej %s"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA umřel na signál %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA vrátil nenulový stav %d\n"
 
-#: sink.c:1345
+#: sink.c:1332
 #, 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:1366
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ukon�ení zprávy nebo zavření souboru BSMTP selhalo\n"
 
-#: sink.c:1387
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "Démon SMTP odmítl doru�ení\n"
 
-#: sink.c:1417
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Chyba doru�ování LMTP při EOM\n"
 
-#: sink.c:1420
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Neo�ekávaná odpově� na LMTP EOM jiná než 503: %s\n"
 
-#: sink.c:1574
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/da.po b/po/da.po
index 7fd28801..c3af16e3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-06 00:35+0200\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2003-04-10 18:50+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,20 +14,25 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Tjekker om %s virkelig er samme maskine som %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Ja, deres IP-adresser stemmer overens\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "Nej, deres IP-adresser stemmer ikke overens\n"
 
-#: checkalias.c:199 checkalias.c:224
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr "navneserverfejl ved opslag på \"%s\" ved prøvning af %s.\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "navneserverfejl ved opslag på \"%s\" ved prøvning af %s.\n"
@@ -41,21 +46,29 @@ msgstr "kunne ikke afkode BASE64-anråb\n"
 msgid "decoded as %s\n"
 msgstr "afkodet som %s\n"
 
-#: driver.c:195
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberosfejl %s\n"
 
-#: driver.c:253 driver.c:258
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server siger '%*s']\n"
 
-#: driver.c:339
+#: driver.c:337
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:342
+#: driver.c:341
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on the mail server %s:"
+msgstr ""
+"Subject: Fetchmail-advarsel om for store breve\n"
+"\n"
+"Disse breve er for store og forbliver paa postserveren %s:"
+
+#: driver.c:345
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -63,73 +76,78 @@ msgstr ""
 "\n"
 "Disse breve er for store og forbliver paa postserveren %s:"
 
-#: driver.c:360
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+
+#: driver.c:368
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
 
-#: driver.c:500
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:552
+#: driver.c:556
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:568
+#: driver.c:572
 msgid " (length -1)"
 msgstr " (længde -1)"
 
-#: driver.c:571
+#: driver.c:575
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:586
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "kunne ikke hente brevhoveder, brev %s@%s:%d (%d oktetter)\n"
 
-#: driver.c:603
+#: driver.c:607
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "læser brev %s@%s:%d af %d"
 
-#: driver.c:608
+#: driver.c:612
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soktetter)"
 
-#: driver.c:609
+#: driver.c:613
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:681
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:739
+#: driver.c:743
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "brev %s@%s:%d havde ikke den forventede længde (%d != %d forventet)\n"
 
-#: driver.c:770
+#: driver.c:774
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:779
+#: driver.c:784
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:796
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " ikke slettet\n"
 
-#: driver.c:813
+#: driver.c:818
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -137,41 +155,41 @@ msgid_plural ""
 msgstr[0] "afhentningsgrænse %d nået; %d breve tilbage på server %s konto %s\n"
 msgstr[1] "afhentningsgrænse %d nået; %d breve tilbage på server %s konto %s\n"
 
-#: driver.c:876
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE kastet fra en MDA, eller en strømsokkelfejl\n"
 
-#: driver.c:883
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på forbindelse til server %s.\n"
 
-#: driver.c:887
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på server %s.\n"
 
-#: driver.c:891
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på %s.\n"
 
-#: driver.c:896
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tidsafbrud efter %d sekunders venten på svar fra modtager.\n"
 
-#: driver.c:899
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:911
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail har gentagne tidsafbrud\n"
 
-#: driver.c:914
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -180,7 +198,7 @@ msgstr ""
 "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%"
 "s.\n"
 
-#: driver.c:918
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -195,56 +213,31 @@ msgstr ""
 "\n"
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
-#: driver.c:947
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:978
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:1000
+#: driver.c:993
 msgid "Lead server has no name.\n"
 msgstr "Fører-server har ikke noget navn.\n"
 
-#: driver.c:1024 driver.c:1050
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "kunne ikke finde kanonisk DNS-navn for %s\n"
 
-#: driver.c:1088
-msgid "internal inconsistency\n"
-msgstr "intern uoverensstemmelse\n"
-
-#: driver.c:1098
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:1104
-msgid "host is unknown."
-msgstr "værten er ukendt."
-
-#: driver.c:1107
-msgid "name is valid but has no IP address."
-msgstr "navnet er gyldigt, men har ingen IP-adresse."
-
-#: driver.c:1110
-msgid "unrecoverable name server error."
-msgstr "uoprettelig navneserverfejl."
-
-#: driver.c:1112
-msgid "temporary name server error."
-msgstr "midlertidig navneserverfejl."
-
-#: driver.c:1115
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "ukendt DNS-fejl %d."
-
-#: driver.c:1133
+#: driver.c:1071
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -252,45 +245,45 @@ msgstr ""
 "\n"
 "Fetchmail kunne ikke naa postserveren %s:"
 
-#: driver.c:1135
+#: driver.c:1073
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1099 imap.c:384 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: driver.c:1215
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lås optaget-fejl på %s@%s\n"
 
-#: driver.c:1219
+#: driver.c:1156
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server optaget-fejl på %s@%s\n"
 
-#: driver.c:1224
+#: driver.c:1161
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Godkendelsesfejl på %s@%s%s\n"
 
-#: driver.c:1227
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
-#: driver.c:1248
+#: driver.c:1185
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail - godkendelse mislykkedes paa %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1256
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -319,7 +312,7 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1271
+#: driver.c:1208
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -338,163 +331,168 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1286
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Prøver straks igen %s@%s\n"
 
-#: driver.c:1291
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl på %s@%s\n"
 
-#: driver.c:1315
+#: driver.c:1252
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden på %s@%s\n"
 
-#: driver.c:1321
+#: driver.c:1258
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail - godkendelse i orden paa %s@%s\n"
 
-#: driver.c:1325
+#: driver.c:1262
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail var i stand til at logge ind på %s@%s.\n"
 
-#: driver.c:1329
+#: driver.c:1266
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1360
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vælger eller prøver igen brevbakke %s\n"
 
-#: driver.c:1362
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "vælger eller prøver igen indbakken\n"
 
-#: driver.c:1374
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1377 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: driver.c:1382
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Prøver %s\n"
 
-#: driver.c:1386
+#: driver.c:1323
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d gamle) til %s"
 msgstr[1] "%d %s (%d gamle) til %s"
 
-#: driver.c:1389
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1392
+#: driver.c:1329
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s til %s"
 msgstr[1] "%d %s til %s"
 
-#: driver.c:1399
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1405
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1438
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1539
+#: driver.c:1485
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1542
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1545
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1548
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1551
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1554
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "server låst-"
 
-#: driver.c:1557
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1560
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1563
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "udefineret fejl\n"
 
-#: driver.c:1574
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1515
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%sfejl ved levering til SMTP-vært fra %s\n"
 
-#: driver.c:1576
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "værten er ukendt."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%sfejl ved hentning fra %s\n"
 
-#: driver.c:1584
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1605
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-støtte.\n"
 
-#: driver.c:1613
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-støtte.\n"
 
-#: driver.c:1624
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke understøttet med %s\n"
 
-#: driver.c:1630
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke understøttet med %s\n"
 
-#: driver.c:1638
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke understøttet med %s\n"
@@ -541,11 +539,23 @@ msgstr "%s: Du findes ikke.  Fjern dig.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: kan ikke bestemme din værtsmaskine!"
 
-#: env.c:158
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fejlede for %s\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -594,76 +604,81 @@ msgstr "ETRN-syntaksfejl i parametre\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "Ukendt ETRN-fejl %d\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Tilvalg --keep er ikke understøttet med ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Tilvalg --flush er ikke understøttet med ETRN\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "Tilvalg --remote er ikke understøttet med ETRN\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "Tilvalg --flush er ikke understøttet med ETRN\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Tilvalg --check er ikke understøttet med ETRN\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "kunne ikke få det nuværende arbejdskatalog\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:355
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:352
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - måske mangler %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail kører\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: fejl ved drab af %sfetchmail på %d; jeg trækker mig.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:403
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %sfetchmail på %d dræbt.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -671,7 +686,7 @@ msgstr ""
 "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært "
 "kører.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -679,180 +694,185 @@ msgstr ""
 "fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail "
 "kører på %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail kører på %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: kan ikke tage tilvalg mens en baggrundsfetchmail kører.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: baggrunds fetchmail på %d vækket.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: ældre søskende på %d døde på mystisk vis.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:487
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: kan ikke finde et kodeord for %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv kodeord for %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starter fetchmail %s-dæmon\n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "kunne ikke åbne %s for at tilføje logs til \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsfæste %s (fejl %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s ændret)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "forsøg på at genstarte kan mislykkes da kataloget ikke er genoprettet\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "forsøg på at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "prøve af %s droppet (mislykket godkendelse eller for mange tidsafbrud)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke nået, spørger ikke %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:690
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Spørgestatus=0 (succes)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:692
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Spørgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:694
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Spørgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:696
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Spørgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:698
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Spørgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:700
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Spørgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:702
 msgid "Query status=6 (IOERR)\n"
 msgstr "Spørgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:704
 msgid "Query status=7 (ERROR)\n"
 msgstr "Spørgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:706
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Spørgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:708
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Spørgestatus=9 (lås optaget)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:710
 msgid "Query status=10 (SMTP)\n"
 msgstr "Spørgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:712
 msgid "Query status=11 (DNS)\n"
 msgstr "Spørgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:714
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Spørgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:716
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Spørgestatus=13 (afhentningsgrænse nået)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Spørgestatus=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:771
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "sover %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "vækket af %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "vækket af signal %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "vækket %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsfæste kørselskontrolfilen\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Advarsel: flere forekomster af vært %s i konfigurationsfil\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "Advarsel: flere forekomster af vært %s i konfigurationsfil\n"
+
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-understøttelse.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -860,671 +880,666 @@ msgstr ""
 "fetchmail: advarsel: DNS er ikke tilgængelig til at tjekke flermodtager-"
 "afhentninger fra %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1177
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1193
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "konfiguration af %s forkert, portnummer kan ikke være negativt\n"
 
-#: fetchmail.c:1200
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "konfiguration af %s forkert, RPOP kræver en privilegeret port\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "konfiguration af %s forkert, LMTP kan ikke bruge standard SMTP-port\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Brug af både fetchall og keep som dæmon er en fejl!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s-forespørgsel til %s (protokol %s) begyndt %s\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-understøttelse.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-understøttelse.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-understøttelse.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-understøttelse.\n"
 
-#: fetchmail.c:1425
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "Kan ikke understøtte ETRN uden gethostbyname(2).\n"
-
-#: fetchmail.c:1432
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-understøttelse.\n"
 
-#: fetchmail.c:1438
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "Kan ikke understøtte ODMR uden gethostbyname(2).\n"
-
-#: fetchmail.c:1444
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-understøttet protokol valgt.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s-forespørgsel til %s (protokol %s) afsluttet %s\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Prøvemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forløbsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forløbsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1512
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Prøvning af denne server vil ske hvert %d. sekund.\n"
 msgstr[1] "  Prøvning af denne server vil ske hvert %d. sekund.\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1519
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Denne vært %s blive forespurgt når ingen vært er specificeret.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1520
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Denne vært %s blive forespurgt når ingen vært er specificeret.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1548
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (bruger netværkssikkerhedstilvalg %s)"
-
-#: fetchmail.c:1551
-#, c-format
-msgid " (using port %d)"
-msgstr " (bruger port %d)"
-
-#: fetchmail.c:1554
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilgængelige godkendelsesmetoder vil blive forsøgt.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er påkrævet.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM-godkendelse er påkrævet.\n"
+
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-nøgle-fingeraftryk (tjekket mod servernøglen): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter på svar fra server i højst %d sekunder"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Hentede breve %s blive gemt på serveren (--keep %s).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Hentede breve %s blive gemt på serveren (--keep %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1630
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Gamle breve %s blive slettede før afhentning (--flush %s).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1631
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  Gamle breve %s blive slettede før afhentning (--flush %s).\n"
 
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr "  Gamle breve %s blive slettede før afhentning (--flush %s).\n"
+
 #: fetchmail.c:1634
 #, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr "  Gamle breve %s blive slettede før afhentning (--flush %s).\n"
+
+#: fetchmail.c:1636
+#, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1639
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1642
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Indsættelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Indsættelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1645
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1646
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1648
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1651
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter prøvning er %s (idle %s).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1652
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Tomgang efter prøvning er %s (idle %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1654
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1655
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1657
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1658
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Maksimal størrelse på breve er %d oktetter (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval for størrelsesadvarsler er %d sekunder (--warnings %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Størrelsesadvarsler ved hver prøvning (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgrænse er %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgrænse (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Sletninger udføres ved hver %d. brev (--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domæner som der vil blive hentet post til:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilføjet %s som BSMTP\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Værtsdelen af MAIL FROM-linjen vil blive %s\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adressen i RCPT TO-linjer til SMTP bliver %s\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er slået fra\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med \"%s\".\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med \"%s\".\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne vært.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1783
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokale navne genkendt\n"
 msgstr[1] "%d lokale navne genkendt\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1798
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1803
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "Adressering efter konvolutadressen er slået fra\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Konvolutadressen antages at være i %s-feltet i brevhovedet\n"
 
-#: fetchmail.c:1809
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1811
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nr. konvolutadresse som vil blive analyseret: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Præfiks %s vil blive slettet fra bruger-id\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Ingen præfikssletning\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderklærede postserveraliaser:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Lokale domæner:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem grænseflade %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen grænsefladekrav specificeret.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Prøveløkke vil overvåge %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overvågning af grænseflade specificeret.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serverforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Modtagerforbindelser vil blive lavet vha. hjælpeprogrammet %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne vært.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 "  Sporingsinformation vil ikke blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: \"%s\".\n"
 
-#: fetchmail.h:614 fetchmail.h:620
-msgid "alloca failed"
-msgstr "alloca mislykkedes"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "FEJL: ingen understøttelse til getpassword()-funktion\n"
@@ -1555,37 +1570,37 @@ msgstr "Sender akkreditiver\n"
 msgid "Error exchanging credentials\n"
 msgstr "Fejl ved udveksling af akkreditiver\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Akkreditiver udvekslet\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server kræver integritet og/eller hemmeligholdelse\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksimal GSS-symbolstørrelse er %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "Frigiver GSS-akkreditiver\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
@@ -1594,77 +1609,77 @@ msgstr "Fejl ved frigivelse af akkreditiver\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: tråd sover i %d sekunder.\n"
 
-#: imap.c:281
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr "går i tomgang efter prøvning\n"
 
-#: imap.c:462
+#: imap.c:482
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som påkrævet\n"
 
-#: imap.c:484
+#: imap.c:504 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 
-#: imap.c:493
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
 
-#: imap.c:644 imap.c:710
-msgid "expunge failed\n"
-msgstr "sletning (EXPUNGE) mislykkedes\n"
-
-#: imap.c:662 imap.c:695
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "genprøvning mislykkedes\n"
 
-#: imap.c:670
+#: imap.c:682
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d breve venter efter genprøvning\n"
 msgstr[1] "%d breve venter efter genprøvning\n"
 
-#: imap.c:682
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:686
+#: imap.c:698
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d breve venter efter første prøvning\n"
 msgstr[1] "%d breve venter efter første prøvning\n"
 
-#: imap.c:714
+#: imap.c:722
+msgid "expunge failed\n"
+msgstr "sletning (EXPUNGE) mislykkedes\n"
+
+#: imap.c:726
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d breve venter efter sletning\n"
 msgstr[1] "%d breve venter efter sletning\n"
 
-#: imap.c:739
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:793 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
@@ -1705,44 +1720,44 @@ msgstr "Ingen grænseflade med navnet %s fundet"
 msgid "No IP address found for %s"
 msgstr "ingen IP-adresse fundet for %s"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "manglende IP-grænsefladeadresse\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "Ugyldig IP-grænsefladeadresse\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "Ugyldig IP-grænseflademaske\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivitet på %s opfattet som %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "springer prøvning af %s over, %s er nede\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "springer prøvning af %s over, %s's IP-adresse er fravalgt\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivitet på %s tjekket som %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "springer prøvning af %s over, %s er inaktiv\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivitet på %s var %d, er %d\n"
@@ -1769,25 +1784,30 @@ msgstr "kunne ikke afkode BASE64 klar-svar\n"
 msgid "challenge mismatch\n"
 msgstr "uoverensstemmelse i anråb\n"
 
-#: lock.c:83
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: fjerner efterladt låsefil\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: fjerner efterladt låsefil\n"
 
-#: lock.c:124
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: fjerner efterladt låsefil\n"
+
+#: lock.c:137
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: oprettelse af låsefil mislykkedes\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "advarsel: fandt \"%s\" før noget værtsnavn"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: advarsel: fandt \"%s\" før noget værtsnavn\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: advarsel: ukendt symbol \"%s\"\n"
@@ -1826,19 +1846,25 @@ msgstr "Godkendelse påkrævet.\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "Ukendt ODMR-fejl %d.\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "skriver brevtekst\n"
+
+#: odmr.c:240
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Tilvalg --keep er ikke understøttet med ODMR\n"
 
-#: odmr.c:247
+#: odmr.c:244
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Tilvalg --flush er ikke understøttet med ODMR\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "Tilvalg --remote er ikke understøttet med ODMR\n"
+#: odmr.c:248
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "Tilvalg --flush er ikke understøttet med ODMR\n"
 
-#: odmr.c:255
+#: odmr.c:252
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Tilvalg --check er ikke understøttet med ODMR\n"
 
@@ -1850,348 +1876,353 @@ msgstr "fatal fejl ved læsning fra server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "strengen '%s' er ikke en gyldig talstreng.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Værdien af strengen '%s' er %s end %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "mindre"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "større"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ugyldig protokol '%s' specificeret.\n"
 
-#: options.c:429
+#: options.c:372
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ugyldig godkendelse '%s' specificeret.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: understøttelse af netværkssikkerhed er slået fra\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "brug: fetchmail [tilvalg] [server ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  Mulige tilvalg er:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        vis denne hjælp\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     vis versionsinformation\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tjek om der er breve uden at hente dem\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      vær stille\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     vær larmende (diagnostisk uddata)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      kør som dæmon en gang pr. n sekunder\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    sæt ikke ikke dæmonprocessen i baggrunden\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        dræb dæmonproces\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     angiv navn på logfil\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr "      --syslog      brug syslog(3) som dæmon til de fleste beskeder\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   skriv ikke Received-linjer & lav værtssløring\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specificer en alternativ kørselskontrolfil\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specificer modtager som sidste udvej\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   specifikation af krævet grænseflade\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     overvåg grænseflade for aktivitet\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         brug ssl-kryptering\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      privat ssl-nøglefil\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:686
+#: options.c:599
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:687
+#: options.c:600
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      -ssl          brug bestemt af ssl-protokol (ssl2/ss3/tls1)\n"
 
-#: options.c:690
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hjælpeprogram til at åbne forbindelse\n"
 
-#: options.c:691
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     specificer hjælpeprogram til at åbne smtp-forbindelse\n"
 
-#: options.c:693
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:694
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:695
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
+
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
 
-#: options.c:696
+#: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:697
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:698
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:699
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    præfiks som skal slettes fra lokale bruger-id'er\n"
 
-#: options.c:700
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:701
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  tilføj sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:703
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specificer brugernavn på server\n"
 
-#: options.c:704
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         hent gamle og nye breve\n"
 
-#: options.c:705
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:706
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:707
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve på server\n"
 
-#: options.c:708
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       slet gamle breve på server\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:709
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       hent ikke breve over den anførte størrelse\n"
 
-#: options.c:710
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:713
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      anfør IP-sikkerhedsanmodning\n"
-
-#: options.c:715
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anfør vært til SMTP-levering\n"
 
-#: options.c:716
+#: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:717
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anfør SMTP-afleveringsdomæne at bruge\n"
 
-#: options.c:718
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anfør fuldt SMTP-navn - brugernavn@domæne\n"
 
-#: options.c:719
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anfør antispam-svarværdier\n"
 
-#: options.c:720
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  anfør maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:721
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  anfør maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:722
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:723
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:724
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     anfør maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:725
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anfør MDA til brug for levering\n"
 
-#: options.c:726
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anfør BSMTP-uddatafil\n"
 
-#: options.c:727
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:728
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 
-#: options.c:729
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
-#: pop3.c:543
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:552
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:574
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:767
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Breve indsat på serverens liste. Kan ikke håndtere dette.\n"
 
-#: pop3.c:853
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:868
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1225
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke understøttet med POP3\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "tilvalg vedr. server efter brugertilvalgene"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr "SDPS er ikke slået til."
 
-#: rcfile_y.y:222
-msgid "invalid security request"
-msgstr "Ugyldig sikkerhedsanmodning"
-
-#: rcfile_y.y:228
-msgid "network-security support disabled"
-msgstr "understøttelse af netværkssikkerhed er slået fra"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2199,7 +2230,7 @@ msgstr ""
 "fetchmail: grænsefladetilvalg (interface) er kun understøttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2207,25 +2238,25 @@ msgstr ""
 "fetchmail: overvågningstilvalg (monitor) er kun understøttet under Linux "
 "(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL er ikke slået til"
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "slut på inddata"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Filen %s skal være en regulær fil.\n"
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Filen %s må ikke flere tilladelser end -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Filen %s skal være ejet af dig.\n"
@@ -2426,110 +2457,124 @@ msgstr "MD5 bliver anvendt på datablok:\n"
 msgid "MD5 result is: \n"
 msgstr "MD5-resultatet er:\n"
 
-#: sink.c:247
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:332
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst til afvisningsbrev)\n"
 
-#: sink.c:335
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "afvisning af brev fra %s sendt til %s\n"
 
-#: sink.c:467
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gemt fejlkode er stadig %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:761
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP-fil åben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:970
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:977
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan virkelig ikke lide modtageradresse '%s'\n"
 
-#: sink.c:1015
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1027
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1033
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "MDA-åbning mislykkedes\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kan ikke få kontakt til modtager, bruger i stedet %s"
 
-#: sink.c:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Underligt: MDA pclose returnede %d, kan ikke håndtere det i %s:%d\n"
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1559
+#: sink.c:1561
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2567,165 +2612,164 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:117 socket.c:143
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:175
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#: socket.c:181
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:188
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:194
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udfører %s (server %s service %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:288
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:430
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: ulovlig adresselængde modtaget for vært %s\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:787
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:789
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (måske afskåret).\n"
 
-#: socket.c:791
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:793
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:795
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (måske afskåret).\n"
 
-#: socket.c:797
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:801
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Servers almennavn %s\n"
 
-#: socket.c:805
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dårligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:821
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:827
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anført, kunne ikke verificere certifikat!\n"
 
-#: socket.c:832
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:834
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:844
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:848
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:856
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:862
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s nøgle-fingeraftryk: %s\n"
 
-#: socket.c:866
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:869
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:878
+#: socket.c:747
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Advarsel: servercertifikat-verificering: %s\n"
 
-#: socket.c:884
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de første %d tegn): %s\n"
 
-#: socket.c:936
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert værdi til SSL"
 
-#: socket.c:953
+#: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:1014
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget "
 "over!\n"
 
-#: socket.c:1086
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr "Forsøger igen at læse cygwin-sokkel\n"
 
-#: socket.c:1089
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Forsøg på at læse cygwin-sokkel mislykkedes!\n"
 
-#: transact.c:66
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s svarer til %s lokalt\n"
 
-#: transact.c:130
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "Undersøgt %s som passer med %s\n"
 
-#: transact.c:199
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2734,69 +2778,69 @@ msgstr ""
 "analyserer Received-linje:\n"
 "%s"
 
-#: transact.c:238
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "linjen accepteret, %s er et alias for postserveren\n"
 
-#: transact.c:244
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "linjen afvist, %s er ikke et alias for postserveren\n"
 
-#: transact.c:318
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "ingen \"Received\"-adresse fundet\n"
 
-#: transact.c:327
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "fandt \"Received\"-adresse `%s'\n"
 
-#: transact.c:528
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "brev afsluttet under læsningen af brevhovedet\n"
 
-#: transact.c:549
+#: transact.c:559
 msgid "incorrect header line found while scanning headers\n"
 msgstr "ukorrekt brevhovedlinje fundet under læsningen af brevhovedet\n"
 
-#: transact.c:551
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Prøver %s\n"
 
-#: transact.c:1069
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1084
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1192
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1213
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erklærede lokale navne"
 
-#: transact.c:1220
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1229
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1237
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1362
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "skriver brevtekst\n"
 
@@ -2805,7 +2849,7 @@ msgstr "skriver brevtekst\n"
 msgid "Old UID list from %s:"
 msgstr "Gammel UID-liste fra %s:"
 
-#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr " <tom>"
 
@@ -2813,53 +2857,53 @@ msgstr " <tom>"
 msgid "Scratch list of UIDs:"
 msgstr "Liste af øvrige UID'er:"
 
-#: uid.c:513 uid.c:565
+#: uid.c:514 uid.c:566
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "Gammel UID-liste fra %s:"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Ny UID-liste fra %s:"
 
-#: uid.c:544
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr "Ombytter UID-lister\n"
 
-#: uid.c:552
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "Ombytter ikke UID-lister, ingen UID'er set ved denne forespørgsel\n"
 
-#: uid.c:577
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "Ombytter UID-lister\n"
 
-#: uid.c:612
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr "Sletter fetchids-fil\n"
 
-#: uid.c:614
+#: uid.c:615
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
-#: uid.c:620
+#: uid.c:621
 msgid "Writing fetchids file.\n"
 msgstr "Skriver fetchids-fil.\n"
 
-#: uid.c:639
+#: uid.c:640
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:643
+#: uid.c:644
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:647
+#: uid.c:648
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2872,6 +2916,66 @@ msgstr "malloc mislykkedes\n"
 msgid "realloc failed\n"
 msgstr "realloc mislykkedes\n"
 
+#~ msgid "internal inconsistency\n"
+#~ msgstr "intern uoverensstemmelse\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "navnet er gyldigt, men har ingen IP-adresse."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "uoprettelig navneserverfejl."
+
+#~ msgid "temporary name server error."
+#~ msgstr "midlertidig navneserverfejl."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "ukendt DNS-fejl %d."
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "Tilvalg --remote er ikke understøttet med ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "Kan ikke understøtte ETRN uden gethostbyname(2).\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "Kan ikke understøtte ODMR uden gethostbyname(2).\n"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (bruger netværkssikkerhedstilvalg %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (bruger port %d)"
+
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca mislykkedes"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "advarsel: fandt \"%s\" før noget værtsnavn"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "Tilvalg --remote er ikke understøttet med ODMR\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: understøttelse af netværkssikkerhed er slået fra\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      anfør IP-sikkerhedsanmodning\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "Ugyldig sikkerhedsanmodning"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "understøttelse af netværkssikkerhed er slået fra"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: ulovlig adresselængde modtaget for vært %s\n"
+
 #~ msgid "header "
 #~ msgstr "brevhoved-"
 
diff --git a/po/el.po b/po/el.po
index 12929efb..2b4a558f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-06 00:35+0200\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,20 +14,27 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "¸ëåã÷ïò åÜí ôï %s åßíáé ğñÜãìáôé ï ßäéïò êüìâïò ìå ôïí %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Íáé, ïé IP äéåõèıíóåéò ôïõò ôáéñéÜæïõí\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "¼÷é, ïé IP äéåõèıíóåéò ôïõò äåí ôáéñéÜæïõí\n"
 
-#: checkalias.c:199 checkalias.c:224
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr ""
+"ç áíáæŞôçóç ôïõ `%s' áğİôõ÷å (óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí), êáôá ôçí\n"
+"óõãêİíôñùóç áëëçëïãñáößáò  ãéá ôï %s.\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -43,21 +50,29 @@ msgstr "áäõíáìßá áğïêùäéêïğïßçóçò ôçò BASE64 ğñüêëçóçò\n"
 msgid "decoded as %s\n"
 msgstr "áğïêùäéêïğïéŞèçêå óáí %s\n"
 
-#: driver.c:195
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "óöÜëìá kerberos %s\n"
 
-#: driver.c:253 driver.c:258
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [ï äéá÷åéñéóôŞò ëİåé '%*s'] \n"
 
-#: driver.c:339
+#: driver.c:337
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:342
+#: driver.c:341
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on the mail server %s:"
+msgstr ""
+"Subject: Ğñïåéäïğïßçóç fetchmail õğåñìåãİèïõò-ìçíõìÜôùí.\n"
+"\n"
+"Ôá áêüëïõèá õğåñâïëéêïı ìåãİèïõò ìçíıìáôá ğáñáìİíïõí óôï äéá÷åéñéóôŞ %s:"
+
+#: driver.c:345
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -65,55 +80,60 @@ msgstr ""
 "\n"
 "Ôá áêüëïõèá õğåñâïëéêïı ìåãİèïõò ìçíıìáôá ğáñáìİíïõí óôï äéá÷åéñéóôŞ %s:"
 
-#: driver.c:360
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "\t%d ìíì %d ìŞêïõò octet ğáñáâëİèçêáí áğü ôï fetchmail.\n"
+
+#: driver.c:368
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d ìíì %d ìŞêïõò octet ğáñáâëİèçêáí áğü ôï fetchmail.\n"
 
-#: driver.c:500
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ğáñÜëçøç ìçíıìáôïò %s@%s:%d (%d octets)"
 
-#: driver.c:552
+#: driver.c:556
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ğáñÜëçøç ìçíıìáôïò %s@%s:%d (%d octets)"
 
-#: driver.c:568
+#: driver.c:572
 msgid " (length -1)"
 msgstr " (ìŞêïò -1)"
 
-#: driver.c:571
+#: driver.c:575
 msgid " (oversized)"
 msgstr " (õğåñöõóéêü ìİãåèïò)"
 
-#: driver.c:586
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "áäõíáìßá ëŞøçò åğéêåöáëßäùí, ìŞíõìá %s@%s:%d (%d octets)\n"
 
-#: driver.c:603
+#: driver.c:607
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "áíÜãíùóç ìçíıìáôïò %s@%s:%d áğü %d"
 
-#: driver.c:608
+#: driver.c:612
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:609
+#: driver.c:613
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octets óşìáôïò) "
 
-#: driver.c:681
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octets óşìáôïò) "
 
-#: driver.c:739
+#: driver.c:743
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -121,19 +141,19 @@ msgstr ""
 "ôï ìŞíõìá %s@%s:%d äåí åß÷å ôï áíáìåíüìåíï ìŞêïò(%d ğñáãìáôéêï !=%d "
 "áíáìåíüìåíï)\n"
 
-#: driver.c:770
+#: driver.c:774
 msgid " retained\n"
 msgstr "óõãêñáôŞèçêå\n"
 
-#: driver.c:779
+#: driver.c:784
 msgid " flushed\n"
 msgstr "äéáãñÜöôçêå\n"
 
-#: driver.c:796
+#: driver.c:801
 msgid " not flushed\n"
 msgstr "äåí äéáãñÜöôçêå\n"
 
-#: driver.c:813
+#: driver.c:818
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -143,42 +163,42 @@ msgstr[0] ""
 msgstr[1] ""
 "óå üñéï ëŞøçò %d; %d ìçíıìáôá İìåéíáí óôïí äéá÷åéñéóôŞ %s ëïãáñéáóìü%s\n"
 
-#: driver.c:876
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "İíá SIGPIPE ğåôÜ÷ôçêå áğü İíá MDA Ş áğü óöÜëìá stream socket\n"
 
-#: driver.c:883
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá óıíäåóç óôïí %s.\n"
 
-#: driver.c:887
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôïí äéá÷åéñéóôŞ %s.\n"
 
-#: driver.c:891
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôï %s.\n"
 
-#: driver.c:896
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôçí áğÜíôçóç ôïõ áêñïáôŞ.\n"
 
-#: driver.c:899
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá.\n"
 
-#: driver.c:911
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: ôï fetchmail âëİğåé åğáíáëáìâáíüìåíåò ëŞîåéò ïñßùí ÷ñüíïõ\n"
 
-#: driver.c:914
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -187,7 +207,7 @@ msgstr ""
 "Ôï fetchmail åßäå ğåñéóóüôåñá áğü %d ëŞîåéò ïñßùí ÷ñüíïõ êáôá ôçí ğñïóğÜèåéá "
 "ãéá ğáñáëá⪠áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:918
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -204,56 +224,31 @@ msgstr ""
 "Ôï fetchmail äåí èá îáíáñùôŞóåé áõôü ôï ãñáììáôïêéâşôéï ìİ÷ñé íá ôï\n"
 "åğáíåêêéíŞóåôå.\n"
 
-#: driver.c:947
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "ç åíôïëŞ ğñï-óıíäåóçò áğİôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:978
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "áäõíáìßá åıñåóçò HESIOD ôá÷. èõñßäáò ãéá ôï %s\n"
 
-#: driver.c:1000
+#: driver.c:993
 msgid "Lead server has no name.\n"
 msgstr "Ï åğéêåöáëŞò äéá÷åéñéóôŞò äåí İ÷åé üíïìá.\n"
 
-#: driver.c:1024 driver.c:1050
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "áäõíáìßá åıñåóçò êáíïíéêïı ïíüìáôïò DNS ôïõ %s\n"
 
-#: driver.c:1088
-msgid "internal inconsistency\n"
-msgstr "åóùôåñéêŞ áóõíİ÷åéá\n"
-
-#: driver.c:1098
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s óıíäåóç óôï %s áğİôõ÷å"
 
-#: driver.c:1104
-msgid "host is unknown."
-msgstr "Üãíùóôïò äéáêïìéóôŞò."
-
-#: driver.c:1107
-msgid "name is valid but has no IP address."
-msgstr "ôï üíïìá åßíáé İãêõñï áëëÜ äåí İ÷åé äéåıèõíóç IP."
-
-#: driver.c:1110
-msgid "unrecoverable name server error."
-msgstr "ìç áíáêôŞóéìï óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
-
-#: driver.c:1112
-msgid "temporary name server error."
-msgstr "ğñïóùñéíü óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
-
-#: driver.c:1115
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "Üãíùóôï óöÜëìá DNS %d."
-
-#: driver.c:1133
+#: driver.c:1071
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -261,45 +256,45 @@ msgstr ""
 "\n"
 "Ôï fetchmail áäõíáôåß íá ğñïóåããßóåé ôï äéáêïìéóôŞ áëëçëïãñáößáò %s:"
 
-#: driver.c:1135
+#: driver.c:1073
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Áäõíáìßá ôïõ fetchmail ëŞøçò áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1099 imap.c:384 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "ç óıíäåóç SSL áğİôõ÷å.\n"
 
-#: driver.c:1215
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "ÓöÜëìá lock-busy óôïí %s@%s\n"
 
-#: driver.c:1219
+#: driver.c:1156
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "ÓöÜëìá busy äéáêïìéóôŞ óôïí %s@%s\n"
 
-#: driver.c:1224
+#: driver.c:1161
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Áğïôõ÷ßá åîïõóéïäüôçóçò óôïí %s@%s%s\n"
 
-#: driver.c:1227
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr " (ğñïçãïõìİíùò åîïõóéïäïôŞèçêå)"
 
-#: driver.c:1248
+#: driver.c:1185
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail áğïôõ÷ßá åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Áäõíáìßá ôïõ fetchmail ëŞøçò áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:1256
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -329,7 +324,7 @@ msgstr ""
 "óå êÜèå êıêëï. Äå èá óôáëèïıí ìåëëïíôéêİò åéäïğïéŞóåéò ìİ÷ñé íá \n"
 "áğïêáôáóôáèåß ç õğçñåóßá."
 
-#: driver.c:1271
+#: driver.c:1208
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -349,163 +344,168 @@ msgstr ""
 "óå êÜèå êıêëï. Äå èá óôáëèïıí ìåëëïíôéêİò åéäïğïéŞóåéò ìİ÷ñé íá\n"
 "áğïêáôáóôáèåß ç õğçñåóßá."
 
-#: driver.c:1286
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Îáíáåñşôçóç áìİóùò óôï %s@%s\n"
 
-#: driver.c:1291
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "¶ãíùóôï óöÜëìá åéóüäïõ Ş åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1315
+#: driver.c:1252
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Åîïõóéïäüôçóç ğİôõ÷å óôïí %s@%s\n"
 
-#: driver.c:1321
+#: driver.c:1258
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: åîïõóéïäüôçóç ôïõ fetchmail ğİôõ÷å óôï %s@%s\n"
 
-#: driver.c:1325
+#: driver.c:1262
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Áäõíáìßá åéóüäïõ ôïõ fetchmail óôï %s@%s.\n"
 
-#: driver.c:1329
+#: driver.c:1266
 msgid "Service has been restored.\n"
 msgstr "Ç õğçñåóßá áğïêáôáóôÜèçêå.\n"
 
-#: driver.c:1360
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "åğéëïãŞ Ş åğáíá-óõãêİíôñùóç öáêİëïõ %s\n"
 
-#: driver.c:1362
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "åğéëïãŞ Ş åğáíá-óõãêİíôñùóç åî'ïñéóìïı öáêİëïõ\n"
 
-#: driver.c:1374
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s óôï  %s (öÜêåëïò %s)"
 
-#: driver.c:1377 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s óôï  %s"
 
-#: driver.c:1382
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Óõãêİíôñùóç áğü %s\n"
 
-#: driver.c:1386
+#: driver.c:1323
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (åßäå %d) ãéá ôï %s"
 msgstr[1] "%d %s (åßäå %d) ãéá ôï %s"
 
-#: driver.c:1389
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1392
+#: driver.c:1329
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s ãéá ôï %s"
 msgstr[1] "%d %s ãéá ôï %s"
 
-#: driver.c:1399
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1405
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Äåí õğÜñ÷åé áëëçëïãñáößá ãéá ôï %s\n"
 
-#: driver.c:1438
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr "åóöáëìİíç ìİôñçóç ìçíõìÜôùí!"
 
-#: driver.c:1539
+#: driver.c:1485
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1542
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "÷áìİíç Ş êáêéÜ åğéêåöáëßäá RFC822"
 
-#: driver.c:1545
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1548
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "óõã÷ñïíéóìüò ğåëÜôç/åîõğçñåôçôŞ"
 
-#: driver.c:1551
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "ğñïôüêïëï ğåëÜôç/åîõğçñåôçôŞ"
 
-#: driver.c:1554
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "áğáó÷ïëçìİíï êëåßäïìá óôï äéá÷åéñéóôŞ"
 
-#: driver.c:1557
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "óõíáëëáãŞ SMTP"
 
-#: driver.c:1560
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "áíáæŞôçóç DNS"
 
-#: driver.c:1563
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "ìç ïñéóìİíï óöÜëìá\n"
 
-#: driver.c:1574
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1515
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí áğïóôïëŞ óôï äéáêïìéóôŞ SMTP %s\n"
 
-#: driver.c:1576
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "Üãíùóôïò äéáêïìéóôŞò."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí ëŞøç áğü ôï %s\n"
 
-#: driver.c:1584
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "ç åíôïëŞ ğñï-óıíäåóçò áğİôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:1605
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Ç õğïóôŞñéîç ãéá Kerberos V4 äåí İ÷åé óõíäåèåß.\n"
 
-#: driver.c:1613
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Ç õğïóôŞñéîç ãéá Kerberos V5 äåí İ÷åé óõíäåèåß.\n"
 
-#: driver.c:1624
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1630
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --all äåí õğïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1638
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --limit äåí õğïóôçñßæåôáé ìå ôï %s\n"
@@ -552,11 +552,23 @@ msgstr "%s: Äåí õğÜñ÷åôå.  Öıãåôå ìáêñéÜ.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: áäõíáìßá ğñïóäéïñéóìïı ôïõ óõóôŞìáôïò óáò!"
 
-#: env.c:158
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "ç gethostbyname áğİôõ÷å ãéá ôï %s\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -605,77 +617,82 @@ msgstr "Óõíôáêôéêü ëÜèïò ETRN óôéò ğáñáìİôñïõò\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "¶ãíùóôï óöÜëìá ETRN %d\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Ç åğéëïãŞ --keep äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ETRN\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Ç åğéëïãŞ --check äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: êáëİóôçêå ìå"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "áäõíáìßá ëŞøçò ôïõ ôñİ÷ïíôïò öáêİëïõ åñãáóßáò (cwd)\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Áõôü åßíáé ôï fetchmail İêäïóç %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "ËŞøç ğáñáìåôñùí áğü ôçí ãñáììŞ åíôïëşí%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:355
 msgid " and "
 msgstr " êáé "
 
-#: fetchmail.c:352
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Äåí İ÷ïõí ïñéóôåß äéá÷åéñéóôİò áëëçëïãñáößáò -- ßóùò ôï %s íá ëåßğåé;\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: äåí İ÷ïõí ïñéóôåß äéá÷åéñéóôİò áëëçëïãñáößáò.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: äåí ôñİ÷åé Üëëï fetchmail\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: óöÜëìá óôç èáíÜôùóç ôïõ %s fetchmail óôï %d; åãêáôÜëåéøç.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "õğüâáèñï"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "ğñïóêŞíéï"
 
-#: fetchmail.c:403
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: ôï %s fetchmail óôï %d ôåñìáôßóôçêå.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -683,7 +700,7 @@ msgstr ""
 "fetchmail: áäõíáìßá åëİã÷ïõ áëëçëïãñáößáò üôáí İíá Üëëï fetchmail ôñİ÷åéóôï "
 "ßäéï óıóôçìá.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -691,847 +708,854 @@ msgstr ""
 "fetchmail: áäõíáìßá åñşôçóçò ôùí ïñéóìİíùí äéáêïìéóôşí åíş ôñİ÷åé Üëëï\n"
 "           fetchmail óôï %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: êÜğïéï Üëëï fetchmail ôñİ÷åé óôï ğñïóêŞíéï óôï %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: åíôïëİò ìç äåêôİò üôáí İíá fetchmail ôñİ÷åé óôï ğáñáóêŞíéï.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: áöığíéóç ğáñáóêçíéáêïı fetchmail óôï %d.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: çëéêéùìİíïò åôåñïèáëåßò áäåñöüò ğİèáíå ìõóôçñéïäşò óôï %d.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:487
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: áäõíáìßá åıñåóç ëİîçò êëåéäß ãéá ôï %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "ĞëçêôñïëïãŞóôå ôçí ëİîç êëåéäß ãéá ôï %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "åêêßíçóç äáßìïíá fetchmail %s \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "áäõíáìßá áíïßãìáôïò ôïõ %s ãéá ğñüóèåóç êáôáãñáöşí óå áõôü \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "áäõíáìßá åëİã÷ïõ-şñáò %s (óöÜëìá %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "åğáíåêêßíçóç fetchmail (%s Üëëáîå)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "ç ğñïóğÜèåéá ãéá åğáíåêê ßóùò áğïôı÷åé áöïı ï öÜêåëïò äåí İ÷åé "
 "áğïêáôáóôáèåß\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "ç áğüğåéñá ãéá åğáíåêêßíçóç ôïõ fetchmail áğİôõ÷å\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "ğáñÜâëåøç åñşôçóçò ôïõ %s (áğİôõ÷å ç åîïõóéïäüôçóç Ş ğïëëİò ëŞîåéò ÷ñüíïõ)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ôï äßáëëåéìá äåí İöôáóå, äåí ãßíåôå åñşôçóç %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:690
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:692
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:694
 msgid "Query status=2 (SOCKET)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:696
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:698
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:700
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:702
 msgid "Query status=6 (IOERR)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:704
 msgid "Query status=7 (ERROR)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:706
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:708
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:710
 msgid "Query status=10 (SMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:712
 msgid "Query status=11 (DNS)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:714
 msgid "Query status=12 (BSMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:716
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "¼ëåò ïé óõíäİóåéò İ÷ïõí ìğëïêÜñåé. ÅãêáôÜëåéøç.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:771
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "áäñáíİò óôï %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "áöõğíßóôçêå áğü ôï %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "áöõğíßóôçêå áğü óŞìá %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "áöõğíßóôçêå óôï %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "öõóéïëïãéêüò ôåñìáôéóìüò, êáôÜóôáóç %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "áäõíáìßá åëİã÷ïõ-şñáò ôïõ áñ÷åßï run-control\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: ğïëëáğëİò áíáöïñİò ôïõ äéáêïìéóôŞ %s óôï áñ÷åßï ñõèìßóåùí\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr ""
+"Ğñïåéäïğïßçóç: ğïëëáğëİò áíáöïñİò ôïõ äéáêïìéóôŞ %s óôï áñ÷åßï ñõèìßóåùí\n"
+
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "ç õğïóôŞñéîç ãéá SSL äåí İ÷åé ìğåé óôç ìåôÜöñáóç.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: ğñïåéäïğïßçóç: êáíİíá äéáèİóéìï DNS ãéá İëåã÷ï ëŞøåùí áğü %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1177
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1193
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr ""
 "ìç İãêõñåò ñõèìßóåéò %s, ï áñéèìüò èıñáò äåí ìğïñåß íá åßíáé áñíçôéêüò\n"
 
-#: fetchmail.c:1200
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "ìç İãêõñåò ñõèìßóåéò %s, ôï RPOP áğáéôåß ğñïíïìéïı÷á èıñá\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "ìç İãêõñåò ñõèìßóåéò %s, ôï LMTP äåí êÜíåé ÷ñŞóç ôçò åî ïñéóìïı èıñáò SMTP\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Åßíáé ëÜèïò ôï fetchall êáé ìáæß ôï ğáñáìïíŞ óå êáôÜóôáóç äáßìïíá!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "İëçîå ìå óŞìá %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s åñşôçóç %s (ğñùôüêïëëï %s) óôï %s: Üñ÷éóå ç åñşôçóç\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç POP2.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç POP3.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç IMAP.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç ETRN.\n"
 
-#: fetchmail.c:1425
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "Áäõíáìßá õğïóôŞñéîçò ETRN ÷ùñßò gethostbyname(2).\n"
-
-#: fetchmail.c:1432
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç ODMR.\n"
 
-#: fetchmail.c:1438
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "Áäõíáìßá õğïóôŞñéîçò ODMR ÷ùñßò gethostbyname(2).\n"
-
-#: fetchmail.c:1444
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "åğéëİ÷èçêå ìç õğïóôçñéæüìåíï ğñùôüêïëëï.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s åñşôçóç %s (ğñùôüêïëëï %s) óôï %s: ïëïêëçñşèçêå ç åñşôçóç\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "ÄéÜëëåéìá åñşôçóçò åßíáé %d äåõôåñüëåğôá\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Áñ÷åßï êáôá÷şñéóçò åßíáé ôï %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Áñ÷åßï Id åßíáé ôï %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Ôá ìçíıìáôá ğñïüäïõ èá êáôá÷ùñéèïıí ìİóù ôïõ syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Ôï fetchmail èá áğïêñõöèåß êáé äå èá ğáñÜãåé Received\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Ôï fetchmail èá äåß÷íåé ôåëåßåò ğñïüäïõ êáé óôá áñ÷åßá êáôáãñáöŞò.\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Ôï fetchmail èá ğñïùèåß multidrop ìçíıìáôá ìå êáêŞ äéåıèõíóç óôï %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï postmaster.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï áğïóôïëİá.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Åğéëïãİò ãéá ëŞøç áğü %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Ç áëëçëïãñáößá èá ëçöèåß ìİóù ôïõ %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1512
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Åñşôçóç óå áõôü ôï äéá÷åéñéóôŞ èá óõìâåß êÜèå %d äéáëåßìáôá.\n"
 msgstr[1] "  Åñşôçóç óå áõôü ôï äéá÷åéñéóôŞ èá óõìâåß êÜèå %d äéáëåßìáôá.\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Ôï áëçèéíü üíïìá ôïõ äéá÷åéñéóôŞ åßíáé %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1519
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Áõôüò ï äéáêïìéóôŞò %s èá åñùôçèåß üôáí äåí İ÷åé ïñéóôåß êáíİíáò.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1520
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Áõôüò ï äéáêïìéóôŞò %s èá åñùôçèåß üôáí äåí İ÷åé ïñéóôåß êáíİíáò.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Ç ëİîç êëåéäß èá åñùôÜôå.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ìõóôéêü APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Ëİîç êëåéäß = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Ôï ğñùôüêïëëï åßíáé KPOP ìå åîïõóéïäüôçóç Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Ôï ğñùôüêïëëï åßíáé %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (÷ñŞóç õğçñåóßáò %s)"
 
-#: fetchmail.c:1548
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (÷ñŞóç åğéëïãşí áóöÜëåéáò äéêôıïõ %s)"
-
-#: fetchmail.c:1551
-#, c-format
-msgid " (using port %d)"
-msgstr " (÷ñçóéìïğïßçóç èıñáò %d)"
-
-#: fetchmail.c:1554
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (÷ñçóéìïğïßçóç èıñáò åî'ïñéóìïı)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (åîáíáãêáóìüò ÷ñŞóçò UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ¼ëåò ïé äéáèİóéìåò ìİèïäïé åîïõóéïäüôçóçò èá äïêéìáóôïıí.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç ìå ëİîç êëåéäß.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç NTLM.\n"
+
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ÊñõğôïãñÜöçóç Üêñç-ìå-Üêñç èåùñŞèçêå.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ÄéåõèõíôŞò õğçñåóßáò áëëçëïãñáößáò åßíáé: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Åíåñãïğïßçóç êñõğôïãñáöçìİíùí SSL óõíåäñéşí.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Ğñùôüêïëëï SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Åíåñãïğïßçóç åëİã÷ïõ ğéóôïğïéçôéêïı äéá÷åéñéóôŞ SSL.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ÖÜêåëïò åìğéóôåõìİíïõ ğéóôïğïéçôéêïı SSL: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Áğïôığùìá êëåéäéïı SSL (óå óıãêñéóç ìå ôï êëåéäß äéá÷åéñéóôŞ): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ËŞîç ÷ñüíïõ ü÷é-áğÜíôçóçò áğü ôï äéá÷åéñéóôŞ åßíáé %d äåõôåñüëåğôá"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (åî'ïñéóìïı).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Åî ïñéóìïı ãñáììáôïêéâşôéï åğéëİ÷èçêå.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Åğéëåãìİíá ãñáììáôïêéâşôéá åßíáé:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ìçíıìáôá èá ëçöèïıí (--all %s).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s ìçíıìáôá èá ëçöèïıí (--all %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Ëçöèİíôá ìçíıìáôá %s èá êñáôçèïıí óôï äéá÷åéñéóôŞ (--keep %s).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Ëçöèİíôá ìçíıìáôá %s èá êñáôçèïıí óôï äéá÷åéñéóôŞ (--keep %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1630
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1631
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
 
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
+
 #: fetchmail.c:1634
 #, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
+
+#: fetchmail.c:1636
+#, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  ÅğáíåããñáöŞ ôùí ôïğéêşí-äéá÷åéñéóôŞ äéåõèıíóåùí %s (--norewrite %s).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  ÅğáíåããñáöŞ ôùí ôïğéêşí-äéá÷åéñéóôŞ äéåõèıíóåùí %s (--norewrite %s).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1639
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Áöáßñåóç ôïõ Carriage-return åßíáé %s (stripcr %s).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Áöáßñåóç ôïõ Carriage-return åßíáé %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1642
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Åîáíáãêáóìüò ôïõ Carriage-return åßíáé %s (forcecr %s).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Åîáíáãêáóìüò ôïõ Carriage-return åßíáé %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1645
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  ÌåôÜöñáóç ôïõ Content-Transfer-Encoding åßíáé %s (pass8bits %s).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1646
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  ÌåôÜöñáóç ôïõ Content-Transfer-Encoding åßíáé %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1648
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Áğïêùäéêïğïßçóç MIME åßíáé %s (mimedecode %s).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Áğïêùäéêïğïßçóç MIME åßíáé %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1651
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Çñåìßá ìåôÜ ôçí åñşôçóç åßíáé %s (idle %s).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1652
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Çñåìßá ìåôÜ ôçí åñşôçóç åßíáé %s (idle %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1654
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ïé ãñáììİò Nonempty Status èá %s (dropstatus %s)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1655
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Ïé ãñáììİò Nonempty Status èá %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1657
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Ïé ãñáììİò Delivered-To èá %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1658
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Ïé ãñáììİò Delivered-To èá %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ôï üñéï ìåãİèïõí ìçíıìáôïò åßíáé %d octets (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Êáíİíá üñéï ìåãİèïõò ìçíıìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Ğåñßïäïò ğñïåéäïğïßçóçò ìåãİèïõò ìçíıìáôïò åßíáé %d äåıôåñá (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ĞñïåéäïğïéŞóåéò ìåãİèïõò óå êÜèå åñşôçóç (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ¼ñéï ğáñáëçöèİí-ìçíıìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Êáíİíá üñéï ğáñáëçöèİí-ìçíıìáôïò (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  ¼ñéï ğáñáëçöèİí-ìçíıìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Êáíİíá üñéï ìåãİèïõò ìçíıìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ¼ñéï äİóìçò ìçíıìáôïò SMTP åßíáé %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Êáíİíá üñéï äİóìçò ìçíıìáôïò SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Ğåñßïäïò äéáãñáöŞò ìåôáîı åîáëåßøåùí åîáíáãêÜóôçêå óå %d (--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ÊáììéÜ åîáíáãêáóìİíç åîÜëåéøç (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Ğåñéï÷İò ãéá ôéò ïğïßåò áëëçëïãñáößá èá ëçöèåß åßíáé:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (åî'ïñéóìïı)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Ôá ìçíıìáôá èá ğñïóôåèïıí óå %s óáí BSMTP\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Ôá ìçíıìáôá èá äéáíåìçèïıí ìå \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Ôá ìçíıìáôá èá ğñïùèçèïıí %cMTP óå:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Ôï ìİñïò äéáêïìéóôŞ ôçò ãñáììŞò MAIL FROM èá åßíáé %s\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Äéåıèõíóç ğïõ èá ìğïõí óôéò ãñáììİò RCPT TO ğïõ áğïóôİëëïíôáé ìİóù\n"
 "   SMTP èá åßíáé %s\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Áíáãíùñéóìİíåò áğáíôŞóåéò ìğëïêáñßóìáôïò spam áêñïáôŞ åßíáé:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Áğåíåñãïğïßçóç ìğëïêáñßóìáôïò-spam\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Ç óıíäåóç äéá÷åéñéóôŞ èá áñ÷éíÜ ìå \"%s\".\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëŞ ğñï-óıíäåóçò.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Ç óıíäåóç äéá÷åéñéóôŞ èá ôåñìáôßæåôáé ìå \"%s\".\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëŞ ìåôÜ-óıíäåóçò.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Êáíİíá ôïğéêü üíïìá äåí ïñßóôçêå ãéá áõôü ôï äéáêïìéóôŞ.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  ÊáôÜóôáóç multi-drop: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  ÊáôÜóôáóç single-drop: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1783
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d ôïğéêü üíïìá(ôá) áíáãíùñßóôçêáí.\n"
 msgstr[1] "%d ôïğéêü üíïìá(ôá) áíáãíùñßóôçêáí.\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1798
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  ÁíáæŞôçóç DNS ãéá ôéò äéåõèıíóåéò multidrop åßíáé %s.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  ÁíáæŞôçóç DNS ãéá ôéò äéåõèıíóåéò multidrop åßíáé %s.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1803
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Ôá øåõäşíõìá äéá÷åéñéóôŞ èá óõãêñéèïıí ìå äéåõèıíóåéò multidrop ìå "
 
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Ôá øåõäşíõìá äéá÷åéñéóôŞ èá óõãêñéèïıí ìå äéåõèıíóåéò multidrop ìå "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ÁğåíåñãïğïéŞèçêå ç äñïìïëüãçóç Åğéêåöáëßäá-öáêİëïõ\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "Åğéêåöáëßäá öáêİëïõ èåùñåßôå íá åßíáé: %s\n"
 
-#: fetchmail.c:1809
-msgid "Received"
-msgstr "ĞáñáëŞöèçêå"
-
-#: fetchmail.c:1811
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Áñéèìüò åğéêåöáëßäáò öáêİëïõ ğïõ èá åğåîåñãáóôïıí: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Ôï ğñüèåìá %s èá áöáéñåèåß áğü ôï user id\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  ÊáììéÜ áöáßñåóç ğñïèİìáôïò\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "Ğñïäçëùìİíá øåõäşíõìá äéá÷åéñéóôŞ-áëëçëïãñáößáò:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Ôïğéêİò ğåñéï÷İò:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ç óıíäåóç ğñİğåé íá åßíáé ìİóù ôïõ interface %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Äåí ïñßóôçêáí áğáéôŞóåéò interface.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Âñüã÷ïò åñşôçóçò èá ğáñáêïëïõèåß ôï %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Äåí ïñßóôçêå interface ğáñáêïëïıèçóçò.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Óõíäİóåéò äéá÷åéñéóôŞ èá ãßíïõí ìİóù ôïõ plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëŞ plugin.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Óõíäİóåéò áêñïáôŞ èá ãßíïõí ìİóù ôïõ plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëŞ plugout.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Äåí áğïèçêåıôçêáí UID áğü áõôü ôï äéáêïìéóôŞ.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID áğïèçêåıôçêáí.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Ğëçñïöïñßåò åíôïğéóìïı åñşôçóçò èá ğñïóôåèåß óôçí åğéêåöáëßäá Received.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1539,15 +1563,11 @@ msgstr ""
 "  ÊáììéÜ ğëçñïöïñßá åíôïğéóìïı åñşôçóçò äå èá ğñïóôåèåß óôçí åğéêåöáëßäá\n"
 "Received.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Éäéüôçôåò Pass-through \"%s\".\n"
 
-#: fetchmail.h:614 fetchmail.h:620
-msgid "alloca failed"
-msgstr "alloca áğİôõ÷å"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ÓÖÁËÌÁ: êáììßá õğïóôŞñéîç ãéá ôç ñïõôßíá getpassword()\n"
@@ -1578,37 +1598,37 @@ msgstr "ÁğïóôïëŞ äéáğéóôåõôçñßùí\n"
 msgid "Error exchanging credentials\n"
 msgstr "ÓöÜëìá óôçí áíôáëëáãŞ äéáğéóôåõôçñßùí\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Áäõíáìßá áğïêÜëõøçò äåäïìİíùí åğéğİäïõ áóöÜëåéáò\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Ïëïêëçñşèçêå ç áíôáëëáãŞ äéáğéóôåõôçñßùí\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Ï äéá÷åéñéóôŞò áğáéôåß áêåñáéüôçôá êáé/Ş ìõóôéêüôçôá\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Áğïêáëõöèİíôåò óçìáßåò åğéğİäïõ áóöÜëåéáò: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Ìİãéóôï ìİãåèïò ôåêìçñßïõ GSS åßíáé %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "ÓöÜëìá óôç äçìéïõñãßá áßôçóçò åğéğİäïõ áóöÜëåéáò\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "Áğåëåõèİñùóç äéáğéóôåõôçñßùí GSS\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "ÓöÜëìá óôçí áğåëåõèİñùóç äéáğéóôåõôçñßùí\n"
 
@@ -1617,77 +1637,77 @@ msgstr "ÓöÜëìá óôçí áğåëåõèİñùóç äéáğéóôåõôçñßùí\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: áíáìïíŞ íçìÜôùóçò ãéá %d äåõô.\n"
 
-#: imap.c:281
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Ôáõôïğïßçóç ğñùôïêüëëïõ óáí IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Ôáõôïğïßçóç ğñùôïêüëëïõ óáí IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Ôáõôïğïßçóç ğñùôïêüëëïõ óáí IMAP2 Ş IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr "èá çñåìŞóåé ìåôÜ ôçí åñşôçóç\n"
 
-#: imap.c:462
+#: imap.c:482
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Áğáéôïıìåíç éêáíüôçôá OTP äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:484
+#: imap.c:504 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Áğáéôïıìåíç éêáíüôçôá NTLM äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:493
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Áğáéôïıìåíç éêáíüôçôá LOGIN äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:644 imap.c:710
-msgid "expunge failed\n"
-msgstr "åîÜëåéøç áğİôõ÷å\n"
-
-#: imap.c:662 imap.c:695
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "åğáíåñşôçóç áğİôõ÷å\n"
 
-#: imap.c:670
+#: imap.c:682
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí áğáíåñşôçóç\n"
 msgstr[1] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí áğáíåñşôçóç\n"
 
-#: imap.c:682
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "ç åğéëïãŞ ãñáììáôïêéâùôßïõ áğİôõ÷å\n"
 
-#: imap.c:686
+#: imap.c:698
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí ğñşôç åñşôçóç\n"
 msgstr[1] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí ğñşôç åñşôçóç\n"
 
-#: imap.c:714
+#: imap.c:722
+msgid "expunge failed\n"
+msgstr "åîÜëåéøç áğİôõ÷å\n"
+
+#: imap.c:726
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí åîÜëåéøç\n"
 msgstr[1] "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí åîÜëåéøç\n"
 
-#: imap.c:739
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "áíáæŞôçóç ãéá ìç éäùìİíá ìçíıìáôá áğİôõ÷å\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u äåí İ÷åé åéäùèåß\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:793 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u åßíáé ôï ğñşôï ìç éäùìİíï\n"
@@ -1730,44 +1750,44 @@ msgstr "Äå âñİèçêå êáíİíá interface ìå üíïìá %s"
 msgid "No IP address found for %s"
 msgstr "Äåí âñİèçêáí äéåõèıíóåéò IP ãéá ôï %s"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "äåí õğÜñ÷åé äéåıèõíóç IP interface\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "ìç İãêõñç äéåıèõíóç IP interface\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "ìç İãêõñç IP interface mask\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s -óçìåéşèçêå- óáí %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "ğáñÜâëåøç åñşôçóçò ôïõ %s, ôï %s åßíáé êÜôù\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "ğáñÜâëåøç åñşôçóçò ôïõ %s, ç äéåıèõíóç IP %s áğïêëåßóôçêå\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s åëİã÷èçêå óáí %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "ğáñÜâëåøç åñşôçóçò ôïõ %s, %s áíåíåñãüò\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s Şôáí %d, åßíáé %d\n"
@@ -1794,25 +1814,30 @@ msgstr "áäõíáìßá áğïêùäéêïğïßçóçò áğÜíôçóçò åôïéìüôçôáò BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "ü÷é ôáßñéáóìá ğñüêëçóçò\n"
 
-#: lock.c:83
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: äéáãñáöŞ ğáëéïı áñ÷åßïõ êëåéäşìáôïò\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: äéáãñáöŞ ğáëéïı áñ÷åßïõ êëåéäşìáôïò\n"
 
-#: lock.c:124
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: äéáãñáöŞ ğáëéïı áñ÷åßïõ êëåéäşìáôïò\n"
+
+#: lock.c:137
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: áğïôõ÷ßá äçìéïõñãßáò êëåéäşìáôïò.\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "ğñïåéäïğïßçóç: âñİèçêå ôï \"%s\" ğñéí êÜèå üíïìá äéáêïìéóôŞ"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: ğñïåéäïğïßçóç: âñİèçêå ôï \"%s\" ğñéí êÜèå üíïìá äéáêïìéóôŞ\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: ğñïåéäïğïßçóç: Üãíùóôï ôåêìŞñéï \"%s\"\n"
@@ -1851,19 +1876,25 @@ msgstr "Áğáéôåßôå åîïõóéïäüôçóç.\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "¶ãíùóôï óöÜëìá ODMR %d\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "åããñáöŞ êåéìİíïõ ìçíıìáôïò\n"
+
+#: odmr.c:240
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Ç åğéëïãŞ --keep äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 
-#: odmr.c:247
+#: odmr.c:244
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ODMR\n"
+#: odmr.c:248
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 
-#: odmr.c:255
+#: odmr.c:252
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Ç åğéëïãŞ --check äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 
@@ -1875,87 +1906,83 @@ msgstr "äéá÷åéñéóôŞò İëáâå èáíÜóéìï\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Áäõíáìßá áğïêùäéêïğïßçóçò ğñüêëçóçò OTP\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "ÌõóôéêŞ öñÜóç êëåéäß: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Ç óõìâïëïóåéñÜ '%s' äåí åßíáé İãêõñç óõìâïëïóåéñÜ áñéèìïı.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "ÔéìŞ ôçò óõìâïëïóåéñÜò '%s' åßíáé %s áíôß %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "ìéêñüôåñï"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "ìåãáëıôåñï"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ïñßóôçêå ìç İãêõñï ğñùôüêïëëï `%s'.\n"
 
-#: options.c:429
+#: options.c:372
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ïñßóôçêå ìç İãêõñç åîïõóéïäüôçóç `%s'.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: áğåíåñãïğïéŞèçêå ç õğïóôŞñéîç áóöÜëåéáò äéêôıïõ\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "÷ñŞóç: fetchmail [åğéëïãİò] [äéá÷åéñéóôŞò ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  Ïé åğéëïãİò åßíáé ïé áêüëïõèåò:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        áğåéêüíéóç áõôïı ôïõ ìçíıìáôïò âïçèåßáò\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     áğåéêüíéóç ğëçñïöïñßåò åêäüóåùò\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       İëåã÷ïò ãéá ìçíıìáôá ÷ùñßò ğáñáëáâŞ\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      áèüñõâç åñãáóßá\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     èïñõâşäçò åñãáóßá (äéáãíùóôéêŞ İîïäïò)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      åêôİëåóç óáí äáßìïíáò ìéá öïñÜ êÜèå n äåıôåñá\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    áêıñùóç áöáßñåóçò äéåñãáóßáò ôïõ äáßìïíá\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ôåñìáôéóìüò äéåñãáóßáò äáßìïíá\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     êáèïñéóìüò ïíüìáôïò áñ÷åßïõ êáôáãñáöŞò\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1963,268 +1990,277 @@ msgstr ""
 "      --syslog      ÷ñçóéìïğïßçóç ôïõ syslog(3) ãéá ôá ğåñéóóüôåñá ìçíıìáôá\n"
 "                    üôáí åêôåëåßôå óáí äáßìïíáò\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   ìç åããñáöŞ Received & ëåéôïõñãßá ôçò áğüêñõøçò "
 "óõóôŞìáôïò\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ïñéóìüò åíáëëáêôéêïı áñ÷åßïõ ğñïôéìŞóåùí\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ïñéóìüò åíáëëáêôéêïı áñ÷åßïõ ìå UIDs\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ïñéóìüò ğáñáëŞğôç óáí ôåëåõôáßá ëıóç\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    áíáäñïìïëüãçóç ôùí áíáğçäŞóåùí áğü ÷ñŞóôç óå "
 "postmaster.\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   áğáéôïıìåíïò ïñéóìüò interface\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ğáñáêïëïıèçóç interface ãéá äñáóôçñéüôçôá\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         åíåñãïğïßçóç ssl êñõğôïãñáöçìİíçò óõíåäñßáò\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ğñïóùğéêü áñ÷åßï êëåéäéïı ssl\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ğéóôïğïéçôéêü ğåëÜôç ssl\n"
 
-#: options.c:686
+#: options.c:599
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ğéóôïğïéçôéêü ğåëÜôç ssl\n"
 
-#: options.c:687
+#: options.c:600
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    åîáíáãêáóìüò ğñùôïêüëëïõ ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:690
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      êáèïñéóìüò åîùôåñéêŞò åíôïëŞò ãéá Üíïéãìá óıíäåóçò\n"
 
-#: options.c:691
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     êáèïñéóìüò åîùôåñéêŞò åíôïëŞò ãéá Üíïéãìá smtp óıíäåóçò\n"
 
-#: options.c:693
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    êáèïñéóìüò ğñùôïêüëëïõ áíÜêôçóçò (äåßôå óåëßäá man)\n"
 
-#: options.c:694
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        åîáíáãêáóìüò ÷ñŞóçò ôùí UIDL (pop3 ìüíï)\n"
 
-#: options.c:695
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        èıñá õğçñåóßáò TCP/IP ãéá óıíäåóç óå áõôŞ\n"
+
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        èıñá õğçñåóßáò TCP/IP ãéá óıíäåóç óå áõôŞ\n"
 
-#: options.c:696
+#: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ôığïò åîïõóéïäüôçóçò (password/kerberos/ssh/otp)\n"
 
-#: options.c:697
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ÷ñüíïò ëŞîçò ìç-áğÜíôçóçò äéáêïìéóôŞ\n"
 
-#: options.c:698
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ôıëéãìá åğéêåöáëßäáò äéåıèõíóçò\n"
 
-#: options.c:699
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    ğñüèåìá ãéá áöáßñåóç áğü ôï ôïğéêü user id\n"
 
-#: options.c:700
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   äéåõèõíôŞò õğçñåóßáò áëëçëïãñáößáò\n"
 
-#: options.c:701
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  ğñïóèŞêç ğëçñïöüñéáò åíôïğéóìïı-åñşôçóçò óôï Received\n"
 
-#: options.c:703
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ïñéóìüò ôïõ user login óôï äéá÷åéñéóôŞ\n"
 
-#: options.c:704
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ëŞøç ğáëéşí êáé íİùí ìçíõìÜôùí\n"
 
-#: options.c:705
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      äéáãñáöŞ íİùí ìçíõìÜôùí ìåôÜ ôçí ëŞøç\n"
 
-#: options.c:706
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        áğïèŞêåõóç íİùí ìçíõìÜôùí ìåôÜ ôçí ëŞøç\n"
 
-#: options.c:707
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ğáëéşí ìçíõìÜôùí áğü ôï äéá÷åéñéóôŞ\n"
 
-#: options.c:708
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       ğáëéşí ìçíõìÜôùí áğü ôï äéá÷åéñéóôŞ\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ü÷é åğáíåããñáöŞ ôçò åğéêåöáëßäáò äéåõèıíóåùí\n"
 
-#: options.c:709
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       ü÷é ëŞøç ìçíõìÜôùí ğÜíù áğü ôï äïóìİíï ìİãåèïò\n"
 
-#: options.c:710
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    ğåñßïäïò ìåôáîı åéäïğïéçôéêïı ìçíıìáôïò ğñïåéäïğïßçóçò\n"
 
-#: options.c:713
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      ïñéóìüò áßôçóçò áóöáëåßáò IP\n"
-
-#: options.c:715
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ïñéóìüò äéáêïìéóôŞ SMTP ãéá ğñïşèçóç\n"
 
-#: options.c:716
+#: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ëŞøç áëëçëïãñáößáò áğü êáèïñéóìİíåò ğåñéï÷İò\n"
 
-#: options.c:717
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress ïñéóìüò ğåñéï÷şí ğáñÜäïóçò SMTP ãéá ÷ñŞóç\n"
 
-#: options.c:718
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ïñéóìüò ğëŞñç ïíüìáôïòSMTP username@domain\n"
 
-#: options.c:719
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   ïñéóìüò ôéìşí áğáíôŞóåùí áíôé-spam\n"
 
-#: options.c:720
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  ïñéóìüò ïñßïõ äİóìçò ãéá ôéò óõíäİóåéò SMTP\n"
 
-#: options.c:721
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  ïñéóìüò ïñßïõ ëŞøçò ãéá ôéò óõíäİóåéò äéá÷åéñéóôŞ\n"
 
-#: options.c:722
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains ëŞøç áëëçëïãñáößáò áğü êáèïñéóìİíåò ğåñéï÷İò\n"
 
-#: options.c:723
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:724
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ïñéóìüò ìİãéóôùí äéáãñáöşí ìåôáîı åîáëåßøåùí\n"
 
-#: options.c:725
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ïñéóìüò MDA ãéá ÷ñŞóç óå ğñïşèçóç\n"
 
-#: options.c:726
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ïñéóìüò áñ÷åßïõ åîüäïõ BSMTP\n"
 
-#: options.c:727
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ïñéóìüò LMTP (RFC2033) ãéá ğáñÜäïóç\n"
 
-#: options.c:728
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      êáèïñéóìüò ïíüìáôïò áğïìáêñõóìİíïõ öáêİëïõ\n"
 
-#: options.c:729
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    åìöÜíéóç ôåëåßùí ğñïüäïõ êáé óôá áñ÷åßá êáôáãñáöŞò\n"
 
-#: pop3.c:543
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Äå âñİèçêå ç áğáéôïıìåíç ÷ñïíïëüãçóç óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:552
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Óõíôáêôéêü óöÜëìá ÷ñïíïëüãçóçò óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:574
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ìç ïñéóìİíç áßôçóç ğñùôïêüëëïõ óôï POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "áğáó÷ïëçìİíï êëåßäùìá!  Åßíáé åíåñãŞ êÜğïéá Üëëç óõíåäñßá;\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:767
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Ôá ìçíıìáôá åéóİñ÷ïíôáé óå ëßóôá óôï äéá÷åéñéóôŞ. Áäõíáìßá ÷åéñéóìïı áõôïı.\n"
 
-#: pop3.c:853
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ\n"
 
-#: pop3.c:868
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ êáôÜ ôç ëŞøç UIDL\n"
 
-#: pop3.c:1225
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôáé ìå ôï POP3\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "åğéëïãŞ äéá÷åéñéóôŞ ìåôÜ ôéò åğéëïãİò ÷ñŞóôç"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr "ôï SDPS äåí İ÷åé åíåñãïğïéçèåß."
 
-#: rcfile_y.y:222
-msgid "invalid security request"
-msgstr "ìç İãêõñç áßôçóç áóöÜëåéáò"
-
-#: rcfile_y.y:228
-msgid "network-security support disabled"
-msgstr "áğåíåñãïğïéŞèçêå ç õğïóôŞñéîç áóöÜëåéá-äéêôıïõ"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2232,7 +2268,7 @@ msgstr ""
 "fetchmail: ç åğéëïãŞ interface õğïóôçñßæåôáé ìüíï áğü Linux (÷ùñßò IPv6) êáé "
 "ôï FreeBSD\n"
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2240,25 +2276,25 @@ msgstr ""
 "fetchmail: ç åğéëïãŞ monitor õğïóôçñßæåôáé ìüíï áğü Linux (÷ùñßò IPv6) êáé "
 "ôï FreeBSD\n"
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "ôï SSL äåí İ÷åé åíåñãïğïéçèåß"
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "ôİëïò åéóüäïõ"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Ôï áñ÷åßï %s ğñİğåé íá åßíáé êáíïíéêü áñ÷åßï.\n"
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Ôï áñ÷åßï %s äå ğñİğåé íá İ÷åé ğÜíù áğü -rwx--x--- (0710) Üäåéåò.\n"
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Ôï áñ÷åßï %s ğñİğåé íá áíŞêåé óå åóÜò.\n"
@@ -2458,110 +2494,124 @@ msgstr "Ôï MD5 åöáñìüæåôáé óôï ìğëüê äåäïìİíï:\n"
 msgid "MD5 result is: \n"
 msgstr "Áğïôİëåóìá MD5: \n"
 
-#: sink.c:247
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "ğñïùèåßôáé óôï %s\n"
 
-#: sink.c:332
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message óşìá)\n"
 
-#: sink.c:335
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "ç áëëçëïãñáößá áğü %s áíáğŞäçóå óôï %s\n"
 
-#: sink.c:467
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Ôï áğïèçêåõìİíï óöÜëìá åßíáé áêüìá %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP óöÜëìá: %s\n"
 
-#: sink.c:761
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Áíïé÷ôü áñ÷åßï BSMTP Ş áğİôõ÷å ç åéóáãùãéêŞ åããñáöŞ\n"
 
-#: sink.c:970
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Ï áêñïáôŞò %cMTP áğå÷èÜíåôáé ôç äéåıèõíóç ğáñáëŞğôç `%s'\n"
 
-#: sink.c:977
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Ï áêñïáôŞò %cMTP ğñáãìáôéêÜ áğå÷èÜíåôáé ôç äéåıèõíóç ğáñáëŞğôç `%s'\n"
 
-#: sink.c:1015
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "êáíİíá ôáßñéáóìá äéåıèõíóçò· äåí İ÷åé ïñéóôåß postmaster.\n"
 
-#: sink.c:1027
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "áäõíáìßá áğïóôïëŞò áêüìá êáé óôï %s!\n"
 
-#: sink.c:1033
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "êáíİíá ôáßñéáóìá äéåıèõíóçò· ğñïşèçóç óôï %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "ğñüêåéôå íá äéáíåìçèïıí ìå: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "¶íïéãìá MDA áğİôõ÷å\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Óıíäåóç %cMTP óôï %s áğİôõ÷å\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "áäõíáìßá áíıøùóçò áêñïáôŞ· ÷ñŞóç ôïõ %s"
 
-#: sink.c:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "ôï MDA áğåâßùóå áğü óŞìá %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "Ôï MDA åğİóôñåøå ìç-ìçäåíéêŞ êáôÜóôáóç %d\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "ĞáñÜîåíï: ôï MDA pclose åğİóôñåøå %d, áäõíáìßá ÷åéñéóìïı óôï %s:%d\n"
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ôåñìáôéóìüò ìçíıìáôïò Ş êëåßóéìï ôïõ áñ÷åßïõ BSMTP áğİôõ÷å\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "Ï áêñïáôŞò SMTP áñíŞèçêå ôç äéáíïìŞ\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "ÓöÜëìá äéáíïìŞò LMTP óôï  EOM\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Ìç áíáìåíüìåíç áğÜíôçóç ü÷é-503 óôï LMTP EOM: %s\n"
 
-#: sink.c:1559
+#: sink.c:1561
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2599,235 +2649,234 @@ msgstr "Åîïõóéïäüôçóç ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ áêñïáôŞ smtp\n"
 
-#: socket.c:117 socket.c:143
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: áğİôõ÷å ôï malloc\n"
 
-#: socket.c:175
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair áğİôõ÷å\n"
 
-#: socket.c:181
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: áğİôõ÷å ôï fork\n"
 
-#: socket.c:188
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 áğİôõ÷å\n"
 
-#: socket.c:194
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "åêôåëåßôå %s (äéáêïìéóôŞò %s õğçñåóßá %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) áğİôõ÷å\n"
 
-#: socket.c:288
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:430
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: ëŞøç ğáñÜíïìïõ ìŞêïõò äéåıèõíóçò ãéá ôï äéáêïìéóôŞ %s\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:787
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Ïñãáíéóìüò Åêäüôç: %s\n"
 
-#: socket.c:789
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: õğåñâïëéêÜ ìåãÜëï ¼íïìá Ïñãáíéóìïı Åêäüôç (ğéèáíÜ êïììİíï).\n"
 
-#: socket.c:791
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "¶ãíùóôïò Ïñãáíéóìüò\n"
 
-#: socket.c:793
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Åêäüôç: %s\n"
 
-#: socket.c:795
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: Êïéíü¼íïìá Åêäüôç åßíáé õğåñâïëéêÜ ìåãÜëï (ğéèáíÜ êïììİíï).\n"
 
-#: socket.c:797
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá Åêäüôç\n"
 
-#: socket.c:801
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Äéá÷åéñéóôŞ: %s\n"
 
-#: socket.c:805
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Êáêü ğéóôïğïéçôéêü: Subject Êïéíü¼íïìá õğåñâïëéêÜ ìåãÜëï!\n"
 
-#: socket.c:821
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ìç ôáßñéáóìá ÊïéíïıÏíüìáôïò ÄéáêïìéóôŞ: %s != %s\n"
 
-#: socket.c:827
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "Äåí İ÷åé ïñéóôåß üíïìá äéá÷åéñéóôŞ, áäõíáìßá åğáëŞèåõóçò ğéóôïğïéçôéêïı!\n"
 
-#: socket.c:832
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá ÄéáêïìéóôŞ\n"
 
-#: socket.c:834
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr "Äåí İ÷åé ïñéóôåß üíïìá äéáêïìéóôŞ óôï ğéóôïğïéçôéêü!\n"
 
-#: socket.c:844
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() áğİôõ÷å!\n"
 
-#: socket.c:848
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr "Óşèçêå ç ìíŞìç!\n"
 
-#: socket.c:856
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr "Ç ğñïóùñéíŞ ìíŞìç êåéìİíïõ ğåñßëçøçò åßíáé õğåñâïëéêÜ ìéêñŞ!\n"
 
-#: socket.c:862
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s áğïôığùìá êëåéäéïı: %s\n"
 
-#: socket.c:866
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s áğïôõğşìáôá ôáéñéÜæïõí.\n"
 
-#: socket.c:869
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s áğïôõğşìáôá äåí ôáéñéÜæïõí!\n"
 
-#: socket.c:878
+#: socket.c:747
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ğñïåéäïğïßçóç: åğáëŞèåõóç ğéóôïğïéçôéêïı äéáêïìéóôŞ: %s\n"
 
-#: socket.c:884
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Üãíùóôïò åêäüôçò (ğñşôïé %d ÷áñáêôŞñåò): %s\n"
 
-#: socket.c:936
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr "Ï ğåñéãñáöİáò áñ÷åßïõ åêôüò êëßìáêáò ãéá ôï SSL"
 
-#: socket.c:953
+#: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Êáèïñßóôçêå Üêõñï ğñïôüêïëëï SSL '%s', ÷ñŞóç åî ïñéóìïı (SSLv23).\n"
 
-#: socket.c:1014
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "ÅğáëŞèåõóç ğéóôïğïéçôéêïı/áğïôõğşìáôïò êÜğùò ğáñáëŞöèçêå!\n"
 
-#: socket.c:1086
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr "ÅğáíáğñïóğÜèåéá áíÜãíùóçò õğïäï÷Şò Cygwin\n"
 
-#: socket.c:1089
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr "ÅğáíáğñïóğÜèåéá áíÜãíùóçò õğïäï÷Şò Cygwin áğİôõ÷å!\n"
 
-#: transact.c:66
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "áíôéóôïß÷çóç ôïõ %s óôï ôïğéêü %s\n"
 
-#: transact.c:130
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "ğİñáóå ìİóá áğü %s ôáéñéÜæïíôáò ôï %s\n"
 
-#: transact.c:199
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
 "%s"
 msgstr "áíÜëõóç ãñáììŞò Received:%s"
 
-#: transact.c:238
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "äåêôŞ ãñáììŞ, ôï %s åßíáé øåõäüíçìï ôïõ äéá÷. áëëçëïãñáößáò\n"
 
-#: transact.c:244
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "ìç äåêôŞ ãñáììŞ, ôï %s äåí åßíáé øåõäüíçìï ôïõ äéá÷. áëëçëïãñáößáò\n"
 
-#: transact.c:318
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "äåí âñİèçêáí äéåõèıíóåéò Received\n"
 
-#: transact.c:327
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "âñİèçêáí äéåõèıíóåéò Received `%s'\n"
 
-#: transact.c:528
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "âñİèçêå ïñéïèİôçò ìçíıìáôïò êáôÜ ôçí óÜñùóç åğéêåöáëßäùí\n"
 
-#: transact.c:549
+#: transact.c:559
 msgid "incorrect header line found while scanning headers\n"
 msgstr "âñİèçêå ëÜèïò ãñáììŞ åğéêåöáëßäáò êáôá ôïí İëåã÷ï åğéêåöáëßäùí\n"
 
-#: transact.c:551
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Óõãêİíôñùóç áğü %s\n"
 
-#: transact.c:1069
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "äåí õğÜñ÷ïõí ôïğéêÜ üìïéá, ğñïşèçóç óôï %s\n"
 
-#: transact.c:1084
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "êáôáóôïëŞ ğñïşèçóçò êáé äéáãñáöŞò ëüãù óöáëìÜôùí ôïõ DNS\n"
 
-#: transact.c:1192
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "åããñáöŞ RFC822 msgblk.headers\n"
 
-#: transact.c:1213
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "êáììéÜ äéåıèõíóç ğáñáëŞğôç äå ôáéñéÜæåé ìå ôá ïñéóìİíá ôïğéêÜ ïíüìáôá"
 
-#: transact.c:1220
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "äéåıèõíóç ğáñáëŞğôç %s äåí ôáéñéÜæåé ìå êáíİíá ôïğéêü üíïìá"
 
-#: transact.c:1229
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "ôï ìŞíõìá ğåñéİ÷åé åíèåôçìİíá NULs"
 
-#: transact.c:1237
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Ï áêñïáôŞò SMTP áğİññéøå ôéò äéåõèıíóåéò ôïğéêşí ğáñáëçğôşí: "
 
-#: transact.c:1362
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "åããñáöŞ êåéìİíïõ ìçíıìáôïò\n"
 
@@ -2836,7 +2885,7 @@ msgstr "åããñáöŞ êåéìİíïõ ìçíıìáôïò\n"
 msgid "Old UID list from %s:"
 msgstr "ĞáëéÜ ëßóôá UID áğü %s:"
 
-#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr " <Üäåéï>"
 
@@ -2844,53 +2893,53 @@ msgstr " <Üäåéï>"
 msgid "Scratch list of UIDs:"
 msgstr "Ğñü÷åéñç ëßóôá ìå UID:"
 
-#: uid.c:513 uid.c:565
+#: uid.c:514 uid.c:566
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "ĞáëéÜ ëßóôá UID áğü %s:"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Íİá ëßóôá UID áğü %s:"
 
-#: uid.c:544
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr "áíôáëëáãŞ ëéóôşí UID\n"
 
-#: uid.c:552
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "ü÷é áíôáëëáãŞ ëéóôşí UID, äå âñİèçêå êáíİíá UID óå áõôŞ ôçí åñşôçóç\n"
 
-#: uid.c:577
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "áíôáëëáãŞ ëéóôşí UID\n"
 
-#: uid.c:612
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr "ÄéáãñáöŞ áñ÷åßïõ fetchids.\n"
 
-#: uid.c:614
+#: uid.c:615
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "ÓöÜëìá óôçí áğåëåõèİñùóç äéáğéóôåõôçñßùí\n"
 
-#: uid.c:620
+#: uid.c:621
 msgid "Writing fetchids file.\n"
 msgstr "ÅããñáöŞ áñ÷åßïõ fetchids\n"
 
-#: uid.c:639
+#: uid.c:640
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:643
+#: uid.c:644
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:647
+#: uid.c:648
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2903,6 +2952,66 @@ msgstr "áğİôõ÷å ôï malloc\n"
 msgid "realloc failed\n"
 msgstr "áğİôõ÷å ôï realloc\n"
 
+#~ msgid "internal inconsistency\n"
+#~ msgstr "åóùôåñéêŞ áóõíİ÷åéá\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "ôï üíïìá åßíáé İãêõñï áëëÜ äåí İ÷åé äéåıèõíóç IP."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "ìç áíáêôŞóéìï óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
+
+#~ msgid "temporary name server error."
+#~ msgstr "ğñïóùñéíü óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "Üãíùóôï óöÜëìá DNS %d."
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "Áäõíáìßá õğïóôŞñéîçò ETRN ÷ùñßò gethostbyname(2).\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "Áäõíáìßá õğïóôŞñéîçò ODMR ÷ùñßò gethostbyname(2).\n"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (÷ñŞóç åğéëïãşí áóöÜëåéáò äéêôıïõ %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (÷ñçóéìïğïßçóç èıñáò %d)"
+
+#~ msgid "Received"
+#~ msgstr "ĞáñáëŞöèçêå"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca áğİôõ÷å"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "ğñïåéäïğïßçóç: âñİèçêå ôï \"%s\" ğñéí êÜèå üíïìá äéáêïìéóôŞ"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ODMR\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: áğåíåñãïğïéŞèçêå ç õğïóôŞñéîç áóöÜëåéáò äéêôıïõ\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      ïñéóìüò áßôçóçò áóöáëåßáò IP\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "ìç İãêõñç áßôçóç áóöÜëåéáò"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "áğåíåñãïğïéŞèçêå ç õğïóôŞñéîç áóöÜëåéá-äéêôıïõ"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: ëŞøç ğáñÜíïìïõ ìŞêïõò äéåıèõíóçò ãéá ôï äéáêïìéóôŞ %s\n"
+
 #~ msgid "header "
 #~ msgstr "åğéêåöáëßäáò "
 
diff --git a/po/es.po b/po/es.po
index dcb6c302..f6f74645 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-11-10 02:41+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+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"
@@ -65,14 +65,14 @@ msgstr "Subject: advertencia de fetchmail, mensajes excedidos en tamaño"
 
 #: driver.c:341
 #, fuzzy, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr ""
 "Los siguientes mensajes permanecen en el servidor de correo %s por estar "
 "excedidos en tamaño:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr ""
 "Los siguientes mensajes permanecen en el servidor de correo %s por estar "
 "excedidos en tamaño:"
@@ -256,7 +256,7 @@ msgstr "Subject: aviso de server fuera de alcance de fetchmail."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1099 imap.c:392 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
@@ -423,7 +423,7 @@ msgstr " (%d octetos).\n"
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
@@ -883,11 +883,11 @@ msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "Cuidado: múltiple mención de la máquina %s en el archivo de configuración\n"
 
-#: fetchmail.c:1151
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no fue compilado.\n"
 
-#: fetchmail.c:1182
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -895,18 +895,18 @@ msgstr ""
 "fetchmail: cuidado: no hay DNS disponible para verificar recepciones "
 "‘multidrop’ de %s\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cuidado: ¡‘multidrop’ para %s requiere la opción envelope!\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "cuidado: ¡no pida soporte técnico si todo el correo es dirigido al "
 "postmaster!\n"
 
-#: fetchmail.c:1211
+#: fetchmail.c:1209
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -914,294 +914,294 @@ msgid ""
 msgstr ""
 "La configuración %s es inválida, el número de puerto no puede ser negativo\n"
 
-#: fetchmail.c:1218
+#: fetchmail.c:1216
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuración de %s inválida, RPOP requiere un puerto privilegiado\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuración de %s inválida, LMTP no puede usar el puerto SMTP por defecto\n"
 
-#: fetchmail.c:1250
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr ""
 "¡Usar ‘fetchall’ junto a ‘keep’ en modo de ejecución en segundo plano es un "
 "error!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1385
+#: fetchmail.c:1383
 #, 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:1410
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "fue seleccionado un protocolo no soportado.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1461
 #, 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:1480
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso serán registrados vía syslog\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará ‘Received’\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1490
 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:1494
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes ‘multidrop’ mal direccionados a %s.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al ‘postmaster’.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo será recibido vía %s\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1512
 #, 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:1518
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1519
 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:1522
+#: fetchmail.c:1520
 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:1526
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  La clave será pedida.\n"
 
-#: fetchmail.c:1530
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = “%s�.\n"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = “%s�.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Clave = “%s�.\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (usando puerto por defecto)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con clave.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1564
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones encriptadas con SSL activadas.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1601
 #, 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:1606
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla por defecto está seleccionada.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1624
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes serán recibidos (--all on).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1625
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1627
 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:1630
+#: fetchmail.c:1628
 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:1632
+#: fetchmail.c:1630
 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:1633
+#: fetchmail.c:1631
 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:1635
+#: fetchmail.c:1633
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1210,7 +1210,7 @@ msgstr ""
 "  Los mensajes viejos serán eliminados antes de recibir nuevos (--flush "
 "on).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1634
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1219,347 +1219,347 @@ msgstr ""
 "  No se eliminarán los mensajes viejos antes de recibir nuevos (--flush "
 "off).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1636
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1637
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1639
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro serán removidos (stripcr on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1640
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se removerán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1642
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se agregarán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1643
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se agregarán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1645
 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:1648
+#: fetchmail.c:1646
 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:1650
+#: fetchmail.c:1648
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1649
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1651
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1652
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1654
 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:1657
+#: fetchmail.c:1655
 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:1659
+#: fetchmail.c:1657
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán descartadas (dropdelivered on).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1658
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán conservadas (dropdelivered off).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1662
 #, 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:1667
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1667
 #, 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:1672
+#: fetchmail.c:1670
 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:1675
+#: fetchmail.c:1673
 #, 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:1678
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1678
 #, 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:1683
+#: fetchmail.c:1681
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1685
 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:1689
+#: fetchmail.c:1687
 #, 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:1692
+#: fetchmail.c:1690
 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:1694
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensaje por lote SMTP es %d.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1698
 #, 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:1702
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1714 fetchmail.c:1734
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1717
 #, 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:1721
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes serán entregados con “%s�.\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes serán reenviados con %cMTP a:"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1737
 #, 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:1742
+#: fetchmail.c:1740
 #, 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:1751
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de ‘spam’ son:"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de ‘spam’ está desactivado\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1758
 #, 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:1763
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  No hay comando de pre-conexión.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1763
 #, 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:1768
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  No hay comando posconexión.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para esta máquina.\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Modo ‘multi-drop’: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Modo ‘single-drop’: "
 
-#: fetchmail.c:1785
+#: fetchmail.c:1783
 #, 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:1800
+#: fetchmail.c:1798
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1803
 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:1807
+#: fetchmail.c:1805
 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:1810
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1811
 #, 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:1816
+#: fetchmail.c:1814
 #, 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:1819
+#: fetchmail.c:1817
 #, 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:1822
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Ningún prefijo será removido\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1846
 #, 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:1850
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificó alguna interfaz requerida.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta monitoreará %s.\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitoreo.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1856
 #, 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:1860
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugin’.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1860
 #, 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:1864
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugout’.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UIDs guardadas de esta máquina.\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs guardadas.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1884
 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:1888
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1567,7 +1567,7 @@ msgstr ""
 "  No se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso “%s�.\n"
@@ -1641,77 +1641,77 @@ msgstr "Error largando las credenciales\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: la tarea dormirá por %d segundos\n"
 
-#: imap.c:298
+#: imap.c:306
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:312
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:319
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:334
 msgid "will idle after poll\n"
 msgstr "descansará después de inquirir\n"
 
-#: imap.c:482
+#: imap.c:490
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:512 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
 
-#: imap.c:513
+#: imap.c:521
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:682 imap.c:715
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:682
+#: imap.c:690
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
 msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
 
-#: imap.c:694
+#: imap.c:702
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:698
+#: imap.c:706
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
 msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
 
-#: imap.c:722
+#: imap.c:730
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:726
+#: imap.c:734
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
 msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
 
-#: imap.c:751
+#: imap.c:759
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:801 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
@@ -2527,112 +2527,112 @@ msgstr ""
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:238
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:327
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:330
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:462
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "El error guardado es aún %d\n"
 
-#: sink.c:522 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:766
+#: sink.c:752
 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:979
+#: sink.c:965
 #, 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:986
+#: sink.c:972
 #, 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:1027
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1039
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1045
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1198
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1222
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1259
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1283
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "El MDA murió por la señal %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "El MDA devolvió un estado distinto a cero %d\n"
 
-#: sink.c:1345
+#: sink.c:1332
 #, 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:1366
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
 
-#: sink.c:1387
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1417
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1420
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n"
 
-#: sink.c:1574
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
diff --git a/po/gl.po b/po/gl.po
index ae44d0a5..d169bb47 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.3.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2000-04-10 01:26+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -21,20 +21,25 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Comprobando se %s é realmente o mesmo nodo que %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Si, os seus enderezos IP coinciden\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "Non, os seus enderezos IP non coinciden\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr "fallo na resolución do nome ó buscar `%s' mentres se recibía de %s.\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "fallo na resolución do nome ó buscar `%s' mentres se recibía de %s.\n"
@@ -48,140 +53,146 @@ msgstr "non se puido decodificar o challenge BASE64\n"
 msgid "decoded as %s\n"
 msgstr "espertado en %s\n"
 
-#: driver.c:191
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "erro %s de kerberos\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [o servidor di '%*s'] \n"
 
-#: driver.c:336
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:341
 #, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+msgid "The following oversized messages were deleted on the mail server %s:"
 msgstr ""
 
-#: driver.c:354
+#: driver.c:345
 #, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+msgid "The following oversized messages remain on the mail server %s:"
+msgstr ""
+
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
+
+#: driver.c:368
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
 
-#: driver.c:497
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#: driver.c:549
+#: driver.c:556
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:572
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:568
+#: driver.c:575
 #, fuzzy
 msgid " (oversized)"
 msgstr " (exceso de tamaño, %d octetos)"
 
-#: driver.c:583
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:600
+#: driver.c:607
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensaxe %d de %d"
 
-#: driver.c:605
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:612
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d octetos%s)"
 
-#: driver.c:606
-msgid "header "
-msgstr " de cabeceira"
+#: driver.c:613
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d octetos de corpo) "
 
-#: driver.c:678
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octetos de corpo) "
 
-#: driver.c:736
+#: driver.c:743
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "a mensaxe %d non tiña o tamaño agardado (%d real != %d agardado)\n"
 
-#: driver.c:767
+#: driver.c:774
 msgid " retained\n"
 msgstr " mantida\n"
 
-#: driver.c:776
+#: driver.c:784
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:793
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " non eliminada\n"
 
-#: driver.c:809
+#: driver.c:818
 #, fuzzy, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr "atinxiuse o límite de %d mensaxes; %d deixadas no servidor\n"
+msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "atinxiuse o límite de %d mensaxes; %d deixadas no servidor\n"
+msgstr[1] "atinxiuse o límite de %d mensaxes; %d deixadas no servidor\n"
 
-#: driver.c:869
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE enviado por un MDA ou erro da conexión stream\n"
 
-#: driver.c:876
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a conexión ó servidor %s.\n"
 
-#: driver.c:880
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando ó servidor %s.\n"
 
-#: driver.c:884
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a %s.\n"
 
-#: driver.c:889
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "tempo esgotado tras %d segundos agardando a resposta do servidor receptor.\n"
 
-#: driver.c:892
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado tras %d segundos.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:916
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail atopa repetidas expiracións do tempo de espera\n"
 
-#: driver.c:906
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -190,7 +201,7 @@ msgstr ""
 "Fetchmail atopou máis de %d expiracións do tempo de espera tentando colle-lo "
 "correo de %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -206,12 +217,12 @@ msgstr ""
 "\n"
 "Fetchmail non recibirá de novo correo desta caixa ata que o reinicie.\n"
 
-#: driver.c:940
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "o programa de pre-conexión fallou con estado %d\n"
 
-#: driver.c:971
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "non se puido atopar a caixa postal HESIOD para %s\n"
@@ -220,85 +231,60 @@ msgstr "non se puido atopar a caixa postal HESIOD para %s\n"
 msgid "Lead server has no name.\n"
 msgstr "O servidor principal non ten nome.\n"
 
-#: driver.c:1016
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "non se puido atopar o nome DNS canónico de %s\n"
 
-#: driver.c:1053
-#, fuzzy
-msgid "internal inconsistency\n"
-msgstr "fetchmail: inconsistencia interna\n"
-
-#: driver.c:1063
+#: driver.c:1055
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "fallou a conexión %cMTP a %s\n"
 
-#: driver.c:1069
-msgid "host is unknown."
-msgstr "a máquina é descoñecida."
-
-#: driver.c:1072
-msgid "name is valid but has no IP address."
-msgstr "o nome é válido mais non ten enderezo IP."
-
-#: driver.c:1075
-msgid "unrecoverable name server error."
-msgstr "erro irrecuperable do servidor de nomes."
-
-#: driver.c:1077
-msgid "temporary name server error."
-msgstr "erro temporal do servidor de nomes."
-
-#: driver.c:1084
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "erro %d de DNS descoñecido."
-
-#: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#: driver.c:1071
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1073
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail non puido coller correo de %s@%s.\n"
+
+#: driver.c:1099 imap.c:384 pop3.c:433
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "fallou a conexión %cMTP a %s\n"
 
-#: driver.c:1184
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1188
+#: driver.c:1156
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1161
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallou a autorización en %s@%s\n"
 
-#: driver.c:1196
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1217
+#: driver.c:1185
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fallou a autenticación do fetchmail\n"
 
-#: driver.c:1220
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -315,7 +301,7 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1239
+#: driver.c:1208
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -333,172 +319,174 @@ msgstr ""
 "non pode distinguilas porque non envían mensaxes de erro útiles cando\n"
 "hai un fallo de login.\n"
 
-#: driver.c:1254
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1259
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro descoñecido de login ou autenticación en %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1252
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Fallou a autorización en %s@%s\n"
 
-#: driver.c:1289
+#: driver.c:1258
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fallou a autenticación do fetchmail\n"
 
-#: driver.c:1292
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1266
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "O servicio escolleu a versión %d.%d do RPA\n"
 
-#: driver.c:1327
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta %s\n"
 
-#: driver.c:1329
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta por defecto\n"
 
-#: driver.c:1345
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Recibindo de %s\n"
 
-#: driver.c:1362
+#: driver.c:1323
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d lidas) para %s"
-
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "mensaxes"
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d lidas) para %s"
+msgstr[1] "%d %s (%d lidas) para %s"
 
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "mensaxe"
-
-#: driver.c:1366
+#: driver.c:1326
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s para %s"
+#: driver.c:1329
+#, fuzzy, c-format
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] "%d %s para %s"
+msgstr[1] "%d %s para %s"
 
-#: driver.c:1375
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1381
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Non hai correo para %s\n"
 
-#: driver.c:1414
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1515
+#: driver.c:1485
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1518
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "a cabeceira RFC822 falta ou é errónea"
 
-#: driver.c:1521
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "sincronización cliente/servidor"
 
-#: driver.c:1527
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1530
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "bloqueo activado no servidor"
 
-#: driver.c:1533
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "Transacción SMTP"
 
-#: driver.c:1536
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1539
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "erro indefinido\n"
 
-#: driver.c:1550
+#: driver.c:1515
 #, fuzzy, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s ó baixar correo de %s\n"
 
-#: driver.c:1552
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "a máquina é descoñecida."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s ó baixar correo de %s\n"
 
-#: driver.c:1560
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "o comando de pos-conexión fallou con estado %d\n"
 
-#: driver.c:1581
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Non está enlazado con soporte Kerberos V4.\n"
 
-#: driver.c:1589
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Non está enlazado con soporte Kerberos V5.\n"
 
-#: driver.c:1600
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "A opción --flush non está soportada con %s\n"
 
-#: driver.c:1606
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "A opción --all non está soportada con %s\n"
 
-#: driver.c:1614
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "A opción --limit non está soportada con %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -508,7 +496,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -519,21 +507,33 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Vostede non existe.  Marche.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: non se pode determina-la súa máquina"
 
-#: env.c:160
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "o gethostbyname fallou para %s\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -559,24 +559,20 @@ msgstr "Non hai mensaxes agardando para %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "Mensaxes pendentes para %s iniciadas\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Imposible poñer mensaxes na cola para o nodo %s\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Nodo %s non permitido: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "Erro de sintaxe de ETRN\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "Erro de sintaxe de ETRN nos parámetros\n"
@@ -586,79 +582,84 @@ msgstr "Erro de sintaxe de ETRN nos parámetros\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "Erro de ETRN %d descoñecido\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "A opción --keep non está soportada con ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "A opción --flush non está soportada con ETRN\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "A opción --remote non está soportada con ETRN\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "A opción --flush non está soportada con ETRN\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "A opción --check non está soportada con ETRN\n"
 
-#: fetchmail.c:154
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 #, fuzzy
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: fallou o fork\n"
 
-#: fetchmail.c:178
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:188
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Isto é fetchmail versión %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Collendo as opcións da liña de comandos%s%s\n"
 
 # Estas dúas cadeas quedan "... da liña de comandos e de .fetchmailrc"
-#: fetchmail.c:330
+#: fetchmail.c:355
 msgid " and "
 msgstr " e de "
 
-#: fetchmail.c:335
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Non hai ningún servidor de correo configurado -- ¿quizais falta o %s?\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: non se indicou ningún servidor de correo.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: non hai outro fetchmail a se executar\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erro matando fetchmail en %s co pid %d; saíndo.\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "primeiro plano"
 
-#: fetchmail.c:386
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail en %s co pid %d matado.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -666,7 +667,7 @@ msgstr ""
 "fetchmail: non se pode comproba-lo correo cando hai outro fetchmail na\n"
 "mesma máquina a se executar.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -674,198 +675,203 @@ msgstr ""
 "fetchmail: non se pode recibir das máquinas indicadas con outro fetchmail a "
 "se executar en %d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 "fetchmail: outro fetchmail en primeiro plano está a se executar en %d.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: non se poden aceptar opcións cando hai un fetchmail en segundo "
 "plano a se executar.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail en segundo plano co pid %d espertado.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: proceso máis antigo en %d morreu misteriosamente.\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:487
 #, fuzzy, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: non se pode atopar unha contrasinal para %s@%s.\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduza a contrasinal para %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando o demonio de fetchmail %s \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:550
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "non se puido comproba-la data de %s (erro %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "iniciando fetchmail (%s cambiou)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:587
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fallou a tentativa de reexecutar o fetchmail\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "recepción de %s omitida (fallo de autenticación ou demasiados excesos de "
 "espera)\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "non se atinxiu o intervalo, non se interrogará %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:690
 #, fuzzy
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:692
 #, fuzzy
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:694
 #, fuzzy
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:696
 #, fuzzy
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:698
 #, fuzzy
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:700
 #, fuzzy
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:702
 #, fuzzy
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:704
 #, fuzzy
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:706
 #, fuzzy
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:708
 #, fuzzy
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:710
 #, fuzzy
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:712
 #, fuzzy
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:714
 #, fuzzy
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:716
 #, fuzzy
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado da petición=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tódalas las conexións están trabadas.  Saíndo.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:771
 #, fuzzy, c-format
 msgid "sleeping at %s\n"
 msgstr "fetchmail: durmindo en %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "espertado por %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "espertado en %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "finalización normal, estado %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "non se puido comprobar a data do ficheiro de control de execución\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Aviso: múltiples mencións da máquina %s no ficheiro de configuración\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "Aviso: múltiples mencións da máquina %s no ficheiro de configuración\n"
+
+#: fetchmail.c:1149
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "non está configurado o soporte POP2.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -873,313 +879,342 @@ msgstr ""
 "fetchmail: aviso: ningún DNS dispoñible para comprobar recepcións con "
 "múltiples entregas de %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1191
 #, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1192
+msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
+msgstr ""
+
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr ""
 "configuración de %s non válida, o número de porto non pode ser negativo\n"
 
-#: fetchmail.c:1171
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuración de %s non válida, RPOP require un porto privilexiado\n"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuración de %s non válida, LMTP non pode usar o porto por defecto SMTP\n"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "¡Baixar e manter tódalas mensaxes en modo demonio é un erro!\n"
 
-#: fetchmail.c:1252
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con sinal %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1383
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "non está configurado o soporte POP2.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "non está configurado o soporte POP3.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "non está configurado o soporte IMAP.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "non está configurado o soporte ETRN.\n"
 
-#: fetchmail.c:1396
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "Non se pode soportar ETRN sen gethostbyname(2).\n"
-
-#: fetchmail.c:1403
+#: fetchmail.c:1444
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "non está configurado o soporte POP2.\n"
 
-#: fetchmail.c:1409
-#, fuzzy
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "Non se pode soportar ETRN sen gethostbyname(2).\n"
-
-#: fetchmail.c:1415
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "o protocolo escollido non está soportado.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1461
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "O intervalo entre peticións é de %d segundos\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "O ficheiro de rexistro é %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "O ficheiro de identificacións é %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "As mensaxes de progreso rexistraranse polo syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascararase e non xerará unha liña Received\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1456
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensaxes multidrop con enderezo incorrecto a %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail enviará as mensaxes de erro ó postmaster.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail enviará as mensaxes de erro ó autor.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcións para recibir de %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  O correo recibirase vía %s\n"
 
-#: fetchmail.c:1476
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Recibirase deste servidor cada %d intervalos.\n"
+#: fetchmail.c:1512
+#, fuzzy, c-format
+msgid "  Poll of this server will occur every %d interval.\n"
+msgid_plural "  Poll of this server will occur every %d intervals.\n"
+msgstr[0] "  Recibirase deste servidor cada %d intervalos.\n"
+msgstr[1] "  Recibirase deste servidor cada %d intervalos.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O nome real do servidor é %s.\n"
 
-#: fetchmail.c:1481
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1519
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta máquina%sserá interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will not"
-msgstr " non "
-
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will"
-msgstr " "
+#: fetchmail.c:1520
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr ""
+"  Esta máquina%sserá interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Pedirase a contrasinal.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasinal = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  O protocolo é KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  O protocolo é %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando o servicio %s)"
 
-#: fetchmail.c:1517
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (usando opcións de seguridade de rede %s)"
-
-#: fetchmail.c:1520
-#, c-format
-msgid " (using port %d)"
-msgstr " (usando o porto %d)"
-
-#: fetchmail.c:1523
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (usando o porto por defecto)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (forzando o uso de UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1534
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autenticación OTP soportada\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "Autenticación NTLM soportada\n"
+
+#: fetchmail.c:1567
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autenticación NTLM soportada\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1570
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autenticación OTP soportada\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1573
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autenticación CRAM-MD5 soportada\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1576
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autenticación OTP soportada\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1579
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Activada a preautenticación Kerberos V4.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1582
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Activada a preautenticación Kerberos V5.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Asúmese encriptado dun punto ó outro.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1562
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1564
+#: fetchmail.c:1594
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  O protocolo é %s"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1568
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1571
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1574
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  O tempo de espera de resposta do servidor é %d segundos"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correo por defecto escollida.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correo escollidas son:"
 
-#: fetchmail.c:1593
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1624
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "All"
-msgstr "tódalas"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "Only new"
-msgstr "só as novas"
+# %s substitúese por " non " ou " "
+#: fetchmail.c:1627
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  As mensaxes recibidas%sserán mantidas no servidor (--keep %s).\n"
 
 # %s substitúese por " non " ou " "
-#: fetchmail.c:1596
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As mensaxes recibidas%sserán mantidas no servidor (--keep %s).\n"
 
 # %s substitúese por " non " ou " "
-#: fetchmail.c:1599
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1630
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
+msgstr ""
+"  As mensaxes vellas%sserán eliminadas antes da recepción de mensaxes (--"
+"flush %s).\n"
+
+# %s substitúese por " non " ou " "
+#: fetchmail.c:1631
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  As mensaxes vellas%sserán eliminadas antes da recepción de mensaxes (--"
+"flush %s).\n"
+
+# %s substitúese por " non " ou " "
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  As mensaxes vellas%sserán eliminadas antes da recepción de mensaxes (--"
+"flush %s).\n"
+
+# %s substitúese por " non " ou " "
+#: fetchmail.c:1634
+#, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
 msgstr ""
 "  As mensaxes vellas%sserán eliminadas antes da recepción de mensaxes (--"
 "flush %s).\n"
@@ -1187,341 +1222,362 @@ msgstr ""
 # A traducción está feita cos : porque é o único xeito de que as
 # palabras "activado" e "desactivado" sirvan para as sentencias
 # masculinas e femininas, sen que quede moi mal
-#: fetchmail.c:1602
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1636
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "enabled"
-msgstr "activado"
+# A traducción está feita cos : porque é o único xeito de que as
+# palabras "activado" e "desactivado" sirvan para as sentencias
+# masculinas e femininas, sen que quede moi mal
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "disabled"
-msgstr "desactivado"
+#: fetchmail.c:1639
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Eliminación do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Eliminación do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1642
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1643
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
+
+#: fetchmail.c:1645
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpretación de Content-Transfer-Encoding: %s (pass8bits %s).\n"
 
-#: fetchmail.c:1614
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1646
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretación de Content-Transfer-Encoding: %s (pass8bits %s).\n"
+
+#: fetchmail.c:1648
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Decodificación MIME: %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  Decodificación MIME: %s (mimedecode %s).\n"
+
+#: fetchmail.c:1651
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inactividade despois da recepción: %s (idle %s).\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Inactividade despois da recepción: %s (idle %s).\n"
+
+#: fetchmail.c:1654
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As liñas Status non baleiras serán %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "discarded"
-msgstr "descartadas"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  As liñas Status non baleiras serán %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "kept"
-msgstr "mantidas"
+#: fetchmail.c:1657
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  As liñas Status non baleiras serán %s (dropstatus %s)\n"
 
-#: fetchmail.c:1623
-#, fuzzy, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1658
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As liñas Status non baleiras serán %s (dropstatus %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O límite de tamaño de mensaxe é %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Sen límite de tamaño de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de avisos do tamaño das mensaxes é %d segundos (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tamaño de mensaxe en cada recepción (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O límite de mensaxes recibidas é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Sen límite de mensaxes recibidas (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O límite de mensaxes recibidas é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Sen límite de tamaño de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O límite de lote de mensaxes SMTP é %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Sen límite de lote de mensaxes SMTP (--bathlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  O intervalo de borrado entre eliminacións forzado a %d (--expunge %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Sen eliminacións forzadas (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensaxes serán engadidas a %s como BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensaxes serán entregadas con \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensaxes serán redirixiadas a través de %cMTP a:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da máquina na liña MAIL FROM será %s\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas de bloques spam recoñecidas polo servidor receptor son:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueo de spam desactivado\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conexión ó servidor será iniciada con \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Ningún comando de pre-conexión.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conexión ó servidor será rematada con \"%s\".\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Ningún comando de pos-conexión.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Non hai ningún nome local declarado para esta máquina.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Modo de entrega múltiple: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simple: "
 
-#: fetchmail.c:1750
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d nome(s) local(is) recoñecidos.\n"
+#: fetchmail.c:1783
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d nome(s) local(is) recoñecidos.\n"
+msgstr[1] "%d nome(s) local(is) recoñecidos.\n"
 
-#: fetchmail.c:1764
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1798
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Busca no DNS por enderezos de múltiple entrega: %s.\n"
 
-#: fetchmail.c:1768
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1799
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  Busca no DNS por enderezos de múltiple entrega: %s.\n"
+
+#: fetchmail.c:1803
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Os aliases do servidor compararanse cos enderezos de múltiple entrega "
 "segundo "
 
-#: fetchmail.c:1770
-msgid "IP address.\n"
-msgstr "o enderezo IP.\n"
-
-#: fetchmail.c:1772
-msgid "name.\n"
-msgstr "o nome.\n"
+#: fetchmail.c:1805
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr ""
+"  Os aliases do servidor compararanse cos enderezos de múltiple entrega "
+"segundo "
 
-#: fetchmail.c:1775
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O encamiñamento dos enderezos do sobre está desactivado\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Asúmese que a cabeceira do sobre é: %s\n"
 
-# Non traducir, refírese á cabeceira Received das mensaxes
-#: fetchmail.c:1779
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1781
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número da cabeceira do sobre a procesar: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Eliminarase o prefixo %s do identificador de usuario\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Sen eliminación de prefixo\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliases predeclarados do servidor de correo:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Dominios locais:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conexión ten que ser a través da interfaz %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Non se indicou ningún requirimento de interfaz.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  O bucle de recibimento monitorizará %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Non se indicou ningunha interfaz de monitorización.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conexións ó servidor faranse polo plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Non se indicou ningún comando de plugin.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Ás conexións ó servidor receptor faranse polo plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Non se indicou ningún comando de plugout.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ningún UID foi grabado desta máquina.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gravados.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1853
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1856
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
-#, fuzzy
-msgid "alloca failed"
-msgstr "fallou o malloc\n"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERRO: non hai soporte para a rotina getpassword()\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1547,37 +1603,37 @@ msgstr "Enviando credenciais\n"
 msgid "Error exchanging credentials\n"
 msgstr "Erro no troco de credenciais\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Non foi posible desempaquetar os datos do nivel de seguridade\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Troco de credenciais completo\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "O servidor require integridade e/ou privacidade\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempaquetadas as marcas do nivel de seguridade: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "O tamaño máximo do símbolo GSS é %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "Erro ó crear a petición de nivel de seguridade\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando as credenciais GSS\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "Erro liberando as credenciais\n"
 
@@ -1586,155 +1642,160 @@ msgstr "Erro liberando as credenciais\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: durmindo en %s\n"
 
-#: imap.c:280
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificabo como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:460
+#: imap.c:482
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:482
+#: imap.c:504 pop3.c:341
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:491
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:641 imap.c:707
-#, fuzzy
-msgid "expunge failed\n"
-msgstr "fallou o execl(%s)\n"
-
-#: imap.c:663 imap.c:692
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "fallou a nova tentativa de baixar mensaxes\n"
 
-#: imap.c:671
+#: imap.c:682
 #, fuzzy, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "Non hai mensaxes agardando para %s\n"
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "Non hai mensaxes agardando para %s\n"
+msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:681
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "fallou a selección de caixa de correo\n"
 
-#: imap.c:685
+#: imap.c:698
 #, fuzzy, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "Non hai mensaxes agardando para %s\n"
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "Non hai mensaxes agardando para %s\n"
+msgstr[1] "Non hai mensaxes agardando para %s\n"
+
+#: imap.c:722
+#, fuzzy
+msgid "expunge failed\n"
+msgstr "fallou o execl(%s)\n"
 
-#: imap.c:711
+#: imap.c:726
 #, fuzzy, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "Non hai mensaxes agardando para %s\n"
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "Non hai mensaxes agardando para %s\n"
+msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:734
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "fallou a busca de mensaxes non lidas\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "a %u aínda foi lida\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:793 pop3.c:744
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "a %u aínda foi lida\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Non se puido abri-la interfaz kvm. Asegúrese que o fetchmail é SGID de kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr ""
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr ""
 
-#: interface.c:426
+#: interface.c:424
 #, fuzzy
 msgid "get_ifinfo: malloc failed"
 msgstr "fallou o malloc\n"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr ""
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr ""
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr ""
 
-#: interface.c:540
+#: interface.c:538
 #, fuzzy, c-format
 msgid "No IP address found for %s"
 msgstr "non se atopou ningún enderezo `Received'\n"
 
-#: interface.c:592
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "falta o enderezo IP da interfaz\n"
 
-#: interface.c:608
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "enderezo IP da interfaz non válido\n"
 
-#: interface.c:614
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "máscara IP da interfaz non válida\n"
 
-#: interface.c:653
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "actividade en %s -percibida- como %d\n"
 
-#: interface.c:668
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "omitindo a recepción de %s, %s está desactivada\n"
 
-#: interface.c:687
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "omitindo a recepción de %s, enderezo IP de %s excluído\n"
 
-#: interface.c:699
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "actividade en %s comprobada como %d\n"
 
-#: interface.c:725
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "omitindo a recepción de %s, %s está inactiva\n"
 
-#: interface.c:732
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "actividade en %s era %d, é %d\n"
@@ -1761,26 +1822,31 @@ msgstr "non se puido decodificar a resposta BASE64 de dispoñibilidade\n"
 msgid "challenge mismatch\n"
 msgstr "o challenge non encaixa\n"
 
-#: lock.c:81
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
 
-#: lock.c:122
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
+
+#: lock.c:137
 #, fuzzy
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: fallou o socketpair\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "aviso: atopouse \"%s\" antes de calquera nome de máquina"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: aviso: atopouse \"%s\" antes de calquera nome de máquina\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: aviso: símbolo descoñecido \"%s\"\n"
@@ -1798,7 +1864,6 @@ msgstr ""
 msgid "ATRN request refused.\n"
 msgstr ""
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr ""
@@ -1807,12 +1872,10 @@ msgstr ""
 msgid "You have no mail.\n"
 msgstr ""
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr ""
 
-#. Authentication required
 #: odmr.c:124
 #, fuzzy
 msgid "Authentication required.\n"
@@ -1823,116 +1886,117 @@ msgstr "Autenticación OTP soportada\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "Erro de ETRN %d descoñecido\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "escribindo o texto da mensaxe\n"
+
+#: odmr.c:240
 #, fuzzy
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "A opción --keep non está soportada con ETRN\n"
 
-#: odmr.c:247
+#: odmr.c:244
 #, fuzzy
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "A opción --flush non está soportada con ETRN\n"
 
-#: odmr.c:251
+#: odmr.c:248
 #, fuzzy
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "A opción --remote non está soportada con ETRN\n"
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "A opción --flush non está soportada con ETRN\n"
 
-#: odmr.c:255
+#: odmr.c:252
 #, fuzzy
 msgid "Option --check is not supported with ODMR\n"
 msgstr "A opción --check non está soportada con ETRN\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr ""
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "Non se puido decodificar o challenge OTP\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "Contrasinal segreda: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "A cadea '%s' non é unha cadea numérica válida.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "O valor da cadea '%s' é %s que %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "máis pequeno"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "maior"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo indicado `%s' non válido.\n"
 
-#: options.c:429
+#: options.c:372
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Preautenticación `%s' indicada non válida.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: o soporte de seguridade de rede está desactivado\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opcións] [servidor ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  As opcións son as seguintes:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        amosar esta axuda das opcións\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     amosa-la información da versión\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       comprobar as mensaxes sen recollelas\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      traballar silenciosamente\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     traballar barullentamente (saída de diagnóstico)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      executarse como un demonio unha vez cada n segundos\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    non quitar do primeiro plano o proceso demonio\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        mata-lo proceso demonio\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     indica-lo nome do ficheiro de rexistro\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1940,458 +2004,472 @@ msgstr ""
 "      --syslog      usar syslog(3) para a maior parte das mensaxes ó "
 "se                     executar como demonio\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   non escribir `Received' e activar finximento de máquina\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc indicar un ficheiro de control de execución diferente\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      indicar un ficheiro de UIDs alternativo\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  indicar o destinatario en último caso\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    redirixir as mensaxes erradas do usuario ó postmaster.\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   indicación de requirimento de interfaz\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar a actividade da interfaz\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesión encriptada con ssl\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ficheiro coa chave privada ssl\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:686
+#: options.c:599
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     certificado de cliente ssl\n"
+
+#: options.c:600
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      indicar comando externo para abri-la conexión\n"
 
-#: options.c:689
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     indicar comando externo para abri-la conexión smtp "
 "local\n"
 
-#: options.c:691
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    indicar o protocolo de recepción (mirar a páxina man)\n"
 
-#: options.c:692
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar o uso de UIDLs (só pop3)\n"
 
-#: options.c:693
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        porto do servicio TCP/IP ó que se conectar\n"
+
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        porto do servicio TCP/IP ó que se conectar\n"
 
-#: options.c:694
+#: options.c:610
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --preauth     tipo de preautenticación: password (contrasinal),\n"
 "                    kerberos, ou ssh\n"
 
-#: options.c:695
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tempo de espera da resposta do servidor\n"
 
-#: options.c:696
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabeceira co enderezo do sobre\n"
 
-#: options.c:697
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo a borrar da identificación de usuario local\n"
 
-#: options.c:698
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:699
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:701
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    indicar o login do usuario no servidor\n"
 
-#: options.c:702
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         coller as mensaxes vellas e novas\n"
 
-#: options.c:703
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borra-las novas mensaxes despois de recollelas\n"
 
-#: options.c:704
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        mante-las novas mensaxes despois de recollelas\n"
 
-#: options.c:705
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
 
-#: options.c:706
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   non rescribi-los enderezos das cabeceiras\n"
 
-#: options.c:707
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       non coller mensaxes meirandes que o tamaño dado\n"
 
-#: options.c:708
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    intervalo entre notificacións de avisos de correo\n"
 
-#: options.c:711
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      establecer petición de seguridade IP\n"
-
-#: options.c:713
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    establece-lo servidor SMTP para redirixir\n"
 
-#: options.c:714
+#: options.c:628
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo límite de mensaxes para as conexións\n"
 "                    ó servidor\n"
 
-#: options.c:715
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress establece-lo dominio de entrega SMTP a usar\n"
 
-#: options.c:716
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:717
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   establece-los valores de resposta antispam\n"
 
-#: options.c:718
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  establece-lo límite de lote para conexións SMTP\n"
 
-#: options.c:719
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo límite de mensaxes para as conexións\n"
 "                    ó servidor\n"
 
-#: options.c:720
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo límite de mensaxes para as conexións\n"
 "                    ó servidor\n"
 
-#: options.c:721
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     establece-lo número máximo de borrados entre "
 "eliminacións\n"
 
-#: options.c:723
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         establece-lo MDA a usar para redirixir\n"
 
-#: options.c:724
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       establece-lo ficheiro BSMTP de saída\n"
 
-#: options.c:725
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para a entrega\n"
 
-#: options.c:726
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      indicar o nome da carpeta remota\n"
 
-#: options.c:727
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Mostra da data de APOP requirida non atopada no saúdo\n"
 
-#: pop3.c:547
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na mostra da data no saúdo\n"
 
-#: pop3.c:569
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petición de protocolo indefinida en POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo activado!  ¿Hai outra sesión activa?\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensaxes inseridas nunha lista no servidor. Non se pode manexar isto.\n"
 
-#: pop3.c:842
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:857
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo ó obter os UIDLs\n"
 
-#: pop3.c:1214
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "A opción --remote non está soportada con POP3\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:222
-#, fuzzy
-msgid "invalid security request"
-msgstr "Erro ó crear a petición de nivel de seguridade\n"
-
-#: rcfile_y.y:228
-#, fuzzy
-msgid "network-security support disabled"
-msgstr "fetchmail: o soporte de seguridade de rede está desactivado\n"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (mensaxe de rexistro incompleta)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "erro parcial de sobrecarga no buffer de mensaxe"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, fuzzy, c-format
 msgid "About to rewrite %s"
 msgstr "a piques de entregar con: %s\n"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:116
+#: rpa.c:117
 msgid "Success"
 msgstr "Éxito"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuario restrinxido (algo está mal coa conta)"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Identificador de usuario ou contrasinal non válidos"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Deity error"
 msgstr "Erro fatal"
 
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA símbolo 2: Erro de decodificación Base64\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "O servicio escolleu a versión %d.%d do RPA\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Challenge do servicio (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "Erro na lonxitude do símbolo 2 RPA\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de dominios: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "Erro RPA na cadea servicio@dominio\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA símbolo 4: Erro de decodificación Base64\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticación de usuario (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estado RPA: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "Erro na lonxitude do símbolo 4 RPA\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA rexeitoulle: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA rexeitoulle, razón descoñecida\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Erro de lonxitude da autenticación de usuario RPA: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Erro de lonxitude da chave da sesión RPA: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallo na autorización do _servicio_ RPA. ¿Servidor falsificado?\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Chave de sesión establecida:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Autorización RPA completa\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Obtención de resposta\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "A obtención de resposta devolveu %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "A cabeceira non é 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "Erro de lonxitude do símbolo\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "A lonxitude %d do compoñente non está de acordo coa rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Campo de mecanismo incorrecto\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no carácter %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Datos binarios entrantes:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Datos saíntes:\n"
 
@@ -2403,342 +2481,350 @@ msgstr "Cadea RPA longa de máis\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA fallou na apertura de /dev/urandom. Isto non debería\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedilo de se conectar, pero significa que\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    non pode estar seguro de estar a falar co\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    servicio que vostede cre (son posibles\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ataques de re-tentativa por un servicio deshonesto.)\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Challenge de usuario:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 sendo aplicado ó bloque de datos:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "O resultado MD5 é: \n"
 
-#: sink.c:246
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "redirixindo a %s\n"
 
-#: sink.c:348
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:461
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:524 sink.c:604
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "erro de %cMTP: %s\n"
 
-#: sink.c:758
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do preámbulo\n"
 
-#: sink.c:979
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:986
+#: sink.c:972
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:1024
+#: sink.c:1013
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1036
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡non se pode nin sequera enviar a %s!\n"
 
-#: sink.c:1042
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1195
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a piques de entregar con: %s\n"
 
-#: sink.c:1219
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "Fallou a apertura MDA\n"
 
-#: sink.c:1256
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "fallou a conexión %cMTP a %s\n"
 
-#: sink.c:1280
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1336
+#: sink.c:1326
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: sink.c:1339
+#: sink.c:1329
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "O MDA saiu anormalmente ou devolveu estado non cero\n"
 
-#: sink.c:1342
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1363
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
 
-#: sink.c:1384
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "O receptor SMTP rexeitou a entrega\n"
 
-#: sink.c:1414
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1417
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta distinta de 503 non agardada ó LMTP EOM: %s\n"
 
-#: sink.c:1567
+#: sink.c:1561
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:86
+#: smtp.c:87
 #, fuzzy
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticación CRAM-MD5 soportada\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:114 socket.c:140
 #, fuzzy
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: fallou o fork\n"
 
-#: socket.c:166
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: fallou o socketpair\n"
 
-#. error
-#: socket.c:172
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fallou o fork\n"
 
-#: socket.c:180
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "fallou o dup2\n"
 
-#: socket.c:186
+#: socket.c:191
 #, fuzzy, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "executando %s %s %s\n"
 
-#: socket.c:189
+#: socket.c:194
 #, fuzzy, c-format
 msgid "execvp(%s) failed\n"
 msgstr "fallou o execl(%s)\n"
 
-#: socket.c:280
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:427
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: lonxitude de enderezo ilegal recibido para a máquina %s\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:778
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:780
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:782
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:784
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:788
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:640
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:812
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:818
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:823
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:825
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:835
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:839
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:857
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:861
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:864
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:872
+#: socket.c:747
 #, c-format
-msgid "Warning: server certificate verification: %s\n"
+msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:878
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:931
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:948
+#: socket.c:822
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo indicado `%s' non válido.\n"
 
-#: socket.c:1008
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1080
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1083
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:70
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s asociado a %s local\n"
 
-#: transact.c:134
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "pasou por %s coincidindo con %s\n"
 
-#: transact.c:203
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2747,85 +2833,80 @@ msgstr ""
 "analizando a liña Received:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "liña aceptada, %s é un alias do servidor de correo\n"
 
-#: transact.c:248
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "liña rexeitada, %s non é un alias do servidor de correo\n"
 
-#: transact.c:322
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "non se atopou ningún enderezo `Received'\n"
 
-#: transact.c:331
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "atopouse o enderezo `Received' `%s'\n"
 
-#: transact.c:531
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "delimitador de mensaxes atopado ó explora-las cabeceiras\n"
 
-#: transact.c:552
+#: transact.c:559
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr "delimitador de mensaxes atopado ó explora-las cabeceiras\n"
 
-#: transact.c:554
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Recibindo de %s\n"
 
-#: transact.c:1074
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "non hai ningunha coincidencia local, reenviando a %s\n"
 
-#: transact.c:1089
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío e borrado omitidos por causa de erros de DNS\n"
 
-#: transact.c:1225
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribindo cabeceiras de mensaxe RFC822\n"
 
-#: transact.c:1246
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "ningún dos enderezos coincidiu cos nomes locais declarados"
 
-#: transact.c:1257
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "o enderezo de destinatario %s non coincidiu con ningún nome local"
 
-#: transact.c:1271
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "a mensaxe contén caracteres nulos"
 
-#: transact.c:1284
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 "O servidor SMTP receptor rexeitou os enderezos de destinatario locais: "
 
-#: transact.c:1409
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "escribindo o texto da mensaxe\n"
 
-#: uid.c:137
-#, c-format
-msgid "lstat: %s: %s\n"
-msgstr ""
-
 #: uid.c:248
 #, c-format
 msgid "Old UID list from %s:"
 msgstr ""
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr ""
 
@@ -2833,39 +2914,57 @@ msgstr ""
 msgid "Scratch list of UIDs:"
 msgstr ""
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
-#: uid.c:512 uid.c:563
+#: uid.c:514 uid.c:566
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr ""
 
-#: uid.c:514
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr ""
 
-#: uid.c:542
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr ""
 
-#: uid.c:550
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:575
+#: uid.c:578
 msgid "discarding new UID list\n"
 msgstr ""
 
-#: uid.c:610
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr ""
 
-#: uid.c:616
+#: uid.c:615
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Erro liberando as credenciais\n"
+
+#: uid.c:621
 #, fuzzy
 msgid "Writing fetchids file.\n"
 msgstr "iniciando o demonio de fetchmail %s \n"
 
+#: uid.c:640
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:644
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:648
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "fallou o malloc\n"
@@ -2874,6 +2973,116 @@ msgstr "fallou o malloc\n"
 msgid "realloc failed\n"
 msgstr "fallou o realloc\n"
 
+#~ msgid "header "
+#~ msgstr " de cabeceira"
+
+#, fuzzy
+#~ msgid "internal inconsistency\n"
+#~ msgstr "fetchmail: inconsistencia interna\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "o nome é válido mais non ten enderezo IP."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "erro irrecuperable do servidor de nomes."
+
+#~ msgid "temporary name server error."
+#~ msgstr "erro temporal do servidor de nomes."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "erro %d de DNS descoñecido."
+
+#~ msgid "messages"
+#~ msgstr "mensaxes"
+
+#~ msgid "message"
+#~ msgstr "mensaxe"
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "A opción --remote non está soportada con ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "Non se pode soportar ETRN sen gethostbyname(2).\n"
+
+#, fuzzy
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "Non se pode soportar ETRN sen gethostbyname(2).\n"
+
+#~ msgid "will not"
+#~ msgstr " non "
+
+#~ msgid "will"
+#~ msgstr " "
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (usando opcións de seguridade de rede %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (usando o porto %d)"
+
+#~ msgid "All"
+#~ msgstr "tódalas"
+
+#~ msgid "Only new"
+#~ msgstr "só as novas"
+
+#~ msgid "enabled"
+#~ msgstr "activado"
+
+#~ msgid "disabled"
+#~ msgstr "desactivado"
+
+#~ msgid "discarded"
+#~ msgstr "descartadas"
+
+#~ msgid "kept"
+#~ msgstr "mantidas"
+
+#~ msgid "IP address.\n"
+#~ msgstr "o enderezo IP.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "o nome.\n"
+
+# Non traducir, refírese á cabeceira Received das mensaxes
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#, fuzzy
+#~ msgid "alloca failed"
+#~ msgstr "fallou o malloc\n"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "aviso: atopouse \"%s\" antes de calquera nome de máquina"
+
+#, fuzzy
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "A opción --remote non está soportada con ETRN\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: o soporte de seguridade de rede está desactivado\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      establecer petición de seguridade IP\n"
+
+#, fuzzy
+#~ msgid "invalid security request"
+#~ msgstr "Erro ó crear a petición de nivel de seguridade\n"
+
+#, fuzzy
+#~ msgid "network-security support disabled"
+#~ msgstr "fetchmail: o soporte de seguridade de rede está desactivado\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "erro parcial de sobrecarga no buffer de mensaxe"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr ""
+#~ "fetchmail: lonxitude de enderezo ilegal recibido para a máquina %s\n"
+
 #~ msgid "fetchmail: %s connection to %s failed"
 #~ msgstr "fetchmail: a conexión %s a %s fallou"
 
diff --git a/po/ja.po b/po/ja.po
index 632398ee..7be3743d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.9.11\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-06 00:35+0200\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2002-04-07 12:00+0900\n"
 "Last-Translator: Jumpei Baba <jbaba@wb3.so-net.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -14,20 +14,25 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "%s ¤È %s ¤¬ËÜÅö¤ËƱ¤¸¥Î¡¼¥É¤Ç¤¢¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "¤Ï¤¤¡¢¤³¤ì¤é¤ÎIP¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤·¤¿¡£\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "¤¤¤¤¤¨¡¢¤³¤ì¤é¤ÎIP¥¢¥É¥ì¥¹¤Ï°ìÃפ·¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: checkalias.c:199 checkalias.c:224
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr "¥Í¡¼¥à¥µ¡¼¥Ğ¤¬`%s'¤ò¸¡º÷½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£(%s ¤ËÀܳ¤¹¤ëºİ¤Ë)\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "¥Í¡¼¥à¥µ¡¼¥Ğ¤¬`%s'¤ò¸¡º÷½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£(%s ¤ËÀܳ¤¹¤ëºİ¤Ë)\n"
@@ -41,21 +46,29 @@ msgstr "BASE64 ÊÑ´¹¤µ¤ì¤¿ challenge ¤ò¥Ç¥³¡¼¥É¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "decoded as %s\n"
 msgstr "%s ¤È¥Ç¥³¡¼¥É¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:195
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos ¥¨¥é¡¼ : %s\n"
 
-#: driver.c:253 driver.c:258
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [¥µ¡¼¥Ğ¤Î±şÅú  '%*s']\n"
 
-#: driver.c:339
+#: driver.c:337
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:342
+#: driver.c:341
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on the mail server %s:"
+msgstr ""
+"Subject: ·Ù¹ğ : Fetchmail ÍÆÎÌĶ²á\n"
+"\n"
+"°Ê²¼¤Ë¼¨¤¹ÍÆÎ̤òĶ²á¤·¤¿¥á¥Ã¥»¡¼¥¸¤¬¥á¡¼¥ë¥µ¡¼¥Ğ %s ¤Ë»Ä¤Ã¤Æ¤¤¤Ş¤¹ :"
+
+#: driver.c:345
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -63,61 +76,67 @@ msgstr ""
 "\n"
 "°Ê²¼¤Ë¼¨¤¹ÍÆÎ̤òĶ²á¤·¤¿¥á¥Ã¥»¡¼¥¸¤¬¥á¡¼¥ë¥µ¡¼¥Ğ %s ¤Ë»Ä¤Ã¤Æ¤¤¤Ş¤¹ :"
 
-#: driver.c:360
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr ""
+"\t%d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d bytes ¤ÎŤµ¤¬¤¢¤ê¤Ş¤¹)¤ÏÆɤßÈô¤Ğ¤µ¤ì¤Ş¤·¤¿¡£\n"
+
+#: driver.c:368
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr ""
 "\t%d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d bytes ¤ÎŤµ¤¬¤¢¤ê¤Ş¤¹)¤ÏÆɤßÈô¤Ğ¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:500
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ğ¥¤¥È) ¤òÆɤßÈô¤Ğ¤·¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:552
+#: driver.c:556
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ğ¥¤¥È) ¤òÆɤßÈô¤Ğ¤·¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:568
+#: driver.c:572
 msgid " (length -1)"
 msgstr " (Ťµ -1)"
 
-#: driver.c:571
+#: driver.c:575
 #, fuzzy
 msgid " (oversized)"
 msgstr "  (ÍÆÎÌĶ²á, %d ¥Ğ¥¤¥È)"
 
-#: driver.c:586
+#: driver.c:590
 #, fuzzy, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d ¥Ğ¥¤¥È) ¤Î¥Ø¥Ã¥À¤òÆɤ߽Ф»¤Ş¤»¤ó¤Ç¤·"
 "¤¿¡£"
 
-#: driver.c:603
+#: driver.c:607
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(Á´Éô¤Ç %d ÄÌ)¤òÆɤ߹ş¤ó¤Ç¤¤¤Ş¤¹"
 
-#: driver.c:608
+#: driver.c:612
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d ¥Ğ¥¤¥È%s)"
 
-#: driver.c:609
+#: driver.c:613
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d ¥Ğ¥¤¥È (ËÜÂÎ) )"
 
-#: driver.c:681
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d ¥Ğ¥¤¥È (ËÜÂÎ) )"
 
-#: driver.c:739
+#: driver.c:743
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -125,19 +144,19 @@ msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤¬¹ç¤¤¤Ş¤»¤ó (%d (¼Âºİ) != %d (ͽ"
 "ÁÛ)) \n"
 
-#: driver.c:770
+#: driver.c:774
 msgid " retained\n"
 msgstr " ¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤Ë¤½¤Î¤Ş¤Ş¤Ë¤·¤Æ¤¢¤ê¤Ş¤¹¡£\n"
 
-#: driver.c:779
+#: driver.c:784
 msgid " flushed\n"
 msgstr " ¥µ¡¼¥Ğ¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:796
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " ¥µ¡¼¥Ğ¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:813
+#: driver.c:818
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -149,42 +168,42 @@ msgstr[1] ""
 "ºÇÂç¼è¤ê¹ş¤ß¿ô¤Ç¤¢¤ë %d Ä̤Ë㤷¤Ş¤·¤¿; ¥á¥Ã¥»¡¼¥¸¤¬ %d ÄÌ¡¢¥µ¡¼¥Ğ %s ¤Ë¥¢¥«"
 "¥¦¥ó¥È %s °¸¤Ç»Ä¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: driver.c:876
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "MDA ¤è¤ê SIGPIPE ¤¬È¯¿®¤µ¤ì¤¿¤« stream socket ¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:883
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ğ %s ¤ÎÀܳ±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:887
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ğ %s ¤Î±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:891
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%d ÉÃ´Ö %s ¤Î±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:896
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "žÁ÷Àè¤Î¥×¥í¥°¥é¥à¤Î±şÅú¤ò %d ÉôÖÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:899
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d ÉôÖÂÔµ¡¤·¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:911
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ¼Â¹ÔÃæ¤Ë·«¤êÊÖ¤·À©¸Â»ş´Ö¤ÎĶ²á¤¬È¯À¸¤·¤Ş¤·¤¿\n"
 
-#: driver.c:914
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -193,7 +212,7 @@ msgstr ""
 "Fetchmail ¼Â¹ÔÃæ¤Ë %d ²ó°Ê¾å¡¢%s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¼õ¿®¤ò»î¤ß¤Ş¤·¤¿¤¬¡¢¤½¤Î"
 "ÅÙ¤ËÀ©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:918
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -209,58 +228,33 @@ msgstr ""
 "ºÆµ¯Æ°¤·¤Ê¤¤¸Â¤ê fetchmail ¤Ï¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤è¤ê\n"
 "¥á¡¼¥ë¤ò¼è¤ê½Ğ¤·¤Ş¤»¤ó¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: driver.c:947
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 "¥µ¡¼¥Ğ¤Ø¤ÎÀܳ³«»ÏÁ°¤Ë¼Â¹Ô¤·¤¿¥³¥Ş¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Ş¤·"
 "¤¿¡£\n"
 
-#: driver.c:978
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s ¤Ë¤¢¤ë¤Ù¤­ HESIOD pobox ¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1000
+#: driver.c:993
 msgid "Lead server has no name.\n"
 msgstr "Lead server ¤Î̾Á°¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1024 driver.c:1050
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "%s ¤Î canonical DNS ̾¤ò¸¡º÷¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1088
-msgid "internal inconsistency\n"
-msgstr "ÆâÉô¤Ç¤ÎÉÔ°ìÃפ¬¤¢¤ê¤Ş¤·¤¿¡£\n"
-
-#: driver.c:1098
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤¿ %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£"
 
-#: driver.c:1104
-msgid "host is unknown."
-msgstr "ÉÔÌÀ¤Ê¥Û¥¹¥È¤Ç¤¹¡£"
-
-#: driver.c:1107
-msgid "name is valid but has no IP address."
-msgstr "̾Á°¤ÏÍ­¸ú¤Ç¤¹¤¬ IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£"
-
-#: driver.c:1110
-msgid "unrecoverable name server error."
-msgstr "¥Í¡¼¥à¥µ¡¼¥Ğ¤Î²óÉüÉÔǽ¤Ê¥¨¥é¡¼¤Ç¤¹¡£"
-
-#: driver.c:1112
-msgid "temporary name server error."
-msgstr "°ì»şÅª¤Ê¥Í¡¼¥à¥µ¡¼¥Ğ¤Î¥¨¥é¡¼¤Ç¤¹¡£"
-
-#: driver.c:1115
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "ÉÔÌÀ¤Ê DNS ¤Î¥¨¥é¡¼ %d ¤Ç¤¹¡£"
-
-#: driver.c:1133
+#: driver.c:1071
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -268,45 +262,45 @@ msgstr ""
 "\n"
 "Fetchmail ¼Â¹ÔÃæ¤Ë¥á¡¼¥ë¥µ¡¼¥Ğ %s ¤È¸ò¿®½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£"
 
-#: driver.c:1135
+#: driver.c:1073
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ¼Â¹ÔÃæ¤Ë %s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¤ò¼è¤ê½Ğ¤»¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1099 imap.c:384 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "SSL ¤Ë¤è¤ëÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1215
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "¥¢¥«¥¦¥ó¥È %s@%s ¤¬ Lock-busy ¾õÂ֤Ǥ¹¡£\n"
 
-#: driver.c:1219
+#: driver.c:1156
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s ¤Î¥µ¡¼¥Ğ¤¬ busy ¾õÂ֤Ǥ¹¡£\n"
 
-#: driver.c:1224
+#: driver.c:1161
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s ¤Îǧ¾Ú¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: driver.c:1227
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr "(°ÊÁ°¤Ïǧ¾Ú¤µ¤ì¤Ş¤·¤¿)"
 
-#: driver.c:1248
+#: driver.c:1185
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail ¼Â¹ÔÃæ %s@%s ¤Îǧ¾Ú¤Ë¼ºÇÔ\n"
 
-#: driver.c:1252
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ¼Â¹ÔÃæ¤Ë %s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¤ò¼è¤ê½Ğ¤»¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1256
+#: driver.c:1193
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -336,7 +330,7 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ğ¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Ş¤¹¡£\n"
 " "
 
-#: driver.c:1271
+#: driver.c:1208
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -357,64 +351,64 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ğ¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Ş¤¹¡£\n"
 "\n"
 
-#: driver.c:1286
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1291
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëÉÔÌÀ¤Ê¥í¥°¥¤¥óËô¤Ïǧ¾Ú¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:1315
+#: driver.c:1252
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëǧ¾Ú¤¬¹Ô¤ï¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1321
+#: driver.c:1258
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail %s@%s ǧ¾Ú´°Î»\n"
 
-#: driver.c:1325
+#: driver.c:1262
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 "%s@%s ¤Î¥í¥°¥¤¥ó¤¬´°Î»¤· fetchmail ¤Ë¤è¤ë¥¢¥¯¥»¥¹¤¬²Äǽ¤È¤Ê¤ê¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1329
+#: driver.c:1266
 msgid "Service has been restored.\n"
 msgstr "¥µ¡¼¥Ó¥¹¤¬Éüµ¢¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1360
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Õ¥©¥ë¥À %s ¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Ş¤¹¡£\n"
 
-#: driver.c:1362
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ë¥À¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Ş"
 "¤¹¡£\n"
 
-#: driver.c:1374
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ğ %s (¥Õ¥©¥ë¥À %s)"
 
-#: driver.c:1377 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ğ %s"
 
-#: driver.c:1382
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: driver.c:1386
+#: driver.c:1323
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -423,103 +417,108 @@ msgstr[0] ""
 msgstr[1] ""
 "%d %s ( ¤½¤Î¤¦¤Á %d Ä̤ϴû¤ËÆɤ߹ş¤ó¤Ç¤¤¤Ş¤¹ ) ¤¬%s°¸¤ËÆϤ¤¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:1389
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1392
+#: driver.c:1329
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s¤¬%s °¸¤ËÆϤ¤¤Æ¤¤¤Ş¤¹¡£"
 msgstr[1] "%d %s¤¬%s °¸¤ËÆϤ¤¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:1399
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d ¥Ğ¥¤¥È)\n"
 
-#: driver.c:1405
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s °¸¤Ë¥á¥Ã¥»¡¼¥¸¤ÏÆϤ¤¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1438
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr "µ¶Â¤¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¿ô!"
 
-#: driver.c:1539
+#: driver.c:1485
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1542
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ¥Ø¥Ã¥À¤Î·çÍ¸íɵ"
 
-#: driver.c:1545
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1548
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥ĞƱ´ü"
 
-#: driver.c:1551
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥Ğ¥×¥í¥È¥³¥ë"
 
-#: driver.c:1554
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "¥µ¡¼¥Ğ¤Î lock busy"
 
-#: driver.c:1557
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "SMTP ÄÌ¿®"
 
-#: driver.c:1560
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "DNS »²¾È"
 
-#: driver.c:1563
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼\n"
 
-#: driver.c:1574
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1515
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s¥¨¥é¡¼¤¬ SMTP ¥µ¡¼¥Ğ %s ¤Ø¤Î¥á¡¼¥ëÁ÷¿®Ãæ¤ËȯÀ¸¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1576
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "ÉÔÌÀ¤Ê¥Û¥¹¥È¤Ç¤¹¡£"
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%s¥¨¥é¡¼¤¬ %s ¤è¤ê¥á¡¼¥ë¤ò¼õ¿®¤·¤Æ¤¤¤ëºÇÃæ¤ËȯÀ¸¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1584
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Àܳ½ªÎ»¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Ş¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1605
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 ¤Ë¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1613
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 ¤Ë¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1624
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --flush ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1630
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --all ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1638
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --limit ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
@@ -568,11 +567,23 @@ msgstr ""
 msgid "%s: can't determine your host!"
 msgstr "%s: ¥Û¥¹¥È¤¬·èÄê¤Ç¤­¤Ş¤»¤ó¡£"
 
-#: env.c:158
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "¥Û¥¹¥È %s ¤ò gethostbyname ¤Ç¸¡º÷¤»¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -621,76 +632,81 @@ msgstr "ETRN ¤Î¥Ñ¥é¥á¡¼¥¿¤¬¸í¤Ã¤Æ¤¤¤Ş¤¹¡£\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "ÉÔÌÀ¤Ê ETRN ¤Î¥¨¥é¡¼¤Ç¤¹ (%d)\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "¥ª¥×¥·¥ç¥ó --keep ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "¥ª¥×¥·¥ç¥ó --flush ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "¥ª¥×¥·¥ç¥ó --flush ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "¥ª¥×¥·¥ç¥ó --check ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: ¼¡¤Îʪ¤ò±çÍѤ·¤Æ¤¤¤Ş¤¹¡£"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:201
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail ¥ê¥ê¡¼¥¹ %s "
 
-#: fetchmail.c:346
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "¥³¥Ş¥ó¥É¥é¥¤¥ó%s%s¤è¤ê¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Ş¤¹¡£\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:355
 msgid " and "
 msgstr "µÚ¤Ó"
 
-#: fetchmail.c:352
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "¥á¡¼¥ë¥µ¡¼¥Ğ¤Î½àÈ÷¤¬À°¤¤¤Ş¤»¤ó -- ¤ª¤½¤é¤¯ %s ¤¬Â¸ºß¤·¤Ê¤¤¤¿¤á¤Ç¤¹\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ¥á¡¼¥ë¥µ¡¼¥Ğ¤¬»ØÄꤵ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ¼Â¹ÔÃæ¤Î fetchmail ¤Ï¸ºß¤·¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: ¥¨¥é¡¼¤ÎȯÀ¸¤Ë¤è¤ê%s fetchmail (PID=%d)¤ò½ªÎ»¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:403
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (PID=%d) ¤¬½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -698,7 +714,7 @@ msgstr ""
 "fetchmail: Ʊ¤¸¥Û¥¹¥È¤ËÂФ·¤ÆÊ̤Πfetchmail ¤¬¸ò¿®¤·¤Æ¤¤¤ë¤¿¤á¥á¡¼¥ë¤Î³Îǧ¤¬"
 "½ĞÍè¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -706,182 +722,187 @@ msgstr ""
 "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¼Â¹ÔÃæ¤Î¤¿¤á»ØÄꤵ¤ì¤¿¥Û¥¹¥È¤ÈÀܳ¤Ç¤­¤Ş"
 "¤»¤ó¡£\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¥Õ¥©¥¢¥°¥é¥¦¥ó¥ÉÆ°ºîÃæ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: ¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç fetchmail ¤¬Æ°ºîÃæ¤Î¤¿¤á¥ª¥×¥·¥ç¥ó¤¬¼õ¤±ÉÕ¤±¤é"
 "¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 "fetchmail: ¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î fetchmail (PID=%d) ¤¬Æ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: Ʊ»ş¤ËÆ°ºî¤·¤Æ¤¤¤¿ fetchmail (PID=%d) ¤¬ÆÍÁ³¾ÃÌǤ·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:487
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆşÎϤ·¤Æ²¼¤µ¤¤ : "
 
-#: fetchmail.c:510
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s ¥Ç¡¼¥â¥ó¤òÆ°ºî³«»Ï¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "¥í¥°¤òÄɲ乤뤿¤á¤Ë %s ¤ò³«¤¯¤³¤È¤¬½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿\n"
 
-#: fetchmail.c:565
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "%s ¤ÎÊÔ½¸¤µ¤ì¤¿»ş´Ö¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¡£(¥¨¥é¡¼ %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "%s ¤¬ÊÔ½¸¤µ¤ì¤¿¤¿¤á fetchmail ¤òºÆµ¯Æ°¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:602
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail ¤ÎºÆµ¯Æ°¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "ǧ¾Ú¼ºÇÔ¤«À©¸Â»ş´ÖĶ²á¤¬ÉÑȯ¤·¤¿¤¿¤á %s ¤È¤Î¸ò¿®¤òÈô¤Ğ¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "»ş´Ö´Ö³Ö¤Ë㤷¤Æ¤¤¤Ê¤¤¤Î¤Ç %s ¤Î°ì»şÊݴɤò¹Ô¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:690
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:692
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:694
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:696
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:698
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:700
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:702
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:704
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:706
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:708
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:710
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:712
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:714
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:716
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Á´¤Æ¤ÎÀܳ¤¬Æ°ºîÉÔÁ´¤Ë´Ù¤Ã¤Æ¤·¤Ş¤¤¤Ş¤·¤¿¡£½ªÎ»¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:771
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "%s ¤ËµÙ̲¾õÂÖ¤È¤Ê¤ê¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s ¿®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s ¤ËÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "Ä̾ï¤Î½ªÎ»¤Ç¤¹¡£status %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "Æ°ºîÀ©¸æ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸»ş´Ö¤ò³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "·Ù¹ğ : ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¥Û¥¹¥È %s ¤òÊ£¿ô²óµ­½Ò¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "·Ù¹ğ : ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¥Û¥¹¥È %s ¤òÊ£¿ô²óµ­½Ò¤·¤Æ¤¤¤Ş¤¹\n"
+
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL Âбş¤¬¥³¥ó¥Ñ¥¤¥ë¤Î»şÅÀ¤ÇÍ­¸ú¤Ë¤µ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -889,666 +910,665 @@ msgstr ""
 "fetchmail: ·Ù¹ğ : %s ¤è¤ê multidrop fetch ¤ò³Îǧ¤¹¤ë¤¿¤á¤Î DNS ¤¬Í­¸ú¤Ç¤¢¤ê¤Ş"
 "¤»¤ó¡£\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1177
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1193
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£¥İ¡¼¥ÈÈÖ¹æ¤ÏÉé¤Î¿ô¤Ç¤Ï¤¤¤±¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1200
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£ RPOP ¤Ç¤Ï privileged port ¤òÍøÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Ş"
 "¤¹¡£\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£LMTP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î SMTP ¥İ¡¼¥È¤òÍøÍѤǤ­¤Ş¤»"
 "¤ó¡£\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall ¤È keep ¥ª¥×¥·¥ç¥ó¤Ï¥Ç¡¼¥â¥ó¥â¡¼¥É¤ÇÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "¥·¥°¥Ê¥ë %d ¤Ç½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Ş¤¹¡£¸ò¿®¤¬³«»Ï¤µ¤ì¤Ş¤·"
 "¤¿¡£\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1425
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "gethostbyname(2) ̵¤·¤Ç ETRN ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
-
-#: fetchmail.c:1432
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1438
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "gethostbyname(2) ̵¤·¤Ç ODMR ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
-
-#: fetchmail.c:1444
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "Âбş¤·¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬ÁªÂò¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Ş¤¹¡£¸ò¿®¤¬½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "¸ò¿®´Ö³Ö¤Ï %d ÉäǤ¹¡£\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "¥í¥°¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID ¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "¿Ê¹Ô¾õ¶·¤Î¥á¥Ã¥»¡¼¥¸¤Ï syslog ¤òÄ̤·¤Æµ­Ï¿¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ¤Ï¥¢¥É¥ì¥¹¤ò½ñ¤­´¹¤¨¡¢Received ¤òÀ¸À®¤·¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail ¤Ï¥í¥°¥Õ¥¡¥¤¥ëÃæ¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹ş¤ß¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ¤Ï¸í¤Ã¤¿°¸Àè¤Î½ñ¤«¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò %s ¤ËžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ¤Ï postmaster °¸¤Ë¥¨¥é¡¼¥á¡¼¥ë¤òÁ÷¿®¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ¤ÏÁ÷¤ê¼ç¤Ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "¥¢¥«¥¦¥ó¥È %s@%s ¤Ç¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ¥á¡¼¥ë¤Ï¥Û¥¹¥È %s ¤ò²ğ¤·¤Æ¤ä¤ê¤È¤ê¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1512
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  ¤³¤Î¥µ¡¼¥Ğ¤ËÂФ·¤Æ¤Î¥¢¥¯¥»¥¹¤Ï %d ¤Î´Ö³Ö¤Ç¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 msgstr[1] "  ¤³¤Î¥µ¡¼¥Ğ¤ËÂФ·¤Æ¤Î¥¢¥¯¥»¥¹¤Ï %d ¤Î´Ö³Ö¤Ç¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  ¥µ¡¼¥Ğ¤ÎËÜ̾¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1519
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤Ï¥Û¥¹¥È¤¬»Ø¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ë¥¢¥¯¥»¥¹%s\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1520
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤Ï¥Û¥¹¥È¤¬»Ø¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ë¥¢¥¯¥»¥¹%s\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥ÉÆşÎϤ¬É¬ÍפǤ¹¡£\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É = \"%s\"\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Kerberos %s ǧ¾Ú¤Ë¤è¤ë KPOP ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s ¥µ¡¼¥Ó¥¹¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1548
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (%s ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¥ª¥×¥·¥ç¥ó¤òÍøÍѤ·¤Ş¤¹)"
-
-#: fetchmail.c:1551
-#, c-format
-msgid " (using port %d)"
-msgstr " (¥İ¡¼¥È %d ¤òÍøÍѤ·¤Ş¤¹)"
-
-#: fetchmail.c:1554
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¤Î¥İ¡¼¥È¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (UIDL ¤ÎÍøÍѤò¶¯À©¤·¤Ş¤¹)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ÍøÍѲÄǽ¤ÊÁ´¤Æ¤Îǧ¾ÚÊı¼°¤ò»î¤ß¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM ǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
+
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM ǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP ¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end °Å¹æ²½¤Ç¤¢¤ë¤È¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ¥á¡¼¥ë¥µ¡¼¥Ó¥¹¤Ï %s ¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ¤Ë¤è¤ë°Å¹æ²½ÄÌ¿®¤¬¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL ¥µ¡¼¥Ğ¾ÚÌÀ½ñ¤Î³Îǧ¤¬ÀßÄꤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL ¿®ÍѲÄǽ¾ÚÌÀ½ñ¤Ï %s ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL key fingerprint (checked against the server key): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ¥µ¡¼¥Ğ¤Î±şÅúÀ©¸Â»ş´Ö¤Ï %d ÉäǤ¹¡£"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)¡£\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  ¥Ç¥Õ¥©¥ë¥È¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ÁªÂò¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  ÁªÂò¤µ¤ì¤¿¥á¡¼¥ë¥Ü¥Ã¥¯¥¹:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s¼èÆÀ¤·¤Ş¤¹¡£ (--all %s)\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s¼èÆÀ¤·¤Ş¤¹¡£ (--all %s)\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  ¼èÆÀ¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤ËÊİ»ı%s (--keep %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  ¼èÆÀ¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤ËÊİ»ı%s (--keep %s)\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1630
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1631
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
 
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
+
 #: fetchmail.c:1634
 #, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
+
+#: fetchmail.c:1636
+#, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local ¥¢¥É¥ì¥¹¤Ø¤Î½ñ¤­´¹¤¨%s (--norewrite %s)\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  server-local ¥¢¥É¥ì¥¹¤Ø¤Î½ñ¤­´¹¤¨%s (--norewrite %s)\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1639
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤Î½üµî%s (stripcr %s)\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤Î½üµî%s (stripcr %s)\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1642
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤ÎÄɲÃ%s (forcecr %s)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤ÎÄɲÃ%s (forcecr %s)\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1645
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding ¤ÎÊÑ´¹%s (pass8bits %s)\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1646
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding ¤ÎÊÑ´¹%s (pass8bits %s)\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1648
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME ¤Î¥Ç¥³¡¼¥É%s (mimedecode %s)\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME ¤Î¥Ç¥³¡¼¥É%s (mimedecode %s)\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1651
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¸å¤ÎÂÔµ¡%s (idle %s)\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1652
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¸å¤ÎÂÔµ¡%s (idle %s)\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1654
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  µ­½Ò¤Î¤¢¤ë Status ¹Ô¤Ï%s (dropstatus %s)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1655
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  µ­½Ò¤Î¤¢¤ë Status ¹Ô¤Ï%s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1657
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To ¹Ô¤Ï%s (dropdelivered %s)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1658
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To ¹Ô¤Ï%s (dropdelivered %s)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ÎºÇÂç %d ¥Ğ¥¤¥È¤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£ (--limit %d)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÂФ¹¤ë·Ù¹ğ¤Ï %d ÉÃËè¤Ë¹Ô¤ï¤ì¤Ş¤¹¡£ (--warnings %d)\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¤ÎÅ٤˥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤Î·Ù¹ğ¤ò¹Ô¤¤¤Ş¤¹¡£ (--warnings 0)\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--fetchlimit 0)\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--batchlimit 0)\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤Ï %d ÄÌËè¤Ëºï½ü¤µ¤ì¤Ş¤¹¡£ (--expunge %d)\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë´Ö³Ö¤ÏÀßÄꤵ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£ (--expunge 0)\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  ¥á¡¼¥ë¤ò¼èÆÀ¤¹¤ë¥É¥á¥¤¥ó¤Ï : "
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ¥Õ¥¡¥¤¥ë %s ¤Ë BSMTP ·Á¼°¤Ç¥á¥Ã¥»¡¼¥¸¤¬Äɵ­¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó\"%s\"¤Ë¤è¤Ã¤Æ¥á¥Ã¥»¡¼¥¸¤¬Á÷¿®¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  ¼õ¿®¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï %cMTP ¤Ë¤è¤Ã¤Æ¼¡¤Ë¼¨¤¹¥µ¡¼¥Ğ¤ØžÁ÷¤µ¤ì¤Ş¤¹ :"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ¥Û¥¹¥È¤Î MAIL FROM ¹Ô¤Î¥¢¥É¥ì¥¹¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1740
 #, 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:1746
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Á÷¿®Àè¤Î¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤ËÂФ¹¤ë±şÅú¤Ï : "
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  ¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  ÀܳÁ°¤Ë¼Â¹Ô¤¹¤ëÌ¿Îá¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤ÆÀÚÃǤµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Àܳ½ªÎ»»ş¤Ë¹Ô¤¦Ì¿Îá¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤ËÂФ¹¤ë localname ¤ÏÀë¸À¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  `multi-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  `single-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1783
 #, fuzzy, 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:1795
+#: fetchmail.c:1798
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  multidrop ¥¢¥É¥ì¥¹¤ò¸¡º÷¤¹¤ë DNS ¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  multidrop ¥¢¥É¥ì¥¹¤ò¸¡º÷¤¹¤ë DNS ¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1803
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  ¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Ş¤¹ : "
 
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  ¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Ş¤¹ : "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address ¤Ë¤è¤ë¥ë¡¼¥Æ¥£¥ó¥°¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header ¤Ï %s ¤È¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1809
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1811
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  %d ¸Ä¤Î Envelope header ¤¬²òÀϤµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s ¤Ï¥æ¡¼¥¶ ID ¤«¤é½üµî¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Prefix ¤Ï½üµî¤µ¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  ͽ¤áÀë¸À¤µ¤ì¤¿¥á¡¼¥ë¥µ¡¼¥Ğ¤ÎÊÌ̾:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  ¥í¡¼¥«¥ë¥É¥á¥¤¥ó:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Àܳ¤Ï¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹ %s ¤òÄ̤·¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Àܳ¤ËÍøÍѤ¹¤Ù¤­¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Àܳ¤Ï %s ¤Î¾õÂÖ¤ò´Æ»ë¤·¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  ¾õÂÖ¤ò´Æ»ë¤·¤ÆÀܳ¤Ï¤ª¤³¤Ê¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¤¥ó \"%s\" ¤òÍøÍѤ·¤Ş¤¹¡£(--plugin %s)\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¤¥ó¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¢¥¦¥È\"%s\"¤òÍøÍѤ·¤Ş¤¹¡£(--plugout %"
 "s)\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¢¥¦¥È¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤«¤é¤Î UID ¤Ïµ­Ï¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d ¸Ä¤Î UID ¤¬µ­Ï¿¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Àܳ¾ğÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲäµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1556,15 +1576,11 @@ msgstr ""
 "  Àܳ¾ğÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲäµ¤ì¤Ş¤»¤ó¡£\n"
 "\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ¥×¥í¥Ñ¥Æ¥£ \"%s\" ¤Ï̵»ë¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.h:614 fetchmail.h:620
-msgid "alloca failed"
-msgstr "alloca ¤¬¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "¥¨¥é¡¼ : getpassword() ¤ËÂбş¤·¤Æ¤¤¤Ş¤»¤ó¡£\n"
@@ -1595,37 +1611,37 @@ msgstr "¾ÚÌÀ½ñ¤òÁ÷¿®¤·¤Ş¤¹¡£\n"
 msgid "Error exchanging credentials\n"
 msgstr "¾ÚÌÀ½ñ¸ò´¹¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "¥»¥­¥å¥ê¥Æ¥£¡¼¥ì¥Ù¥ë¥Ç¡¼¥¿¤òÊѹ¹¤·¤Ş¤·¤¿¡£\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "¾ÚÌÀ½ñ¤Î¸ò´¹¤¬½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "¥µ¡¼¥Ğ¤Ï integrity ¤È privacy ¤òÍ׵ᤷ¤Æ¤¤¤Ş¤¹\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Êѹ¹¤µ¤ì¤Ê¤¤¥»¥­¥å¥ê¥Æ¥£¡¼¥ì¥Ù¥ë¤Î¥Õ¥é¥°: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "ºÇÂç GSS ¥È¡¼¥¯¥óĹ¤Ï %ld ¤Ç¤¹\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "¥»¥­¥å¥ê¥Æ¥£¡¼¥ì¥Ù¥ë¤ÎÍ×µá¤ÎÀ¸À®¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "GSS ¾ÚÌÀ½ñ¤òȯ¹Ô¤·¤Ş¤¹¡£\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "¾ÚÌÀ½ñ¤Îȯ¹Ô¥¨¥é¡¼¤Ç¤¹¡£\n"
 
@@ -1634,78 +1650,78 @@ msgstr "¾ÚÌÀ½ñ¤Îȯ¹Ô¥¨¥é¡¼¤Ç¤¹¡£\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ¥¹¥ì¥Ã¥É¤Ï %d Éô֥¹¥ê¡¼¥×¤·¤Ş¤¹¡£\n"
 
-#: imap.c:281
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP4 rev 1 ¤Èǧ¼±¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: imap.c:287
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP4 rev 0 ¤Èǧ¼±¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: imap.c:294
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP2 Ëô¤Ï IMAP2BIS ¤Èǧ¼±¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: imap.c:309
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr "Àܳ¤Î¸å¡¢µÙ»ß¤·¤Ş¤¹¡£\n"
 
-#: imap.c:462
+#: imap.c:482
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 "OTP ¤¬Í׵ᤵ¤ì¤Ş¤·¤¿¤¬¡¢fetchmail ¤¬ OTP Âбş¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: imap.c:484
+#: imap.c:504 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Í׵ᤵ¤ì¤¿ NTLM ½èÍıǽÎÏ¤Ï fetchmail ¤ËÁȤ߹ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: imap.c:493
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Í׵ᤵ¤ì¤¿ LOGIN ½èÍıǽÎϤϥµ¡¼¥Ğ¤Ç¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: imap.c:644 imap.c:710
-msgid "expunge failed\n"
-msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
-
-#: imap.c:662 imap.c:695
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "ºÆ¥¢¥¯¥»¥¹¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: imap.c:670
+#: imap.c:682
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬ºÆ¥¢¥¯¥»¥¹¤Î¸å¤Ë¸ºß¤·¤Ş¤¹¡£\n"
 msgstr[1] "%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬ºÆ¥¢¥¯¥»¥¹¤Î¸å¤Ë¸ºß¤·¤Ş¤¹¡£\n"
 
-#: imap.c:682
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: imap.c:686
+#: imap.c:698
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ºÇ½é¤Î¥¢¥¯¥»¥¹¤«¤é %d Ä̤Υá¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Ş¤¹¡£\n"
 msgstr[1] "ºÇ½é¤Î¥¢¥¯¥»¥¹¤«¤é %d Ä̤Υá¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Ş¤¹¡£\n"
 
-#: imap.c:714
+#: imap.c:722
+msgid "expunge failed\n"
+msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
+
+#: imap.c:726
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "ºï½ü¤Î¸å¡¢%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬»Ä¤Ã¤Æ¤¤¤Ş¤¹¡£\n"
 msgstr[1] "ºï½ü¤Î¸å¡¢%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬»Ä¤Ã¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: imap.c:739
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:793 pop3.c:744
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
@@ -1748,44 +1764,44 @@ msgstr "%s ¤È¤¤¤¦Ì¾¤Î¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤Ï¸ºß¤·¤Ş¤»¤ó¡£"
 msgid "No IP address found for %s"
 msgstr "%s ¤Î IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "̵¸ú¤Ê IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥¢¥É¥ì¥¹¤Ç¤¹\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "̵¸ú¤Ê IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥Ş¥¹¥¯¤Ç¤¹¡£\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "%s ¤ÎÆ°ºî¾õÂÖ¤Ï %d ¤È¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "¥µ¡¼¥Ğ %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ğ¤·¤Ş¤¹¡£¥µ¡¼¥Ğ %s ¤Ïµ¡Ç½¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "¥µ¡¼¥Ğ %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ğ¤·¤Ş¤¹¡£%s \n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "%s ¤ÎÆ°ºî¾õÂÖ¤Ï %d ¤ÈȽÄꤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "¥µ¡¼¥Ğ %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ğ¤·¤Ş¤¹¡£%s ¤ÏÆ°ºî²Äǽ¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s ¤ÎÆ°ºî¤Ï %d ¤Ç¤·¤¿¤¬¡¢º£¤Ï %d ¤Ç¤¹¡£\n"
@@ -1813,25 +1829,30 @@ msgstr "BASE64 ¥ì¥Ç¥£±şÅú¤ò¥Ç¥³¡¼¥É¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "challenge mismatch\n"
 msgstr "challenge ¤ÎÉÔ°ìÃפǤ¹¡£\n"
 
-#: lock.c:83
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: ¸Å¤¤¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ş¤¹¡£\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: ¸Å¤¤¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ş¤¹¡£\n"
 
-#: lock.c:124
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: ¸Å¤¤¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ş¤¹¡£\n"
+
+#: lock.c:137
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: ¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "·Ù¹ğ: ¥Û¥¹¥È̾¤ÎÁ°¤Ë \"%s\" ¤ò¸¡ÃΤ·¤Ş¤·¤¿"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: ·Ù¹ğ: ¥Û¥¹¥È̾¤ÎÁ°¤Ë \"%s\" ¤ò¸¡ÃΤ·¤Ş¤·¤¿¡£\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: ·Ù¹ğ: ÉÔÌÀ¤Ê¥È¡¼¥¯¥ó \"%s\"\n"
@@ -1870,19 +1891,25 @@ msgstr "¥æ¡¼¥¶Ç§¾Ú¤¬É¬ÍפǤ¹¡£\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "ÉÔÌÀ¤Ê ODMR ¤Î¥¨¥é¡¼ %d ¤Ç¤¹¡£\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹ş¤ó¤Ç¤¤¤Ş¤¹\n"
+
+#: odmr.c:240
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "¥ª¥×¥·¥ç¥ó --keep ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: odmr.c:247
+#: odmr.c:244
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "¥ª¥×¥·¥ç¥ó --flush ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
+#: odmr.c:248
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "¥ª¥×¥·¥ç¥ó --flush ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: odmr.c:255
+#: odmr.c:252
 msgid "Option --check is not supported with ODMR\n"
 msgstr "¥ª¥×¥·¥ç¥ó --check ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
@@ -1894,88 +1921,84 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge ¤Î¥Ç¥³¡¼¥É¤¬½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "ʸ»úÎó '%s' ¤ÏÍ­¸ú¤ÊŤµ¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "'%s' ¤ÎÃͤϼ¡¤Ë¼¨¤¹¿ô»ú¤è¤ê%sɬÍפ¬¤¢¤ê¤Ş¤¹¡£: %d\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "¾®¤µ¤¤"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "Â礭¤¤"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "̵¸ú¤Ê¥×¥í¥È¥³¥ë `%s' ¤¬»ØÄꤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: options.c:429
+#: options.c:372
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "̵¸ú¤Êǧ¾ÚÊı¼° `%s' ¤¬»ØÄꤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£Âбş¤¬Ìµ¸ú¤Ë¤µ¤ì¤Ş¤·¤¿\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "ÍøÍÑÊıË¡:  fetchmail [¥ª¥×¥·¥ç¥ó] [¥µ¡¼¥Ğ ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  °Ê²¼¤Ë¼¨¤¹¥ª¥×¥·¥ç¥ó¤¬ÍøÍѲÄǽ¤Ç¤¹¡£\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        ¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤òɽ¼¨¤·¤Ş¤¹\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     ¥Ğ¡¼¥¸¥ç¥ó¾ğÊó¤òɽ¼¨¤·¤Ş¤¹\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr ""
 "  -c, --check       ¥á¥Ã¥»¡¼¥¸¤Î̵ͭ¤òÄ´¤Ù¤Ş¤¹(¥Ç¡¼¥¿¤Ï¼è¤ê½Ğ¤·¤Ş¤»¤ó)\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      ¾õÂÖɽ¼¨¤Ê¤É¤òÍŞÀ©¤·¤Ş¤¹\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     ºÙ¤«¤¯¾õÂÖɽ¼¨¤ò¹Ô¤¤¤Ş¤¹\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      n Éä˰ì²óÆ°ºî¤¹¤ë¥Ç¡¼¥â¥ó¤È¤·¤ÆÆ°ºî¤·¤Ş¤¹\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    ¥Ç¡¼¥â¥ó¥×¥í¥»¥¹¤ò¥Õ¥©¡¼¥¯¤·¤Ş¤»¤ó\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ¥Ç¡¼¥â¥ó¥×¥í¥»¥¹¤ò½ªÎ»¤µ¤»¤Ş¤¹\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ¥í¥°¤ò½ñ¤­½Ğ¤¹¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1983,272 +2006,281 @@ msgstr ""
 "      --syslog      ¥Ç¡¼¥â¥ó¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¾ì¹ç¤Ë syslog(3) ¤òÄ̤·¤Æ\n"
 "                    ÂçȾ¤Î¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­½Ğ¤·¤Ş¤¹\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   Received ¤ò½ñ¤«¤º¡¢¥Û¥¹¥È̾¤Îµ¶Â¤¤òµö²Ä¤·¤Ş¤¹\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      UID ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ºÇ½ªÅª¤Ê¼õ¤±¼è¤ê¼ê¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    ¥æ¡¼¥¶¤Ç¤Ï¤Ê¤¯ postmaster ¤Ø¥¨¥é¡¼ÄÌÃΤò¹Ô¤¤¤Ş¤¹\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤¬Í­¸ú¤«´Æ»ë¤·¤Ş¤¹\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         SSL ¤Ë¤è¤ë°Å¹æ²½¤òÍøÍѤ·¤Ş¤¹\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      SSL ¤Î private key file ¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL ¤Î client certificate ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:686
+#: options.c:599
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     SSL ¤Î client certificate ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:687
+#: options.c:600
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 "      --sslproto    SSL ¤Î¥×¥í¥È¥³¥ë¤ò¶¯À©Åª¤Ë»ØÄꤷ¤Ş¤¹ (ssl2/ssl3/tls1)\n"
 
-#: options.c:690
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      ÀܳÍѤγ°Éô¥³¥Ş¥ó¥É¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:691
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     SMTP ¤Ë¤è¤ë¸ò¿®¤ò¹Ô¤¦¤¿¤á¤Î³°Éô¥³¥Ş¥ó¥É¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:693
+#: options.c:606
 #, fuzzy
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    ÍøÍѤ¹¤ë¥×¥í¥È¥³¥ë¤ò»ØÄꤷ¤Ş¤¹¡£\n"
 "                    (¾ÜºÙ¤Ï man page ¤ò»²¾È¤·¤Æ²¼¤µ¤¤)\n"
 
-#: options.c:694
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        UIDL ¤ò¶¯À©Åª¤ËÍøÍѤ·¤Ş¤¹ (POP3 ¤Î¤ßÍ­¸ú¤Ç¤¹)\n"
 
-#: options.c:695
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        Àܳ¤ËÍøÍѤ¹¤ë TCP/IP ¥µ¡¼¥Ó¥¹¥İ¡¼¥È¤ò»ØÄꤷ¤Ş¤¹\n"
+
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        Àܳ¤ËÍøÍѤ¹¤ë TCP/IP ¥µ¡¼¥Ó¥¹¥İ¡¼¥È¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:696
+#: options.c:610
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ǧ¾ÚÊı¼°¤ò»ØÄꤷ¤Ş¤¹ (password/kerberos/ssh)\n"
 
-#: options.c:697
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ¥µ¡¼¥Ğ¤Î±şÅúÂÔ¤ÁÀ©¸Â»ş´Ö¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:698
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ¥¢¥É¥ì¥¹¥Ø¥Ã¥À¤ò±£¤·¤Ş¤¹\n"
 
-#: options.c:699
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    local user id ¤«¤é prefix ¤òºï½ü¤·¤Ş¤¹\n"
 
-#: options.c:700
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ¥á¡¼¥ë¥µ¡¼¥Ó¥¹¤ÇÍøÍѤ¹¤ëÊı¼°¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:701
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received ¥Ø¥Ã¥À¤ËÀܳ¾ğÊó¤ò½ñ¤­²Ã¤¨¤Ş¤¹\n"
 
-#: options.c:703
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ¥µ¡¼¥Ğ¤Ø¤Î¥í¥°¥¤¥ó̾¤ò¤·¤Æ¤¤¤·¤Ş¤¹\n"
 
-#: options.c:704
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ¿·ÃåµÚ¤Ó´ûÃå¤Î¥á¡¼¥ë¤òÁ´¤Æ¼è¤ê½Ğ¤·¤Ş¤¹\n"
 
-#: options.c:705
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      ¼è¤ê½Ğ¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ğ¤«¤é¾Ãµî¤·¤Ş¤¹\n"
 
-#: options.c:706
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ¼è¤ê½Ğ¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ğ¤Ë»Ä¤·¤Æ¤ª¤­¤Ş¤¹\n"
 
-#: options.c:707
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ´û¤Ë¼è¤ê½Ğ¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ğ¤«¤é¾Ãµî¤·¤Ş¤¹\n"
 
-#: options.c:708
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       ´û¤Ë¼è¤ê½Ğ¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ğ¤«¤é¾Ãµî¤·¤Ş¤¹\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ¥Ø¥Ã¥À¤Î¥¢¥É¥ì¥¹¤ò½ñ¤­´¹¤¨¤Ş¤»¤ó\n"
 
-#: options.c:709
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       »ØÄꤵ¤ì¤¿Â礭¤µ°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê½Ğ¤·¤Ş¤»¤ó\n"
 
-#: options.c:710
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    ÍÆÎÌĶ²á¤Î¥á¡¼¥ë¤Ë¤Ä¤¤¤Æ·Ù¹ğ¤òȯ¤¹¤ë´Ö³Ö¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:713
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      IP security request ¤ò»ØÄꤷ¤Ş¤¹¡£\n"
-
-#: options.c:715
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    žÁ÷Àè¤Î SMTP ¥Û¥¹¥È¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:716
+#: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "      --fetchdomains °ì²ó¤ÎÀܳ¤Ç¥á¡¼¥ë¤ò¼èÆÀ¤¹¤Ù¤­¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:717
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress SMTP ¤Ë¤è¤ëžÁ÷¤ÇÍøÍѤ¹¤ë¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:718
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    SMTP žÁ÷¤ÇÍøÍѤ¹¤ë¥Õ¥ë¥Í¡¼¥à username@domain ¤ò»ØÄꤷ¤Ş"
 "¤¹\n"
 
-#: options.c:719
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    ¥¹¥Ñ¥à¥á¡¼¥ëÂкö¤Î±şÅú¤ò»ØÄꤷ¤Ş¤¹¡£\n"
 
-#: options.c:720
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  °ì²ó¤Î SMTP žÁ÷¤ÇÁ÷¿®¤µ¤ì¤ë¥á¡¼¥ë¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Ş¤¹\n"
 
-#: options.c:721
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  °ì²ó¤Î¥µ¡¼¥Ğ¤È¤Î¸ò¿®¤Ç¼èÆÀ¤Ç¤­¤ë¥á¡¼¥ë¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Ş"
 "¤¹¡£\n"
 
-#: options.c:722
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchdomains °ì²ó¤ÎÀܳ¤Ç¥á¡¼¥ë¤ò¼èÆÀ¤¹¤Ù¤­¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:723
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:724
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ¥á¥Ã¥»¡¼¥¸¤ò°ìÅ٤˾õ¤ëºÇÂç¿ô¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:725
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ¥á¡¼¥ëÁ÷¿®¥×¥í¥°¥é¥à¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:726
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 "      --bsmtp       ¼è¤ê¹ş¤ó¤À¥á¡¼¥ë¤ò½ñ¤­½Ğ¤¹ BSMTP ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ş¤¹¡£\n"
 
-#: options.c:727
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) ¤òÇÛ¿®¤ËÍøÍѤ·¤Ş¤¹\n"
 
-#: options.c:728
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      ¥µ¡¼¥Ğ¤Î¥á¡¼¥ë¥Õ¥©¥ë¥À¤ò»ØÄꤷ¤Ş¤¹\n"
 
-#: options.c:729
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹ş¤ß¤Ş¤¹\n"
 
-#: pop3.c:543
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting Ãæ¤Ë APOP timestamp ¤¬Â¸ºß¤·¤Ş¤»¤ó¡£\n"
 
-#: pop3.c:552
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting Ãæ¤Î timestamp ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: pop3.c:574
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth Ãæ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬Í׵ᤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: pop3.c:582
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy ¾õÂ֤Ǥ¹¡£Ê̤θò¿®¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:767
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "¥µ¡¼¥Ğ¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤¬ÁŞÆş¤µ¤ì¤Æ¤¤¤Ş¤¹¡£¼è¤ê°·¤¦¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: pop3.c:853
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: pop3.c:868
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL ¤ò¼è¤ê¹ş¤ßÃæ¤Ë¥×¥í¥È¥³¥ë¥¨¥é¡¼¤¬È¯À¸¤·¤Ş¤·¤¿¡£\n"
 
-#: pop3.c:1225
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 ¤Ç¤Ï --remote ¥ª¥×¥·¥ç¥ó¤ÏÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "¥µ¡¼¥Ğ¥ª¥×¥·¥ç¥ó¤Ï¥æ¡¼¥¶¥ª¥×¥·¥ç¥ó¤Î¸å¤ÇÀßÄꤷ¤Ş¤¹¡£"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr "SDPS ¤ÏÍøÍѤǤ­¤Ş¤»¤ó¡£"
 
-#: rcfile_y.y:222
-msgid "invalid security request"
-msgstr "̵¸ú¤Ê¥»¥­¥å¥ê¥Æ¥£¡¼Í×µá¤Ç¤¹¡£"
-
-#: rcfile_y.y:228
-msgid "network-security support disabled"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¡¼Âбş¤Ï¤Ç¤­¤Ê¤¤ÀßÄê¤È¤Ê¤Ã¤Æ¤¤¤Ş¤¹¡£"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2256,7 +2288,7 @@ msgstr ""
 "fetchmail: interface ¥ª¥×¥·¥ç¥ó¤Ï Linux (IPv6 ¤ÏÍøÍѤǤ­¤Ş¤»¤ó) ¤ÈFreeBSD ¤Î"
 "¤ß¤ÇÍøÍѲÄǽ¤Ç¤¹¡£\n"
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2264,25 +2296,25 @@ msgstr ""
 "fetchmail: monitor ¥ª¥×¥·¥ç¥ó¤Ï Linux (IPv6 ¤ÏÍøÍѤǤ­¤Ş¤»¤ó) ¤ÈFreeBSD ¤Î¤ß"
 "¤ÇÍøÍѲÄǽ¤Ç¤¹¡£\n"
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL ¤¬Í­¸ú¤È¤Ê¤Ã¤Æ¤ª¤ê¤Ş¤»¤ó¡£"
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "ÆşÎϤνªÃ¼"
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, fuzzy, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "%s ¤Ï¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Ş¤»¤ó¡£\n"
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "%s ¤Ï -rwx--x--- (0710) °Ê³°¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Ş¤»¤ó¡£\n"
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "%s ¤Î½êÍ­¼Ô¤Ïµ®Êı¼«¿È¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Ş¤¹¡£\n"
@@ -2482,115 +2514,129 @@ msgstr "MD5 ¤ò¥Ç¡¼¥¿¥Ö¥í¥Ã¥¯¤ËŬÍѤ·¤Æ¤¤¤Ş¤¹¡£\n"
 msgid "MD5 result is: \n"
 msgstr "MD5 ¤Î·ë²Ì :\n"
 
-#: sink.c:247
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s ¤ØžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: sink.c:332
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (žÁ÷¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎËÜÂÎ)\n"
 
-#: sink.c:335
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s ¤«¤é¤Î¥á¡¼¥ë¤ò %s ¤ËžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: sink.c:467
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "¥¨¥é¡¼¤Ï¤Ş¤À %d ¤Ç¤¹¡£\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP ¥¨¥é¡¼: %s\n"
 
-#: sink.c:761
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "BSMTP ¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¡¢¤Ş¤¿¤Ï¡¢¥×¥ê¥¢¥ó¥Ö¥ë¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:970
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Ş¤»"
 "¤ó¡£\n"
 
-#: sink.c:977
+#: sink.c:972
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Ş¤»"
 "¤ó¡£\n"
 
-#: sink.c:1015
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤»¤ó¡£postmaster ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: sink.c:1027
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "%s ¤ËÂФ·¤Æ¤µ¤¨Á÷¿®¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: sink.c:1033
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤»¤ó¡£%s ¤ØžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "%s ¤òÍøÍѤ·¤¿ÇÛ¿®¤Ë¤Ä¤¤¤Æ\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "MDA ¤Îµ¯Æ°¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP ¤Ë¤è¤ë %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¸ò¿®¤Ç¤­¤Ş¤»¤ó¡£%s ¤È¸ò¿®¤·¤Ş¤¹¡£"
 
-#: sink.c:1327
+#: sink.c:1326
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ¤¬ 0 °Ê³°¤Î¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»¡¢¤Ş¤¿¤Ï¡¢BSMTP ¥Õ¥¡¥¤¥ë¤Î½ªÎ»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÇÛ¿®¤òµñ¤ß¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP ¤Î EOM ¤Ë¤ª¤±¤ëÇÛ¿®¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM ¤ËÂФ·¤Æ 503 °Ê³°¤Îͽ´ü¤»¤Ì±şÅú %s ¤¬¤¢¤ê¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1559
+#: sink.c:1561
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2630,166 +2676,165 @@ msgstr "ESMTP ¤Ç LOGIN ǧ¾Ú¤ò¤·¤Ş¤¹...\n"
 msgid "smtp listener protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: socket.c:117 socket.c:143
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:175
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: socket.c:181
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:188
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:194
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹¡£(¥Û¥¹¥È %s ¥µ¡¼¥Ó¥¹ %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:288
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:430
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: ¥Û¥¹¥È %s ¤Î¥¢¥É¥ì¥¹¤ÎŤµ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:787
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "ȯ¹Ô¸µ¤ÎÁÈ¿¥: %s\n"
 
-#: socket.c:789
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "·Ù¹ğ : ȯ¹Ô¸µ¤ÎÁÈ¿¥Ì¾¤¬Ä¹²á¤®¤Ş¤¹¡£(ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Ş¤¹)\n"
 
-#: socket.c:791
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "ÉÔÌÀ¤ÊÁÈ¿¥¤Ç¤¹¡£\n"
 
-#: socket.c:793
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "ȯ¹Ô¸µ¤Î CommonName: %s\n"
 
-#: socket.c:795
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "·Ù¹ğ : ȯ¹Ô¸µ¤Î CommonName ¤¬Ä¹²á¤®¤Ş¤¹¡£ (ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Ş¤¹)\n"
 
-#: socket.c:797
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¸µ¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:801
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "¥µ¡¼¥Ğ¤Î CommonName: %s\n"
 
-#: socket.c:805
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "ÉÔÀµ¾ÚÌÀ½ñ : Subject CommonName ¤¬Ä¹²á¤®¤Ş¤¹¡£\n"
 
-#: socket.c:821
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "¥µ¡¼¥Ğ¤Î CommonName ¤¬°ìÃפ·¤Ş¤»¤ó : %s != %s\n"
 
-#: socket.c:827
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "¥µ¡¼¥Ğ̾¤¬ÀßÄꤵ¤ì¤Æ¤ª¤é¤º¡¢¾ÚÌÀ½ñ¤ò¸¡¾Ú¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: socket.c:832
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr "ÉÔÌÀ¤Ê¥µ¡¼¥Ğ¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:834
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr "¾ÚÌÀ½ñÃæ¤Ë¥µ¡¼¥Ğ̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: socket.c:844
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:848
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr "¥á¥â¥êÉÔ­¤Ç¤¹¡£\n"
 
-#: socket.c:856
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr "¥À¥¤¥¸¥§¥¹¥È¥Æ¥­¥¹¥È¥Ğ¥Ã¥Õ¥¡¤¬¾¯¤Ê²á¤®¤Ş¤¹¡£\n"
 
-#: socket.c:862
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ¤Î key fingerprint ¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£: %s \n"
 
-#: socket.c:866
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Ş¤·¤¿¡£\n"
 
-#: socket.c:869
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:878
+#: socket.c:747
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "·Ù¹ğ : ¥µ¡¼¥Ğ¾ÚÌÀ½ñ¸¡¾Ú: %s\n"
 
-#: socket.c:884
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¼Ô (¤Ï¤¸¤á¤Î %d ʸ»ú): %s\n"
 
-#: socket.c:936
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr "¥Õ¥¡¥¤¥ë¼±Ê̻Ҥ¬ SSL ¤È¤·¤Æ¤ÏĹ²á¤®¤Ş¤¹¡£"
 
-#: socket.c:953
+#: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "̵¸ú¤Ê SSL ¥×¥í¥È¥³¥ë `%s' ¤¬»ØÄꤵ¤ì¤¿¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È (SSLv23)¤òÍøÍѤ·¤Ş"
 "¤¹¡£\n"
 
-#: socket.c:1014
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "¾ÚÌÀ½ñ/fingerprint ¸¡¾Ú¤¬´ö¤Ä¤«Èô¤Ğ¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: socket.c:1086
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1089
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:66
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s ¤ò¥í¡¼¥«¥ë¤Î %s ¤ËÃÖ´¹¤·¤Ş¤·¤¿¡£\n"
 
-#: transact.c:130
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "%s ¤È %s ¤¬°ìÃפ·¤Ş¤·¤¿¡£\n"
 
-#: transact.c:199
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2798,70 +2843,70 @@ msgstr ""
 "Receive ¹Ô¤ò²òÀÏÃæ¤Ç¤¹:\n"
 "%s"
 
-#: transact.c:238
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "¹Ô¤¬¼õÎΤµ¤ì¤Ş¤·¤¿¡£%s ¤Ï¥á¡¼¥ë¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ç¤¹¡£\n"
 
-#: transact.c:244
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "¹Ô¤¬µñÀ䤵¤ì¤Ş¤·¤¿¡£%s ¤Ï¥á¡¼¥ë¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: transact.c:318
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "Received ¤Î¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: transact.c:327
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "Received ¤Î¥¢¥É¥ì¥¹¤Ï `%s' ¤Ç¤¹¡£\n"
 
-#: transact.c:528
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "¥Ø¥Ã¥À¤ò²òÀÏÃæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬½ªÎ»¤·¤Æ¤·¤Ş¤¤¤Ş¤·¤¿\n"
 
-#: transact.c:549
+#: transact.c:559
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr "¥Ø¥Ã¥À¤ò²òÀÏÃæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬½ªÎ»¤·¤Æ¤·¤Ş¤¤¤Ş¤·¤¿\n"
 
-#: transact.c:551
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: transact.c:1069
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "%s ¤È¤¤¤¦Å¾Á÷Àè¤Ë³ºÅö¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: transact.c:1084
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "DNS ¤ÎÉÔÄ´¤ÇžÁ÷¤Èºï½ü¤¬½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: transact.c:1192
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers ¤ò½ñ¤­¹ş¤ó¤Ç¤¤¤Ş¤¹¡£\n"
 
-#: transact.c:1213
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "¤³¤Á¤é¤ÇÀë¸À¤µ¤ì¤¿¥¢¥É¥ì¥¹¤È¼õ¼è¼ê¤Î¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤»¤ó¤Ç¤·¤¿¡£"
 
-#: transact.c:1220
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "¼õ¼è¼ê¤Î¥¢¥É¥ì¥¹ %s ¤Ë³ºÅö¤¹¤ëʪ¤¬¤¢¤ê¤Ş¤»¤ó¡£"
 
-#: transact.c:1229
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë NUL ¤¬´Ş¤Ş¤ì¤Æ¤¤¤Ş¤¹"
 
-#: transact.c:1237
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP ¼õ¿®¥×¥í¥°¥é¥à¤¬¼¡¤Î¥¢¥É¥ì¥¹¤Î¼õ¿®¤òµñÈݤ·¤Ş¤·¤¿ : "
 
-#: transact.c:1362
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹ş¤ó¤Ç¤¤¤Ş¤¹\n"
 
@@ -2870,7 +2915,7 @@ msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹ş¤ó¤Ç¤¤¤Ş¤¹\n"
 msgid "Old UID list from %s:"
 msgstr "¥µ¡¼¥Ğ %s ¤«¤é¤Î¸Å¤¤ UID ¥ê¥¹¥È :"
 
-#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr " <¤¢¤ê¤Ş¤»¤ó>"
 
@@ -2878,53 +2923,53 @@ msgstr " <¤¢¤ê¤Ş¤»¤ó>"
 msgid "Scratch list of UIDs:"
 msgstr "UID ¤Î¥¹¥¯¥é¥Ã¥Á¥ê¥¹¥È :"
 
-#: uid.c:513 uid.c:565
+#: uid.c:514 uid.c:566
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "¥µ¡¼¥Ğ %s ¤«¤é¤Î¸Å¤¤ UID ¥ê¥¹¥È :"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr "¥µ¡¼¥Ğ %s ¤«¤é¤Î¿·¤¿¤Ê UID ¥ê¥¹¥È :"
 
-#: uid.c:544
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:552
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Ş¤»¤ó¡£¤³¤Î¸ò¿®¤ËÂФ¹¤ë UID ¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: uid.c:577
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:612
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:614
+#: uid.c:615
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "¾ÚÌÀ½ñ¤Îȯ¹Ô¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: uid.c:620
+#: uid.c:621
 msgid "Writing fetchids file.\n"
 msgstr "fetchids ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹ş¤ßÃæ¤Ç¤¹¡£\n"
 
-#: uid.c:639
+#: uid.c:640
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:643
+#: uid.c:644
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:647
+#: uid.c:648
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2937,6 +2982,66 @@ msgstr "malloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "realloc failed\n"
 msgstr "realloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
+#~ msgid "internal inconsistency\n"
+#~ msgstr "ÆâÉô¤Ç¤ÎÉÔ°ìÃפ¬¤¢¤ê¤Ş¤·¤¿¡£\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "̾Á°¤ÏÍ­¸ú¤Ç¤¹¤¬ IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£"
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "¥Í¡¼¥à¥µ¡¼¥Ğ¤Î²óÉüÉÔǽ¤Ê¥¨¥é¡¼¤Ç¤¹¡£"
+
+#~ msgid "temporary name server error."
+#~ msgstr "°ì»şÅª¤Ê¥Í¡¼¥à¥µ¡¼¥Ğ¤Î¥¨¥é¡¼¤Ç¤¹¡£"
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "ÉÔÌÀ¤Ê DNS ¤Î¥¨¥é¡¼ %d ¤Ç¤¹¡£"
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "gethostbyname(2) ̵¤·¤Ç ETRN ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "gethostbyname(2) ̵¤·¤Ç ODMR ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (%s ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¥ª¥×¥·¥ç¥ó¤òÍøÍѤ·¤Ş¤¹)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (¥İ¡¼¥È %d ¤òÍøÍѤ·¤Ş¤¹)"
+
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca ¤¬¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "·Ù¹ğ: ¥Û¥¹¥È̾¤ÎÁ°¤Ë \"%s\" ¤ò¸¡ÃΤ·¤Ş¤·¤¿"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£Âбş¤¬Ìµ¸ú¤Ë¤µ¤ì¤Ş¤·¤¿\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      IP security request ¤ò»ØÄꤷ¤Ş¤¹¡£\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "̵¸ú¤Ê¥»¥­¥å¥ê¥Æ¥£¡¼Í×µá¤Ç¤¹¡£"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¡¼Âбş¤Ï¤Ç¤­¤Ê¤¤ÀßÄê¤È¤Ê¤Ã¤Æ¤¤¤Ş¤¹¡£"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: ¥Û¥¹¥È %s ¤Î¥¢¥É¥ì¥¹¤ÎŤµ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
+
 #~ msgid "header "
 #~ msgstr " (¥Ø¥Ã¥À) "
 
diff --git a/po/pl.po b/po/pl.po
index 7aaddd7e..a7a283ca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-10 02:41+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+0100\n"
 "PO-Revision-Date: 2005-11-16 19:19+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: checkalias.c:172
 #, c-format
@@ -64,13 +65,13 @@ msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: Ostrze¿enie fetchmaila o zbyt du¿ych listach"
 
 #: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr "Nastêpuj±ce zbyt du¿e listy zosta³y usuniête z serwera poczty %s:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr "Nastêpuj±ce zbyt du¿e listy pozosta³y na serwerze poczty %s:"
 
 #: driver.c:364
@@ -128,8 +129,11 @@ msgstr " (%d bajtów tre¶ci) "
 
 #: driver.c:743
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "d³ugo¶æ listu %s@%s:%d nie odpowiada d³ugo¶ci zg³oszonej przez serwer (%d != %d)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"d³ugo¶æ listu %s@%s:%d nie odpowiada d³ugo¶ci zg³oszonej przez serwer (%d != "
+"%d)\n"
 
 #: driver.c:774
 msgid " retained\n"
@@ -146,10 +150,17 @@ msgstr " nie zosta³ skasowany\n"
 #: driver.c:818
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "limit pobranych listów %d osi±gniêty: %d pozosta³ na serwerze %s na koncie %s\n"
-msgstr[1] "limit pobranych listów %d osi±gniêty: %d pozosta³y na serwerze %s na koncie %s\n"
-msgstr[2] "limit pobranych listów %d osi±gniêty: %d pozosta³o na serwerze %s na koncie %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³ na serwerze %s na koncie %"
+"s\n"
+msgstr[1] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³y na serwerze %s na koncie %"
+"s\n"
+msgstr[2] ""
+"limit pobranych listów %d osi±gniêty: %d pozosta³o na serwerze %s na koncie %"
+"s\n"
 
 #: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
@@ -158,7 +169,8 @@ msgstr "SIGPIPE otrzymany od MDA lub b³±d gniazda strumienia\n"
 #: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na po³±czenie z %s.\n"
+msgstr ""
+"limit czasu %d sekund przekroczony podczas oczekiwania na po³±czenie z %s.\n"
 
 #: driver.c:892
 #, c-format
@@ -186,7 +198,9 @@ msgstr "Subject: fetchmail zg³asza wielokrotne przekroczenie czasu oczekiwania"
 
 #: driver.c:919
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
 msgstr "Po %d timeoutach fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
 #: driver.c:923
@@ -238,7 +252,7 @@ msgstr "Subject: Ostrze¿enie fetchmaila o nieosi±galnym serwerze."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nie móg³ po³±czyæ siê z serwerem poczty %s:"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1099 imap.c:392 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "po³±czenie SSL nie powiod³o siê.\n"
 
@@ -405,7 +419,7 @@ msgstr "(%d bajtów).\n"
 msgid "No mail for %s\n"
 msgstr "Nie ma poczty dla %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "b³êdna liczba listów!"
 
@@ -497,7 +511,8 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 "%s: Zmienna ¶rodowiskowa QMAILINJECT jest ustawiona.\n"
-"Jest to niebezpieczne, poniewa¿ mo¿e spowodowaæ, ¿e qmail-inject lub qmailowy\n"
+"Jest to niebezpieczne, poniewa¿ mo¿e spowodowaæ, ¿e qmail-inject lub "
+"qmailowy\n"
 "zastêpnik sendmaila namiesza z nag³ówkami From: lub Message-ID:.\n"
 "Proszê spróbowaæ \"env QMAILINJECT= %s W£ASNE PARAMETRY\"\n"
 "%s: Przerwano.\n"
@@ -507,7 +522,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -540,7 +556,8 @@ msgstr "Nie mo¿na odnale¼æ w³asnej nazwy hosta w bazie danych hosts!\n"
 #: env.c:169
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Próba kontynuacji z nierozwi±zan± nazw± hosta.\n"
@@ -654,7 +671,8 @@ msgstr "fetchmail: nie dzia³a ¿aden inny proces fetchmaila\n"
 #: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: wyst±pi³ b³±d podczas próby zabicia %s fetchmaila, PID %d.\n"
+msgstr ""
+"fetchmail: wyst±pi³ b³±d podczas próby zabicia %s fetchmaila, PID %d.\n"
 
 #: fetchmail.c:400 fetchmail.c:409
 msgid "background"
@@ -670,13 +688,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: zabito %s fetchmaila o numerze procesu %d.\n"
 
 #: fetchmail.c:431
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: nie mogê sprawdziæ poczty, bo dzia³a inny fetchmail do tego serwera\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: nie mogê sprawdziæ poczty, bo dzia³a inny fetchmail do tego "
+"serwera\n"
 
 #: fetchmail.c:437
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: nie mogê po³±czyæ siê z podanym hostem, bo dzia³a inny fetchmail (proces %d).\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: nie mogê po³±czyæ siê z podanym hostem, bo dzia³a inny fetchmail "
+"(proces %d).\n"
 
 #: fetchmail.c:444
 #, c-format
@@ -684,8 +709,11 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: dzia³a inny chodz±cy z konsoli fetchmail (proces %d).\n"
 
 #: fetchmail.c:454
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: nie mogê przyjmowaæ opcji, poniewa¿ inny fetchmail dzia³a ju¿ w tle.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: nie mogê przyjmowaæ opcji, poniewa¿ inny fetchmail dzia³a ju¿ w "
+"tle.\n"
 
 #: fetchmail.c:460
 #, c-format
@@ -695,7 +723,8 @@ msgstr "fetchmail: chodz±cy w tle fetchmail (proces %d) zosta³ uaktywniony.\n"
 #: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: starszy proces %d zgin±³ w niewyja¶nionych okoliczno¶ciach.\n"
+msgstr ""
+"fetchmail: starszy proces %d zgin±³ w niewyja¶nionych okoliczno¶ciach.\n"
 
 #: fetchmail.c:487
 #, c-format
@@ -729,7 +758,8 @@ msgstr "restart fetchmaila (zmieniono %s)\n"
 
 #: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "próba restartu mo¿e siê nie udaæ, poniewa¿ katalog nie zosta³ odtworzony\n"
+msgstr ""
+"próba restartu mo¿e siê nie udaæ, poniewa¿ katalog nie zosta³ odtworzony\n"
 
 #: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
@@ -846,135 +876,146 @@ msgstr "Uwaga: host %s wystêpuje wielokrotnie w pliku konfiguracyjnym\n"
 
 #: fetchmail.c:1029
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: B³±d: wiele rekordów \"defaults\" w pliku konfiguracyjnym.\n"
+msgstr ""
+"fetchmail: B³±d: wiele rekordów \"defaults\" w pliku konfiguracyjnym.\n"
 
-#: fetchmail.c:1151
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1182
+#: fetchmail.c:1180
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: uwaga: brak serwera DNS potrzebnego do sprawdzenia %s\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "uwaga: multidrop dla %s wymaga opcji envelope!\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "uwaga: Nie pro¶ o pomoc je¶li ca³a poczta pójdzie do postmastera!\n"
 
-#: fetchmail.c:1211
+#: fetchmail.c:1209
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: konfiguracja dla %s jest b³êdna - nale¿y podaæ dodatni numer portu\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: konfiguracja dla %s jest b³êdna - nale¿y podaæ dodatni numer "
+"portu\n"
 
-#: fetchmail.c:1218
+#: fetchmail.c:1216
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego portu\n"
+msgstr ""
+"fetchmail: konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego "
+"portu\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "konfiguracja dla %s jest b³êdna - LMTP nie u¿ywa domy¶lnego portu SMTP\n"
+msgstr ""
+"konfiguracja dla %s jest b³êdna - LMTP nie u¿ywa domy¶lnego portu SMTP\n"
 
-#: fetchmail.c:1250
+#: fetchmail.c:1248
 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:1300
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "przerwany sygna³em %d\n"
 
-#: fetchmail.c:1385
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
-msgstr "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie rozpoczête\n"
+msgstr ""
+"%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie rozpoczête\n"
 
-#: fetchmail.c:1410
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "obs³uga protoko³u POP2 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "obs³uga protoko³u POP3 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "obs³uga protoko³u IMAP nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "obs³uga polecenia ETRN nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "obs³uga protoko³u ODMR nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "Wybrany protokó³ nie jest obs³ugiwany przez fetchmaila.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
-msgstr "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie zakoñczone\n"
+msgstr ""
+"%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie zakoñczone\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Czas miêdzy sprawdzaniem skrzynek wynosi %d sekund\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Plik diagnostyczny to %s\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Plik identyfikacyjny to %s\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1485
 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:1490
+#: fetchmail.c:1488
 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:1492
+#: fetchmail.c:1490
 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:1494
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail wy¶le ¼le zaadresowane listy do %s.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do postmastera.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do nadawcy.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Poczta bêdzie pobierana przez %s\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1512
 #, 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"
@@ -982,382 +1023,423 @@ msgstr[0] "  Po³±czenie z tym serwerem odbêdzie siê co %d okres.\n"
 msgstr[1] "  Po³±czenie z tym serwerem odbêdzie siê co %d okresy.\n"
 msgstr[2] "  Po³±czenie z tym serwerem odbêdzie siê co %d okresów.\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1519
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr "  Z tym serwerem nie bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny serwer.\n"
+msgstr ""
+"  Z tym serwerem nie bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny "
+"serwer.\n"
 
-#: fetchmail.c:1522
+#: fetchmail.c:1520
 msgid "  This host will be queried when no host is specified.\n"
-msgstr "  Z tym serwerem bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny serwer.\n"
+msgstr ""
+"  Z tym serwerem bêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny "
+"serwer.\n"
 
-#: fetchmail.c:1526
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Bêdê pyta³ o has³o.\n"
 
-#: fetchmail.c:1530
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Has³o APOP = \"%s\".\n"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  U¿ytkownik RPOP = \"%s\".\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Has³o = \"%s\".\n"
 
 # %s zawiera numer wersji protoko³u -PK
-#: fetchmail.c:1545
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  U¿ywam protoko³u KPOP z uwierzytelnieniem przez Kerberos %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  U¿ywam protoko³u %s"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (us³uga %s)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (po³±czenie na domy¶lny port)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (bêd± stosowane UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Bêd± próbowane wszystkie dostêpne metody uwierzytelnienia.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie przy pomocy has³a.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1564
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie MSN.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie NTLM.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie GSSAPI.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V4.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V5.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Zak³adam szyfrowanie end-to-end.\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Zarz±dc± us³ugi pocztowej jest: %s\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesje kodowane SSL w³±czone.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokó³ SSL: %s.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Sprawdzanie certyfikatu SSL serwera w³±czone.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog zaufanego certyfikatu SSL: %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1601
 #, 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:1606
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limit czasu na odpowied¼ serwera wynosi %d sekund"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (domy¶lne).\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Wybrana jest domy¶lna skrzynka odbiorcza.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Wybrano nastêpuj±ce skrzynki:"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1624
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Zostan± pobrane wszystkie listy (--all w³±czone).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1625
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Zostan± pobrane tylko nowe listy (--all wy³±czone).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1627
 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:1630
+#: fetchmail.c:1628
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr "  Pobrane listy nie bêd± pozostawione na serwerze (--keep wy³±czone).\n"
+msgstr ""
+"  Pobrane listy nie bêd± pozostawione na serwerze (--keep wy³±czone).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1630
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Stare listy bêd± kasowane przed pobraniem poczty (--flush w³±czone).\n"
+msgstr ""
+"  Stare listy bêd± kasowane przed pobraniem poczty (--flush w³±czone).\n"
+
+#: fetchmail.c:1631
+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:1633
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Stare listy nie bêd± kasowane przed pobraniem poczty (--flush wy³±czone).\n"
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Zbyt du¿e listy bêd± kasowane przed pobraniem poczty (--limitflush "
+"w³±czone).\n"
 
-#: fetchmail.c:1635
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Zbyt du¿e listy bêd± kasowane przed pobraniem poczty (--limitflush w³±czone).\n"
+#: fetchmail.c:1634
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Zbyt du¿e listy nie bêd± kasowane przed pobraniem poczty (--limitflush "
+"wy³±czone).\n"
 
 #: fetchmail.c:1636
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Zbyt du¿e listy nie bêd± kasowane przed pobraniem poczty (--limitflush wy³±czone).\n"
-
-#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Przepisywanie adresów na postaæ lokaln± jest w³±czone (--norewrite wy³±czone).\n"
+msgstr ""
+"  Przepisywanie adresów na postaæ lokaln± jest w³±czone (--norewrite "
+"wy³±czone).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1637
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Przepisywanie adresów na postaæ lokaln± jest wy³±czone (--norewrite w³±czone).\n"
+msgstr ""
+"  Przepisywanie adresów na postaæ lokaln± jest wy³±czone (--norewrite "
+"w³±czone).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1639
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  Usuwanie znaków CR z koñców linii jest w³±czone (stripcr w³±czone).\n"
+msgstr ""
+"  Usuwanie znaków CR z koñców linii jest w³±czone (stripcr w³±czone).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1640
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr "  Usuwanie znaków CR z koñców linii jest wy³±czone (stripcr wy³±czone).\n"
+msgstr ""
+"  Usuwanie znaków CR z koñców linii jest wy³±czone (stripcr wy³±czone).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1642
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
-msgstr "  Dodawanie znaków CR na koñcach linii jest w³±czone (forcecr w³±czone).\n"
+msgstr ""
+"  Dodawanie znaków CR na koñcach linii jest w³±czone (forcecr w³±czone).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1643
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
-msgstr "  Dodawanie znaków CR na koñcach linii jest wy³±czone (forcecr wy³±czone).\n"
+msgstr ""
+"  Dodawanie znaków CR na koñcach linii jest wy³±czone (forcecr wy³±czone).\n"
 
-#: fetchmail.c:1647
-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:1645
+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:1648
-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:1646
+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:1650
+#: fetchmail.c:1648
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekodowanie MIME jest w³±czone (mimedecode w³±czone).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1649
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekodowanie MIME jest wy³±czone (mimedecode wy³±czone).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1651
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Zw³oka po odpytaniu jest w³±czona (idle w³±czone).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1652
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Zw³oka po odpytaniu jest wy³±czona (idle wy³±czone).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1654
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niepuste nag³ówki Status bêd± usuwane (dropstatus w³±czone).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1655
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niepuste nag³ówki Status bêd± zachowane (dropstatus wy³±czone).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1657
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Linie Delivered-To bêd± usuwane (dropdelivered w³±czone).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1658
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Linie Delivered-To bêd± zachowane (dropdelivered wy³±czone).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1662
 #, 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:1667
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--limit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Ostrze¿enia o wielko¶ci listu bêd± wy¶wietlane co %d sekund (--warnings %d).\n"
+msgstr ""
+"  Ostrze¿enia o wielko¶ci listu bêd± wy¶wietlane co %d sekund (--warnings %"
+"d).\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr "  Ostrze¿enia o wielko¶ci bêd± wy¶wietlane przy ka¿dym ³±czeniu (--warnings 0).\n"
+msgstr ""
+"  Ostrze¿enia o wielko¶ci bêd± wy¶wietlane przy ka¿dym ³±czeniu (--warnings "
+"0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1673
 #, 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:1678
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr "  Limit ilo¶ci otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
+msgstr ""
+"  Limit ilo¶ci otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1678
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit wielko¶ci listu wynosi %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1681
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Binarne przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 1).\n"
+msgstr ""
+"  Binarne przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 1).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Binarne przeszukiwanie UID-ów przy %d z %d ¶ci±gañ (--fastuidl %d).\n"
+msgstr ""
+"  Binarne przeszukiwanie UID-ów przy %d z %d ¶ci±gañ (--fastuidl %d).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Liniowe przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 0).\n"
+msgstr ""
+"   Liniowe przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 0).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1692
 #, 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:1696
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr "  Limit ilo¶ci listów wysy³anych przez SMTP nie ustawiony (--batchlimit 0).\n"
+msgstr ""
+"  Limit ilo¶ci listów wysy³anych przez SMTP nie ustawiony (--batchlimit 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1698
 #, 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:1702
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Listy nie bêd± kasowane (--expunge 0).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeny dla których poczta bêdzie ¶ci±gana to:"
 
-#: fetchmail.c:1714 fetchmail.c:1734
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (domy¶ny)"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Listy bêd± dopisywane do %s jako BSMTP\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Listy bêd± lokalne dorêczane przy u¿yciu \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Listy bêd± przes³ane przy pomocy %cMTP do:"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1737
 #, 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:1742
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP bêdzie %s\n"
+msgstr ""
+"  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP bêdzie %s\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznawane odpowiedzi blokad antyspamowych to:"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokowanie spamu wy³±czone\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1758
 #, 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:1763
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Przed po³±czeniem nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1763
 #, 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:1768
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
-msgstr "  Po zamkniêciu po³±czenia nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
+msgstr ""
+"  Po zamkniêciu po³±czenia nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Brak nazw lokalnych ustawionych dla tego hosta.\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Tryb wielu skrzynek: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Tryb jednej skrzynki: "
 
-#: fetchmail.c:1785
+#: fetchmail.c:1783
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1365,103 +1447,108 @@ msgstr[0] "%d znana nazwa lokalna.\n"
 msgstr[1] "%d znane nazwy lokalne.\n"
 msgstr[2] "%d znanych nazw lokalnych.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1798
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest w³±czone.\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest wy³±czone.\n"
 
-#: fetchmail.c:1805
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1803
+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:1807
+#: fetchmail.c:1805
 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:1810
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Obs³uga poczty wed³ug adresów w kopercie jest wy³±czone\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag³ówek koperty zosta³ ustawiony na: %s\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1814
 #, 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:1819
+#: fetchmail.c:1817
 #, 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:1822
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  ¯adne przedrostki nie bêd± usuwane\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Zadeklarowane aliasy serwera pocztowego:"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Domeny lokalne:"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Po³±czenia bêd± nawi±zywane tylko przez interfejs %s.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Nie jest okre¶lony ¿aden obowi±zkowy interfejs.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1850
 #, 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:1854
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  ¯aden interfejs nie bêdzie monitorowany.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Po³±czenia z serwerem bêd± nawi±zywane przez wtyczkê %s (--plugin %s).\n"
+msgstr ""
+"  Po³±czenia z serwerem bêd± nawi±zywane przez wtyczkê %s (--plugin %s).\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie nawi±zuj±ce po³±czenie\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Po³±czenie z serwerem odbiorcy zostanie nawi±zane programem %s (--plugout %s).\n"
+msgstr ""
+"  Po³±czenie z serwerem odbiorcy zostanie nawi±zane programem %s (--plugout %"
+"s).\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie zamykaj±ce po³±czenie.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¯adne UID-y nie zosta³y zachowane z sesji z tym hostem.\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Zachowano %d UID-ów.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr "  Informacje o ¶ledzeniu po³±czenia bêd± dodane do nag³ówka Received.\n"
+msgstr ""
+"  Informacje o ¶ledzeniu po³±czenia bêd± dodane do nag³ówka Received.\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1470,7 +1557,7 @@ msgstr ""
 ".\n"
 
 # XXX -PK
-#: fetchmail.c:1891
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  W³asno¶ci przepuszczania \"%s\".\n"
@@ -1546,39 +1633,39 @@ msgstr "Wyst±pi³ b³±d podczas zwalniania uprawnieñ\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: usypiam na %d sekund.\n"
 
-#: imap.c:298
+#: imap.c:306
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:312
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:319
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokó³ rozpoznany jako IMAP2 lub IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:334
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
 
-#: imap.c:482
+#: imap.c:490
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:512 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:513
+#: imap.c:521
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:682 imap.c:715
 msgid "re-poll failed\n"
 msgstr "ponowne po³±czenie nie powiod³o siê\n"
 
-#: imap.c:682
+#: imap.c:690
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1586,11 +1673,11 @@ msgstr[0] "%d list oczekuj±cy po ponownym pobraniu\n"
 msgstr[1] "%d listy oczekuj±ce po ponownym pobraniu\n"
 msgstr[2] "%d listów oczekuj±cych po ponownym pobraniu\n"
 
-#: imap.c:694
+#: imap.c:702
 msgid "mailbox selection failed\n"
 msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
 
-#: imap.c:698
+#: imap.c:706
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1598,11 +1685,11 @@ msgstr[0] "%d list oczekuj±cy po pierwszym pobraniu\n"
 msgstr[1] "%d listy oczekuj±ce po pierwszym pobraniu\n"
 msgstr[2] "%d listów oczekuj±cych po pierwszym pobraniu\n"
 
-#: imap.c:722
+#: imap.c:730
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod³o siê\n"
 
-#: imap.c:726
+#: imap.c:734
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1610,23 +1697,24 @@ msgstr[0] "%d list oczekuj±cy po usuwaniu\n"
 msgstr[1] "%d listy oczekuj±ce po usuwaniu\n"
 msgstr[2] "%d listów oczekuj±cych po usuwaniu\n"
 
-#: imap.c:751
+#: imap.c:759
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nie przeczytanych listów nie powiod³o siê\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nie przeczytany\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:801 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nie przeczytanym\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "Nie mo¿na otworzyæ interfejsu kvm. Byæ mo¿e fetchmail nie jest SGID kmem."
+msgstr ""
+"Nie mo¿na otworzyæ interfejsu kvm. Byæ mo¿e fetchmail nie jest SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1893,12 +1981,17 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     podaje nazwê pliku kroniki\n"
 
 #: options.c:585
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      w³±cza wy¶wietlanie wiêkszo¶ci komunikatów przez syslog(3)\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      w³±cza wy¶wietlanie wiêkszo¶ci komunikatów przez syslog"
+"(3)\n"
 
 #: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   w³±cza udawanie hosta i nie dodaje nag³ówków Received\n"
+msgstr ""
+"      --invisible   w³±cza udawanie hosta i nie dodaje nag³ówków Received\n"
 
 #: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
@@ -1941,8 +2034,12 @@ msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ¶cie¿ka do certyfikatów ssl\n"
 
 #: options.c:600
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint odcisk, który musi pasowaæ do odcisku certyfikatu serwera.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint odcisk, który musi pasowaæ do odcisku certyfikatu "
+"serwera.\n"
 
 #: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
@@ -1950,15 +2047,21 @@ msgstr "      --sslproto    wymusza protokó³ ssl (ssl2/ssl3/tls1)\n"
 
 #: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      ¶cie¿ka do zewnêtrznego polecenia otwieraj±cego po³±czenie\n"
+msgstr ""
+"      --plugin      ¶cie¿ka do zewnêtrznego polecenia otwieraj±cego "
+"po³±czenie\n"
 
 #: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     ¶cie¿ka do zewn. polecenia otwieraj±cego po³±czenie smtp\n"
+msgstr ""
+"      --plugout     ¶cie¿ka do zewn. polecenia otwieraj±cego po³±czenie "
+"smtp\n"
 
 #: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr "  -p, --protocol    okre¶la protokó³ którym bêd± pobierane listy (patrz manual)\n"
+msgstr ""
+"  -p, --protocol    okre¶la protokó³ którym bêd± pobierane listy (patrz "
+"manual)\n"
 
 #: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
@@ -1966,15 +2069,22 @@ msgstr "  -U, --uidl        wymusza u¿ywanie UIDL (tylko POP3)\n"
 
 #: options.c:608
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        ³±czenie z portem TCP (przestarza³e, nale¿y u¿ywaæ --service)\n"
+msgstr ""
+"      --port        ³±czenie z portem TCP (przestarza³e, nale¿y u¿ywaæ --"
+"service)\n"
 
 #: options.c:609
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     ³±czenie z podan± us³ug± TCP (mo¿e byæ numerem portu TCP)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     ³±czenie z podan± us³ug± TCP (mo¿e byæ numerem portu "
+"TCP)\n"
 
 #: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
-msgstr "      --auth        okre¶la metodê uwierzytelnienia (has³o/Kerberos/ssh/otp)\n"
+msgstr ""
+"      --auth        okre¶la metodê uwierzytelnienia (has³o/Kerberos/ssh/"
+"otp)\n"
 
 #: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
@@ -1982,11 +2092,13 @@ msgstr "  -t, --timeout     limit czasu oczekiwania na odpowied¼ serwera\n"
 
 #: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
-msgstr "  -E, --envelope    okre¶la nazwê nag³ówka zawieraj±cego adres z koperty\n"
+msgstr ""
+"  -E, --envelope    okre¶la nazwê nag³ówka zawieraj±cego adres z koperty\n"
 
 #: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr "  -Q, --qvirtual    przedrostek, który bêdzie usuwany z nazwy u¿ytkownika\n"
+msgstr ""
+"  -Q, --qvirtual    przedrostek, który bêdzie usuwany z nazwy u¿ytkownika\n"
 
 #: options.c:614
 msgid "      --principal   mail service principal\n"
@@ -1994,7 +2106,8 @@ msgstr "      --principal   zarz±dca us³ugi pocztowej\n"
 
 #: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  dodaje informacje o ¶ledzeniu po³±czenia do Received\n"
+msgstr ""
+"      --tracepolls  dodaje informacje o ¶ledzeniu po³±czenia do Received\n"
 
 #: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
@@ -2034,7 +2147,8 @@ msgstr "  -w, --warnings    czas miêdzy powiadomieniami o poczcie\n"
 
 #: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
-msgstr "  -S, --smtphost    okre¶la nazwê hosta SMTP przesy³aj±cego nasze listy\n"
+msgstr ""
+"  -S, --smtphost    okre¶la nazwê hosta SMTP przesy³aj±cego nasze listy\n"
 
 #: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
@@ -2042,7 +2156,9 @@ msgstr "      --fetchdomains pobiera pocztê dla podanych domen\n"
 
 #: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress okre¶la nazwê domeny SMTP u¿ywan± przy dorêczaniu poczty\n"
+msgstr ""
+"  -D, --smtpaddress okre¶la nazwê domeny SMTP u¿ywan± przy dorêczaniu "
+"poczty\n"
 
 #: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
@@ -2054,11 +2170,13 @@ msgstr "  -Z, --antispam    okre¶la odpowiedzi blokad antyspamowych\n"
 
 #: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  okre¶la limit listów wys³anych w jednym po³±czeniu SMTP\n"
+msgstr ""
+"  -b, --batchlimit  okre¶la limit listów wys³anych w jednym po³±czeniu SMTP\n"
 
 #: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  okre¶la limit listów pobieranych w jednym po³±czeniu\n"
+msgstr ""
+"  -B, --fetchlimit  okre¶la limit listów pobieranych w jednym po³±czeniu\n"
 
 #: options.c:634
 msgid "      --fetchsizelimit set fetch message size limit\n"
@@ -2070,11 +2188,13 @@ msgstr "      --fastuidl    wykonuje binarne poszukiwanie UIDL-i\n"
 
 #: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     liczba skasowanych listów miêdzy czyszczeniem skrzynki\n"
+msgstr ""
+"  -e, --expunge     liczba skasowanych listów miêdzy czyszczeniem skrzynki\n"
 
 #: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
-msgstr "  -m, --mda         okre¶la ¶cie¿kê do MDA dorêczaj±cego pobrane listy\n"
+msgstr ""
+"  -m, --mda         okre¶la ¶cie¿kê do MDA dorêczaj±cego pobrane listy\n"
 
 #: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
@@ -2090,7 +2210,8 @@ msgstr "  -r, --folder      okre¶la nazwê skrzynki na serwerze\n"
 
 #: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
+msgstr ""
+"      --showdots    pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
 
 #: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2123,7 +2244,8 @@ msgstr "id=%s (num=%d) zosta³ skasowany, ale nadal istnieje!\n"
 
 #: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
+msgstr ""
+"Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
 
 #: pop3.c:902
 msgid "protocol error\n"
@@ -2146,12 +2268,20 @@ msgid "SDPS not enabled."
 msgstr "SDPS nie w³±czone."
 
 #: rcfile_y.y:212
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: opcja interface jest obs³ugiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: opcja interface jest obs³ugiwana tylko pod Linuksem (bez IPv6) i "
+"FreeBSD\n"
 
 #: rcfile_y.y:219
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: opcja monitor jest obs³ugiwana tylko pod Linuksem (bez IPv6) i FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: opcja monitor jest obs³ugiwana tylko pod Linuksem (bez IPv6) i "
+"FreeBSD\n"
 
 #: rcfile_y.y:332
 msgid "SSL is not enabled"
@@ -2385,110 +2515,110 @@ msgstr "Nie mo¿na rozwi±zaæ us³ugi %s na numer portu.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Proszê podaæ us³ugê jako dziesiêtny numer portu.\n"
 
-#: sink.c:238
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "przesy³anie do %s\n"
 
-#: sink.c:327
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cia³o odbitego listu)\n"
 
-#: sink.c:330
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "poczta od %s odbita do %s\n"
 
-#: sink.c:462
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Zachowany b³±d to nadal %d\n"
 
-#: sink.c:522 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "b³±d %cMTP: %s\n"
 
-#: sink.c:766
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
 
-#: sink.c:979
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "demon %cMTP nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:986
+#: sink.c:972
 #, 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:1027
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "brak pasuj±cych adresów; postmaster nie ustawiony.\n"
 
-#: sink.c:1039
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nie mogê wys³aæ poczty nawet do %s!\n"
 
-#: sink.c:1045
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "brak pasuj±cych lokalnych adresów, przesy³am do %s\n"
 
-#: sink.c:1198
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "list zostanie dorêczony przy pomocy: %s\n"
 
-#: sink.c:1222
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "b³±d podczas uruchamiania MDA (programu dorêczaj±cego pocztê)\n"
 
-#: sink.c:1259
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "po³±czenie %cMTP z %s nie powiod³o siê\n"
 
-#: sink.c:1283
+#: sink.c:1270
 #, 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:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna³ %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwróci³ niezerowy kod b³êdu %d\n"
 
-#: sink.c:1345
+#: sink.c:1332
 #, 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:1366
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Zakoñczenie listu lub zamkniêcie pliku BSMTP nie powiod³o siê\n"
 
-#: sink.c:1387
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "serwer SMTP odmówi³ dostarczenia listu\n"
 
-#: sink.c:1417
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "B³±d podczas dorêczania LMTP w momencie wykonywania komendy EOM\n"
 
-#: sink.c:1420
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Niespodziewana odpowied¼ inna ni¿ 503 na LSTMP EOM: %s\n"
 
-#: sink.c:1574
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2807,7 +2937,8 @@ msgstr "Zapisujê plik fetchids.\n"
 #: uid.c:640
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "B³±d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
+msgstr ""
+"B³±d podczas zapisu pliku fetchids %s, stary plik pozostawiono na miejscu.\n"
 
 #: uid.c:644
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 22aa5fa6..2a3987ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-5.4.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2000-07-28 09:40-03:00\n"
 "Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -16,20 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Checando se %s é realmente o mesmo nó que %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Sim, o endereço IP deles bate\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "Não, o endereço IP deles não bate\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr ""
+"falha na resolução de nomes ao procurar por `%s' durante a consulta de %s.\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -44,144 +50,152 @@ msgstr "não foi possível decodificar o desafio BASE64\n"
 msgid "decoded as %s\n"
 msgstr "acordado em %s\n"
 
-#: driver.c:191
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "erro kerberos %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [servidor informa '%*s'] \n"
 
-#: driver.c:336
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:341
 #, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+msgid "The following oversized messages were deleted on the mail server %s:"
 msgstr ""
 
-#: driver.c:354
+#: driver.c:345
 #, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+msgid "The following oversized messages remain on the mail server %s:"
+msgstr ""
+
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
 msgstr "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 
-#: driver.c:497
+#: driver.c:368
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
+msgstr "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
+
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:549
+#: driver.c:556
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:572
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:568
+#: driver.c:575
 #, fuzzy
 msgid " (oversized)"
 msgstr " (muito grande, %d octetos)"
 
-#: driver.c:583
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:600
+#: driver.c:607
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensagem %d de %d"
 
-#: driver.c:605
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:612
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %soctetos)"
 
-#: driver.c:606
-msgid "header "
-msgstr "cabeçalho "
+#: driver.c:613
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d octetos no corpo da mensagem) "
 
-#: driver.c:678
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octetos no corpo da mensagem) "
 
-#: driver.c:736
+#: driver.c:743
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "mensagem %d não possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: driver.c:767
+#: driver.c:774
 msgid " retained\n"
 msgstr " retida\n"
 
-#: driver.c:776
+#: driver.c:784
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:793
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " não eliminada\n"
 
-#: driver.c:809
+#: driver.c:818
 #, fuzzy, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr ""
+msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
+"servidor\n"
+msgstr[1] ""
 "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
 "servidor\n"
 
-#: driver.c:869
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "Um MDA enviou um SIGPIPE ou houve um erro de socket\n"
 
-#: driver.c:876
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "tempo esgotado após %d segundos esperando para conectar ao servidor %s.\n"
 
-#: driver.c:880
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado após %d segundos esperando pelo servidor %s.\n"
 
-#: driver.c:884
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado após %d segundos esperando por %s.\n"
 
-#: driver.c:889
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tempo esgotado após %d segundos esperando pelo receptor responder.\n"
 
-#: driver.c:892
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado após %d segundos.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:916
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Assunto: o fetchmail tem notado repetidos vencimentos de temporização\n"
 "\n"
 
-#: driver.c:906
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -190,7 +204,7 @@ msgstr ""
 "Fetchmail notou mais que %d vencimentos de temporização enquanto tentava "
 "baixar mensagens de %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -206,12 +220,12 @@ msgstr ""
 "\n"
 "Fetchmail não vai consultar mais esta caixa postal até que seja reiniciado.\n"
 
-#: driver.c:940
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "comando de pré-conexão falhou com status %d\n"
 
-#: driver.c:971
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "não foi possível encontrar caixa postal HESIOD para %s\n"
@@ -220,87 +234,62 @@ msgstr "não foi possível encontrar caixa postal HESIOD para %s\n"
 msgid "Lead server has no name.\n"
 msgstr "Servidor líder não possui nome.\n"
 
-#: driver.c:1016
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "não foi possível encontrar o nome de DNS canônico para %s\n"
 
-#: driver.c:1053
-#, fuzzy
-msgid "internal inconsistency\n"
-msgstr "fetchmail: inconsistência interna\n"
-
-#: driver.c:1063
+#: driver.c:1055
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: driver.c:1069
-msgid "host is unknown."
-msgstr "a máquina é desconhecida."
-
-#: driver.c:1072
-msgid "name is valid but has no IP address."
-msgstr "o nome válido mas sem endereço IP."
-
-#: driver.c:1075
-msgid "unrecoverable name server error."
-msgstr "erro irrecuperável no servidor de nomes."
-
-#: driver.c:1077
-msgid "temporary name server error."
-msgstr "erro temporário no servidor de nomes."
-
-#: driver.c:1084
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "erro desconhecido de DNS %d."
-
-#: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#: driver.c:1071
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1073
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "O fetchmail não pôde receber o correio eletrônico de %s@%s.\n"
+
+#: driver.c:1099 imap.c:384 pop3.c:433
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: driver.c:1184
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1188
+#: driver.c:1156
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1161
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Falha de autorização para %s@%s\n"
 
-#: driver.c:1196
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1217
+#: driver.c:1185
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr ""
 "Assunto: falha de autenticação do fetchmail\n"
 "\n"
 
-#: driver.c:1220
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "O fetchmail não pôde receber o correio eletrônico de %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -317,7 +306,7 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1239
+#: driver.c:1208
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -334,174 +323,176 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail não consegue distinguir desta\n"
 "pois eles não enviam mensagens de erro úteis durante a falha no login.\n"
 
-#: driver.c:1254
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1259
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desconhecido de login ou autenticação em %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1252
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Falha de autorização para %s@%s\n"
 
-#: driver.c:1289
+#: driver.c:1258
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr ""
 "Assunto: falha de autenticação do fetchmail\n"
 "\n"
 
-#: driver.c:1292
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "O fetchmail não pôde receber o correio eletrônico de %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1266
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "Serviço escolheu a versão %d.%d do RPA\n"
 
-#: driver.c:1327
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta %s\n"
 
-#: driver.c:1329
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta padrão\n"
 
-#: driver.c:1345
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s em %s (pasta %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Baixando %s\n"
 
-#: driver.c:1362
+#: driver.c:1323
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d visualizadas) para %s"
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d visualizadas) para %s"
+msgstr[1] "%d %s (%d visualizadas) para %s"
 
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "mensagens"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "mensagem"
-
-#: driver.c:1366
+#: driver.c:1326
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s para %s"
+#: driver.c:1329
+#, fuzzy, c-format
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] "%d %s para %s"
+msgstr[1] "%d %s para %s"
 
-#: driver.c:1375
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1381
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nenhuma mensagem para %s\n"
 
-#: driver.c:1414
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1515
+#: driver.c:1485
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1518
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "cabeçalho RFC822 ruim ou faltando"
 
-#: driver.c:1521
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "sincronização cliente/servidor"
 
-#: driver.c:1527
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1530
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "arquivo de lock existente no servidor"
 
-#: driver.c:1533
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "Transação SMTP"
 
-#: driver.c:1536
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1539
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "erro não definido\n"
 
-#: driver.c:1550
+#: driver.c:1515
 #, fuzzy, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1552
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "a máquina é desconhecida."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1560
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "comando de pós-conexão falhou com status %d\n"
 
-#: driver.c:1581
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Suporte a Kerberos V4 não incluído (linkado).\n"
 
-#: driver.c:1589
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Suporte a Kerberos V5 não incluído (linkado).\n"
 
-#: driver.c:1600
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opção --flush não é suportada com %s\n"
 
-#: driver.c:1606
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opção --all não é suportada com %s\n"
 
-#: driver.c:1614
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opção --limit não é suportada com %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -511,7 +502,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -522,21 +513,33 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Você não existe. Vá embora.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: não foi possível determinar sua máquina!"
 
-#: env.c:160
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falhou para %s\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -562,24 +565,20 @@ msgstr "Nenhuma mensagem esperando para %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "Mensagens pendentes para %s iniciadas\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Incapaz de armazenar mensagens para o nó %s\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Nó %s não permitido: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "Erro de sintaxe ETRN\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "Erro de sintaxe nos parâmetros ETRN\n"
@@ -589,79 +588,84 @@ msgstr "Erro de sintaxe nos parâmetros ETRN\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "Erro ETRN desconhecido %d\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Opção --keep não é compatível com ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Opção --flush não é compatível com ETRN\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "Opção --remote não é compatível com ETRN\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "Opção --flush não é compatível com ETRN\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Opção --check não é compatível com ETRN\n"
 
-#: fetchmail.c:154
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 #, fuzzy
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: fork falhou\n"
 
-#: fetchmail.c:178
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:188
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Este é o fetchmail versão %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Utilizando opções da linha de comando%s%s\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:355
 msgid " and "
 msgstr " e "
 
-#: fetchmail.c:335
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Nenhum servidor de correio eletrônico configurado -- talvez %s esteja "
 "faltando?\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nenhum servidor de correio eletrônico foi especificado.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nenhum outro fetchmail está rodando\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erro eliminando %s fetchmail em %d; desistindo.\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "primeiro plano"
 
-#: fetchmail.c:386
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail em %d terminado.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -669,7 +673,7 @@ msgstr ""
 "fetchmail: não é possível checar por mensagens enquanto outro fetchmail está "
 "rodando para a mesma máquina.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -677,199 +681,205 @@ msgstr ""
 "fetchmail: não é possível receber mensagens das máquinas especificadas\n"
 "enquanto houver outro fetchmail rodando em %d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: outro fetchmail está rodando em primeiro plano em %d.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: não é possível aceitar opções com outro fetchmail rodando em \n"
 "segundo plano.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail rodando em segundo plano em %d despertado.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: processo mais antigo rodando em %d morreu misteriosamente.\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:487
 #, fuzzy, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: não é possível encontrar uma senha para %s@s.\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Digite a senha para %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:550
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "não foi possível fazer checagem de horário de %s (erro %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s mudou) \n"
 
-#: fetchmail.c:560
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:587
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "tentativa de re-executar fetchmail falhou.\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "consulta de %s pulada (falha de autenticação ou muitos vencimentos de "
 "temporização)\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo não atingido, não consultando %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:690
 #, fuzzy
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:692
 #, fuzzy
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:694
 #, fuzzy
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:696
 #, fuzzy
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:698
 #, fuzzy
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:700
 #, fuzzy
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:702
 #, fuzzy
 msgid "Query status=6 (IOERR)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:704
 #, fuzzy
 msgid "Query status=7 (ERROR)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:706
 #, fuzzy
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:708
 #, fuzzy
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:710
 #, fuzzy
 msgid "Query status=10 (SMTP)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:712
 #, fuzzy
 msgid "Query status=11 (DNS)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:714
 #, fuzzy
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:716
 #, fuzzy
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Situação da consulta=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas as conexões estão travadas. Encerrando.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:771
 #, fuzzy, c-format
 msgid "sleeping at %s\n"
 msgstr "fetchmail: `dormindo' em %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "acordado por %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "acordado em %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "encerramento normal, status %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "não foi possível checar o horário do arquivo de controle de execução\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr ""
+"Atenção: múltiplas entradas para a máquina %s no arquivo de configuração\n"
+
+#: fetchmail.c:1149
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "O suporte a POP2 não está configurado.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -877,650 +887,697 @@ msgstr ""
 "fetchmail: warning: nenhum DNS disponível para checar buscas com múltiplas\n"
 "entregas de %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1191
 #, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1192
+msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
+msgstr ""
+
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "configuração de %s inválida, número da porta não pode ser negativo\n"
 
-#: fetchmail.c:1171
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuração de %s inválida, o RPOP exige uma porta privilegiada\n"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "configuração de %s inválida, LMTP não pode usar a porta SMTP padrão\n"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall e modo daemon juntos está errado!\n"
 
-#: fetchmail.c:1252
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "encerrado com o sinal %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1383
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "O suporte a POP2 não está configurado.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "O suporte a POP3 não está configurado.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "O suporte a IMAP não está configurado.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "O suporte a ETRN não está configurado.\n"
 
-#: fetchmail.c:1396
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "Não é possível usar ETRN sem a função gethostbyname(2).\n"
-
-#: fetchmail.c:1403
+#: fetchmail.c:1444
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "O suporte a POP2 não está configurado.\n"
 
-#: fetchmail.c:1409
-#, fuzzy
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "Não é possível usar ETRN sem a função gethostbyname(2).\n"
-
-#: fetchmail.c:1415
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "protocolo não suportado escolhido.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1461
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervalo de consulta é %d segundos\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Arquivo de registro é %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Arquivo de identificação é %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mensagens de progresso serão gravadas pelo syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail fará mascaramento e não gerará `Received'\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1456
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensagens multidrop mal endereçadas para %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail irá enviar mensagens de correio de erro para o postmaster.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail irá enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opções para consulta de %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mensagens serão recuperadas via %s\n"
 
-#: fetchmail.c:1476
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Consulta deste servidor irá ocorrer a cada %d intervalos.\n"
+#: fetchmail.c:1512
+#, fuzzy, c-format
+msgid "  Poll of this server will occur every %d interval.\n"
+msgid_plural "  Poll of this server will occur every %d intervals.\n"
+msgstr[0] "  Consulta deste servidor irá ocorrer a cada %d intervalos.\n"
+msgstr[1] "  Consulta deste servidor irá ocorrer a cada %d intervalos.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O verdadeiro nome do servidor é %s.\n"
 
-#: fetchmail.c:1481
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1519
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta máquina %s será consultada quando nenhuma máquina for\n"
 "especificada.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will not"
-msgstr "não"
-
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will"
-msgstr " "
+#: fetchmail.c:1520
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr ""
+"  Esta máquina %s será consultada quando nenhuma máquina for\n"
+"especificada.\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  A senha será solicitada.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificação RPOP = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "   Senha = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocolo é KPOP com autenticação Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocolo é %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando serviço %s)"
 
-#: fetchmail.c:1517
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (usando opções de segurança de rede %s)"
-
-#: fetchmail.c:1520
-#, c-format
-msgid " (using port %d)"
-msgstr " (usando porta %d)"
-
-#: fetchmail.c:1523
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (usando porta padrão)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (forçando o uso de UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1534
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autenticação OTP é suportada\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "Autenticação NTLM é suportada\n"
+
+#: fetchmail.c:1567
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autenticação NTLM é suportada\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1570
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autenticação OTP é suportada\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1573
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autenticação CRAM-MD5 é suportada\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1576
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autenticação GSS é suportada\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1579
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Pré-autenticação Kerberos V4 ativada.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1582
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Pré-autenticação Kerberos V5 ativada.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Criptografia end-to-end assumida.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1562
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1564
+#: fetchmail.c:1594
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo é %s"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1568
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1571
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1574
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 "  O tempo máximo para não obtenção de resposta do servidor é %d segundos"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (padrão).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correio padrão selecionada.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correio selecionadas são:"
 
-#: fetchmail.c:1593
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1624
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s mensagens serão recuperadas (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "All"
-msgstr "Todas as"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s mensagens serão recuperadas (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "Only new"
-msgstr "Apenas as novas"
+#: fetchmail.c:1627
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  As Mensagens baixadas %s serão mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1596
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As Mensagens baixadas %s serão mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1599
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1630
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1602
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1631
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
+"(--flush %s).\n"
+
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
+"(--flush %s).\n"
+
+#: fetchmail.c:1634
+#, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Mensagens antigas %s serão eliminadas antes da recuperação de mensagens \n"
+"(--flush %s).\n"
+
+#: fetchmail.c:1636
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "enabled"
-msgstr "ativada"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr ""
+"  A reescrita de endereços no servidor local está %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "disabled"
-msgstr "desativada"
+#: fetchmail.c:1639
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  A eliminação do retorno de carro (CR) está %s (stripcr %s).\n"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  A eliminação do retorno de carro (CR) está %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1642
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Forçar retorno de carro (CR) está %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1643
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Forçar retorno de carro (CR) está %s (forcecr %s).\n"
+
+#: fetchmail.c:1645
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
 
-#: fetchmail.c:1614
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1646
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  A interpretação de Content-Transfer-Encoding está %s (pass8bits %s).\n"
+
+#: fetchmail.c:1648
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  A decodificação MIME está %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  A decodificação MIME está %s (mimedecode %s).\n"
+
+#: fetchmail.c:1651
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inatividade após consulta é %s (inatividade %s).\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Inatividade após consulta é %s (inatividade %s).\n"
+
+#: fetchmail.c:1654
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "discarded"
-msgstr "descartadas"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "kept"
-msgstr "mantidas"
+#: fetchmail.c:1657
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1623
-#, fuzzy, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1658
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As linhas de status não vazias serão %s (dropstatus %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O tamanho limite por mensagem é %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de aviso de tamanho de mensagem é de %d segundos (--warnings \n"
 "%d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tamanho a cada recebimento (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O limite de mensagem recebida é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nenhum limite para mensagem recebida (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O limite de mensagem recebida é %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O limite de lote de mensagens SMTP é %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nenhum limite de lote de mensagens SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  O intervalo de deleção entre eliminações é %d (--expunge %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nenhuma eliminação (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (padrão)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensagens serão anexadas a %s como BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensagens serão entregues com \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensagens serão re-enviadas via %cMTP para:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da máquina na linha MAIL FROM será %s\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas reconhecidas de blocos spam são:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueio de spam desabilitado\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conexão do servidor será efetuada com \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Nenhum comando de pré-conexão.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conexão com o servidor será derrubada com \"%s\".\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Nenhum comando de pós-conexão.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nenhum nome local declarado para esta máquina.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Modo de múltipla entrega (multi-drop): "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simples (single-drop): "
 
-#: fetchmail.c:1750
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d nome(s) local(is) reconhecido(s).\n"
+#: fetchmail.c:1783
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d nome(s) local(is) reconhecido(s).\n"
+msgstr[1] "%d nome(s) local(is) reconhecido(s).\n"
 
-#: fetchmail.c:1764
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1798
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  A busca no DNS por endereços de múltipla entrega está %s.\n"
 
-#: fetchmail.c:1768
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1799
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  A busca no DNS por endereços de múltipla entrega está %s.\n"
+
+#: fetchmail.c:1803
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Os apelidos de servidores serão comparados com endereços de múltipla\n"
 "entrega por "
 
-#: fetchmail.c:1770
-msgid "IP address.\n"
-msgstr "endereço IP.\n"
-
-#: fetchmail.c:1772
-msgid "name.\n"
-msgstr "nome.\n"
+#: fetchmail.c:1805
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr ""
+"  Os apelidos de servidores serão comparados com endereços de múltipla\n"
+"entrega por "
 
-#: fetchmail.c:1775
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O roteamento de endereços de envelope está desabilitado\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Assume-se que o cabeçalho do envelope esteja: %s\n"
 
-#: fetchmail.c:1779
-msgid "Received"
-msgstr "Recebido"
-
-#: fetchmail.c:1781
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número de cabeçalhos de envelope  a serem processados: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  O prefixo %s será removido da identificação do usuário\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Nenhuma remoção de prefixo\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Apelidos pré-declarados do servidor de correio eletrônico:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Domínios locais:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conexão precisa se dar pela interface %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Não foi especificada nenhuma exigência de interface.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Ciclo de consultas monitorará %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Nenhuma interface de monitoramento foi especificada.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conexões com o servidor se darão via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Nenhum comando \"plugin\" especificado.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  As conexões com o cliente se darão via \"plugout\" %s (--plugout %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Nenhum comando \"plugout\" especificado.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nenhuma identificação de usuário gravada a partir desta máquina.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d identificações de usuários gravadas.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1853
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1856
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriedades de passagem \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
-#, fuzzy
-msgid "alloca failed"
-msgstr "malloc falhou\n"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERRO: não há suporte à rotina getpassword()\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1546,37 +1603,37 @@ msgstr "Enviando credenciais\n"
 msgid "Error exchanging credentials\n"
 msgstr "Erro na troca de credenciais\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Não foi possível desempacotar dados do nível de segurança\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Troca de credenciais completa\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Servidor requer integridade e/ou privacidade\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempacotadas marcas de nível de segurança: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Tamanho máximo do símbolo GSS é %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "Erro criando solicitação de nível de segurança\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando credenciais GSS\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "Erro na liberação de credenciais\n"
 
@@ -1587,156 +1644,161 @@ msgstr ""
 "fetchmail: tarefa aguardando por %d segundos.\n"
 "\n"
 
-#: imap.c:280
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:460
+#: imap.c:482
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:482
+#: imap.c:504 pop3.c:341
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:491
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade de LOGIN exigida não é suportada pelo servidor\n"
 
-#: imap.c:641 imap.c:707
-#, fuzzy
-msgid "expunge failed\n"
-msgstr "execl(%s) falhou\n"
-
-#: imap.c:663 imap.c:692
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "nova tentativa de baixar mensagens falhou\n"
 
-#: imap.c:671
+#: imap.c:682
 #, fuzzy, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "Nenhuma mensagem esperando para %s\n"
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "Nenhuma mensagem esperando para %s\n"
+msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:681
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "seleção de caixa postal falhou\n"
 
-#: imap.c:685
+#: imap.c:698
 #, fuzzy, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "Nenhuma mensagem esperando para %s\n"
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "Nenhuma mensagem esperando para %s\n"
+msgstr[1] "Nenhuma mensagem esperando para %s\n"
+
+#: imap.c:722
+#, fuzzy
+msgid "expunge failed\n"
+msgstr "execl(%s) falhou\n"
 
-#: imap.c:711
+#: imap.c:726
 #, fuzzy, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "Nenhuma mensagem esperando para %s\n"
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "Nenhuma mensagem esperando para %s\n"
+msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:734
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "falha na busca por mensagens não vistas\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u é não vista\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:793 pop3.c:744
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u é não vista\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Não foi possível abrir a interface kvm. Certifique-se que fetchmail está "
 "SGID kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr ""
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr ""
 
-#: interface.c:426
+#: interface.c:424
 #, fuzzy
 msgid "get_ifinfo: malloc failed"
 msgstr "malloc falhou\n"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr ""
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr ""
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr ""
 
-#: interface.c:540
+#: interface.c:538
 #, fuzzy, c-format
 msgid "No IP address found for %s"
 msgstr "nenhum endereço Received encontrado\n"
 
-#: interface.c:592
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "faltando endereço IP da interface\n"
 
-#: interface.c:608
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "endereço IP da interface inválido\n"
 
-#: interface.c:614
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "máscara IP da interface inválida\n"
 
-#: interface.c:653
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "atividade em %s -percebida- como %d\n"
 
-#: interface.c:668
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "pulando mensagens de %s, %s está parado\n"
 
-#: interface.c:687
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "pulando mensagens de %s, endereço IP de %s excluído\n"
 
-#: interface.c:699
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "atividade em %s checada como %d\n"
 
-#: interface.c:725
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "pulando mensagens de %s, %s inativo\n"
 
-#: interface.c:732
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "atividade em %s foi %d, é %d\n"
@@ -1763,26 +1825,31 @@ msgstr "não foi possível decodificar resposta \"pronto\" de BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "erro no desafio\n"
 
-#: lock.c:81
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: removendo arquivos de trava antigos\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: removendo arquivos de trava antigos\n"
 
-#: lock.c:122
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: removendo arquivos de trava antigos\n"
+
+#: lock.c:137
 #, fuzzy
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: socketpair falhou\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "atenção: encontrado \"%s\" antes de qualquer nome de máquina"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: atenção: encontrado \"%s\" antes de qualquer nome de máquina\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: warning: símbolo desconhecido \"%s\"\n"
@@ -1800,7 +1867,6 @@ msgstr ""
 msgid "ATRN request refused.\n"
 msgstr ""
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr ""
@@ -1809,12 +1875,10 @@ msgstr ""
 msgid "You have no mail.\n"
 msgstr ""
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr ""
 
-#. Authentication required
 #: odmr.c:124
 #, fuzzy
 msgid "Authentication required.\n"
@@ -1825,117 +1889,118 @@ msgstr "Autenticação OTP é suportada\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "Erro ETRN desconhecido %d\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "escrevendo o texto da mensagem\n"
+
+#: odmr.c:240
 #, fuzzy
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Opção --keep não é compatível com ETRN\n"
 
-#: odmr.c:247
+#: odmr.c:244
 #, fuzzy
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Opção --flush não é compatível com ETRN\n"
 
-#: odmr.c:251
+#: odmr.c:248
 #, fuzzy
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "Opção --remote não é compatível com ETRN\n"
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "Opção --flush não é compatível com ETRN\n"
 
-#: odmr.c:255
+#: odmr.c:252
 #, fuzzy
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Opção --check não é compatível com ETRN\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr ""
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "Não foi possível decodificar o desafio OTP\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "Frase-senha secreta: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Cadeia '%s' não é uma cadeia de números válidos.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Valor da cadeia '%s' é %s que %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "maior"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo `%s' inválido foi especificado.\n"
 
-#: options.c:429
+#: options.c:372
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Pré-autenticação `%s' inválida foi especificada.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: suporte a segurança na rede está desativado\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso: fetchmail [opções] [servidor ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  As opções são:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra esta tela de ajuda\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informações sobre a versão\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       checa por mensagens sem baixá-las\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabalha silenciosamente\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabalha barulhentamente (saídas para diagnóstico)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      roda como um servidor uma vez a cada n segundos\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 "  -N, --nodetach    não desconecta o processo servidor do seu terminal\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        elimina processo servidor\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica o nome do arquivo de log\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1943,459 +2008,473 @@ msgstr ""
 "      --syslog      usa o syslog(3) para a maioria das mensagens quando\n"
 "                    estiver rodando como servidor\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   não escreve `Received' & ativa mascaramento da máquina\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especifica arquivo de controle de execução alternativo\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usuários \n"
 "                    alternativo\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica o destinatário usado em último caso\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redireciona mensagens erradas para o postmaster.\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificação de interface exigida\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitora a atividade na interface\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         habilita sessão ssl criptografada\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      arquivo contendo a chave ssl privada\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:686
+#: options.c:599
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     certificado ssl do cliente\n"
+
+#: options.c:600
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica um comando externo para abrir uma conexão\n"
 
-#: options.c:689
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especifica um comando externo para abrir uma conexão "
 "smtp\n"
 
-#: options.c:691
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica o protocolo de retirada (ver página de \n"
 "                    manual)\n"
 
-#: options.c:692
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        força o uso de UIDLs (somente para pop3)\n"
 
-#: options.c:693
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        Porta TCP para conexão\n"
 
-#: options.c:694
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --port        Porta TCP para conexão\n"
+
+#: options.c:610
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --preauth     tipo de pré-autenticação (senha/kerberos/ssh)\n"
 
-#: options.c:695
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 "  -t, --timeout     tempo limite para não obtenção de resposta do servidor\n"
 
-#: options.c:696
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabeçalho do endereço de envelope\n"
 
-#: options.c:697
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo para remover da identificação de um usuário "
 "local\n"
 
-#: options.c:698
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:699
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:701
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    especifica a identificação do usuário no servidor\n"
 
-#: options.c:702
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         recupera mensagens antigas e novas\n"
 
-#: options.c:703
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      apaga novas mensagens após a recuperação\n"
 
-#: options.c:704
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        não apaga novas mensagens após recuperação\n"
 
-#: options.c:705
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:706
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   não reescreve os cabeçalhos das mensagens\n"
 
-#: options.c:707
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       não recupera mensagens acima de um dado tamanho\n"
 
-#: options.c:708
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre avisos de notificação de e-mail\n"
 
-#: options.c:711
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      ativa solicitação de segurança IP\n"
-
-#: options.c:713
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configura a máquina SMTP para reenvio\n"
 
-#: options.c:714
+#: options.c:628
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:715
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress configura o domínio de entrega do SMTP a ser usado\n"
 
-#: options.c:716
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:717
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configura o valor das respostas anti-spam\n"
 
-#: options.c:718
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  configura o limite de lote para conexões SMTP\n"
 
-#: options.c:719
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:720
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recepção para conexões com o\n"
 "                    servidor\n"
 
-#: options.c:721
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     configura o máximo de deleções entre eliminações\n"
 
-#: options.c:723
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "      --mda         configura o MDA a ser usado para reenvio\n"
 
-#: options.c:724
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configura o arquivo de saída BSMTP\n"
 
-#: options.c:725
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) para entrega\n"
 
-#: options.c:726
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especifica o nome da pasta remota\n"
 
-#: options.c:727
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Data/horário APOP exigidos não encontrados na saudação\n"
 
-#: pop3.c:547
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na data/horário da saudação\n"
 
-#: pop3.c:569
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Solicitação de protocolo não definida em POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "arquivo de travamento presente! Há outra sessão ativa?\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Mensagens inseridas numa lista no servidor. Não posso tratar isso.\n"
 
-#: pop3.c:842
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:857
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo durante a obtenção de UIDLs\n"
 
-#: pop3.c:1214
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "Opção --remote não é compatível com POP3\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:222
-#, fuzzy
-msgid "invalid security request"
-msgstr "Erro criando solicitação de nível de segurança\n"
-
-#: rcfile_y.y:228
-#, fuzzy
-msgid "network-security support disabled"
-msgstr "fetchmail: suporte a segurança na rede está desativado\n"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (mensagem de registro incompleta)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "erro parcial sobrecarga no buffer de mensagem"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, fuzzy, c-format
 msgid "About to rewrite %s"
 msgstr "prestes a entregar para: %s\n"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:116
+#: rpa.c:117
 msgid "Success"
 msgstr "Sucesso"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Usuário restrito (algo errado com a conta)"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Identificação de usuário ou frase-senha inválidos"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Deity error"
 msgstr "Erro fatal"
 
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Erro de decodificação Base64\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Serviço escolheu a versão %d.%d do RPA\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Desafio de serviço (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Data/horário do serviço %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "Erro no comprimento do token 2 RPA\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista de domínios: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "Erro RPA na cadeia serviço@domínio\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Erro de decodificação Base64\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticação de usuário (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "status RPA: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "Erro no comprimento do símbolo 4 RPA\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "Você foi rejeitado pelo RPA: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "Você foi rejeitado pelo RPA por motivos desconhecidos\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "Erro no comprimento da autenticação de usuário RPA: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "Erro no comprimento da chave da sessão RPA: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Autenticação de _serviço_ RPA falhou. Enganar o servidor?\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Chave de sessão estabelecida:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Autorização RPA completa\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Resposta recebida\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Recebido retorno de resposta %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Hdr não é 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "Erro no comprimento do Token\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Comprimento do símbolo %d não combina com rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Campo mecanismo incorreto\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no caractere %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Entrada de dados binários:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Saída de dados:\n"
 
@@ -2407,344 +2486,352 @@ msgstr "Cadeia RPA muito longa\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA falhou na abertura de /dev/urandom. Isto não deveria\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedi-lo de se conectar, mas significa que\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    você não pode ter certeza de estar falando com\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    o serviço que você pensa estar (ataques\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 "    de re-tentativa por parte de um serviço desonesto são possíveis.)\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Desafio de usuário:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 está sendo aplicado ao bloco de dados:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "O resultado MD5 é: \n"
 
-#: sink.c:246
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "repassando para %s\n"
 
-#: sink.c:348
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:461
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:524 sink.c:604
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erro %cMTP: %s\n"
 
-#: sink.c:758
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de preâmbulo falhou\n"
 
-#: sink.c:979
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Cliente %cMTP não gosta do endereço do destinatário `%s'\n"
 
-#: sink.c:986
+#: sink.c:972
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Cliente %cMTP não gosta do endereço do destinatário `%s'\n"
 
-#: sink.c:1024
+#: sink.c:1013
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1036
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "não é possível nem mandar para %s!\n"
 
-#: sink.c:1042
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1195
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "prestes a entregar para: %s\n"
 
-#: sink.c:1219
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "Abertura MDA falhou\n"
 
-#: sink.c:1256
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Conexão %cMTP com %s falhou\n"
 
-#: sink.c:1280
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1336
+#: sink.c:1326
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: sink.c:1339
+#: sink.c:1329
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 "O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
 
-#: sink.c:1342
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1363
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
 
-#: sink.c:1384
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "Cliente SMTP recusou a entrega\n"
 
-#: sink.c:1414
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1417
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta não-503 para o EOM LMTP: %s\n"
 
-#: sink.c:1567
+#: sink.c:1561
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:86
+#: smtp.c:87
 #, fuzzy
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticação CRAM-MD5 é suportada\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:114 socket.c:140
 #, fuzzy
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:166
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair falhou\n"
 
-#. error
-#: socket.c:172
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork falhou\n"
 
-#: socket.c:180
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 falhou\n"
 
-#: socket.c:186
+#: socket.c:191
 #, fuzzy, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "rodando %s %s %s\n"
 
-#: socket.c:189
+#: socket.c:194
 #, fuzzy, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: socket.c:280
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:427
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: comprimento de endereço ilegal recebido para máquina %s\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:778
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:780
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:782
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:784
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:788
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:640
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Data/horário do serviço %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:812
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:818
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:823
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:825
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:835
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:839
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:857
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:861
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:864
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:872
+#: socket.c:747
 #, c-format
-msgid "Warning: server certificate verification: %s\n"
+msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:878
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:931
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:948
+#: socket.c:822
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo `%s' inválido foi especificado.\n"
 
-#: socket.c:1008
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1080
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1083
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:70
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s mapeado localmente para %s\n"
 
-#: transact.c:134
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "passou por %s combinando com %s\n"
 
-#: transact.c:203
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2753,86 +2840,81 @@ msgstr ""
 "analisando linha Received:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "linha aceita, %s é um apelido do servidor de email\n"
 
-#: transact.c:248
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "linha rejeitada, %s não é um apelido do servidor de email\n"
 
-#: transact.c:322
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "nenhum endereço Received encontrado\n"
 
-#: transact.c:331
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "encontrado endereço Received `%s'\n"
 
-#: transact.c:531
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr ""
 "encontrado o delimitador de mensagens durante varredura de cabeçalhos\n"
 
-#: transact.c:552
+#: transact.c:559
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 "encontrado o delimitador de mensagens durante varredura de cabeçalhos\n"
 
-#: transact.c:554
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Baixando %s\n"
 
-#: transact.c:1074
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "não combina com nada localmente, repassando para %s\n"
 
-#: transact.c:1089
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvio e remoção suprimidos devido a erro de DNS\n"
 
-#: transact.c:1225
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrevendo cabeçalhos RFC822\n"
 
-#: transact.c:1246
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "nenhum endereço de destino combina com o valor local declarado"
 
-#: transact.c:1257
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "endereço do destinatário %s não combina com nenhum nome local"
 
-#: transact.c:1271
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "a mensagem possui NULs inseridos"
 
-#: transact.c:1284
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Cliente SMTP rejeitou o endereço do destinatário: "
 
-#: transact.c:1409
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "escrevendo o texto da mensagem\n"
 
-#: uid.c:137
-#, c-format
-msgid "lstat: %s: %s\n"
-msgstr ""
-
 #: uid.c:248
 #, c-format
 msgid "Old UID list from %s:"
 msgstr ""
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr ""
 
@@ -2840,41 +2922,59 @@ msgstr ""
 msgid "Scratch list of UIDs:"
 msgstr ""
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
-#: uid.c:512 uid.c:563
+#: uid.c:514 uid.c:566
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr ""
 
-#: uid.c:514
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr ""
 
-#: uid.c:542
+#: uid.c:545
 #, fuzzy
 msgid "swapping UID lists\n"
 msgstr "lista de UID gravada\n"
 
-#: uid.c:550
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:575
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "lista de UID gravada\n"
 
-#: uid.c:610
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr ""
 
-#: uid.c:616
+#: uid.c:615
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Erro na liberação de credenciais\n"
+
+#: uid.c:621
 #, fuzzy
 msgid "Writing fetchids file.\n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
+#: uid.c:640
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:644
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:648
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc falhou\n"
@@ -2883,6 +2983,115 @@ msgstr "malloc falhou\n"
 msgid "realloc failed\n"
 msgstr "realloc falhou\n"
 
+#~ msgid "header "
+#~ msgstr "cabeçalho "
+
+#, fuzzy
+#~ msgid "internal inconsistency\n"
+#~ msgstr "fetchmail: inconsistência interna\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "o nome válido mas sem endereço IP."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "erro irrecuperável no servidor de nomes."
+
+#~ msgid "temporary name server error."
+#~ msgstr "erro temporário no servidor de nomes."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "erro desconhecido de DNS %d."
+
+#~ msgid "messages"
+#~ msgstr "mensagens"
+
+#~ msgid "message"
+#~ msgstr "mensagem"
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "Opção --remote não é compatível com ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "Não é possível usar ETRN sem a função gethostbyname(2).\n"
+
+#, fuzzy
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "Não é possível usar ETRN sem a função gethostbyname(2).\n"
+
+#~ msgid "will not"
+#~ msgstr "não"
+
+#~ msgid "will"
+#~ msgstr " "
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (usando opções de segurança de rede %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (usando porta %d)"
+
+#~ msgid "All"
+#~ msgstr "Todas as"
+
+#~ msgid "Only new"
+#~ msgstr "Apenas as novas"
+
+#~ msgid "enabled"
+#~ msgstr "ativada"
+
+#~ msgid "disabled"
+#~ msgstr "desativada"
+
+#~ msgid "discarded"
+#~ msgstr "descartadas"
+
+#~ msgid "kept"
+#~ msgstr "mantidas"
+
+#~ msgid "IP address.\n"
+#~ msgstr "endereço IP.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "nome.\n"
+
+#~ msgid "Received"
+#~ msgstr "Recebido"
+
+#, fuzzy
+#~ msgid "alloca failed"
+#~ msgstr "malloc falhou\n"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "atenção: encontrado \"%s\" antes de qualquer nome de máquina"
+
+#, fuzzy
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "Opção --remote não é compatível com ETRN\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: suporte a segurança na rede está desativado\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      ativa solicitação de segurança IP\n"
+
+#, fuzzy
+#~ msgid "invalid security request"
+#~ msgstr "Erro criando solicitação de nível de segurança\n"
+
+#, fuzzy
+#~ msgid "network-security support disabled"
+#~ msgstr "fetchmail: suporte a segurança na rede está desativado\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "erro parcial sobrecarga no buffer de mensagem"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr ""
+#~ "fetchmail: comprimento de endereço ilegal recebido para máquina %s\n"
+
 #~ msgid "fetchmail: %s connection to %s failed"
 #~ msgstr "fetchmail: conexão de %s com %s falhou"
 
diff --git a/po/ru.po b/po/ru.po
index 3ea17586..cf93f3d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-10 02:41+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+0100\n"
 "PO-Revision-Date: 2005-11-16 12:29+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -33,7 +33,8 @@ msgstr "îÅÔ, ÉÈ IP-ÁÄÒÅÓÁ ÎÅ ÓÏ×ĞÁÄÁÀÔ\n"
 #: checkalias.c:196
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "÷ÙĞÏÌÎÑÑ ĞÏÉÓË `%s', nameserver ×ÏÚ×ÒÁÔÉÌ ÏÛÉÂËÕ ×Ï ×ÒÅÍÑ ÏĞÒÏÓÁ %s: %s.\n"
+msgstr ""
+"÷ÙĞÏÌÎÑÑ ĞÏÉÓË `%s', nameserver ×ÏÚ×ÒÁÔÉÌ ÏÛÉÂËÕ ×Ï ×ÒÅÍÑ ÏĞÒÏÓÁ %s: %s.\n"
 
 #: checkalias.c:221
 #, c-format
@@ -64,14 +65,16 @@ msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "ôÅÍÁ: ğÒÅÄÕĞÒÅÖÄÅÎÉÅ Fetchmail Ï ĞÒÅ×ÙÛÅÎÉÉ ÒÁÚÍÅÒÁ ÓÏÏÂİÅÎÉÊ"
 
 #: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
-msgstr "óÌÅÄÕÀİÉÅ ÓÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÂÙÌÉ ÕÄÁÌÅÎÙ Ó ĞÏŞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
+msgstr ""
+"óÌÅÄÕÀİÉÅ ÓÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÂÙÌÉ ÕÄÁÌÅÎÙ Ó ĞÏŞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ %s:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
-msgstr "óÌÅÄÕÀİÉÅ ÓÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÎÁÈÏÄÑÔÓÑ ÎÁ ĞÏŞÔÏ×ÏÍ ÓÅÒ×ÅÒÅ %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
+msgstr ""
+"óÌÅÄÕÀİÉÅ ÓÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÎÁÈÏÄÑÔÓÑ ÎÁ ĞÏŞÔÏ×ÏÍ ÓÅÒ×ÅÒÅ %s:"
 
 #: driver.c:364
 #, c-format
@@ -128,8 +131,11 @@ msgstr " (%d ÏËÔÅÔÏ× × ÔÅÌÅ) "
 
 #: driver.c:743
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "ÄÌÉÎÁ ÓÏÏÂİÅÎÉÑ %s@%s:%d ÎÅ ÓÏ×ĞÁÌÁ Ó ÏÖÉÄÁÅÍÏÊ (%d ÎÁ ÓÁÍÏÍ ÄÅÌÅ != %d ÏÖÉÄÁÌÏÓØ)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"ÄÌÉÎÁ ÓÏÏÂİÅÎÉÑ %s@%s:%d ÎÅ ÓÏ×ĞÁÌÁ Ó ÏÖÉÄÁÅÍÏÊ (%d ÎÁ ÓÁÍÏÍ ÄÅÌÅ != %d "
+"ÏÖÉÄÁÌÏÓØ)\n"
 
 #: driver.c:774
 msgid " retained\n"
@@ -146,9 +152,14 @@ msgstr " ÎÅ ĞÒÏĞÕİÅÎÏ\n"
 #: driver.c:818
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ ÉÚ×ÌÅŞÅÎÉÑ %d; ÏÓÔÁÌÏÓØ %d ÓÏÏÂİÅÎÉÅ, ÓÅÒ×ÅÒ %s, ÕŞ£ÔÎÁÑ ÚÁĞÉÓØ %s\n"
-msgstr[1] "äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ ÉÚ×ÌÅŞÅÎÉÑ %d; ÏÓÔÁÌÏÓØ %d ÓÏÏÂİÅÎÉÊ, ÓÅÒ×ÅÒ %s, ÕŞ£ÔÎÁÑ ÚÁĞÉÓØ %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ ÉÚ×ÌÅŞÅÎÉÑ %d; ÏÓÔÁÌÏÓØ %d ÓÏÏÂİÅÎÉÅ, ÓÅÒ×ÅÒ %s, ÕŞ£ÔÎÁÑ "
+"ÚÁĞÉÓØ %s\n"
+msgstr[1] ""
+"äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ ÉÚ×ÌÅŞÅÎÉÑ %d; ÏÓÔÁÌÏÓØ %d ÓÏÏÂİÅÎÉÊ, ÓÅÒ×ÅÒ %s, ÕŞ£ÔÎÁÑ "
+"ÚÁĞÉÓØ %s\n"
 
 #: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
@@ -185,8 +196,12 @@ msgstr "ôÅÍÁ: fetchmail ÎÁÂÌÀÄÁÅÔ ĞÏ×ÔÏÒÑÀİÉÅÓÑ ÔÁÊÍ-ÁÕÔÙ"
 
 #: driver.c:919
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail ÏÂÎÁÒÕÖÉÌ ÂÏÌÅÅ %d ÔÁÊÍ-ÁÕÔÏ× ĞÒÉ ĞÏĞÙÔËÅ ĞÏÌÕŞÅÎÉÑ ĞÏŞÔÙ ÉÚ %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail ÏÂÎÁÒÕÖÉÌ ÂÏÌÅÅ %d ÔÁÊÍ-ÁÕÔÏ× ĞÒÉ ĞÏĞÙÔËÅ ĞÏÌÕŞÅÎÉÑ ĞÏŞÔÙ ÉÚ %s@%"
+"s.\n"
 
 #: driver.c:923
 msgid ""
@@ -209,7 +224,8 @@ msgstr ""
 #: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
-msgstr "ËÏÍÁÎÄÁ, ×ÙĞÏÌÎÑÅÍÁÑ ÄÏ ÓÏÅÄÉÎÅÎÉÑ, ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ ÓÏ ÓÔÁÔÕÓÏÍ %d\n"
+msgstr ""
+"ËÏÍÁÎÄÁ, ×ÙĞÏÌÎÑÅÍÁÑ ÄÏ ÓÏÅÄÉÎÅÎÉÑ, ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ ÓÏ ÓÔÁÔÕÓÏÍ %d\n"
 
 #: driver.c:972
 #, c-format
@@ -239,7 +255,7 @@ msgstr "ôÅÍÁ: ğÒÅÄÕĞÒÅÖÄÅÎÉÅ Fetchmail Ï ÎÅÄÏÓÔÕĞÎÏÓÔÉ ÓÅÒ×ÅÒÁ."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ÎÅ ÓÍÏÇ ÕÓÔÁÎÏ×ÉÔØ Ó×ÑÚØ Ó ĞÏŞÔÏ×ÙÍ ÓÅÒ×ÅÒÏÍ %s:"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1099 imap.c:392 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "ğÏÄËÌÀŞÅÎÉÅ ŞÅÒÅÚ SSL ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ.\n"
 
@@ -410,7 +426,7 @@ msgstr " (%d ÏËÔÅÔÏ×).\n"
 msgid "No mail for %s\n"
 msgstr "äÌÑ %s ĞÏŞÔÙ ÎÅÔ\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "ÆÉËÔÉ×ÎÏÅ ËÏÌÉŞÅÓÔ×Ï ÓÏÏÂİÅÎÉÊ!"
 
@@ -467,7 +483,8 @@ msgstr "ïÛÉÂËÁ %s ĞÒÉ ×ÙÂÏÒËÅ ÉÚ %s@%s\n"
 #: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
-msgstr "ËÏÍÁÎÄÁ, ×ÙĞÏÌÎÑÅÍÁÑ ĞÏÓÌÅ ÓÏÅÄÉÎÅÎÉÑ, ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ ÓÏ ÓÔÁÔÕÓÏÍ %d\n"
+msgstr ""
+"ËÏÍÁÎÄÁ, ×ÙĞÏÌÎÑÅÍÁÑ ĞÏÓÌÅ ÓÏÅÄÉÎÅÎÉÑ, ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ ÓÏ ÓÔÁÔÕÓÏÍ %d\n"
 
 #: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
@@ -513,7 +530,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -541,16 +559,20 @@ msgstr "gethostbyname ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ %s\n"
 
 #: env.c:165
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ Ó×ÏÊ ÓÏÂÓÔ×ÅÎÎÙÊ ÈÏÓÔ × ÂÁÚÅ ÄÁÎÎÙÈ ÈÏÓÔÏ×, ŞÔÏÂÙ ÏĞÒÅÄÅÌÉÔØ ÅÇÏ!\n"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ Ó×ÏÊ ÓÏÂÓÔ×ÅÎÎÙÊ ÈÏÓÔ × ÂÁÚÅ ÄÁÎÎÙÈ ÈÏÓÔÏ×, ŞÔÏÂÙ "
+"ÏĞÒÅÄÅÌÉÔØ ÅÇÏ!\n"
 
 #: env.c:169
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "ğÙÔÁÅÍÓÑ ĞÒÏÄÏÌÖÉÔØ Ó ÎÅÏĞÒÅÄÅÌ£ÎÎÙÍ ÉÍÅÎÅÍ ÈÏÓÔÁ.\n"
-"îå óïïâıáêôå Ï ÎÁÒÕÛÅÎÎÙÈ ÚÁÇÏÌÏ×ËÁÈ Received:, ÓÔÒÏËÁÈ HELO/EHLO ÉÌÉ ĞÏÄÏÂÎÙÈ ĞÒÏÂÌÅÍÁÈ!\n"
+"îå óïïâıáêôå Ï ÎÁÒÕÛÅÎÎÙÈ ÚÁÇÏÌÏ×ËÁÈ Received:, ÓÔÒÏËÁÈ HELO/EHLO ÉÌÉ "
+"ĞÏÄÏÂÎÙÈ ĞÒÏÂÌÅÍÁÈ!\n"
 "÷ÍÅÓÔÏ ÜÔÏÇÏ éóğòá÷øôå Ó×ÏÊ /etc/hosts, DNS, NIS ÉÌÉ LDAP.\n"
 
 #: etrn.c:47 odmr.c:58
@@ -659,7 +681,8 @@ msgstr "fetchmail: ÄÒÕÇÉÅ ÚÁĞÕİÅÎÎÙÅ fetchmail ÏÔÓÕÔÓÔ×ÕÀÔ\n"
 #: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: ÏÛÉÂËÁ ÏÓÔÁÎÏ×ËÉ %s fetchmail ÎÁ %d; ×ÙÎÕÖÄÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ.\n"
+msgstr ""
+"fetchmail: ÏÛÉÂËÁ ÏÓÔÁÎÏ×ËÉ %s fetchmail ÎÁ %d; ×ÙÎÕÖÄÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ.\n"
 
 #: fetchmail.c:400 fetchmail.c:409
 msgid "background"
@@ -675,13 +698,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail ÎÁ %d ÏÓÔÁÎÏ×ÌÅÎ.\n"
 
 #: fetchmail.c:431
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏ×ÅÒÉÔØ ĞÏŞÔÕ, ĞÏËÁ ÎÁ ÔÏÍ ÖÅ ÈÏÓÔÅ ÚÁĞÕİÅÎ ÄÒÕÇÏÊ fetchmail.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏ×ÅÒÉÔØ ĞÏŞÔÕ, ĞÏËÁ ÎÁ ÔÏÍ ÖÅ ÈÏÓÔÅ ÚÁĞÕİÅÎ ÄÒÕÇÏÊ "
+"fetchmail.\n"
 
 #: fetchmail.c:437
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ÏĞÒÏÓÉÔØ ÕËÁÚÁÎÎÙÅ ÈÏÓÔÙ ÉÚ-ÚÁ ÄÒÕÇÏÇÏ fetchmail, ÚÁĞÕİÅÎÎÏÇÏ ÎÁ %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ÏĞÒÏÓÉÔØ ÕËÁÚÁÎÎÙÅ ÈÏÓÔÙ ÉÚ-ÚÁ ÄÒÕÇÏÇÏ fetchmail, "
+"ÚÁĞÕİÅÎÎÏÇÏ ÎÁ %d.\n"
 
 #: fetchmail.c:444
 #, c-format
@@ -689,8 +719,10 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ÎÁ %d ÚÁĞÕİÅÎ ÄÒÕÇÏÊ ĞÒÉÏÒÉÔÅÔÎÙÊ fetchmail.\n"
 
 #: fetchmail.c:454
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÉÍÅÎÉÔØ ÏĞÃÉÉ, ĞÏËÁ ÚÁĞÕİÅÎ ÆÏÎÏ×ÙÊ fetchmail.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÉÍÅÎÉÔØ ÏĞÃÉÉ, ĞÏËÁ ÚÁĞÕİÅÎ ÆÏÎÏ×ÙÊ fetchmail.\n"
 
 #: fetchmail.c:460
 #, c-format
@@ -700,7 +732,9 @@ msgstr "fetchmail: ÎÁ %d ÉÚ ÆÏÎÏ×ÏÇÏ ÒÅÖÉÍÁ ×ÅÒÎÕÌÓÑ  fetchmail.\n"
 #: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: ÎÁ %d ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ ÂÏÌÅÅ ÓÔÁÒÛÉÊ ĞÒÏÃÅÓÓ ÔÏÇÏ ÖÅ ÕÒÏ×ÎÑ.\n"
+msgstr ""
+"fetchmail: ÎÁ %d ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ ÂÏÌÅÅ ÓÔÁÒÛÉÊ ĞÒÏÃÅÓÓ ÔÏÇÏ ÖÅ "
+"ÕÒÏ×ÎÑ.\n"
 
 #: fetchmail.c:487
 #, c-format
@@ -734,7 +768,9 @@ msgstr "ĞÅÒÅÚÁĞÕÓËÁÅÔÓÑ fetchmail (%s ÉÚÍÅÎÅÎ)\n"
 
 #: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "ĞÏĞÙÔËÁ ĞÅÒÅÚÁĞÕÓËÁ ÍÏÖÅÔ ÚÁ×ÅÒÛÉÔØÓÑ ÎÅÕÄÁŞÅÊ, Ô.Ë. ËÁÔÁÌÏÇ ÎÅ ÂÙÌ ×ÏÓÓÔÁÎÏ×ÌÅÎ\n"
+msgstr ""
+"ĞÏĞÙÔËÁ ĞÅÒÅÚÁĞÕÓËÁ ÍÏÖÅÔ ÚÁ×ÅÒÛÉÔØÓÑ ÎÅÕÄÁŞÅÊ, Ô.Ë. ËÁÔÁÌÏÇ ÎÅ ÂÙÌ "
+"×ÏÓÓÔÁÎÏ×ÌÅÎ\n"
 
 #: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
@@ -743,7 +779,8 @@ msgstr "ĞÏĞÙÔËÁ ĞÅÒÅÚÁĞÕÓÔÉÔØ  fetchmail ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ\n"
 #: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "ÏĞÒÏÓ %s ĞÒÏĞÕİÅÎ (ÏÛÉÂËÁ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÉÌÉ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÔÁÊÍ-ÁÕÔÏ×)\n"
+msgstr ""
+"ÏĞÒÏÓ %s ĞÒÏĞÕİÅÎ (ÏÛÉÂËÁ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÉÌÉ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÔÁÊÍ-ÁÕÔÏ×)\n"
 
 #: fetchmail.c:652
 #, c-format
@@ -851,619 +888,664 @@ msgstr "ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÍÎÏÇÏËÒÁÔÎÙÅ ÓÓÙÌËÉ ÎÁ ÈÏÓÔ %s × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ\n"
 
 #: fetchmail.c:1029
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: ïÛÉÂËÁ: ÍÎÏÇÏËÒÁÔÎÙÅ ÚÁĞÉÓÉ \"defaults\" × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ.\n"
+msgstr ""
+"fetchmail: ïÛÉÂËÁ: ÍÎÏÇÏËÒÁÔÎÙÅ ÚÁĞÉÓÉ \"defaults\" × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ.\n"
 
-#: fetchmail.c:1151
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "ğÏÄÄÅÒÖËÁ SSL ÎÅ ÂÙÌÁ ×ËÌÀŞÅÎÁ ĞÒÉ ËÏÍĞÉÌÑÃÉÉ.\n"
 
-#: fetchmail.c:1182
+#: fetchmail.c:1180
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÎÅ ÄÏÓÔÕĞÅÎ DNS ÄÌÑ ĞÒÏ×ÅÒËÉ ÍÎÏÇÏËÁÎÁÌØÎÏÊ ×ÙÂÏÒËÉ ÉÚ %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÎÅ ÄÏÓÔÕĞÅÎ DNS ÄÌÑ ĞÒÏ×ÅÒËÉ ÍÎÏÇÏËÁÎÁÌØÎÏÊ "
+"×ÙÂÏÒËÉ ÉÚ %s\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: multidrop ÄÌÑ %s ÔÒÅÂÕÅÔ ÏĞÃÉÀ envelope!\n"
 
-#: fetchmail.c:1194
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: îÅ ĞÒÏÓÉÔÅ ÔÅÈÎÉŞÅÓËÏÊ ĞÏÄÄÅÒÖËÉ, ÅÓÌÉ ×ÓÅ ÓÏÏÂİÅÎÉÑ ÏÔĞÒÁ×ÌÑÀÔÓÑ ĞÏÓÔÍÁÓÔÅÒÕ!\n"
+msgstr ""
+"ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: îÅ ĞÒÏÓÉÔÅ ÔÅÈÎÉŞÅÓËÏÊ ĞÏÄÄÅÒÖËÉ, ÅÓÌÉ ×ÓÅ ÓÏÏÂİÅÎÉÑ "
+"ÏÔĞÒÁ×ÌÑÀÔÓÑ ĞÏÓÔÍÁÓÔÅÒÕ!\n"
 
-#: fetchmail.c:1211
+#: fetchmail.c:1209
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÕËÁÖÉÔÅ ĞÏÌÏÖÉÔÅÌØÎÙÊ ÎÏÍÅÒ ĞÏÒÔÁ ÄÌÑ ÓÌÕÖÂÙ\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÕËÁÖÉÔÅ ĞÏÌÏÖÉÔÅÌØÎÙÊ ÎÏÍÅÒ ĞÏÒÔÁ ÄÌÑ "
+"ÓÌÕÖÂÙ\n"
 
-#: fetchmail.c:1218
+#: fetchmail.c:1216
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÄÌÑ RPOP ÔÒÅÂÕÅÔÓÑ ĞÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÊ ĞÏÒÔ\n"
+msgstr ""
+"fetchmail: ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÄÌÑ RPOP ÔÒÅÂÕÅÔÓÑ ĞÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÊ "
+"ĞÏÒÔ\n"
 
-#: fetchmail.c:1236
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, LMTP ÎÅ ÍÏÖÅÔ ÉÓĞÏÌØÚÏ×ÁÔØ ĞÏÒÔ SMTP ĞÏ ÕÍÏÌŞÁÎÉÀ\n"
+msgstr ""
+"ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, LMTP ÎÅ ÍÏÖÅÔ ÉÓĞÏÌØÚÏ×ÁÔØ ĞÏÒÔ SMTP ĞÏ ÕÍÏÌŞÁÎÉÀ\n"
 
-#: fetchmail.c:1250
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "úÁĞÕÓËÁÔØ fetchall, ÏÓÔÁ×ÌÑÑ ÅÇÏ ĞÒÉ ÜÔÏÍ × ÒÅÖÉÍÅ ÄÅÍÏÎÁ, ÎÅÌØÚÑ!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ÚÁ×ÅÒÛÅÎ ĞÏ ÓÉÇÎÁÌÕ %d\n"
 
-#: fetchmail.c:1385
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ÚÁĞÒÁÛÉ×ÁÅÔ %s (ĞÒÏÔÏËÏÌ %s) ÎÁ %s: ÏĞÒÏÓ ÎÁŞÁÔ\n"
 
-#: fetchmail.c:1410
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ POP2 ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1422
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ POP3 ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ IMAP ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ ETRN ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ ODMR ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1453
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "×ÙÂÒÁÎ ÎÅĞÏÄÄÅÒÖÉ×ÁÅÍÙÊ ĞÒÏÔÏËÏÌ.\n"
 
-#: fetchmail.c:1463
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ÚÁĞÒÁÛÉ×ÁÅÔ %s (ĞÒÏÔÏËÏÌ %s) ÎÁ %s: ÏĞÒÏÓ ÚÁ×ÅÒÛÅÎ\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "éÎÔÅÒ×ÁÌ ÏĞÒÏÓÁ - %d ÓÅËÕÎÄ\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "ìÏÇ-ÆÁÊÌ - %s\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-ÆÁÊÌ - %s\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "ïÂÒÁÂÏÔËÁ ÓÏÏÂİÅÎÉÊ ÂÕÄÅÔ ÒÅÇÉÓÔÒÉÒÏ×ÁÔØÓÑ ŞÅÒÅÚ syslog\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ÓÙÍÉÔÉÒÕÅÔ É ÎÅ ÓÏÚÄÁÓÔ Received\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr "Fetchmail ÂÕÄÅÔ ÏÔÏÂÒÁÖÁÔØ ÔÏŞÅŞÎÕÀ ÓÔÒÏËÕ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ.\n"
+msgstr ""
+"Fetchmail ÂÕÄÅÔ ÏÔÏÂÒÁÖÁÔØ ÔÏŞÅŞÎÕÀ ÓÔÒÏËÕ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ.\n"
 
-#: fetchmail.c:1494
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ĞÅÒÅÁÄÒÅÓÕÅÔ ÍÎÏÇÏËÁÎÁÌØÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÅÚ ÁÄÒÅÓÁ ÎÁ %s.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ÎÁĞÒÁ×ÉÔ ÏÛÉÂÏŞÎÏÅ ĞÉÓØÍÏ ĞÏÓÔÍÁÓÔÅÒÕ.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ÎÁĞÒÁ×ÉÔ ÏÛÉÂÏŞÎÏÅ ĞÉÓØÍÏ ÏÔĞÒÁ×ÉÔÅÌÀ.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "ğÁÒÁÍÅÔÒÙ ÄÌÑ ĞÏÌÕŞÅÎÉÑ ÉÚ %s@%s:\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ğÏŞÔÁ ÂÕÄÅÔ ĞÏÌÕŞÅÎÁ ŞÅÒÅÚ %s\n"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1512
 #, 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:1518
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  îÁÓÔÏÑİÅÅ ÉÍÑ ÓÅ×ÅÒÁ - %s.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1519
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ëÏÇÄÁ ÈÏÓÔ ÎÅ ÕËÁÚÁÎ, ÜÔÏÔ ÈÏÓÔ ÎÅ ÂÕÄÅÔ ÚÁĞÒÏÛÅÎ.\n"
 
-#: fetchmail.c:1522
+#: fetchmail.c:1520
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ëÏÇÄÁ ÈÏÓÔ ÎÅ ÕËÁÚÁÎ, ÂÕÄÅÔ ÚÁĞÒÏÛÅÎ ÜÔÏÔ ÈÏÓÔ.\n"
 
-#: fetchmail.c:1526
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  âÕÄÅÔ ÚÁÔÒÅÂÏ×ÁÎ ĞÁÒÏÌØ.\n"
 
-#: fetchmail.c:1530
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  óÅËÒÅÔ APOP = \"%s\".\n"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ğÁÒÏÌØ = \"%s\".\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  ğÒÏÔÏËÏÌ - KPOP Ó ÁÕÔÅÎÔÉÆÉËÁÃÉÅÊ Kerberos %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  ğÒÏÔÏËÏÌ - %s"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (ÉÓĞÏÌØÚÕÅÔÓÑ ÓÌÕÖÂÁ %s)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (ÉÓĞÏÌØÚÕÅÔÓÑ ĞÏÒÔ ĞÏ ÕÍÏÌŞÁÎÉÀ)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (ĞÒÉÎÕÄÉÔÅÌØÎÏ ÉÓĞÏÌØÚÕÅÔÓÑ UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  âÕÄÕÔ ÉÓĞÒÏÂÏ×ÁÎÙ ×ÓÅ ÄÏÓÔÕĞÎÙÅ ÓĞÏÓÏÂÙ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Ó ĞÁÒÏÌÅÍ.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1564
 msgid "  MSN authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ MSN.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ NTLM.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ OTP.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ CRAM-Md5.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ GSSAPI.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Kerberos V4.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Kerberos V5.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  äÏĞÕÓËÁÅÔÓÑ ÏĞÅÒÁÔÉ×ÎÏÅ ÛÉÆÒÏ×ÁÎÉÅ.\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ğÒÉÎÃÉĞÁÌ ĞÏŞÔÏ×ÏÊ ÓÌÕÖÂÙ: %s\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ÷ËÌÀŞÅÎÙ ÓÅÓÓÉÉ, ÚÁÛÉÆÒÏ×ÁÎÎÙÅ SSL.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ğÒÏÔÏËÏÌ SSL: %s.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  ÷ËÌÀŞÅÎÁ ĞÒÏ×ÅÒËÁ ÓÅÒÔÉÆÉËÁÔÁ ÓÅÒ×ÅÒÁ SSL.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ëÁÔÁÌÏÇ ÄÏ×ÅÒÅÎÎÙÈ ÓÅÒÔÉÆÉËÁÔÏ× SSL: %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ïÔĞÅŞÁÔÏË ËÌÀŞÁ SSL (Ó×ÅÒÅÎÎÙÊ Ó ËÌÀŞÏÍ ÓÅÒ×ÅÒÁ): %s\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ôÁÊÍÁÕÔ ÍÏÌŞÁÎÉÑ ÓÅÒ×ÅÒÁ - %d ÓÅËÕÎÄ"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (ĞÏ ÕÍÏÌŞÁÎÉÀ).\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  ÷ÙÂÒÁÎ ĞÏŞÔÏ×ÙÊ ÑİÉË ĞÏ ÕÍÏÌŞÁÎÉÀ.\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ĞÏŞÔÏ×ÙÅ ÑİÉËÉ:"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1624
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  âÕÄÕÔ ĞÏÌÕŞÅÎÙ ×ÓÅ ÓÏÏÂİÅÎÉÑ (--all on).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1625
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  âÕÄÕÔ ĞÏÌÕŞÅÎÙ ÔÏÌØËÏ ÎÏ×ÙÅ ÓÏÏÂİÅÎÉÑ (--all off).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1627
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÏÓÔÁ×ÌÅÎÙ ÎÁ ÓÅÒ×ÅÒÅ (--keep on).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1628
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ Ó ÓÅÒ×ÅÒÁ (--keep off).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1630
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush on).\n"
+msgstr ""
+"  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush on).\n"
+
+#: fetchmail.c:1631
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÎÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush "
+"off).\n"
 
 #: fetchmail.c:1633
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÎÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush off).\n"
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  óÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--"
+"limitflush on).\n"
 
-#: fetchmail.c:1635
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  óÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--limitflush on).\n"
+#: fetchmail.c:1634
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  óÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÎÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ "
+"(--limitflush  off).\n"
 
 #: fetchmail.c:1636
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  óÏÏÂİÅÎÉÑ ÚÁ×ÙÛÅÎÎÏÇÏ ÒÁÚÍÅÒÁ ÎÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--limitflush  off).\n"
-
-#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  ğÅÒÅÚÁĞÉÓØ ÌÏËÁÌØÎÙÈ ÁÄÒÅÓÏ× ÓÅÒ×ÅÒÁ ×ËÌÀŞÅÎÁ (--norewrite off).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1637
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  ğÅÒÅÚÁĞÉÓØ ÌÏËÁÌØÎÙÈ ÁÄÒÅÓÏ× ÓÅÒ×ÅÒÁ ×ÙËÌÀŞÅÎÁ (--norewrite on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1639
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  õÄÁÌÅÎÉÅ ×ÏÚ×ÒÁÔÁ ËÁÒÅÔËÉ ×ËÌÀŞÅÎÏ (stripcr on).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1640
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  õÄÁÌÅÎÉÅ ×ÏÚ×ÒÁÔÁ ËÁÒÅÔËÉ ×ÙËÌÀŞÅÎÏ (stripcr off).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1642
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ğÒÉÎÕÄÉÔÅÌØÎÙÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ ×ËÌÀŞÅÎ (forcecr on).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1643
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  ğÒÉÎÕÄÉÔÅÌØÎÙÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ ×ÙËÌÀŞÅÎ (forcecr off).\n"
 
-#: fetchmail.c:1647
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ÙËÌÀŞÅÎÁ (pass8bits on).\n"
+#: fetchmail.c:1645
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ÙËÌÀŞÅÎÁ (pass8bits on).\n"
 
-#: fetchmail.c:1648
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ËÌÀŞÅÎÁ (pass8bits off).\n"
+#: fetchmail.c:1646
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ËÌÀŞÅÎÁ (pass8bits off).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1648
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-ÄÅËÏÄÉÒÏ×ÁÎÉÅ ×ËÌÀŞÅÎÏ (mimedecode on).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1649
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-ÄÅËÏÄÉÒÏ×ÁÎÉÅ ×ÙËÌÀŞÅÎÏ (mimedecode off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1651
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ğÒÏÓÔÏÊ ĞÏÓÌÅ ÏĞÒÏÓÁ ×ËÌÀŞÅÎ (idle on).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1652
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ğÒÏÓÔÏÊ ĞÏÓÌÅ ÏĞÒÏÓÁ ×ÙËÌÀŞÅÎ (idle off).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1654
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  îÅĞÕÓÔÙÅ ÓÔÒÏËÉ ÓÏÓÔÏÑÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ (dropstatus on)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1655
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  îÅĞÕÓÔÙÅ ÓÔÒÏËÉ ÓÏÓÔÏÑÎÉÑ ÂÕÄÕÔ ÓÏÈÒÁÎÅÎÙ (dropstatus off)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1657
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  óÔÒÏËÉ Delivered-To ÂÕÄÕÔ ÕÄÁÌÅÎÙ (dropdelivered on)\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1658
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  óÔÒÏËÉ Delivered-To ÂÕÄÕÔ ÓÏÈÒÁÎÅÎÙ (dropdelivered off)\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ ÓÏÏÂİÅÎÉÑ - %d ÏËÔÅÔÏ× (--limit %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ÓÏÏÂİÅÎÉÑ (--limit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ĞÒÅÄÕĞÒÅÖÄÅÎÉÑÍÉ Ï ÒÁÚÍÅÒÅ ÓÏÏÂİÅÎÉÑ - %d ÓÅËÕÎÄ (--warnings %d).\n"
+msgstr ""
+"  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ĞÒÅÄÕĞÒÅÖÄÅÎÉÑÍÉ Ï ÒÁÚÍÅÒÅ ÓÏÏÂİÅÎÉÑ - %d ÓÅËÕÎÄ (--"
+"warnings %d).\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ğÒÅÄÕĞÒÅÖÄÅÎÉÑ Ï ÒÁÚÍÅÒÅ ĞÒÉ ËÁÖÄÏÍ ÏĞÒÏÓÅ (--warnings 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ĞÏÌÕŞÅÎÎÙÅ ÓÏÏÂİÅÎÉÑ - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÏÌÕŞÅÎÎÙÅ ÓÏÏÂİÅÎÉÑ (--fetchlimit 0).\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1678
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ - %d (--fetchsizelimit %d).\n"
+msgstr ""
+"  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1681
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl -1).\n"
+msgstr ""
+"  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl -1).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ %d ÉÚ %d ÏĞÒÏÓÏ× (--fastuidl %d).\n"
+msgstr ""
+"  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ %d ÉÚ %d ÏĞÒÏÓÏ× (--fastuidl %"
+"d).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   ÷ÙĞÏÌÎÑÔØ ÌÉÎÅÊÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl 0).\n"
+msgstr ""
+"   ÷ÙĞÏÌÎÑÔØ ÌÉÎÅÊÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl 0).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ĞÁËÅÔ SMTP-ÓÏÏÂİÅÎÉÊ - %d.\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÁËÅÔ SMTP-ÓÏÏÂİÅÎÉÊ (--batchlimit 0).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ÕÄÁÌÅÎÉÑÍÉ ĞÒÉÎÕÄÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÌÅÎ × %d (--expunge %d).\n"
+msgstr ""
+"  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ÕÄÁÌÅÎÉÑÍÉ ĞÒÉÎÕÄÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÌÅÎ × %d (--expunge %d).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  îÅÔ ĞÒÉÎÕÄÉÔÅÌØÎÙÈ ÕÄÁÌÅÎÉÊ (--expunge 0).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  äÏÍÅÎÙ, ÄÌÑ ËÏÔÏÒÙÈ ÂÕÄÅÔ ×ÙĞÏÌÎÑÔØÓÑ ×ÙÂÏÒËÁ ĞÏŞÔÙ:"
 
-#: fetchmail.c:1714 fetchmail.c:1734
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (ĞÏ ÕÍÏÌŞÁÎÉÀ)"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ĞÒÉËÒÅĞÌÅÎÙ Ë %s ËÁË BSMTP\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÄÏÓÔÁ×ÌÅÎÙ Ó \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ĞÅÒÅÁÄÒÅÓÏ×ÁÎÙ ĞÏ %cMTP ÎÁ:"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  şÁÓÔØ ÈÏÓÔÁ ÉÚ ÓÔÒÏËÉ MAIL FROM ÂÕÄÅÔ %s\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  áÄÒÅÓ, ×ÓÔÁ×ÌÑÅÍÙÊ × ÓÔÒÏËÉ RCPT TO, ÏÔĞÒÁ×ÌÑÅÍÙÅ ĞÏ SMTP, ÂÕÄÅÔ %s\n"
+msgstr ""
+"  áÄÒÅÓ, ×ÓÔÁ×ÌÑÅÍÙÊ × ÓÔÒÏËÉ RCPT TO, ÏÔĞÒÁ×ÌÑÅÍÙÅ ĞÏ SMTP, ÂÕÄÅÔ %s\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  ïÔ×ÅÔÎÙÅ ÄÅÊÓÔ×ÉÑ ÎÁ ÒÁÓĞÏÚÎÁÎÎÙÅ ÓÌÕÛÁÔÅÌÅÍ ÓĞÁÍ-ÂÌÏËÉ:"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  âÌÏËÉÒÏ×ËÁ ÓĞÁÍÁ ÏÔËÌÀŞÅÎÁ\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ Ë ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ Ó \"%s\".\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  îÅÔ ËÏÍÁÎÄÙ, ×ÙĞÏÌÎÑÅÍÏÊ ÄÏ ÓÏÅÄÉÎÅÎÉÑ.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ Ë ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÒÁÚÏÒ×ÁÎÏ Ó \"%s\".\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  îÅÔ ËÏÍÁÎÄÙ, ×ÙĞÏÌÎÑÅÍÏÊ ĞÏÓÌÅ ÓÏÅÄÉÎÅÎÉÑ.\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  îÅÔ ÌÏËÁÌØÎÙÈ ÉÍÅÎ, ÏÂßÑ×ÌÅÎÎÙÈ ÄÌÑ ÜÔÏÇÏ ÈÏÓÔÁ.\n"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  íÎÏÇÏËÁÎÁÌØÎÙÊ ÒÅÖÉÍ:"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  ïÄÎÏËÁÎÁÌØÎÙÊ ÒÅÖÉÍ: "
 
-#: fetchmail.c:1785
+#: fetchmail.c:1783
 #, 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:1800
+#: fetchmail.c:1798
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-ÚÁĞÒÏÓ ÄÌÑ ÍÎÏÇÏËÁÎÁÌØÎÙÈ ÁÄÒÅÓÏ× ×ËÌÀŞÅÎ.\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-ÚÁĞÒÏÓ ÄÌÑ ÍÎÏÇÏËÁÎÁÌØÎÙÈ ÁÄÒÅÓÏ× ×ÙËÌÀŞÅÎ.\n"
 
-#: fetchmail.c:1805
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  áÌÉÓÙ ÓÅÒ×ÅÒÁ ÂÕÄÕÔ ÓÒÁ×ÎÅÎÙ Ó ÍÎÏÇÏËÁÎÁÌØÎÙÍÉ ÁÄÒÅÓÁÍÉ ĞÏ IP-ÁÄÒÅÓÕ.\n"
+#: fetchmail.c:1803
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  áÌÉÓÙ ÓÅÒ×ÅÒÁ ÂÕÄÕÔ ÓÒÁ×ÎÅÎÙ Ó ÍÎÏÇÏËÁÎÁÌØÎÙÍÉ ÁÄÒÅÓÁÍÉ ĞÏ IP-ÁÄÒÅÓÕ.\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1805
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  áÌÉÓÙ ÓÅÒ×ÅÒÁ ÂÕÄÕÔ ÓÒÁ×ÎÅÎÙ Ó ÍÎÏÇÏËÁÎÁÌØÎÙÍÉ ÁÄÒÅÓÁÍÉ ĞÏ ÉÍÅÎÉ.\n"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  íÁÒÛÒÕÔÉÚÁÃÉÑ ÏÈ×ÁÔÙ×ÁÀİÅÇÏ ÁÄÒÅÓÁ ÏÔËÌÀŞÅÎÁ\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  ïÈ×ÁÔÙ×ÁÀİÉÊ ÚÁÇÏÌÏ×ÏË ÄÏÌÖÅÎ ÂÙÔØ: %s\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1814
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  ëÏÌÉŞÅÓÔ×Ï ĞÒÏĞÕÓËÁÅÍÙÈ ÏÈ×ÁÔÙ×ÁÀİÉÈ ÚÁÇÏÌÏ×ËÏ×: %d\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  ğÒÅÆÉËÓ %s ÂÕÄÅÔ ÕÄÁÌÅÎ ÉÚ id ĞÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  îÅÔ ÒÁÚÂÏÒËÉ ĞÒÅÆÉËÓÁ\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  òÁÎÅÅ ÏÂßÑ×ÌÅÎÎÙÅ ÁÌÉÁÓÙ ĞÏŞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ:"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  ìÏËÁÌØÎÙÅ ÄÏÍÅÎÙ:"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ %s.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÙ ÔÒÅÂÏ×ÁÎÉÑ ÉÎÔÅÒÆÅÊÓÁ.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ãÉËÌ ÏĞÒÏÓÁ ÂÕÄÅÔ ÎÁÂÌÀÄÁÔØ ÚÁ %s.\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎ ÉÎÔÅÒÆÅÊÓ ÍÏÎÉÔÏÒÁ.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  ğÏÄËÌÀŞÅÎÉÑ Ë ÓÅÒ×ÅÒÕ ÂÕÄÕÔ ×ÙĞÏÌÎÑÔØÓÑ ĞÏÓÒÅÄÓÔ×ÏÍ ĞÌÁÇÉÎÁ %s (--plugin %s).\n"
+msgstr ""
+"  ğÏÄËÌÀŞÅÎÉÑ Ë ÓÅÒ×ÅÒÕ ÂÕÄÕÔ ×ÙĞÏÌÎÑÔØÓÑ ĞÏÓÒÅÄÓÔ×ÏÍ ĞÌÁÇÉÎÁ %s (--plugin %"
+"s).\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÁ ËÏÍÁÎÄÁ ĞÌÁÇÉÎÁ.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  ğÏÄËÌÀŞÅÎÉÑ ÓÌÕÛÁÔÅÌÑ ÂÕÄÕÔ ×ÙĞÏÌÎÑÔØÓÑ ŞÅÒÅÚ plugout %s (--plugout %s).\n"
+msgstr ""
+"  ğÏÄËÌÀŞÅÎÉÑ ÓÌÕÛÁÔÅÌÑ ÂÕÄÕÔ ×ÙĞÏÌÎÑÔØÓÑ ŞÅÒÅÚ plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÁ ËÏÍÁÎÄÁ plugout'Á.\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ó ÜÔÏÇÏ ÈÏÓÔÁ ÎÅÔ ÓÏÈÒÁÎÅÎÎÙÈ UID'Ï×.\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  óÏÈÒÁÎÅÎÏ %d UID'Ï×.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr "  éÎÆÏÒÍÁÃÉÑ Ó ÔÒÁÓÓÉÒÏ×ËÏÊ ÏĞÒÏÓÁ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ÚÁÇÏÌÏ×ÏË Received.\n"
+msgstr ""
+"  éÎÆÏÒÍÁÃÉÑ Ó ÔÒÁÓÓÉÒÏ×ËÏÊ ÏĞÒÏÓÁ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ÚÁÇÏÌÏ×ÏË Received.\n"
 
-#: fetchmail.c:1888
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1471,7 +1553,7 @@ msgstr ""
 "  éÎÆÏÒÍÁÃÉÑ Ó ÔÒÁÓÓÉÒÏ×ËÏÊ ÏĞÒÏÓÁ ÎÅ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ÚÁÇÏÌÏ×ÏË Received.\n"
 ".\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ó×ÏÊÓÔ×Á ÒÅÔÒÁÎÓÌÑÃÉÉ \"%s\".\n"
@@ -1545,84 +1627,86 @@ msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÙÈ ÄÁÎÎÙÈ\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ĞÏÔÏË ĞÒÉÏÓÔÁÎÏ×ÌÅÎ × ÔÅŞÅÎÉÅ %d ÓÅËÕÎÄ.\n"
 
-#: imap.c:298
+#: imap.c:306
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP4 ÒÅ×ÉÚÉÑ 1\n"
 
-#: imap.c:304
+#: imap.c:312
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP4 ÒÅ×ÉÚÉÑ 0\n"
 
-#: imap.c:311
+#: imap.c:319
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP2 ÉÌÉ IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:334
 msgid "will idle after poll\n"
 msgstr "ÂÕÄÅÔ ĞÒÉÏÓÔÁÎÏ×ÌÅÎ ĞÏÓÌÅ ÏĞÒÏÓÁ\n"
 
-#: imap.c:482
+#: imap.c:490
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail ÏÔËÏÍĞÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ĞÏÄÄÅÒÖËÉ OTP\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:512 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail ÏÔËÏÍĞÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ĞÏÄÄÅÒÖËÉ NTLM\n"
 
-#: imap.c:513
+#: imap.c:521
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "ôÒÅÂÕÅÍÁÑ ÏĞÃÉÑ LOGIN ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÓÅÒ×ÅÒÏÍ\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:682 imap.c:715
 msgid "re-poll failed\n"
 msgstr "ĞÏ×ÔÏÒÎÙÊ ÏĞÒÏÓ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:682
+#: imap.c:690
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÅ ĞÏÓÌÅ ĞÏ×ÔÏÒÎÏÇÏ ÏĞÒÏÓÁ\n"
 msgstr[1] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÊ ĞÏÓÌÅ ĞÏ×ÔÏÒÎÏÇÏ ÏĞÒÏÓÁ\n"
 
-#: imap.c:694
+#: imap.c:702
 msgid "mailbox selection failed\n"
 msgstr "×ÙÂÏÒ ĞÏŞÔÏ×ÏÇÏ ÑİÉËÁ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:698
+#: imap.c:706
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÅ ĞÏÓÌÅ ĞÅÒ×ÏÇÏ ÏĞÒÏÓÁ\n"
 msgstr[1] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÊ ĞÏÓÌÅ ĞÅÒ×ÏÇÏ ÏĞÒÏÓÁ\n"
 
-#: imap.c:722
+#: imap.c:730
 msgid "expunge failed\n"
 msgstr "ÕÄÁÌÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:726
+#: imap.c:734
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÅ ĞÏÓÌÅ ÕÄÁÌÅÎÉÑ\n"
 msgstr[1] "ÏÖÉÄÁÅÔÓÑ %d ÓÏÏÂİÅÎÉÊ ĞÏÓÌÅ ÕÄÁÌÅÎÉÑ\n"
 
-#: imap.c:751
+#: imap.c:759
 msgid "search for unseen messages failed\n"
 msgstr "ĞÏÉÓË ÎÅ ĞÒÏÓÍÏÔÒÅÎÎÙÈ ÓÏÏÂİÅÎÉÊ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
+#: imap.c:789 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ÎÅ ĞÒÏÓÍÏÔÒÅÎÏ\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:801 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ĞÅÒ×ÏÅ ÎÅ ĞÒÏÓÍÏÔÒÅÎÎÏÅ\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÔÅÒÆÅÊÓ kvm. õÂÅÄÉÔÅÓØ, ŞÔÏ fetchmail Ñ×ÌÑÅÔÓÑ SGID kmem."
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÔÅÒÆÅÊÓ kvm. õÂÅÄÉÔÅÓØ, ŞÔÏ fetchmail Ñ×ÌÑÅÔÓÑ SGID "
+"kmem."
 
 #: interface.c:396
 #, c-format
@@ -1868,7 +1952,8 @@ msgstr "  -s, --silent      ÒÁÂÏÔÁ ÂÅÚ ÌÉÛÎÅÊ ÉÎÆÏÒÍÁÃÉÉ\n"
 
 #: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr "  -v, --verbose     ÒÁÂÏÔÁ Ó ĞÏÄÒÏÂÎÙÍ ×Ù×ÏÄÏÍ ÄÉÁÇÎÏÓÔÉŞÅÓËÉÈ ÄÁÎÎÙÈ\n"
+msgstr ""
+"  -v, --verbose     ÒÁÂÏÔÁ Ó ĞÏÄÒÏÂÎÙÍ ×Ù×ÏÄÏÍ ÄÉÁÇÎÏÓÔÉŞÅÓËÉÈ ÄÁÎÎÙÈ\n"
 
 #: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
@@ -1887,8 +1972,12 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ÕËÁÚÁÎÉÅ ÉÍÅÎÉ log-ÆÁÊÌÁ\n"
 
 #: options.c:585
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      ÉÓĞÏÌØÚÏ×ÁÎÉÅ syslog(3) ÄÌÑ ÂÏÌØÛÉÎÓÔ×Á ÓÏÏÂİÅÎÉÊ, ËÏÇÄÁ ÚÁĞÕİÅÎ ËÁË ÄÅÍÏÎ\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      ÉÓĞÏÌØÚÏ×ÁÎÉÅ syslog(3) ÄÌÑ ÂÏÌØÛÉÎÓÔ×Á ÓÏÏÂİÅÎÉÊ, ËÏÇÄÁ "
+"ÚÁĞÕİÅÎ ËÁË ÄÅÍÏÎ\n"
 
 #: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
@@ -1908,7 +1997,8 @@ msgstr "      --postmaster  ÕËÁÚÁÎÉÅ ĞÏÌÕŞÁÔÅÌÑ ÎÁ ËÒÁÊÎÉÊ ÓÌÕŞÁÊ\n"
 
 #: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    ĞÅÒÅÎÁĞÒÁ×ÌÅÎÉÅ ÒÉËÏÛÅÔÏ× ĞÏÌØÚÏ×ÁÔÅÌÅÊ Ë ĞÏÓÔÍÁÓÔÅÒÕ.\n"
+msgstr ""
+"      --nobounce    ĞÅÒÅÎÁĞÒÁ×ÌÅÎÉÅ ÒÉËÏÛÅÔÏ× ĞÏÌØÚÏ×ÁÔÅÌÅÊ Ë ĞÏÓÔÍÁÓÔÅÒÕ.\n"
 
 #: options.c:592
 msgid "  -I, --interface   interface required specification\n"
@@ -1935,20 +2025,28 @@ msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ĞÕÔØ Ë ÓÅÒÔÉÆÉËÁÔÁÍ ssl\n"
 
 #: options.c:600
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint ÏÔĞÅŞÁÔÏË, ËÏÔÏÒÙÊ ÄÏÌÖÅÎ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÅÒÔÉÆÉËÁÔÕ ÓÅÒ×ÅÒÁ.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint ÏÔĞÅŞÁÔÏË, ËÏÔÏÒÙÊ ÄÏÌÖÅÎ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÅÒÔÉÆÉËÁÔÕ "
+"ÓÅÒ×ÅÒÁ.\n"
 
 #: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
-msgstr "      --sslproto    ĞÒÉÎÕÄÉÔÅÌØÎÏÅ ÉÓĞÏÌØÚÏ×ÁÎÉÅ ĞÒÏÔÏËÏÌÁ ssl (ssl2/ssl3/tls1)\n"
+msgstr ""
+"      --sslproto    ĞÒÉÎÕÄÉÔÅÌØÎÏÅ ÉÓĞÏÌØÚÏ×ÁÎÉÅ ĞÒÏÔÏËÏÌÁ ssl (ssl2/ssl3/"
+"tls1)\n"
 
 #: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      ÕËÁÚÁÎÉÅ ×ÎÅÛÎÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÏÅÄÉÎÅÎÉÑ\n"
+msgstr ""
+"      --plugin      ÕËÁÚÁÎÉÅ ×ÎÅÛÎÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÏÅÄÉÎÅÎÉÑ\n"
 
 #: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     ÕËÁÚÁÎÉÅ ×ÎÅÛÎÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÏÅÄÉÎÅÎÉÑ smtp\n"
+msgstr ""
+"      --plugout     ÕËÁÚÁÎÉÅ ×ÎÅÛÎÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÏÅÄÉÎÅÎÉÑ smtp\n"
 
 #: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
@@ -1956,15 +2054,21 @@ msgstr "  -p, --protocol    ÕËÁÚÁÎÉÅ ĞÒÏÔÏËÏÌÁ ĞÏÉÓËÁ (ÓÍ. man page)\n"
 
 #: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr "  -U, --uidl        ĞÒÉÎÕÄÉÔÅÌØÎÏÅ ÉÓĞÏÌØÚÏ×ÁÎÉÅ UIDL'Ï× (ÔÏÌØËÏ pop3)\n"
+msgstr ""
+"  -U, --uidl        ĞÒÉÎÕÄÉÔÅÌØÎÏÅ ÉÓĞÏÌØÚÏ×ÁÎÉÅ UIDL'Ï× (ÔÏÌØËÏ pop3)\n"
 
 #: options.c:608
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        TCP-ĞÏÒÔ ÄÌÑ ĞÏÄËÌÀŞÅÎÉÑ (ÕÓÔÁÒÅÌ, ÉÓĞÏÌØÚÕÊÔÅ --service)\n"
+msgstr ""
+"      --port        TCP-ĞÏÒÔ ÄÌÑ ĞÏÄËÌÀŞÅÎÉÑ (ÕÓÔÁÒÅÌ, ÉÓĞÏÌØÚÕÊÔÅ --"
+"service)\n"
 
 #: options.c:609
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     ÓÌÕÖÂÁ TCP ÄÌÑ ĞÏÄËÌÀŞÅÎÉÑ (ÍÏÖÅÔ ÂÙÔØ ŞÉÓÌÏ×ÙÍ TCP-ĞÏÒÔÏÍ)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     ÓÌÕÖÂÁ TCP ÄÌÑ ĞÏÄËÌÀŞÅÎÉÑ (ÍÏÖÅÔ ÂÙÔØ ŞÉÓÌÏ×ÙÍ TCP-"
+"ĞÏÒÔÏÍ)\n"
 
 #: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
@@ -1988,7 +2092,9 @@ msgstr "      --principal   ĞÒÉÎÃÉĞÁÌ ĞÏŞÔÏ×ÏÊ ÓÌÕÖÂÙ\n"
 
 #: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  ÄÏÂÁ×ÌÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ ÔÒÁÓÓÉÒÏ×ËÉ ÏĞÒÏÓÁ × ÚÁÇÏÌÏ×ÏË Received\n"
+msgstr ""
+"      --tracepolls  ÄÏÂÁ×ÌÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ ÔÒÁÓÓÉÒÏ×ËÉ ÏĞÒÏÓÁ × ÚÁÇÏÌÏ×ÏË "
+"Received\n"
 
 #: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
@@ -2020,11 +2126,14 @@ msgstr "  -n, --norewrite   ÎÅ ĞÅÒÅÚÁĞÉÓÙ×ÁÔØ ÁÄÒÅÓÁ ÚÁÇÏÌÏ×ËÁ\n"
 
 #: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr "  -l, --limit       ÎÅ ÄÅÌÁÔØ ×ÙÂÏÒËÕ ÓÏÏÂİÅÎÉÊ ÂÏÌØÛÅ ÚÁÄÁÎÎÏÇÏ ÒÁÚÍÅÒÁ\n"
+msgstr ""
+"  -l, --limit       ÎÅ ÄÅÌÁÔØ ×ÙÂÏÒËÕ ÓÏÏÂİÅÎÉÊ ÂÏÌØÛÅ ÚÁÄÁÎÎÏÇÏ ÒÁÚÍÅÒÁ\n"
 
 #: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr "  -w, --warnings    ĞÒÏÍÅÖÕÔËÉ ÍÅÖÄÕ ĞÒÅÄÕĞÒÅÖÄÁÀİÉÍÉ ĞÏŞÔÏ×ÙÍÉ Õ×ÅÄÏÍÌÅÎÉÑÍÉ\n"
+msgstr ""
+"  -w, --warnings    ĞÒÏÍÅÖÕÔËÉ ÍÅÖÄÕ ĞÒÅÄÕĞÒÅÖÄÁÀİÉÍÉ ĞÏŞÔÏ×ÙÍÉ "
+"Õ×ÅÄÏÍÌÅÎÉÑÍÉ\n"
 
 #: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
@@ -2036,27 +2145,33 @@ msgstr "      --fetchdomains ×ÙÂÏÒËÁ ĞÏŞÔÙ ÄÌÑ ÕËÁÚÁÎÎÙÈ ÄÏÍÅÎÏ×\n"
 
 #: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress ÕÓÔÁÎÏ×ËÁ ÄÏÍÅÎÁ, ÉÓĞÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÄÏÓÔÁ×ËÉ SMTP\n"
+msgstr ""
+"  -D, --smtpaddress ÕÓÔÁÎÏ×ËÁ ÄÏÍÅÎÁ, ÉÓĞÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÄÏÓÔÁ×ËÉ SMTP\n"
 
 #: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr "      --smtpname    ÕÓÔÁÎÏ×ËÁ ĞÏÌÎÏÇÏ (ĞÏÌØÚÏ×ÁÔÅÌØ@ÄÏÍÅÎ) ÉÍÅÎÉ SMTP\n"
+msgstr ""
+"      --smtpname    ÕÓÔÁÎÏ×ËÁ ĞÏÌÎÏÇÏ (ĞÏÌØÚÏ×ÁÔÅÌØ@ÄÏÍÅÎ) ÉÍÅÎÉ SMTP\n"
 
 #: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr "  -Z, --antispam,   ÕÓÔÁÎÏ×ËÁ ÚÎÁŞÅÎÉÊ ÁÎÔÉÓĞÁÍÅÒÓËÉÈ ÏÔ×ÅÔÎÙÈ ÄÅÊÓÔ×ÉÊ\n"
+msgstr ""
+"  -Z, --antispam,   ÕÓÔÁÎÏ×ËÁ ÚÎÁŞÅÎÉÊ ÁÎÔÉÓĞÁÍÅÒÓËÉÈ ÏÔ×ÅÔÎÙÈ ÄÅÊÓÔ×ÉÊ\n"
 
 #: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÁËÅÔ ÄÌÑ SMTP-ÓÏÅÄÉÎÅÎÉÊ\n"
+msgstr ""
+"  -b, --batchlimit  ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÁËÅÔ ÄÌÑ SMTP-ÓÏÅÄÉÎÅÎÉÊ\n"
 
 #: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ×ÙÂÏÒËÕ ÄÌÑ ÓÏÅÄÉÎÅÎÉÊ ÓÅÒ×ÅÒÁ\n"
+msgstr ""
+"  -B, --fetchlimit  ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ×ÙÂÏÒËÕ ÄÌÑ ÓÏÅÄÉÎÅÎÉÊ ÓÅÒ×ÅÒÁ\n"
 
 #: options.c:634
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr "      --fetchsizelimit ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ\n"
+msgstr ""
+"      --fetchsizelimit ÕÓÔÁÎÏ×ËÁ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ\n"
 
 #: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
@@ -2084,7 +2199,8 @@ msgstr "  -r, --folder      ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÕÄÁÌÅÎÎÏÇÏ ËÁÔÁÌÏÇÁ\n"
 
 #: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    ÏÔÏÂÒÁÖÅÎÉÅ ÔÏŞÅŞÎÏÊ ÓÔÒÏËÉ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ\n"
+msgstr ""
+"      --showdots    ÏÔÏÂÒÁÖÅÎÉÅ ÔÏŞÅŞÎÏÊ ÓÔÒÏËÉ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ\n"
 
 #: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2140,12 +2256,19 @@ msgid "SDPS not enabled."
 msgstr "SDPS ÎÅ ×ËÌÀŞÅÎ."
 
 #: rcfile_y.y:212
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: ÏĞÃÉÑ interface ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ × Linux (ÂÅÚ IPv6) É FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: ÏĞÃÉÑ interface ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ × Linux (ÂÅÚ IPv6) É "
+"FreeBSD\n"
 
 #: rcfile_y.y:219
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: ÏĞÃÉÑ monitor ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ × Linux (ÂÅÚ IPv6) É FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: ÏĞÃÉÑ monitor ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ × Linux (ÂÅÚ IPv6) É FreeBSD\n"
 
 #: rcfile_y.y:332
 msgid "SSL is not enabled"
@@ -2379,110 +2502,110 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÏĞÒÅÄÅÌÉÔØ ÔÉĞ ÓÌÕÖÂÙ %s ĞÏ ÎÏÍÅÒÕ ĞÏÒÔÁ.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "ğÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÓÌÕÖÂÕ × ×ÉÄÅ ÄÅÓÑÔÉŞÎÏÇÏ ÎÏÍÅÒÁ ĞÏÒÔÁ.\n"
 
-#: sink.c:238
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "ĞÅÒÅÁÄÒÅÓÏ×Ù×ÁÅÔÓÑ ÎÁ %s\n"
 
-#: sink.c:327
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (ÔÅÌÏ ÓÏÏÂİÅÎÉÑ-ÒÉËÏÛÅÔÁ)\n"
 
-#: sink.c:330
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "ĞÉÓØÍÏ ÏÔ %s ÏÔĞÒÁ×ÌÅÎÏ ÒÉËÏÛÅÔÏÍ ÎÁ %s\n"
 
-#: sink.c:462
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "óÏÈÒÁÎÅÎÎÁÑ ÏÛÉÂËÁ ×ÓÅ ÅİÅ %d\n"
 
-#: sink.c:522 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "ïÛÉÂËÁ %cMTP: %s\n"
 
-#: sink.c:766
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "ïÔËÒÙÔÉÅ ÆÁÊÌÁ BSMTP ÉÌÉ ÚÁĞÉÓØ ÚÁÇÏÌÏ×ËÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: sink.c:979
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "óÌÕÛÁÔÅÌÀ %cMTP ÎÅ ĞÏÎÒÁ×ÉÌÓÑ ÁÄÒÅÓ ĞÏÌÕŞÁÔÅÌÑ `%s'\n"
 
-#: sink.c:986
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "óÌÕÛÁÔÅÌÀ %cMTP × ÓÁÍÏÍ ÄÅÌÅ ÎÅ ĞÏÎÒÁ×ÉÌÓÑ ÁÄÒÅÓ ĞÏÌÕŞÁÔÅÌÑ `%s'\n"
 
-#: sink.c:1027
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "ÎÅÔ ÓÏĞÏÓÔÁ×ÌÅÎÎÙÈ ÁÄÒÅÓÏ×; ĞÏÓÔÍÁÓÔÅÒ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ.\n"
 
-#: sink.c:1039
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ÄÁÖÅ ÎÅ×ÏÚÍÏÖÎÏ ÏÔĞÒÁ×ÉÔØ ÎÁ %s!\n"
 
-#: sink.c:1045
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ÎÅÔ ÓÏĞÏÓÔÁ×ÌÅÎÎÙÈ ÁÄÒÅÓÏ×; ĞÅÒÅÁÄÒÅÓÏ×Ù×ÁÅÔÓÑ ÎÁ %s.\n"
 
-#: sink.c:1198
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "ÂÕÄÅÔ ÏÔĞÒÁ×ÌÅÎ Ó: %s\n"
 
-#: sink.c:1222
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "ïÔËÒÙÔÉÅ MDA ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: sink.c:1259
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-ĞÏÄËÌÀŞÅÎÉÅ Ë %s ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: sink.c:1283
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ ÓÌÕÛÁÔÅÌÑ; ÏÔËÁÔ ÎÁ %s"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA ÚÁ×ÅÒÛÅÎ ĞÏ ÓÉÇÎÁÌÕ %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ×ÏÚ×ÒÁÔÉÌ ÎÅÎÕÌÅ×ÏÊ ÓÔÁÔÕÓ %d\n"
 
-#: sink.c:1345
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "óÔÒÁÎÎÏ: MDA pclose ×ÏÚ×ÒÁÔÉÌ %d, ÎÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ × %s:%d\n"
 
-#: sink.c:1366
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "õÄÁÌÅÎÉÅ ÓÏÏÂİÅÎÉÑ ÉÌÉ ÚÁËÒÙÔÉÅ ÆÁÊÌÁ BSMTP ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: sink.c:1387
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "óÌÕÛÁÔÅÌØ SMTP ÏÔËÁÚÁÌ × ÄÏÓÔÁ×ËÅ\n"
 
-#: sink.c:1417
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "ïÛÉÂËÁ ÄÏÓÔÁ×ËÉ LMTP ÎÁ EOM\n"
 
-#: sink.c:1420
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "îÅÏÖÉÄÁÎÎÙÊ ÎÅ-503 ÏÔ×ÅÔ ÄÌÑ LMTP EOM: %s\n"
 
-#: sink.c:1574
+#: sink.c:1561
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2561,7 +2684,9 @@ msgstr "úÁĞÒÁÛÉ×ÁÀİÁÑ ÏÒÇÁÎÉÚÁÃÉÑ: %s\n"
 
 #: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr "ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÉÍÑ ÚÁĞÒÁÛÉ×ÁÀİÅÊ ÏÒÇÁÎÉÚÁÃÉÉ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (×ÏÚÍÏÖÎÏ ÕËÏÒÏŞÅÎÏ).\n"
+msgstr ""
+"ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÉÍÑ ÚÁĞÒÁÛÉ×ÁÀİÅÊ ÏÒÇÁÎÉÚÁÃÉÉ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (×ÏÚÍÏÖÎÏ "
+"ÕËÏÒÏŞÅÎÏ).\n"
 
 #: socket.c:630
 msgid "Unknown Organization\n"
@@ -2574,7 +2699,8 @@ msgstr "ïÂİÅĞÒÉÎÑÔÏÅ ÉÍÑ: %s\n"
 
 #: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÏÂİÅĞÒÉÎÑÔÏÅ ÉÍÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (×ÏÚÍÏÖÎÏ ÕËÏÒÏŞÅÎÏ).\n"
+msgstr ""
+"ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÏÂİÅĞÒÉÎÑÔÏÅ ÉÍÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (×ÏÚÍÏÖÎÏ ÕËÏÒÏŞÅÎÏ).\n"
 
 #: socket.c:636
 msgid "Unknown Issuer CommonName\n"
@@ -2650,7 +2776,9 @@ msgstr "äÅÓËÒÉĞÔÏÒ ÆÁÊÌÁ ×ÎÅ ÄÉÁĞÁÚÏÎÁ SSL"
 #: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "õËÁÚÁÎ ÎÅ×ÅÒÎÙÊ ĞÒÏÔÏËÏÌ SSL '%s', ÉÓĞÏÌØÚÕÅÔÓÑ ĞÒÏÔÏËÏÌ ĞÏ ÕÍÏÌŞÁÎÉÀ (SSLv23).\n"
+msgstr ""
+"õËÁÚÁÎ ÎÅ×ÅÒÎÙÊ ĞÒÏÔÏËÏÌ SSL '%s', ÉÓĞÏÌØÚÕÅÔÓÑ ĞÒÏÔÏËÏÌ ĞÏ ÕÍÏÌŞÁÎÉÀ "
+"(SSLv23).\n"
 
 #: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
diff --git a/po/sk.po b/po/sk.po
index 2be51e34..2c4be405 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2003-06-12 15:02+00\n"
 "Last-Translator: Lubos Vitek <lubos_vitek@yahoo.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -15,20 +15,25 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Kontrolujem, èi %s je naozaj ten istı uzol ako %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Áno, ich IP adresy súhlasia\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "Nie, ich IP adresy nesúhlasia\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr "Nameserver-zlyhanie pri hµadaní `%s' poèas komunikácie s %s.\n"
+
+#: checkalias.c:221
 #, fuzzy, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "Nameserver-zlyhanie pri hµadaní `%s' poèas komunikácie s %s.\n"
@@ -42,147 +47,158 @@ msgstr "nemô¾em dekódova» BASE64 vızvu\n"
 msgid "decoded as %s\n"
 msgstr "dekódované ako %s\n"
 
-#: driver.c:191
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "Kerberos-chyba %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server odpovedal '%*s'] \n"
 
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:341
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on the mail server %s:"
+msgstr ""
+"Predmet: Fetchmail-varovanie: nadrozmerná správa.\n"
 "\n"
-"The following oversized messages remain on the mail server %s:"
+"Nasledujúca nadrozmerná správa zostáva na po¹tovom serveri %s:"
+
+#: driver.c:345
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Predmet: Fetchmail-varovanie: nadrozmerná správa.\n"
 "\n"
 "Nasledujúca nadrozmerná správa zostáva na po¹tovom serveri %s:"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "\t%d msg %d oktetov dlhé vynechané fetchmailom.\n"
+
+#: driver.c:368
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d msg %d oktetov dlhé vynechané fetchmailom.\n"
 
-#: driver.c:497
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "vynechávam správu %s@%s:%d (%d oktetov)"
 
-#: driver.c:549
+#: driver.c:556
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "vynechávam správu %s@%s:%d (%d oktetov)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:572
 msgid " (length -1)"
 msgstr "(då¾ka -1)"
 
-#: driver.c:568
+#: driver.c:575
 msgid " (oversized)"
 msgstr "(nadrozmerné)"
 
-#: driver.c:583
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nemô¾em získa» záhlavie, správa %s@%s:%d (%d oktetov)\n"
 
-#: driver.c:600
+#: driver.c:607
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "èítam správu %s@%s:%d z %d"
 
-#: driver.c:605
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:612
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %s oktetov)"
 
-#: driver.c:606
-msgid "header "
-msgstr "záhlavie "
+#: driver.c:613
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d oktetov v tele správy)"
 
-#: driver.c:678
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d oktetov v tele správy)"
 
-#: driver.c:736
+#: driver.c:743
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "správa %s@%s:%d nemala oèakávanú då¾ku (%d aktuálne != %d oèakávané)\n"
 
-#: driver.c:767
+#: driver.c:774
 msgid " retained\n"
 msgstr " ponechané\n"
 
-#: driver.c:776
+#: driver.c:784
 msgid " flushed\n"
 msgstr " vyprázdnené\n"
 
-#: driver.c:793
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " nevyprázdnené\n"
 
-#: driver.c:809
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr "fetchlimit %d dosiahnutı; %d správ ponechánıch na serveri %s úèet %s\n"
-
-#: driver.c:869
+#: driver.c:818
+#, fuzzy, c-format
+msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"fetchlimit %d dosiahnutı; %d správ ponechánıch na serveri %s úèet %s\n"
+msgstr[1] ""
+"fetchlimit %d dosiahnutı; %d správ ponechánıch na serveri %s úèet %s\n"
+
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE obdr¾ané z MDA alebo chyba v prúde dát zo socketu\n"
 
-#: driver.c:876
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "vypr¹anie èasového limitu po %d sekundách pri èakaní na pripojenie na server "
 "%s.\n"
 
-#: driver.c:880
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr ""
 "vypr¹anie èasového limitu po %d sekundách pri èakaní na odpoveï zo servera %"
 "s.\n"
 
-#: driver.c:884
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "vypr¹anie èasového limitu po %d sekundách pri èakaní na %s.\n"
 
-#: driver.c:889
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "vypr¹anie èasového limitu po %d sekundách pri èakaní na odpoveï z "
 "prijímaèa.\n"
 
-#: driver.c:892
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "vypr¹anie èasového limitu po %d sekundách.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:916
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Predmet: fetchmail spozoroval opakované vypr¹anie èasovıch limitov\n"
 
-#: driver.c:906
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -191,7 +207,7 @@ msgstr ""
 "Fetchmail zistil viac ako %d vypr¹aní èasovıch limitov pri pokusoch\n"
 "získa» po¹tu z %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -207,12 +223,12 @@ msgstr ""
 "\n"
 "Fetchmail nebude pracova» s tımto prieèinkom, pokiaµ ho nespustíte znova.\n"
 
-#: driver.c:940
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "príkaz spú¹»anı pred spojením nebol úspe¹nı, návratovı stav: %d\n"
 
-#: driver.c:971
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nemô¾em nájs» HESIOD po¹tovú schránku pre %s\n"
@@ -221,86 +237,63 @@ msgstr "nemô¾em nájs» HESIOD po¹tovú schránku pre %s\n"
 msgid "Lead server has no name.\n"
 msgstr "Vedúci server nemá meno.\n"
 
-#: driver.c:1016
+#: driver.c:1017
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "nemô¾em nájs» kanonické DNS meno pre %s\n"
 
-#: driver.c:1053
-msgid "internal inconsistency\n"
-msgstr "vnútorná nezrovnalos»\n"
-
-#: driver.c:1063
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s spojení s %s bolo neúspe¹nıch"
 
-#: driver.c:1069
-msgid "host is unknown."
-msgstr "hostiteµ je neznámy."
-
-#: driver.c:1072
-msgid "name is valid but has no IP address."
-msgstr "meno je platné ale nemá IP adresu."
-
-#: driver.c:1075
-msgid "unrecoverable name server error."
-msgstr "neodstrániteµná chyba servera mien."
-
-#: driver.c:1077
-msgid "temporary name server error."
-msgstr "doèasná chyba servera mien."
-
-#: driver.c:1084
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "neznáma DNS chyba %d."
-
-#: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#: driver.c:1071
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Predmet: Fetchmail varovanie - nedosiahnuteµnı server.\n"
 "\n"
 "Fetchmail sa nemohol spoji» s po¹tovım serverom %s:"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1073
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail nemohol získa» po¹tu z %s@%s.\n"
+
+#: driver.c:1099 imap.c:384 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "SSL spojenie neúspe¹né.\n"
 
-#: driver.c:1184
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Zámka-chyba zaneprázdnenia pri %s@%s\n"
 
-#: driver.c:1188
+#: driver.c:1156
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba zaneprázdnenia servra pri %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1161
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autorizácie pri %s@%s%s\n"
 
-#: driver.c:1196
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr " (predtım autorizovanı)"
 
-#: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#: driver.c:1185
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Predmet: autentifikácia fetchmailu neúspe¹ná pri %s@%s\n"
 
-#: driver.c:1220
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohol získa» po¹tu z %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -330,7 +323,7 @@ msgstr ""
 "o spojenie. Ïal¹ie upozornenia nebudú zasielané, pokiaµ slu¾ba\n"
 "nebude obnovená."
 
-#: driver.c:1239
+#: driver.c:1208
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -350,171 +343,173 @@ msgstr ""
 "o spojenie. Ïal¹ie upozornenia nebudú zasielané, pokiaµ slu¾ba\n"
 "nebude obnovená."
 
-#: driver.c:1254
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okam¾ité stiahnutie z %s@%s\n"
 
-#: driver.c:1259
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Neznáma chyba pri prihlásení alebo autentifikácii na %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1252
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autentifikácia OK na %s@%s\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1258
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Predmet: fetchmail autentifikácia OK na %s@%s\n"
 
-#: driver.c:1292
+#: driver.c:1262
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail bol úspe¹nı pri prihlásení na %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1266
 msgid "Service has been restored.\n"
 msgstr "Slu¾ba bola obnovená.\n"
 
-#: driver.c:1327
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vıber alebo stiahnutie prieèinka %s\n"
 
-#: driver.c:1329
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "vıber alebo stiahnutie ¹tandardného prieèinka\n"
 
-#: driver.c:1345
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s pri %s (prieèinok %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s pri %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Obnovujem %s\n"
 
-#: driver.c:1362
+#: driver.c:1323
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d videné) pre %s"
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d videné) pre %s"
+msgstr[1] "%d %s (%d videné) pre %s"
 
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "správ"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "správa"
-
-#: driver.c:1366
+#: driver.c:1326
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s pre %s"
+#: driver.c:1329
+#, fuzzy, c-format
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] "%d %s pre %s"
+msgstr[1] "%d %s pre %s"
 
-#: driver.c:1375
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetov).\n"
 
-#: driver.c:1381
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "®iadna po¹ta pre %s\n"
 
-#: driver.c:1414
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr "neplatnı poèet správ!"
 
-#: driver.c:1515
+#: driver.c:1485
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1518
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "chıbajúce alebo neplatné záhlavie RFC822"
 
-#: driver.c:1521
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "klient/server synchronizácia"
 
-#: driver.c:1527
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "klient/server protokol"
 
-#: driver.c:1530
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "zámka na servri zaneprázdnená"
 
-#: driver.c:1533
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "SMTP transakcia"
 
-#: driver.c:1536
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "DNS vyhµadávanie"
 
-#: driver.c:1539
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "neznáma chyba\n"
 
-#: driver.c:1550
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1515
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-chyba pri doruèovaní na SMTP server %s\n"
 
-#: driver.c:1552
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "hostiteµ je neznámy."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%s-chyba pri s»ahovaní po¹ty z %s\n"
 
-#: driver.c:1560
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "príkaz spú¹»anı po spojení nebol úspe¹nı, návratovı stav: %d\n"
 
-#: driver.c:1581
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Podpora Kerberos V4 nebola pripojená.\n"
 
-#: driver.c:1589
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Podpora Kerberos V5 nebola pripojená.\n"
 
-#: driver.c:1600
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Voµba --flush nie je podporovaná s %s\n"
 
-#: driver.c:1606
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Voµba --all nie je podporovaná s %s\n"
 
-#: driver.c:1614
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Voµba --limit nie je podporovaná s %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -529,7 +524,7 @@ msgstr ""
 "Skúste \"env QMAILINJECT= %s PARAMETRE\"\n"
 "%s: Ukonèené.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -545,21 +540,33 @@ msgstr ""
 "Návratová-cesta: záhlaví. Skúste \"env NULLMAILER_FLAGS= %s PARAMETRE\"\n"
 "%s: Ukonèené.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Neexistujete. Choïte preè.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: nemô¾em rozozna» vá¹ho hostiteµa!"
 
-#: env.c:160
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zlyhalo pre %s\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -585,24 +592,20 @@ msgstr "®iadna správa pre %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "Spracovanie nedoruèenıch správ pre %s bolo spustené\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Nemô¾em spracova» frontu správ pre uzol %s\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Uzol %s nie je prípustnı: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "ETRN-syntaktická chyba\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "ETRN-syntaktická chyba v parametroch\n"
@@ -612,76 +615,81 @@ msgstr "ETRN-syntaktická chyba v parametroch\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "ETRN-neznáma syntaktická chyba %d\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Voµba --keep nie je podporovaná s ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Voµba --flush nie je podporovaná s ETRN\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "Voµba --remote nie je podporovaná s ETRN\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "Voµba --flush nie je podporovaná s ETRN\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Voµba --check nie je podporovaná s ETRN\n"
 
-#: fetchmail.c:154
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: vyvolanı s"
 
-#: fetchmail.c:178
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "nemô¾em nájs» aktuálny pracovnı adresár\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Toto je fetchmail verzia %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Preberám voµby z príkazového riadku%s%s\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:355
 msgid " and "
 msgstr " a "
 
-#: fetchmail.c:335
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nie sú nakongifurované po¹tové sevre -- mo¾no chıba %s?\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: neboli ¹pecifikované po¹tové servre.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nie je spustenı ¾iadny ïal¹í fetchmail\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: chyba pri stopovaní %s-fetchmailu pri %d; zastavené.\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "pozadie"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "popredie"
 
-#: fetchmail.c:386
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s-fetchmail pri %d ukonèenı.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -689,7 +697,7 @@ msgstr ""
 "nemô¾em skontrolova» po¹tu pokiaµ je spustenı inı fetchmail pre rovnakého "
 "hostiteµa.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -697,180 +705,185 @@ msgstr ""
 "fetchmail: nemô¾em »aha» z uvedenıch hostiteµov pokiaµ be¾í inı fetchmail na "
 "%d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: je spustenı inı fetchmail v popredí na %d.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: nemô¾em akceptova» voµby pokiaµ be¾í inı fetchmail v pozadí.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail be¾iaci v pozadí na %d bol prebudenı.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: star¹í súrodenec na %d záhadne zomrel.\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:487
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nemô¾em nájs» heslo pre %s@%s.\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Zadaj heslo pre %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "¹tartujem fetchmail %s démona \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nemô¾em otvori» %s pre pripojenie logov k \n"
 
-#: fetchmail.c:550
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nemô¾em vykona» èasovú kontrolu %s (chyba %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail re¹tartovanı (%s zmenenıch)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus o nové spustenie mô¾e zlyha», preto¾e prieèinok nebol obnovenı\n"
 
-#: fetchmail.c:587
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus o nové spustenie fetchmail zlyhal\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "obnovenie %s vynechané (zlyhala autentifikácia alebo vypr¹al èas spojenia)\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval nebol dosiahnutı, nebudem posiela» dotaz na %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:690
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav dotazu=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:692
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav dotazu=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:694
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav dotazu=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:696
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav dotazu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:698
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav dotazu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:700
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav dotazu=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:702
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav dotazu=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:704
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav dotazu=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:706
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav dotazu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:708
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav dotazu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:710
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav dotazu=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:712
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav dotazu=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:714
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav dotazu=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:716
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav dotazu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav dotazu=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "®iadne spojenie nefunguje. Konèím.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:771
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "spím o %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "zobudenı od %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "zobudenı signálom %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "zobudenı o %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normálne ukonèenie, stav %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "nemô¾em vykona» èasovú kontrolu run-control súboru\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Upozornenie: viaceré zmienky o hostiteli %s v konfiguraènom súbore\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "Upozornenie: viaceré zmienky o hostiteli %s v konfiguraènom súbore\n"
+
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL podpora nebola prelo¾ená.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -878,612 +891,660 @@ msgstr ""
 "fetchmail: varovanie: nie je dostupnı DNS pre kontrolu Multidrop-spracovaní "
 "z %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1191
 #, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1192
+msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
+msgstr ""
+
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "nesprávna konfigurácia %s, èíslo portu nemô¾e by» záporné\n"
 
-#: fetchmail.c:1171
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "nesprávna konfigurácia %s, RPOP vy¾aduje privilegovanı port\n"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "nesprávna konfigurácia %s, LMTP nemô¾e pou¾i» ¹tandardnı SMTP port\n"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Pou¾itie fetchall ako aj keep on v re¾ime démona je chybné!\n"
 
-#: fetchmail.c:1252
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukonèené signálom %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: »ahanie spustené\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 podpora nebola nakonfigurovaná.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 podpora nebola nakonfigurovaná.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP podpora nebola nakonfigurovaná.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN podpora nebola nakonfigurovaná.\n"
 
-#: fetchmail.c:1396
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "ETRN nie je podporované bez gethostbyname(2).\n"
-
-#: fetchmail.c:1403
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR podpora nebola nakonfigurovaná.\n"
 
-#: fetchmail.c:1409
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "ODMR nie je podporované bez gethostbyname(2).\n"
-
-#: fetchmail.c:1415
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "vybranı nepodporovanı protokol.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: »ahanie dokonèené\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Dotazovací interval je %d sekúnd\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-súbor je %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile je %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Protokol o správach bude zaznamenanı syslog-om\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail sa bude maskova» a nebude generova» Received\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazova» priebeh pomocou bodiek aj v log-súbore.\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail bude nesprávne adresované správy posiela» ïalej na %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude smerova» chybové správy správcovi po¹ty.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude smerova» chybové správy odosielateµovi.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Voµby pre príjem z %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Po¹ta bude prijatá cez %s\n"
 
-#: fetchmail.c:1476
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Dotazovanie tohoto servra bude vykonané ka¾dé %d intervaly.\n"
+#: fetchmail.c:1512
+#, fuzzy, c-format
+msgid "  Poll of this server will occur every %d interval.\n"
+msgid_plural "  Poll of this server will occur every %d intervals.\n"
+msgstr[0] "  Dotazovanie tohoto servra bude vykonané ka¾dé %d intervaly.\n"
+msgstr[1] "  Dotazovanie tohoto servra bude vykonané ka¾dé %d intervaly.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skutoènı názov servera je %s.\n"
 
-#: fetchmail.c:1481
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1519
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tento hostiteµ %s dotazovanı, keï nebude ¹pecifikovanı ¾iadny inı.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will not"
-msgstr "nebude"
-
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
-msgid "will"
-msgstr "bude"
+#: fetchmail.c:1520
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Tento hostiteµ %s dotazovanı, keï nebude ¹pecifikovanı ¾iadny inı.\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Heslo bude po¾adované.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP tajomstvo = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol je KPOP s Kerberos %s autentifikáciou"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol je %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (pou¾ívam slu¾bu %s)"
 
-#: fetchmail.c:1517
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (pou¾ívam bezpeènostné nastavenia siete %s)"
-
-#: fetchmail.c:1520
-#, c-format
-msgid " (using port %d)"
-msgstr " (pou¾ívam port %d)"
-
-#: fetchmail.c:1523
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (pou¾ívam ¹tandardnı port)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (povinné pou¾itie UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr " V¹etky dostupné metódy autentifikácie budú vyskú¹ané.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Autentifikácia heslom bude povinná.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM autentifikácia bude povinná.\n"
+
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 autentifikácia bude povinná.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Predpokladané ¹ifrovanie na úrovni koncového zariadenia.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Vedúci po¹tovej slu¾by je: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ¹ifrované spojenia povolené.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL Protokol je %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL servra povolená.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL prieèinok pre dôverné certifikáty: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odtlaèok SSL kµúèa (kontrolovanı proti kµúèu servra): %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Èasovı limit pre ne-odpovedanie servra je %d sekúnd"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (implicitná hodnota).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Vybranı ¹tandardnı po¹tovı prieèinok.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Vybrané po¹tové prieèinky sú:"
 
-#: fetchmail.c:1593
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1624
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s správy budu prijaté (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "All"
-msgstr "V¹etky"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s správy budu prijaté (--all %s).\n"
 
-#: fetchmail.c:1594
-msgid "Only new"
-msgstr "Len nové"
+#: fetchmail.c:1627
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Stiahnuté správy %s ponechané na servri (--keep %s).\n"
 
-#: fetchmail.c:1596
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stiahnuté správy %s ponechané na servri (--keep %s).\n"
 
-#: fetchmail.c:1599
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1630
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Staré správy %s budú zmazané pred príjmom novıch správ (--flush %s).\n"
 
-#: fetchmail.c:1602
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1631
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Staré správy %s budú zmazané pred príjmom novıch správ (--flush %s).\n"
+
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Staré správy %s budú zmazané pred príjmom novıch správ (--flush %s).\n"
+
+#: fetchmail.c:1634
+#, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Staré správy %s budú zmazané pred príjmom novıch správ (--flush %s).\n"
+
+#: fetchmail.c:1636
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Prepis lokálnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "enabled"
-msgstr "povolené"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  Prepis lokálnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
-msgid "disabled"
-msgstr "zakázané"
+#: fetchmail.c:1639
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Vynechanie znaku \"návrat vozíka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Vynechanie znaku \"návrat vozíka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1642
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynútenie znaku \"návrat vozíka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1643
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Vynútenie znaku \"návrat vozíka\"-CR je %s (forcecr %s).\n"
+
+#: fetchmail.c:1645
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpretácia ¹ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1614
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1646
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Interpretácia ¹ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
+
+#: fetchmail.c:1648
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódovanie MIME je %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  Dekódovanie MIME je %s (mimedecode %s).\n"
+
+#: fetchmail.c:1651
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Neèinnos» po stiahnutí je %s (idle %s).\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Neèinnos» po stiahnutí je %s (idle %s).\n"
+
+#: fetchmail.c:1654
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdne stavové riadky budú %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "discarded"
-msgstr "zahodené"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Neprázdne stavové riadky budú %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
-msgid "kept"
-msgstr "ponechané"
+#: fetchmail.c:1657
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  Delivered-To riadky budú %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1623
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1658
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To riadky budú %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit pre veµkos» správy je %d oktetov (--limit %d).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Správy nemajú limitovanú veµkos» (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Interval pre varovanie ohµadom veµkosti správy je %d sekúnd (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varovanie o veµkosti správ pri ka¾dom s»ahovaní (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit pre prijaté správy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Príjem správ nie je limitovanı (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit pre prijaté správy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Správy nemajú limitovanú veµkos» (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky SMTP správ je %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Dávka SMTP správ nie je limitovaná (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval medzi skutoènımi vymazaniami nastavenı na %d (--expunge %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nevynútené vymazania (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény pre ktoré bude doruèená po¹ta sú:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr "(implicitná hodnota)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Správy budú pripojené k %s ako BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Správy budú doruèené s \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Správy budú %cMTP-dopravené na:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Hos»ová èas» z MAIL FROM riadku bude %s\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adresa, ktorá sa pou¾ije v RCPT TO a bude doruèená v SMTP bude %s\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznané SPAM-blokované odpovede prijímaèa sú:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  SPAM-blokovanie vypnuté\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Spojenie so servrom bude aktivované s \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Príkaz spú¹»anı pred spojením neexistuje.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Spojenie so servrom bude ukonèené s \"%s\".\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Príkaz spú¹»anı po spojení neexistuje.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nie sú definované ¾iadne lokálne názvy pre tohto hostiteµa.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mód: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mód: "
 
-#: fetchmail.c:1750
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d rozpoznanıch lokálnych názvov.\n"
+#: fetchmail.c:1783
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d rozpoznanıch lokálnych názvov.\n"
+msgstr[1] "%d rozpoznanıch lokálnych názvov.\n"
 
-#: fetchmail.c:1764
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1798
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS vyhµadávanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1768
-msgid "  Server aliases will be compared with multidrop addresses by "
-msgstr "  Prezıvky servra budú porovnávané s multi-drop adresami pomocou "
+#: fetchmail.c:1799
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  DNS vyhµadávanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1770
-msgid "IP address.\n"
-msgstr "IP adries.\n"
+#: fetchmail.c:1803
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Prezıvky servra budú porovnávané s multi-drop adresami pomocou "
 
-#: fetchmail.c:1772
-msgid "name.\n"
-msgstr "mien.\n"
+#: fetchmail.c:1805
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  Prezıvky servra budú porovnávané s multi-drop adresami pomocou "
 
-#: fetchmail.c:1775
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Smerovanie adries obálok nie je aktivované\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Predpokladá sa záhlavie obálky: %s\n"
 
-#: fetchmail.c:1779
-msgid "Received"
-msgstr "Prijaté"
-
-#: fetchmail.c:1781
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Poèet záhlaví obálok na analızu: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s bude odstránenı z pou¾ívateµovho id\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  ®iadne odstránenie prefixu\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Preddeklarované prezıvky po¹tového servra:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Lokálne domény:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojenie musí by» realizované pomocou rozhrania %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Neboli ¹pecifikované ¾iadne po¾iadavky na rozhranie.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Dotazovací cyklus s monitorom %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Nebolo ¹pecifikované ¾iadne monitorovacie rozhranie.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Spojenie so servrom bude realizované pomocou plugin-u %s (--plugin %s).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Nebol ¹pecifikovanı ¾iadny príkaz pre plugin.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Spojenia s prijímaèom budú realizované pomocou plugout-u %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Nebol ¹pecifikovanı ¾iadny príkaz pre plugout.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Neboli ulo¾ené ¾iadne UID-y z tohoto hostiteµa.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID-ov ulo¾enıch.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Informácia o trase dotazu bude pridaná do záhlavia Received.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1491,24 +1552,16 @@ msgstr ""
 "  Do záhlavia Received nebude pridaná ¾iadna informácia o trase s»ahovania.\n"
 ".\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Vlastnosti prechodu \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
-msgid "alloca failed"
-msgstr "alloca neúspe¹né"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "CHYBA: ¾iadna podpora pre rutinu getpassword()\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1534,37 +1587,37 @@ msgstr "Posielam osobné údaje\n"
 msgid "Error exchanging credentials\n"
 msgstr "Chyba pri vımene osobnıch údajov\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nemô¾em rozbali» dáta bezpeènostnej úrovne\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Vımena osobnıch údajov kompletná\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server po¾aduje integritu a/alebo súkromie\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Rozbalené príznaky bezpeènostnej úrovne: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximálna veµkos» GSS symbolu je %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "Chyba pri vytváraní ¾iadosti bezpeènostnej úrovne\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "Uvoµòujem osobné údaje GSS\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "Chyba pri uvoµòovaní osobnıch údajov\n"
 
@@ -1573,151 +1626,156 @@ msgstr "Chyba pri uvoµòovaní osobnıch údajov\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: vlákno uspaté na %d sekúnd.\n"
 
-#: imap.c:280
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identifikovanı ako IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identifikovanı ako IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identifikovanı ako IMAP2 alebo IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr "bude neèinnı po stiahnutí\n"
 
-#: imap.c:460
+#: imap.c:482
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Po¾adovaná funkcia OTP nebola prelo¾ená do fetchmail-u\n"
 
-#: imap.c:482
+#: imap.c:504 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Po¾adovaná funkcia NTLM nebola prelo¾ená do fetchmail-u\n"
 
-#: imap.c:491
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Po¾adovaná funkcia LOGIN nie je podporovaná servrom\n"
 
-#: imap.c:641 imap.c:707
-msgid "expunge failed\n"
-msgstr "vymazanie zlyhalo\n"
-
-#: imap.c:663 imap.c:692
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "stiahnutie zlyhalo\n"
 
-#: imap.c:671
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d správ èaká po stiahnutí\n"
+#: imap.c:682
+#, fuzzy, c-format
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "%d správ èaká po stiahnutí\n"
+msgstr[1] "%d správ èaká po stiahnutí\n"
 
-#: imap.c:681
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "vıber po¹tového prieèinka zlyhal\n"
 
-#: imap.c:685
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "%d správ èaká po prvom stiahnutí\n"
+#: imap.c:698
+#, fuzzy, c-format
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "%d správ èaká po prvom stiahnutí\n"
+msgstr[1] "%d správ èaká po prvom stiahnutí\n"
 
-#: imap.c:711
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "%d správ èaká po prvom vymazaní\n"
+#: imap.c:722
+msgid "expunge failed\n"
+msgstr "vymazanie zlyhalo\n"
 
-#: imap.c:734
+#: imap.c:726
+#, fuzzy, c-format
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "%d správ èaká po prvom vymazaní\n"
+msgstr[1] "%d správ èaká po prvom vymazaní\n"
+
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "vyhµadávanie nepreèítanıch správ zlyhalo\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u je nepreèítanıch\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:793 pop3.c:744
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je prvá nepreèítaná\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Nemô¾em otvori» rozhranie kvm, uistite sa ¾e fetchmail má nastavené SGID kmem"
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Nemô¾em analyzova» názov rozhrania z %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist odhad) zlyhal"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc zlyhal"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) zlyhal"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Verzia smerovania správy %d nerozpoznaná."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Nebolo nájdené ¾iadne rozhranie s názvom %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "Nebola nájdená ¾iadna IP adresa pre %s"
 
-#: interface.c:592
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "chıbajúca IP adresa rozhrania\n"
 
-#: interface.c:608
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "neplatná IP adresa rozhrania\n"
 
-#: interface.c:614
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "neplatná IP maska rozhrania\n"
 
-#: interface.c:653
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivita na %s -zaznamenaná- ako %d\n"
 
-#: interface.c:668
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "s»ahovanie z %s vynechané, %s je nedostupnı\n"
 
-#: interface.c:687
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "s»ahovanie z %s vynechané, IP adresa %s je vylúèená\n"
 
-#: interface.c:699
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivita na %s skontrolovaná ako %d\n"
 
-#: interface.c:725
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "s»ahovanie z %s vynechané, %s neaktívny\n"
 
-#: interface.c:732
+#: interface.c:729
 #, fuzzy, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivita na %s bola %d, je %d\n"
@@ -1745,25 +1803,30 @@ msgstr "nemô¾em dekódova» BASE64 odpoveï o pripravenosti\n"
 msgid "challenge mismatch\n"
 msgstr "nezhoda vızvy\n"
 
-#: lock.c:81
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: odstraòujem starı zamykací súbor\n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: odstraòujem starı zamykací súbor\n"
 
-#: lock.c:122
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: odstraòujem starı zamykací súbor\n"
+
+#: lock.c:137
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: vytvorenie zámky zlyhalo.\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "varovanie: nájdené \"%s\" pred niektorımi názvami hostiteµa"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: varovanie: nájdené \"%s\" pred niektorımi názvami hostiteµa\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: varovanie: neznámy symbol \"%s\"\n"
@@ -1782,7 +1845,6 @@ msgstr "Otoèené teraz...\n"
 msgid "ATRN request refused.\n"
 msgstr "ATRN ¾iados» zamietnutá.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "Nie je mo¾né teraz spracova» ATRN ¾iados»\n"
@@ -1791,12 +1853,10 @@ msgstr "Nie je mo¾né teraz spracova» ATRN ¾iados»\n"
 msgid "You have no mail.\n"
 msgstr "Nemáte po¹tu.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Príkaz nie je implementovanı\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Autentifikácia po¾adovaná.\n"
@@ -1806,548 +1866,562 @@ msgstr "Autentifikácia po¾adovaná.\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "Neznáma ODMR chyba %d\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "zápis textu správy\n"
+
+#: odmr.c:240
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Voµba --keep nie je podporovaná s ODMR\n"
 
-#: odmr.c:247
+#: odmr.c:244
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Voµba --flush nie je podporovaná s ODMR\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "Voµba --remote nie je podporovaná s ODMR\n"
+#: odmr.c:248
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "Voµba --flush nie je podporovaná s ODMR\n"
 
-#: odmr.c:255
+#: odmr.c:252
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Voµba --check nie je podporovaná s ODMR\n"
 
-#: opie.c:37
+#: opie.c:36
 #, fuzzy
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "Nie je mo¾né dekódova» OTP vızvu\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:58 pop3.c:515
 #, fuzzy
 msgid "Secret pass phrase: "
 msgstr "Heslo: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Re»azec '%s' nie je platnı èíselny re»azec.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota re»azca '%s' je %s ako %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "men¹ia"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "väè¹ia"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "©pecifikovanı neplatnı protokol `%s'.\n"
 
-#: options.c:429
+#: options.c:372
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "©pecifikovaná neplatná autentifikácia `%s'.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: podpora sie»ovej bezpeènosti je zakázaná\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "pou¾itie:  fetchmail [prepínaèe] [server ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  Prepínaèe sú nasledovné:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobraz tohto pomocníka\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobraz informáciu o verzii\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       skontroluj správy bez stiahnutia\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracuj potichu\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracuj hluène (diagnostickı vıstup)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spusti ako démon raz za n sekúnd\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodpájaj proces démona\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabi proces démona\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ¹pecifikuj názov log-súboru\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 "      --syslog      pou¾i syslog(3) pre väè¹inu správ keï be¾í ako démon\n"
 
-#: options.c:673
+#: options.c:586
 #, fuzzy
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   nezapisuj Received & povoµ podvrhnutie hostiteµa\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ¹pecifikuj náhradnı spú¹»ací riadiaci súbor\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ¹pecifikuj náhradnı súbor UID-ov\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr ""
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:686
+#: options.c:599
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr ""
+
+#: options.c:600
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:689
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:691
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:692
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:693
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:694
+#: options.c:609
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 
-#: options.c:695
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 
-#: options.c:696
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:697
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:698
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:699
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:701
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 
-#: options.c:702
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr ""
 
-#: options.c:703
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 
-#: options.c:704
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 
-#: options.c:705
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr ""
 
-#: options.c:706
+#: options.c:622
+msgid "      --limitflush  delete oversized messages\n"
+msgstr ""
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr ""
 
-#: options.c:707
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 
-#: options.c:708
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 
-#: options.c:711
-msgid "  -T, --netsec      set IP security request\n"
-msgstr ""
-
-#: options.c:713
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:714
+#: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:715
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:716
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:717
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:718
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:719
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:720
+#: options.c:634
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:721
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:723
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:724
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:725
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:726
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:727
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:538
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:547
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:569
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:577
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:842
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr ""
 
-#: pop3.c:857
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1214
-msgid "Option --remote is not supported with POP3\n"
-msgstr ""
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
+msgstr "Voµba --flush nie je podporovaná s ODMR\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:222
-msgid "invalid security request"
-msgstr ""
-
-#: rcfile_y.y:228
-msgid "network-security support disabled"
-msgstr ""
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr ""
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr ""
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr ""
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr ""
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:116
+#: rpa.c:117
 msgid "Success"
 msgstr ""
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr ""
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr ""
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Deity error"
 msgstr ""
 
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr ""
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr ""
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr ""
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr ""
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr ""
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr ""
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr ""
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr ""
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr ""
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr ""
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr ""
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr ""
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr ""
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr ""
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr ""
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr ""
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr ""
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr ""
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr ""
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr ""
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr ""
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr ""
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr ""
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr ""
 
@@ -2359,338 +2433,346 @@ msgstr ""
 msgid "Unicode:\n"
 msgstr ""
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr ""
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr ""
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr ""
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr ""
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr ""
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr ""
 
-#: sink.c:246
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:348
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:461
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:524 sink.c:604
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr ""
 
-#: sink.c:758
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 
-#: sink.c:979
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:986
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1024
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1036
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1042
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1195
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
-#: sink.c:1219
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1256
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1280
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1336
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1339
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1342
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1363
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr ""
 
-#: sink.c:1384
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1414
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1417
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1567
+#: sink.c:1561
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr ""
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:108 socket.c:134
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr ""
 
-#: socket.c:166
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr ""
 
-#. error
-#: socket.c:172
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr ""
 
-#: socket.c:180
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr ""
 
-#: socket.c:186
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:189
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr ""
 
-#: socket.c:280
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:427
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:778
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:780
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:782
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:784
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:788
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:812
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:818
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:823
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:825
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:835
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:839
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:857
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:861
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:864
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
-msgstr ""
+#: socket.c:747
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
+msgstr "  SSL prieèinok pre dôverné certifikáty: %s\n"
 
-#: socket.c:878
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:931
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:948
+#: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:1008
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1080
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1083
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:70
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr ""
 
-#: transact.c:134
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr ""
 
-#: transact.c:203
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2699,84 +2781,79 @@ msgstr ""
 "analıza riadku Received:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "riadok akceptovanı, %s je alias po¹tového servra\n"
 
-#: transact.c:248
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "riadok zamietnutı, %s nie je alias po¹tového servra\n"
 
-#: transact.c:322
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "nenájdená adresa Received\n"
 
-#: transact.c:331
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "nájdená adresa Received `%s'\n"
 
-#: transact.c:531
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "oddeµovaè správy nájdenı pri prezeraní záhlaví\n"
 
-#: transact.c:552
+#: transact.c:559
 msgid "incorrect header line found while scanning headers\n"
 msgstr "nesprávny riadok záhlavia nájdenı pri prezeraní záhlaví\n"
 
-#: transact.c:554
+#: transact.c:561
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Obnovujem %s\n"
 
-#: transact.c:1074
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "¾iadne lokálne zhody, posielam na %s\n"
 
-#: transact.c:1089
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "odoslanie a zmazanie odlo¾ené kvôli DNS chybám\n"
 
-#: transact.c:1225
+#: transact.c:1209
 #, fuzzy
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "zápis msgblk.hlavièiek RFC822\n"
 
-#: transact.c:1246
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr "¾iadna adresa príjemcu nezodpovedá zadanım lokálnym menám"
 
-#: transact.c:1257
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa príjemcu %s nezodpovedá ¾iadnemu lokálnemu menu"
 
-#: transact.c:1271
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "správa obsahuje NUL-y"
 
-#: transact.c:1284
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP prijímaè zamietol lokálne adresy príjemcu: "
 
-#: transact.c:1409
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "zápis textu správy\n"
 
-#: uid.c:137
-#, c-format
-msgid "lstat: %s: %s\n"
-msgstr "lstat: %s: %s\n"
-
 #: uid.c:248
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "Starı zoznam UID z %s:"
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr " <prázdny>"
 
@@ -2784,39 +2861,57 @@ msgstr " <prázdny>"
 msgid "Scratch list of UIDs:"
 msgstr "Doèasnı zoznam UID-ov:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
-#: uid.c:512 uid.c:563
+#: uid.c:514 uid.c:566
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "Starı zoznam UID z %s:"
 
-#: uid.c:514
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Novı zoznam UID z %s:"
 
-#: uid.c:542
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr "vymieòam zoznamy UID\n"
 
-#: uid.c:550
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "nevymieòam zoznamy UID, ¾iadne UID-y nevideli túto po¾iadavku\n"
 
-#: uid.c:575
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "vymieòam zoznamy UID\n"
 
-#: uid.c:610
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr "Ma¾em súbor fetchids.\n"
 
-#: uid.c:616
+#: uid.c:615
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Chyba pri uvoµòovaní osobnıch údajov\n"
+
+#: uid.c:621
 msgid "Writing fetchids file.\n"
 msgstr "Zapisujem súbor fetchids.\n"
 
+#: uid.c:640
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:644
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:648
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc zlyhal\n"
@@ -2824,3 +2919,90 @@ msgstr "malloc zlyhal\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc zlyhal\n"
+
+#~ msgid "header "
+#~ msgstr "záhlavie "
+
+#~ msgid "internal inconsistency\n"
+#~ msgstr "vnútorná nezrovnalos»\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "meno je platné ale nemá IP adresu."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "neodstrániteµná chyba servera mien."
+
+#~ msgid "temporary name server error."
+#~ msgstr "doèasná chyba servera mien."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "neznáma DNS chyba %d."
+
+#~ msgid "messages"
+#~ msgstr "správ"
+
+#~ msgid "message"
+#~ msgstr "správa"
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "Voµba --remote nie je podporovaná s ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "ETRN nie je podporované bez gethostbyname(2).\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "ODMR nie je podporované bez gethostbyname(2).\n"
+
+#~ msgid "will not"
+#~ msgstr "nebude"
+
+#~ msgid "will"
+#~ msgstr "bude"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (pou¾ívam bezpeènostné nastavenia siete %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (pou¾ívam port %d)"
+
+#~ msgid "All"
+#~ msgstr "V¹etky"
+
+#~ msgid "Only new"
+#~ msgstr "Len nové"
+
+#~ msgid "enabled"
+#~ msgstr "povolené"
+
+#~ msgid "disabled"
+#~ msgstr "zakázané"
+
+#~ msgid "discarded"
+#~ msgstr "zahodené"
+
+#~ msgid "kept"
+#~ msgstr "ponechané"
+
+#~ msgid "IP address.\n"
+#~ msgstr "IP adries.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "mien.\n"
+
+#~ msgid "Received"
+#~ msgstr "Prijaté"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca neúspe¹né"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "varovanie: nájdené \"%s\" pred niektorımi názvami hostiteµa"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "Voµba --remote nie je podporovaná s ODMR\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: podpora sie»ovej bezpeènosti je zakázaná\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
diff --git a/po/sq.po b/po/sq.po
index 52028a4b..5e06f2dd 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,13 +1,12 @@
 # translation of fetchmail-6.2.9-rc8.sq.po to Albanian
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Besnik Bleta <besnik@spymac.com>, 2004.
+# This file is distributed under the same license as the fetchmail package.
+# Copyright (C) 2005 Besnik Bleta <besnik@spymac.com>, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-18 00:25+0100\n"
+"POT-Creation-Date: 2005-11-18 00:37+0100\n"
 "PO-Revision-Date: 2005-11-17 19:17+0200\n"
 "Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -65,13 +64,13 @@ msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subjekt: Sinjalizim nga Fetchmail rreth mesazhesh tej mase"
 
 #: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr "Mesazhet vijues tej mase u fshinë prej shërbyesit të postës %s:"
 
 #: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr "Mesazhet vijues tej mase mbesin në shërbyesin e postës %s:"
 
 #: driver.c:364
diff --git a/po/tr.po b/po/tr.po
index 11056914..288f22bb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-06 00:35+0200\n"
+"POT-Creation-Date: 2005-11-17 09:23+0100\n"
 "PO-Revision-Date: 2003-08-18 23:00+0100\n"
 "Last-Translator: Engin Gündüz <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -14,20 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:172
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "`%s' düğümünün gerçekten `%s' ile aynı olup olmadığına bakılıyor\n"
 
-#: checkalias.c:175
+#: checkalias.c:176
 msgid "Yes, their IP addresses match\n"
 msgstr "Evet, IP adresleri birbirine uyuyor\n"
 
-#: checkalias.c:179
+#: checkalias.c:180
 msgid "No, their IP addresses don't match\n"
 msgstr "Hayır, IP adresleri birbirine uymuyor\n"
 
-#: checkalias.c:199 checkalias.c:224
+#: checkalias.c:196
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr ""
+"%2$s yoklanırken `%1$s'in aranması sırasında DNS sorgusu başarısız oldu.\n"
+
+#: checkalias.c:221
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -42,21 +48,29 @@ msgstr "BASE64 challenge'ının kodunu çözemedim\n"
 msgid "decoded as %s\n"
 msgstr "%s olarak kodu çözüldü\n"
 
-#: driver.c:195
+#: driver.c:193
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos hatası %s\n"
 
-#: driver.c:253 driver.c:258
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
-#: driver.c:339
+#: driver.c:337
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:342
+#: driver.c:341
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on the mail server %s:"
+msgstr ""
+"Subject: Fetchmail çok büyük ileti uyarısı.\n"
+"\n"
+"Aşağıda yazılı çok büyük iletiler sunucu %s üzerinde bırakıldı:"
+
+#: driver.c:345
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -64,55 +78,60 @@ msgstr ""
 "\n"
 "Aşağıda yazılı çok büyük iletiler sunucu %s üzerinde bırakıldı:"
 
-#: driver.c:360
+#: driver.c:364
+#, fuzzy, c-format
+msgid "  %d msg %d octets long deleted by fetchmail."
+msgstr "\tfetchmail %2$d sekizlik büyüklüğündeki %1$d. iletiyi atlıyor.\n"
+
+#: driver.c:368
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\tfetchmail %2$d sekizlik büyüklüğündeki %1$d. iletiyi atlıyor.\n"
 
-#: driver.c:500
+#: driver.c:502
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlanıyor (%d sekizlik)"
 
-#: driver.c:552
+#: driver.c:556
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ileti %s@%s:%d atlanıyor (%d sekizlik)"
 
-#: driver.c:568
+#: driver.c:572
 msgid " (length -1)"
 msgstr " (büyüklük -1)"
 
-#: driver.c:571
+#: driver.c:575
 msgid " (oversized)"
 msgstr " (çok büyük)"
 
-#: driver.c:586
+#: driver.c:590
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "başlıklar getirilemedi, ileti %s@%s:%d (%d sekizlik)\n"
 
-#: driver.c:603
+#: driver.c:607
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:608
+#: driver.c:612
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %ssekizlik)"
 
-#: driver.c:609
+#: driver.c:613
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (ileti gövdesi %d sekizlik) "
 
-#: driver.c:681
+#: driver.c:685
 #, c-format
 msgid " (%d body octets) "
 msgstr " (ileti gövdesi %d sekizlik) "
 
-#: driver.c:739
+#: driver.c:743
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -120,19 +139,19 @@ msgstr ""
 "%s@%s:%d iletisinin uzunluğu beklendiği kadar değil (gerçekte %d != beklenen "
 "%d)\n"
 
-#: driver.c:770
+#: driver.c:774
 msgid " retained\n"
 msgstr " bırakıldı\n"
 
-#: driver.c:779
+#: driver.c:784
 msgid " flushed\n"
 msgstr " boşaltıldı\n"
 
-#: driver.c:796
+#: driver.c:801
 msgid " not flushed\n"
 msgstr " boşaltılmadı\n"
 
-#: driver.c:813
+#: driver.c:818
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -142,42 +161,42 @@ msgstr[0] ""
 msgstr[1] ""
 "`fetchlimit' %d ulaşıldı; %d ileti %s sunucusunda %s hesabında bırakıldı\n"
 
-#: driver.c:876
+#: driver.c:881
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "bir MDA'dan SIGPIPE fırlatıldı ya da stream soket hatası\n"
 
-#: driver.c:883
+#: driver.c:888
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "%d saniye %s sunucusuna bağlanmak beklendi ve zamanaşımı süresi doldu.\n"
 
-#: driver.c:887
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "sunucu %2$s %1$d saniye beklendi ve zamanaşımı süresi doldu.\n"
 
-#: driver.c:891
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%2$s %1$d saniye beklendi ve zamanaşımı süresi doldu.\n"
 
-#: driver.c:896
+#: driver.c:901
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "dinleyici %d saniye beklendikten sonra zamanaşımına uğrandı.\n"
 
-#: driver.c:899
+#: driver.c:904
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamanaşımı süresi doldu.\n"
 
-#: driver.c:911
+#: driver.c:916
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail çok sayıda zamanaşımı ile karşılaşıyor\n"
 
-#: driver.c:914
+#: driver.c:919
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -186,7 +205,7 @@ msgstr ""
 "Fetchmail %2$s@%3$s'den posta almaya çalışırken %1$d'den çok zamanaşımı ile "
 "karşılaştı.\n"
 
-#: driver.c:918
+#: driver.c:923
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -203,59 +222,32 @@ msgstr ""
 "Fetchmail yeniden çalıştırılana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:947
+#: driver.c:948
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "bağlantı sonrası komut başarısız oldu, durum kodu %d\n"
 
-#: driver.c:978
+#: driver.c:972
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s için HESIOD pobox bulunamadı\n"
 
-#: driver.c:1000
+#: driver.c:993
 msgid "Lead server has no name.\n"
 msgstr "Lead sunucunun adı yok.\n"
 
 # canonical'in Türkçesi ne ola? kanonik hiç hoş değil.
-#: driver.c:1024 driver.c:1050
+#: driver.c:1017
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "%s (%s)'in kanonik DNS adını bulamadım\n"
 
-#: driver.c:1088
-msgid "internal inconsistency\n"
-msgstr "iç tutarsızlık\n"
-
-#: driver.c:1098
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s bağlantısı başarısız oldu"
 
-#: driver.c:1104
-msgid "host is unknown."
-msgstr "makina bilinmiyor."
-
-#: driver.c:1107
-msgid "name is valid but has no IP address."
-msgstr "ad geçerli ama IP adresi yok."
-
-# unrecoverable = düzeltilemez (Sankur'un sözlüğü 'kurtarılamaz' diyor ama buraya pek
-# uymuyor bence...
-#: driver.c:1110
-msgid "unrecoverable name server error."
-msgstr "düzeltilemeyen ad sunucusu hatası."
-
-#: driver.c:1112
-msgid "temporary name server error."
-msgstr "geçici ad sunucusu hatası."
-
-#: driver.c:1115
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "bilinmeyen DNS hatası %d."
-
-#: driver.c:1133
+#: driver.c:1071
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -263,45 +255,45 @@ msgstr ""
 "\n"
 "Fetchmail posta sunucusuna (%s) ulaşamadı:"
 
-#: driver.c:1135
+#: driver.c:1073
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail %s@%s'den posta alamadı.\n"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1099 imap.c:384 pop3.c:433
 msgid "SSL connection failed.\n"
 msgstr "SSL bağlantısı başarısız oldu.\n"
 
-#: driver.c:1215
+#: driver.c:1152
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Meşgul kilit hatası (%s@%s)\n"
 
-#: driver.c:1219
+#: driver.c:1156
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Sunucu meşgul hatası (%s@%s)\n"
 
-#: driver.c:1224
+#: driver.c:1161
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s'te yetkilendirme hatası\n"
 
-#: driver.c:1227
+#: driver.c:1164
 msgid " (previously authorized)"
 msgstr " (önceden yetkilendirilmiş)"
 
-#: driver.c:1248
+#: driver.c:1185
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetlemesi başarısız oldu\n"
 
-#: driver.c:1252
+#: driver.c:1189
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamadı.\n"
 
-#: driver.c:1256
+#: driver.c:1193
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -331,7 +323,7 @@ msgstr ""
 "Fetchmail daemon'ı çalışmaya devam edecek ve sırası geldikçe bağlanmaya\n"
 "çalışacak. Hizmet yeniden sağlanana dek başka bir bildirim gönderilmeyecek."
 
-#: driver.c:1271
+#: driver.c:1208
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -350,71 +342,71 @@ msgstr ""
 "Fetchmail daemon'ı çalışmaya devam edecek ve sırası geldikçe bağlanmaya\n"
 "çalışacak. Hizmet yeniden sağlanana dek başka bir bildirim gönderilmeyecek."
 
-#: driver.c:1286
+#: driver.c:1223
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1291
+#: driver.c:1228
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s'te bilinmeyen giriş ya da kimlik denetleme hatası\n"
 
-#: driver.c:1315
+#: driver.c:1252
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1321
+#: driver.c:1258
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1325
+#: driver.c:1262
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi başardı.\n"
 
-#: driver.c:1329
+#: driver.c:1266
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden sağlanıyor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1360
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "%s klasörünü seçiyor ya da yeniden kontrol ediyorum\n"
 
-#: driver.c:1362
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "öntanımlı klasörü seçiyor ya da yeniden kotrol ediyorum\n"
 
 # kaynak koduna bakılacak
-#: driver.c:1374
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klasör %3$s)"
 
 # kaynak koduna bakılacak
-#: driver.c:1377 rcfile_y.y:401
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#: driver.c:1382
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklanıyor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1386
+#: driver.c:1323
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%5$s için (%3$d adedi %4$s) %1$d %2$s"
 msgstr[1] "%5$s için (%3$d adedi %4$s) %1$d %2$s"
 
-#: driver.c:1389
+#: driver.c:1326
 #, fuzzy
 msgid "seen"
 msgid_plural "seen"
@@ -422,98 +414,103 @@ msgstr[0] "görülmüş"
 msgstr[1] "görülmüş"
 
 # önceki iki ileti ile ilgili.
-#: driver.c:1392
+#: driver.c:1329
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%3$s için %1$d %2$s"
 msgstr[1] "%3$s için %1$d %2$s"
 
-#: driver.c:1399
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1405
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s için mektup yok\n"
 
-#: driver.c:1438
+#: driver.c:1375 imap.c:85
 msgid "bogus message count!"
 msgstr "sahte ileti sayısı!"
 
-#: driver.c:1539
+#: driver.c:1485
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1542
+#: driver.c:1488
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 başlığı ya hiç yok ya da formatı kötü"
 
-#: driver.c:1545
+#: driver.c:1491
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1548
+#: driver.c:1494
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1551
+#: driver.c:1497
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokolü"
 
-#: driver.c:1554
+#: driver.c:1500
 msgid "lock busy on server"
 msgstr "sunucuda kilit meşgul"
 
 # transaction'ı işlem diye çevirdim. Doğru mu?
-#: driver.c:1557
+#: driver.c:1503
 msgid "SMTP transaction"
 msgstr "SMTP işlemi"
 
-#: driver.c:1560
+#: driver.c:1506
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1563
+#: driver.c:1509
 msgid "undefined error\n"
 msgstr "tanımlanmamış hata\n"
 
-#: driver.c:1574
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1515
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "SMTP makinası %2$s'e dağıtılırken %1$s hatası\n"
 
-#: driver.c:1576
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1517
+#, fuzzy
+msgid "unknown"
+msgstr "makina bilinmiyor."
+
+#: driver.c:1519
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%2$s'den getirilirken %1$s hatası\n"
 
-#: driver.c:1584
+#: driver.c:1529
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "bağlantı sonrası komut %d durum kodu ile başarısız oldu\n"
 
-#: driver.c:1605
+#: driver.c:1550
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 desteği yok.\n"
 
-#: driver.c:1613
+#: driver.c:1558
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 desteği yok.\n"
 
-#: driver.c:1624
+#: driver.c:1569
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush seçeneği %s ile desteklenmiyor\n"
 
-#: driver.c:1630
+#: driver.c:1575
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all seçeneği %s ile desteklenmiyor\n"
 
-#: driver.c:1638
+#: driver.c:1584
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit seçeneği %s ile desteklenmiyor\n"
@@ -561,11 +558,23 @@ msgstr "%s: Burada yoksunuz. Uzak durun.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: makinanızı belirleyemiyorum!"
 
-#: env.c:158
+#: env.c:163
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "`gethostbyname' %s için başarısız oldu\n"
 
+#: env.c:165
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:169
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
 #: etrn.c:47 odmr.c:58
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
@@ -614,85 +623,90 @@ msgstr "Parametrelerde ETRN sözdizim hatası\n"
 msgid "Unknown ETRN error %d\n"
 msgstr "Bilinmeyen ETRN hatası %d\n"
 
-#: etrn.c:155
+#: etrn.c:151
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "--keep seçeneği ETRN ile desteklenmiyor\n"
 
-#: etrn.c:159
+#: etrn.c:155
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "--flush seçeneği ETRN ile desteklenmiyor\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "--remote seçeneği ETRN ile desteklenmiyor\n"
+#: etrn.c:159
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "--flush seçeneği ETRN ile desteklenmiyor\n"
 
-#: etrn.c:167
+#: etrn.c:163
 msgid "Option --check is not supported with ETRN\n"
 msgstr "--check seçeneği ETRN ile desteklenmiyor\n"
 
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
 # bu Türkçe'nin sözdizimine uymuyor??? Ne biçim 'i18n'!! :((
-#: fetchmail.c:167
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: bunlarla başlatıldı"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "çalışma dizini bulunamadı\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:257
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail sürüm %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:354
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Seçenekler komut satırından alınıyor%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:355
 msgid " and "
 msgstr " ve "
 
-#: fetchmail.c:352
+#: fetchmail.c:360
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Hiçbir posta sunucusu yok; belki %s eksik?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:381
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: hiçbir posta sunucusu belirtilmedi.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:393
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: başka bir fetchmail çalışmıyor\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr ""
 "fetchmail: %2$d'de %1$sda çalışan fetchmail'i öldürürken hata; çıkıyorum.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "background"
 msgstr "arkaplan"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:400 fetchmail.c:409
 msgid "foreground"
 msgstr "önplan"
 
-#: fetchmail.c:403
+#: fetchmail.c:408
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %2$d'de %1$sde çalışan fetchmail öldürüldü.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:431
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 msgstr ""
 "fetchmail: aynı makinaya başka bir fetchmail çalışırken iletilere bakamam.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:437
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -700,68 +714,68 @@ msgstr ""
 "fetchmail: %d'de çalışan başka bir fetchmail ile belirtilen makinaları "
 "yoklayamam.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: %d'de başka bir fetchmail önplanda çalışıyor.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:454
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: arkaplanda bir fetchmail çalışırken seçenekleri kabul edemem.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: %d'de arkaplanda çalışan fetchmail uyandırıldı.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:472
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: %d büyük kardeş süreç gizemli bir biçimde öldü.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:487
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s'in parolasını bulamıyorum.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:491
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s'in parolasını yazınız: "
 
-#: fetchmail.c:510
+#: fetchmail.c:522
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s daemon başlatılıyor \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:537 fetchmail.c:539
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "kayıt eklemek için %s açılamadı \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:575
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "dosya zamanı kontrol edilemedi %s (hata kodu %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:580
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail yeniden başlatılıyor (%s değişti)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:585
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "yeniden başlatma denemesi, dizin eski haline döndürülmediğinden başarısız "
 "olabilir\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:612
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail'i yeniden başlatma denemesi başarısız oldu\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:640
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
@@ -769,198 +783,198 @@ msgstr ""
 "zamamaşımı)\n"
 
 # interval ne? time interval mi?? kaynak koduna bak
-#: fetchmail.c:642
+#: fetchmail.c:652
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "aralık ulaşılmadı, %s'i sorgulamıyorum\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:690
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sorgulama durumu=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:692
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sorgulama durumu=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:694
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sorgulama durumu=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:696
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sorgulama durumu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:698
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sorgulama durumu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:700
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sorgulama durumu=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:702
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sorgulama durumu=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:704
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sorgulama durumu=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:706
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sorgulama durumu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:708
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sorgulama durumu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:710
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sorgulama durumu=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:712
 msgid "Query status=11 (DNS)\n"
 msgstr "Sorgulama durumu=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:714
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sorgulama durumu=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:716
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sorgulama durumu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:718
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sorgulama durumu=%d\n"
 
 # wedge'yi sıkışmak diye çevirdim. Uygun mu?
-#: fetchmail.c:754
+#: fetchmail.c:764
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tüm bağlantılar sıkıştı. Çıkıyorum.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:771
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "fetchmail: %s'de uyuyorum\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:795
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s tarafından uyandırıldım\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:798
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d sinyali ile tarafından uyandırıldım\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:805
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s'de uyandırıldım\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:811
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal bitiş, durum kodu %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:963
 msgid "couldn't time-check the run-control file\n"
 msgstr "çalışma denetimi (run-control) dosyasının zamanı kontrol edilemedi\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:996
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Uyarı: yapılandırma dosyasında %s makinasının adı birden çok kez geçiyor\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1029
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr ""
+"Uyarı: yapılandırma dosyasında %s makinasının adı birden çok kez geçiyor\n"
+
+#: fetchmail.c:1149
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL desteği derlenirken eklenmemiş.\n"
 
 # multidrop'u çeviremedim.
-#: fetchmail.c:1165
+#: fetchmail.c:1180
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: uyarı: %s'den multidrop iletileri kontrol etmek için DNS yok\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1191
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1177
+#: fetchmail.c:1192
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1193
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#: fetchmail.c:1209
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "%s yapılandırma geçersiz, port sıfırdan küçük bir sayı olamaz\n"
 
 # priviledged port = ayrıcalıklı port???
-#: fetchmail.c:1200
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1216
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "%s yapılandırma geçersiz, RPOP ayrıcalıklı bir port gerektirir\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1234
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s yapılandırma geçersiz, LMTP, SMTP'nin öntanımlı portunu kullanamaz\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1248
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "`fetchall' ve daemon kipinde çalışma birlikte olmaz!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1298
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1383
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%4$s'de %1$s %2$s'i sorguluyor (protokol %3$s): yoklama başlatıldı\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1408
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1420
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1430
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1436
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1425
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
-
-#: fetchmail.c:1432
+#: fetchmail.c:1444
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1438
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
-
-#: fetchmail.c:1444
+#: fetchmail.c:1451
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol seçilmiş.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1454
+#: fetchmail.c:1461
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -968,497 +982,506 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1471
+#: fetchmail.c:1478
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nabız yoklama aralığı %d saniye\n"
 
 # logfile = kayıt dosyası ?
-#: fetchmail.c:1473
+#: fetchmail.c:1480
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Kayıt  dosyası = %s\n"
 
 # Idfile'i Türkçe'ye çevirebilir miyim burada (kimlik dosyası?) Kaynak koduna bak
-#: fetchmail.c:1475
+#: fetchmail.c:1482
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyası %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1485
 msgid "Progress messages will be logged via syslog\n"
 msgstr "İlerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1488
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail kılık değiştirecek ve Received satırı oluşturmayacak\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1490
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail ilerleme durumunu gösteren noktaları kayıt dosyalarında bile "
 "gösterecek.\n"
 
 # multidrop message ne demek?
-#: fetchmail.c:1485
+#: fetchmail.c:1492
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail yanlış adrese gönderilmiş multidrop iletileri %s'e iletecek.\n"
 
 # postmaster = postmaster ??
-#: fetchmail.c:1489
+#: fetchmail.c:1496
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1498
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini göndericiye iletecek.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1505
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek için seçenekler:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1509
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1505
+#: fetchmail.c:1512
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Bu sunucunun yoklaması her %d zaman aralığında yapılacak.\n"
 msgstr[1] "  Bu sunucunun yoklaması her %d zaman aralığında yapılacak.\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1516
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun gerçek adı %s.\n"
 
 # Bu çeviriyi kontrol et.
-#: fetchmail.c:1512
+#: fetchmail.c:1519
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Hiçbir makina belirtilmediğinde %s sorgulanacak.\n"
 
 # Bu çeviriyi kontrol et.
-#: fetchmail.c:1513
+#: fetchmail.c:1520
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Hiçbir makina belirtilmediğinde %s sorgulanacak.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1524
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1528
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1531
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullanıcı adı = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1534
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullanılıyor"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1548
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullanıyorum)"
 
-#: fetchmail.c:1548
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (şu ağ güvenliği seçeneklerini kullanıyorum: %s)"
-
-#: fetchmail.c:1551
-#, c-format
-msgid " (using port %d)"
-msgstr " (port %d kullanılıyor)"
-
-#: fetchmail.c:1554
+#: fetchmail.c:1550
 msgid " (using default port)"
 msgstr " (öntanımlı port kullanılıyor)"
 
 # 'to force' nasıl çevrilebilir?
-#: fetchmail.c:1556
+#: fetchmail.c:1552
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullanımı istenecek)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1558
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Tüm kimlik denetleme yöntemleri denenecek.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1561
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1564
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM kimlik kanıtlaması istenecek.\n"
+
+#: fetchmail.c:1567
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1570
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1573
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1576
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1579
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1582
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1585
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Uçtan uca şifreleme varsayılıyor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1590
+#: fetchmail.c:1589
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1592
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile şifrelenmiş oturumlar etkinleştirildi.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1594
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokolü: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1596
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikası kontrolü etkinleştirildi.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1598
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL güvenilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1601
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL anahtar parmakizi (sunucu anahtarı ile denetlendi): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1604
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamanaşımı %d saniye"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1606
 msgid " (default).\n"
 msgstr " (öntanımlı).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1613
 msgid "  Default mailbox selected.\n"
 msgstr "  Öntanımlı posta kutusu seçildi.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1618
 msgid "  Selected mailboxes are:"
 msgstr "  Seçilen posta kutuları:"
 
 #  bu çeviriyi kontrol et
-#: fetchmail.c:1625
+#: fetchmail.c:1624
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
 #  bu çeviriyi kontrol et
-#: fetchmail.c:1626
+#: fetchmail.c:1625
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1627
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1628
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1630
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Eski iletiler %s ileti alımından önce boşaltılacak (--flush %s).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1631
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  Eski iletiler %s ileti alımından önce boşaltılacak (--flush %s).\n"
 
+#: fetchmail.c:1633
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr "  Eski iletiler %s ileti alımından önce boşaltılacak (--flush %s).\n"
+
 #: fetchmail.c:1634
 #, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr "  Eski iletiler %s ileti alımından önce boşaltılacak (--flush %s).\n"
+
+#: fetchmail.c:1636
+#, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local adreslerin yeniden yazılması %s (--norewrite %s).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1637
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  server-local adreslerin yeniden yazılması %s (--norewrite %s).\n"
 
 # carriage-return?? Başkalarına sor
-#: fetchmail.c:1637
+#: fetchmail.c:1639
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Başkalarına sor
-#: fetchmail.c:1638
+#: fetchmail.c:1640
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Başkalarına sor
-#: fetchmail.c:1640
+#: fetchmail.c:1642
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return'lerin zorunlu kullanımı %s (orcecr %s).\n"
 
 # carriage-return?? Başkalarına sor
-#: fetchmail.c:1641
+#: fetchmail.c:1643
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return'lerin zorunlu kullanımı %s (orcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1645
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1646
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1648
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME kod çözümü %s (mimedecode %s).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1649
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME kod çözümü %s (mimedecode %s).\n"
 
 # idle = ?? Başkalarına sor
-#: fetchmail.c:1649
+#: fetchmail.c:1651
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # idle = ?? Başkalarına sor
-#: fetchmail.c:1650
+#: fetchmail.c:1652
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # Bunun aşağıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
 # düşünülmeliler.
-#: fetchmail.c:1652
+#: fetchmail.c:1654
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Boş olmayan Status satırları %s (dropstatus %s)\n"
 
 # Bunun aşağıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
 # düşünülmeliler.
-#: fetchmail.c:1653
+#: fetchmail.c:1655
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Boş olmayan Status satırları %s (dropstatus %s)\n"
 
 # Bunun yukarıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
 # düşünülmeliler.
-#: fetchmail.c:1655
+#: fetchmail.c:1657
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To satırları %s (dropdelivered %s)\n"
 
 # Bunun yukarıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
 # düşünülmeliler.
-#: fetchmail.c:1656
+#: fetchmail.c:1658
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To satırları %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1662
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  İleti boyut sınırı %d sekizlik (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  İleti boyut sınırı yok (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  İleti boyut uyarısı aralığı %d saniye (--warnings %d).\n"
 
 # poll = yoklama
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada büyüklük uyarısı (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Alınan ileti sınırı %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1676
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Alınan ileti sınırı yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1678
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Alınan ileti sınırı %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  İleti boyut sınırı yok (--limit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1685
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1690
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
 # batch = ?
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1698
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Silmeler arasındaki zaman aralığı olarak %d kullanılacak (--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1700
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Silmeler zorlanmayacak (--expunge 0).\n"
 
 # bu çeviriye bir bak. domain=alan deyince 'alanlar' sanki 'recipients' gibi anlaşılabilir??
-#: fetchmail.c:1704
+#: fetchmail.c:1707
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Şu alanlar (domains) için posta getirilecek:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1712 fetchmail.c:1732
 msgid " (default)"
 msgstr " (öntanımlı)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  İletiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1719
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  İletiler \"%s\" ile ulaştırılacak.\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  İletiler %cMTP ile aşağıdakilere iletilecek:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1737
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  MAIL FROM satırının bilgisayar bölümü %s olacak\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1740
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  SMTP'ye gönderilecek RCPT TO satırlarına konacak adres %s olacak\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yanıtları şöyle:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin değil\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1758
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu bağlantısı \"%s\" ile açılacak.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 msgid "  No pre-connection command.\n"
 msgstr "  Hiçbir bağlantı öncesi komutu yok.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu bağlantısı \"%s\" ile kopatılacak.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1766
 msgid "  No post-connection command.\n"
 msgstr "  Hiçbir bağlantı öncesi komutu yok.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina için hiçbir yerel ad tanımlanmamış.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1779
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1781
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1783
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1466,13 +1489,13 @@ msgstr[0] "%d yerel ad tanındı.\n"
 msgstr[1] "%d yerel ad tanındı.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1795
+#: fetchmail.c:1798
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Multidrop adresler için DNS sorgulaması %s.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Multidrop adresler için DNS sorgulaması %s.\n"
@@ -1481,7 +1504,7 @@ msgstr "  Multidrop adresler için DNS sorgulaması %s.\n"
 # ve "name.". Dilbilgisi yapısı Türkçeye tümüyle ters olduğundan
 # bunları aşağıdaki iki iletide çevirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye böyle olduğunu anlamak için.
-#: fetchmail.c:1800
+#: fetchmail.c:1803
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1491,100 +1514,94 @@ msgstr "  "
 # ve "name.". Dilbilgisi yapısı Türkçeye tümüyle ters olduğundan
 # bunları aşağıdaki iki iletide çevirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye böyle olduğunu anlamak için.
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin değil\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope başlığı şöyle varsayılıyor: %s\n"
 
-# Bu ileti yukarıdaki "Envelope header is assumed to be: %" iletisine
-# bağlı.
-#: fetchmail.c:1809
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1811
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1814
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Parse edilecek envelope başlığı sayısı: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1817
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s öneki kullanıcı kimliğinden silinecek\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1820
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Önceden tanımlanmış posta sunucusu takma adları:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1836
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Bağlatı %s arayüzünden olmalı.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir arayüzün kullanılması zorunlu koşulmamış.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama döngüsü %s'i gözleyecek.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No monitor interface specified.\n"
 msgstr "  Gözleme arayüzü belirtilmemiş.\n"
 
 # plugin == ?
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Sunucu bağlantıları %s plugin'i ile yapılacak (--plugin %s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1858
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemiş.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:1857
+#: fetchmail.c:1860
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Dinleyici bağlantıları %s plugout'u ile yapılacak (--plugput %s).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1862
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemiş.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hiçbir UID saklanmadı.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1876
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID saklandı.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1884
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received başlığına yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1592,15 +1609,11 @@ msgstr ""
 "  Received başlığına yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Özellikler geçiriliyor \"%s\".\n"
 
-#: fetchmail.h:614 fetchmail.h:620
-msgid "alloca failed"
-msgstr "alloca başarısız oldu"
-
 #: getpass.c:72
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "HATA: getpassword() desteklenmiyor\n"
@@ -1631,37 +1644,37 @@ msgstr "Credential'lar gönderiliyor\n"
 msgid "Error exchanging credentials\n"
 msgstr "Credential takasında hata\n"
 
-#: gssapi.c:148
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "Güvenlik düzeyi verisi elde edilemedi\n"
 
-#: gssapi.c:153
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "Crendential takası tamamlandı\n"
 
-#: gssapi.c:157
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Sunucu iç tutarlılık ve/ya da mahremiyet gerektiriyor\n"
 
-#: gssapi.c:166
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Güvenlik düzeyi bayrakları: %s%s%s\n"
 
-#: gssapi.c:170
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "En büyük GSS token boyutu %ld\n"
 
-#: gssapi.c:183
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "Güvenlik düzeyi isteğini oluştururken hata\n"
 
-#: gssapi.c:194
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "GSS credential'ları bırakılıyor\n"
 
-#: gssapi.c:197
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "Credential'lar bırakılırken hata\n"
 
@@ -1670,77 +1683,77 @@ msgstr "Credential'lar bırakılırken hata\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread %d saniye uyuyor.\n"
 
-#: imap.c:281
+#: imap.c:298
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol IMAP4 rev 1 olarak belirlendi\n"
 
-#: imap.c:287
+#: imap.c:304
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol IMAP rev 0 olarak belirlendi.\n"
 
-#: imap.c:294
+#: imap.c:311
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
 
-#: imap.c:309
+#: imap.c:326
 msgid "will idle after poll\n"
 msgstr "yoklamadan sonra idle kalınacak\n"
 
-#: imap.c:462
+#: imap.c:482
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli OTP desteği ile derlenmemiş\n"
 
-#: imap.c:484
+#: imap.c:504 pop3.c:341
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli NTLM desteği ile derlenmemiş\n"
 
-#: imap.c:493
+#: imap.c:513
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yeteneğini desteklemiyor\n"
 
-#: imap.c:644 imap.c:710
-msgid "expunge failed\n"
-msgstr "silme başarısız oldu\n"
-
-#: imap.c:662 imap.c:695
+#: imap.c:674 imap.c:707
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama başarısız oldu\n"
 
-#: imap.c:670
+#: imap.c:682
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "yeniden yokladıktan sonra %d ileti bekliyor\n"
 msgstr[1] "yeniden yokladıktan sonra %d ileti bekliyor\n"
 
-#: imap.c:682
+#: imap.c:694
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu seçimi başarısız oldu\n"
 
-#: imap.c:686
+#: imap.c:698
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ilk yoklamadan sonra %d ileti bekliyor\n"
 msgstr[1] "ilk yoklamadan sonra %d ileti bekliyor\n"
 
-#: imap.c:714
+#: imap.c:722
+msgid "expunge failed\n"
+msgstr "silme başarısız oldu\n"
+
+#: imap.c:726
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "silinmeden sonra %d ileti bekliyor\n"
 msgstr[1] "silinmeden sonra %d ileti bekliyor\n"
 
-#: imap.c:739
+#: imap.c:751
 msgid "search for unseen messages failed\n"
 msgstr "görülmemiş iletileri arama işlemi başarısız oldu\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u görülmemiş\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:793 pop3.c:744
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ilk görülmemiş\n"
@@ -1781,44 +1794,44 @@ msgstr "Adı %s olan bir arayüz bulunamadı"
 msgid "No IP address found for %s"
 msgstr "%s için bir IP adresi bulunamadı"
 
-#: interface.c:590
+#: interface.c:589
 msgid "missing IP interface address\n"
 msgstr "IP arayüzü adresi yok\n"
 
-#: interface.c:606
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "geçersiz IP arayüzü adresi\n"
 
-#: interface.c:612
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "geçersiz IP arayüzü maskesi\n"
 
-#: interface.c:651
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:666
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "%s'in yoklanmasını atlıyorum, %s çalışmıyor\n"
 
-#: interface.c:685
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "%s'in yoklaması atlanıyor, %s IP adresi dışarıda tutuluyor\n"
 
-#: interface.c:697
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:723
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "%s'in yoklaması atlanıyor, %s etkin değil\n"
 
-#: interface.c:730
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s'de etkinlik %d idi, şimdi %d\n"
@@ -1845,25 +1858,30 @@ msgstr "BASE64 hazır yanıtının kodu çözülemedi\n"
 msgid "challenge mismatch\n"
 msgstr "challenge'lar uymuyor\n"
 
-#: lock.c:83
+#: lock.c:77
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: eski kilit dosyasını siliyorum \n"
+
+#: lock.c:89
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: eski kilit dosyasını siliyorum \n"
 
-#: lock.c:124
+#: lock.c:96
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: eski kilit dosyasını siliyorum \n"
+
+#: lock.c:137
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: kilit oluşturulamadı.\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "uyarı: herhangi bir makina adından önce \"%s\" bulundu"
-
-#: netrc.c:222
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: uyarı: herhangi bir makina adından önce \"%s\" bulundu\n"
 
-#: netrc.c:261
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: uyarı: bilinmeyen token \"%s\"\n"
@@ -1902,19 +1920,25 @@ msgstr "Kimlik kanıtlaması gerekiyor.\n"
 msgid "Unknown ODMR error %d\n"
 msgstr "Bilinmeyen ODMR hatası %d\n"
 
-#: odmr.c:243
+#: odmr.c:187
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "ileti metni yazılıyor\n"
+
+#: odmr.c:240
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "--keep seçeneği ODMR ile desteklenmiyor\n"
 
-#: odmr.c:247
+#: odmr.c:244
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "--flush seçeneği ODMR ile desteklenmiyor\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "--remote seçeneği ODMR ile desteklenmiyor\n"
+#: odmr.c:248
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "--flush seçeneği ODMR ile desteklenmiyor\n"
 
-#: odmr.c:255
+#: odmr.c:252
 msgid "Option --check is not supported with ODMR\n"
 msgstr "--check seçeneği ODMR ile desteklenmiyor\n"
 
@@ -1926,87 +1950,83 @@ msgstr "sunucu recv ölümcül\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'ının kodu çözülemedi\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:515
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "'%s' katarı geçerli bir sayı katarı değil.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "'%1$s'in değeri %3$d'den %2$s.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "küçük"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "büyük"
 
-#: options.c:383
+#: options.c:330
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Geçersiz protokol `%s' belirtilmiş.\n"
 
-#: options.c:429
+#: options.c:372
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Geçersiz kimlik denetlemesi yöntemi `%s' belirtilmiş.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: ağ güvenliği desteği etkin değil\n"
-
-#: options.c:660
+#: options.c:573
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "kullanım: fetchmail [seçenekler] [sunucu ...]\n"
 
-#: options.c:661
+#: options.c:574
 msgid "  Options are as follows:\n"
 msgstr "  Aşağıdaki seçenekler kullanılabilir:\n"
 
-#: options.c:662
+#: options.c:575
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        bu yardım iletisini göster\n"
 
-#: options.c:663
+#: options.c:576
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     sürüm bilgisini göster\n"
 
-#: options.c:665
+#: options.c:578
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       iletileri kontrol et ama getirme\n"
 
-#: options.c:666
+#: options.c:579
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      sessizce çalış\n"
 
-#: options.c:667
+#: options.c:580
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     çok ayrıntılı bilgi ver (tanılama çıktısı)\n"
 
-#: options.c:668
+#: options.c:581
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      n saniye için bir kez daemon olarak  çalış\n"
 
-#: options.c:669
+#: options.c:582
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    deamon sürecini 'detach' etme\n"
 
-#: options.c:670
+#: options.c:583
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        daemon sürecini öldür\n"
 
-#: options.c:671
+#: options.c:584
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     kayıt dosyası adını belirle\n"
 
-#: options.c:672
+#: options.c:585
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2014,209 +2034,217 @@ msgstr ""
 "      --syslog      daemon olarak çalışırken çoğu ileti için syslog(3) "
 "kullan\n"
 
-#: options.c:673
+#: options.c:586
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   'Received' satırlarını yazma ve 'spoof' etmeye izin ver\n"
 
-#: options.c:674
+#: options.c:587
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc başka bir yapılandırma dosyası kullan\n"
 
-#: options.c:675
+#: options.c:588
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      başka bir UID dosyası kullan\n"
 
-#: options.c:676
+#: options.c:589
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  başka bir \"son çare\" alıcısı belirle\n"
 
-#: options.c:677
+#: options.c:590
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    bounce eden iletileri kullanıcıdan postmaster'a gönder.\n"
 
-#: options.c:679
+#: options.c:592
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:680
+#: options.c:593
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     arayüzün etkinliğini gözle\n"
 
-#: options.c:683
+#: options.c:596
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ssl ile şifrelenmiş oturumu etkinleştir\n"
 
-#: options.c:684
+#: options.c:597
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl özel anahtar dosyası\n"
 
-#: options.c:685
+#: options.c:598
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl istemci sertifikası\n"
 
-#: options.c:686
+#: options.c:599
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ssl istemci sertifikası\n"
 
-#: options.c:687
+#: options.c:600
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:688
+#: options.c:601
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    ssl protokolünü seç (ssl2/ssl3/tls1)\n"
 
-#: options.c:690
+#: options.c:603
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      bağlatıları açmak için dışarıdan bir program belirle\n"
 
-#: options.c:691
+#: options.c:604
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     SMTP bağlantılarını yapmak için dışarıdan bir program "
 "belirle\n"
 
-#: options.c:693
+#: options.c:606
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    belirtilen protokolü kullan (man sayfasına bakınız)\n"
 
-#: options.c:694
+#: options.c:607
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        UIDL kullanımını zorunlu kıl (yalnızca pop3 için)\n"
 
-#: options.c:695
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:608
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        bağlanılacak TCP/IP portu\n"
+
+#: options.c:609
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        bağlanılacak TCP/IP portu\n"
 
-#: options.c:696
+#: options.c:610
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        kimlik kanıtama türü (parola/kerberos/ssh/otp)\n"
 
-#: options.c:697
+#: options.c:611
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     sunucu zamanaşımı süresi\n"
 
-#: options.c:698
+#: options.c:612
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope   envelope adresi başlığı\n"
 
-#: options.c:699
+#: options.c:613
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    yerel kullanıcı kimliğinden silinecek önek\n"
 
 # 'principal' ne demek?
-#: options.c:700
+#: options.c:614
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   posta hizmeti pricipal'ı\n"
 
-#: options.c:701
+#: options.c:615
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received başlıklarına yoklama bilgisi ekle\n"
 
-#: options.c:703
+#: options.c:617
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    kullanıcının sunucudakı kullanıcı adı\n"
 
-#: options.c:704
+#: options.c:618
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         eski ve yeni iletileri getir\n"
 
-#: options.c:705
+#: options.c:619
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      getirdikten sonra yeni iletileri sil\n"
 
-#: options.c:706
+#: options.c:620
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep       getirdikten sonra yeni iletileri sakla\n"
 
-#: options.c:707
+#: options.c:621
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:708
+#: options.c:622
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
+
+#: options.c:623
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   başlık adreslerini yeniden yazma\n"
 
-#: options.c:709
+#: options.c:624
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -w, --limit       belirtilenden daha büyük iletileri getirme\n"
 
-#: options.c:710
+#: options.c:625
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    posta bildirimleri arasındaki zaman aralığı\n"
 
-#: options.c:713
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      IP güvenliği iste\n"
-
-#: options.c:715
+#: options.c:627
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    bu SMTP sunucusunu kullan\n"
 
-#: options.c:716
+#: options.c:628
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "      --fetchdomains belirtilen alan adları için gelen postaları getir\n"
 
-#: options.c:717
+#: options.c:629
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress kullanılacak SMTP dağıtım alanı (domain) belirle\n"
 
-#: options.c:718
+#: options.c:630
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    bu SMTP kullanıcı@alanadı adresini kullan\n"
 
-#: options.c:719
+#: options.c:631
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam yanıt değerlerini kullan\n"
 
-#: options.c:720
+#: options.c:632
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  SMTP bağlantıları için batch limiti belirle\n"
 
-#: options.c:721
+#: options.c:633
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  sunucu bağlantıları için getirme sınırı\n"
 
-#: options.c:722
+#: options.c:634
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchdomains belirtilen alan adları için gelen postaları getir\n"
 
-#: options.c:723
+#: options.c:635
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:724
+#: options.c:636
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:725
+#: options.c:637
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         iletim için kullanılacak MDA'yı belirle\n"
 
-#: options.c:726
+#: options.c:638
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP çıktısını bu dosyaya al\n"
 
-#: options.c:727
+#: options.c:639
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        dağıtım için LMTP (RFC2033) kullan\n"
 
-#: options.c:728
+#: options.c:640
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder    uzaktaki klasör adı olarak bunu kullan\n"
 
-#: options.c:729
+#: options.c:641
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ilerlemeyi gösteren noktaları kayıt dosyalarında bile "
@@ -2224,60 +2252,61 @@ msgstr ""
 
 # timestamp = zaman damgası (zaman belirteci daha doğal olurdu bence ama böyle kullanılmış
 # başka yerlerde)
-#: pop3.c:543
+#: pop3.c:553
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgası selamlama içerisinde bulunamadı\n"
 
-#: pop3.c:552
+#: pop3.c:562
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama içindeki zaman damgasında sözdizim yanlışı var\n"
 
-#: pop3.c:574
+#: pop3.c:584
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tanımlanmamış protokol isteği\n"
 
-#: pop3.c:582
+#: pop3.c:592
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit meşgul!  Başka bir oturum açık olabilir\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:664
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:687
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:714 pop3.c:948
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:767
+#: pop3.c:816
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmuş. Bu durumu idare edemem.\n"
 
-#: pop3.c:853
+#: pop3.c:902
 msgid "protocol error\n"
 msgstr "protokol hatası\n"
 
-#: pop3.c:868
+#: pop3.c:917
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatası\n"
 
-#: pop3.c:1225
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1276
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "--remote seçeneği POP3 ile desteklenmiyor\n"
 
-#: rcfile_y.y:127
+#: rcfile_y.y:123
 msgid "server option after user options"
 msgstr "kullanıcı seçeneklerinden sonra sunucu seçeneği verilmiş"
 
-#: rcfile_y.y:174
+#: rcfile_y.y:166
 msgid "SDPS not enabled."
 msgstr "SDPS etkin değil."
 
-#: rcfile_y.y:222
-msgid "invalid security request"
-msgstr "geçersiz güvenlik isteği"
-
-#: rcfile_y.y:228
-msgid "network-security support disabled"
-msgstr "ağ güvenliği desteğini etkisizleştirildi"
-
-#: rcfile_y.y:235
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2285,7 +2314,7 @@ msgstr ""
 "fetchmail: 'interface' seçeneği yalnızca Linux'ta (IPv6'sız) ve FreeBSD'de "
 "destekleniyor\n"
 
-#: rcfile_y.y:242
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2293,26 +2322,26 @@ msgstr ""
 "fetchmail: 'monitor' seçeneği yalnızca Linux'ta (IPv6'sız) ve FreeBSD'de "
 "destekleniyor\n"
 
-#: rcfile_y.y:354
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL etkin değil."
 
-#: rcfile_y.y:402
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "girdi sonu"
 
 # symbolic link?
-#: rcfile_y.y:439
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "%s dosyası normal bir dosya olmalı.\n"
 
-#: rcfile_y.y:449
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Dosyanın (%s) izinleri -rwx--x--- (0710)'den çok olmamalı.\n"
 
-#: rcfile_y.y:461
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Dosyanin (%s) sahibi siz olmalısınız.\n"
@@ -2515,114 +2544,128 @@ msgstr "Veri bloğuna MD5 uygulanıyor:\n"
 msgid "MD5 result is: \n"
 msgstr "MD5 sonucu:\n"
 
-#: sink.c:247
+#: servport.c:52
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:78
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:223
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:332
+#: sink.c:312
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: ('bounce' iletisi gövdesi)\n"
 
-#: sink.c:335
+#: sink.c:315
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
 
-#: sink.c:467
+#: sink.c:447
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Kaydedilen hata hala %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:507 sink.c:591
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP hatası: %s\n"
 
-#: sink.c:761
+#: sink.c:752
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP dosya açılamadı ya da önsöz yazılamadı\n"
 
-#: sink.c:970
+#: sink.c:965
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi alıcı adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:977
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP dinleyicisi alıcı adresi olarak `%s'i sevmedi\n"
 
-#: sink.c:1015
+#: sink.c:1013
 msgid "no address matches; no postmaster set.\n"
 msgstr "hiçbir adres uyuşmadı; postmaster yok.\n"
 
-#: sink.c:1027
+#: sink.c:1025
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile gönderilemedi!\n"
 "\n"
 
-#: sink.c:1033
+#: sink.c:1031
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hiçbir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek üzereyim: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "MDA açma başarısız oldu\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%2$s'e %1$cMTP bağlantısı başarısız oldu\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici çalıştırılamadı; %s denenecek"
 
-#: sink.c:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile öldürüldü\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA sıfırdan başka bir durum kodu döndürdü (%d)\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Garip: MDA pclose durum kodu olarak %d döndürdü, %s:%d'de sorun\n"
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr ""
 "İletiyi bitirme ya da BSMTP dosyasını kapatma işlemi başarısızlıkla "
 "sonuçlandı\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi dağıtımı reddetti\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "İleti sonunda LMTP dağıtım hatası\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM'a beklenmeyen, 503 olmayan yanıt: %s\n"
 
-#: sink.c:1559
+#: sink.c:1561
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2660,166 +2703,165 @@ msgstr "ESMTP LOGIN Kimlik kanıtlaması...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatası\n"
 
-#: socket.c:117 socket.c:143
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc başarısız oldu\n"
 
-#: socket.c:175
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair başarısız oldu\n"
 
-#: socket.c:181
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork başarısız oldu\n"
 
-#: socket.c:188
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 başarısız oldu\n"
 
-#: socket.c:194
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s çalıştırılıyor (makina %s hizmet %s)\n"
 
-#: socket.c:197
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) başarısız oldu\n"
 
-#: socket.c:288
+#: socket.c:281
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
 
-#: socket.c:430
-#, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: %s makinesi için geçersiz adres uzunluğu alındı\n"
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
 
-#: socket.c:787
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Çıkaran Kurum: %s\n"
 
-#: socket.c:789
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uyarı: Çıkaran Kurum Adı çok uzun (sonundan kesilmiş olabilir).\n"
 
-#: socket.c:791
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:793
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Çıkaran `CommonName'i: %s\n"
 
-#: socket.c:795
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uyarı: Çıkaran `CommonName'i çok uzun (sonundan kesilmiş olabilir).\n"
 
-#: socket.c:797
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen Çıkaran `CommonName'i\n"
 
-#: socket.c:801
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Sunucu `CommonName'i: %s\n"
 
-#: socket.c:805
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Kötü sertifika: `Subject CommonName' çok uzun!\n"
 
-#: socket.c:821
+#: socket.c:690
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyuşmazlığı: %s != %s\n"
 
-#: socket.c:827
+#: socket.c:696
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu adı ayarlanmamış, sertifikayı doğrulayamıyorum!\n"
 
-#: socket.c:832
+#: socket.c:701
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:834
+#: socket.c:703
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu adı sertifikada belirtilmemiş!\n"
 
-#: socket.c:844
+#: socket.c:713
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() başarısız oldu!\n"
 
-#: socket.c:848
+#: socket.c:717
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:856
+#: socket.c:725
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu çok küçük!\n"
 
-#: socket.c:862
+#: socket.c:731
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtarı parmak izi: %s\n"
 
-#: socket.c:866
+#: socket.c:735
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyuşuyor.\n"
 
-#: socket.c:869
+#: socket.c:738
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s parmak izleri uyuşmuyor!\n"
 
-#: socket.c:878
+#: socket.c:747
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Uyarı: sunucu sertifikası doğrulaması: %s\n"
 
-#: socket.c:884
+#: socket.c:753
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "bilinmeyen çıkaran firma adı (ilk %d karakter): %s\n"
 
-#: socket.c:936
+#: socket.c:805
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL için sınırlar dışında"
 
-#: socket.c:953
+#: socket.c:822
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Geçersiz SSL protokolü '%s' belirtildi, öntanımlı olan kullanılıyor "
 "(SSLv23).\n"
 
-#: socket.c:1014
+#: socket.c:883
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi doğrulaması bir biçimde atlandı!\n"
 
-#: socket.c:1086
+#: socket.c:957
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1089
+#: socket.c:960
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma başarısız oldu!\n"
 
-#: transact.c:66
+#: transact.c:74
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s yerel %s'e eşlendi\n"
 
 # kaynak koduna bakılacak
-#: transact.c:130
+#: transact.c:138
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "%2$s ile uyuşan %1$s geçirildi\n"
 
-#: transact.c:199
+#: transact.c:207
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2828,73 +2870,73 @@ msgstr ""
 "'Received' satırı çözümleniyor:\n"
 "%s"
 
-#: transact.c:238
+#: transact.c:246
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "satır kabul edildi, %s posta sunucusu için bir takma ad\n"
 
-#: transact.c:244
+#: transact.c:252
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "satır kabul edilmedi, %s posta sunucusu için bir takma ad değil\n"
 
-#: transact.c:318
+#: transact.c:326
 msgid "no Received address found\n"
 msgstr "hiçbir Received adresi bulunamadı\n"
 
-#: transact.c:327
+#: transact.c:335
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "`%s' Received adresi bulundu\n"
 
 # delimiter = sınır belirteci  (Sankur'un sözlüğünden)
-#: transact.c:528
+#: transact.c:538
 msgid "message delimiter found while scanning headers\n"
 msgstr "başlıklar taranırken ileti sınır belirteci bulundu\n"
 
 # delimiter = sınır belirteci  (Sankur'un sözlüğünden)
-#: transact.c:549
+#: transact.c:559
 msgid "incorrect header line found while scanning headers\n"
 msgstr "başlıklar taranırken geçersiz başlık satırı bulundu\n"
 
-#: transact.c:551
+#: transact.c:561
 #, c-format
 msgid "line: %s"
 msgstr "satır: %s"
 
-#: transact.c:1069
+#: transact.c:1082
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "yerelde uyan bulunamadı, %s'e iletiliyor\n"
 
-#: transact.c:1084
+#: transact.c:1097
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "iletme ve silme DNS hataları nedeniyle yapılmıyor\n"
 
-#: transact.c:1192
+#: transact.c:1209
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers yazılıyor\n"
 
-#: transact.c:1213
+#: transact.c:1230
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "alıcı adreslerinden hiçbiri bildirilen yerel adlardan hiçbirine uymuyor"
 
-#: transact.c:1220
+#: transact.c:1237
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "alıcı adresi %s yerel adlardan hiçbirine uymuyor"
 
-#: transact.c:1229
+#: transact.c:1246
 msgid "message has embedded NULs"
 msgstr "iletinin içinde NUL karakterleri var"
 
 # listener = dinleyici
-#: transact.c:1237
+#: transact.c:1254
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP dinleyicisi yerel alıcı adreslerini reddetti: "
 
-#: transact.c:1362
+#: transact.c:1382
 msgid "writing message text\n"
 msgstr "ileti metni yazılıyor\n"
 
@@ -2904,7 +2946,7 @@ msgid "Old UID list from %s:"
 msgstr "%s'den eski UID listesi:"
 
 # kaynak koduna bakılacak
-#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
+#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
 msgid " <empty>"
 msgstr " <boş>"
 
@@ -2912,53 +2954,53 @@ msgstr " <boş>"
 msgid "Scratch list of UIDs:"
 msgstr "Müsvedde UID listesi:"
 
-#: uid.c:513 uid.c:565
+#: uid.c:514 uid.c:566
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "%s'den eski UID listesi:"
 
-#: uid.c:515
+#: uid.c:516
 #, c-format
 msgid "New UID list from %s:"
 msgstr "%s'den yeni UID listesi:"
 
-#: uid.c:544
+#: uid.c:545
 msgid "swapping UID lists\n"
 msgstr "UID listeleri takas ediliyor\n"
 
-#: uid.c:552
+#: uid.c:553
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID listeleri takas edilmiyor, hiçbir UID bu sorguyu görmedi\n"
 
-#: uid.c:577
+#: uid.c:578
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "UID listeleri takas ediliyor\n"
 
-#: uid.c:612
+#: uid.c:613
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids dosyası siliniyor.\n"
 
-#: uid.c:614
+#: uid.c:615
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Credential'lar bırakılırken hata\n"
 
-#: uid.c:620
+#: uid.c:621
 msgid "Writing fetchids file.\n"
 msgstr "fetchids dosyası yazılıyor.\n"
 
-#: uid.c:639
+#: uid.c:640
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:643
+#: uid.c:644
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:647
+#: uid.c:648
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2971,6 +3013,70 @@ msgstr "malloc başarısız oldu\n"
 msgid "realloc failed\n"
 msgstr "realloc başarısız oldu\n"
 
+#~ msgid "internal inconsistency\n"
+#~ msgstr "iç tutarsızlık\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "ad geçerli ama IP adresi yok."
+
+# unrecoverable = düzeltilemez (Sankur'un sözlüğü 'kurtarılamaz' diyor ama buraya pek
+# uymuyor bence...
+#~ msgid "unrecoverable name server error."
+#~ msgstr "düzeltilemeyen ad sunucusu hatası."
+
+#~ msgid "temporary name server error."
+#~ msgstr "geçici ad sunucusu hatası."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "bilinmeyen DNS hatası %d."
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "--remote seçeneği ETRN ile desteklenmiyor\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (şu ağ güvenliği seçeneklerini kullanıyorum: %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (port %d kullanılıyor)"
+
+# Bu ileti yukarıdaki "Envelope header is assumed to be: %" iletisine
+# bağlı.
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca başarısız oldu"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "uyarı: herhangi bir makina adından önce \"%s\" bulundu"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "--remote seçeneği ODMR ile desteklenmiyor\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: ağ güvenliği desteği etkin değil\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      IP güvenliği iste\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "geçersiz güvenlik isteği"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "ağ güvenliği desteğini etkisizleştirildi"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: %s makinesi için geçersiz adres uzunluğu alındı\n"
+
 #~ msgid "header "
 #~ msgstr "başlık "