Snapshot line numbers.

svn path=/trunk/; revision=4154

12 files changed, 4840 insertions, 4029 deletions

diff --git a/po/ca.po b/po/ca.po
index c1b1f225..b40b2074 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6.a\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-11 00:38+0200\n"
+"POT-Creation-Date: 2005-07-21 12:50+0200\n"
 "PO-Revision-Date: 2005-07-11 13:46+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -262,7 +262,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:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "La conexió SSL ha fallat.\n"
 
@@ -427,7 +427,7 @@ msgstr " (%d octets).\n"
 msgid "No mail for %s\n"
 msgstr "No hi ha correu per a %s\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "recompte de missatges erroni!"
 
@@ -548,7 +548,7 @@ msgstr "%s: No existiu. Escampeu la boira.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: no s'ha pogut determinar el vostre host!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "ha fallat la funció gethostbyname per a %s\n"
@@ -617,62 +617,66 @@ msgstr "L'opció --remote no està suportada amb ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'opció --check no està suportada amb 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: invocat amb"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "no s'ha pogut determinar quin és el directori actual\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Aquesta és la versió del fetchmail %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Obtenint les opcions de la línia d'ordres%s%s\n"
 
 # després d'això vé el nom d'un fitxer
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " i de "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hi ha cap servidor de correu configurat. Potser falta el %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no heu especificat cap servidor de correu.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no hi ha cap altre fetchmail funcionant\n"
 
 # bailing out
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error finalitzant el fetchmail %s a %d; es deixa estar.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "en segon terme"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "en primer terme"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: el fetchmail %s a %d ha estat finalitzat.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -680,7 +684,7 @@ msgstr ""
 "fetchmail: no es pot comprovar el correu mentre funcioni un altre procés del "
 "fetchmail.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -688,187 +692,187 @@ msgstr ""
 "fetchmail: no es poden consultar els hosts especificats amb un altre "
 "fetchmail funcionant a %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: hi ha un altre fetchmail funcionant en primer terme a %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: no es poden acceptar opcions mentre funcioni un altre fetchmail "
 "en segon terme.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 "fetchmail: el fetchmail funcionant en segon terme a %d s'ha despertat.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: un procés anterior ha finalitzat misteriosament a %d.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no s'ha trobat cap contrasenya per a %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entreu la contrasenya per a %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciant el dimoni fetchmail %s \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "no s'ha pogut obrir %s per afegir-hi el registre d'activitat \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no s'ha pogut verificar la data de %s (error %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciant fetchmail (%s ha canviat)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "l'intent de reexecució pot fallar ja que el directori no ha estat restaurat\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "l'intent de reexecutar el fetchmail ha fallat\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "s'ha omès la consulta de %s (error d'autenticació o massa temps d'espera "
 "excedits)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "no s'ha completat l'interval, no es consultarà %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estat de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estat de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estat de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estat de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estat de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estat de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estat de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estat de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estat de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estat de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estat de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "Estat de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estat de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estat de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estat de la consulta=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Totes les connexions estan bloquejades. Sortint.\n"
 
 # %s és la sortida de timestamp()
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "dormint el %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertat per %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertat per un senyal %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertat el %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "finalització normal, estat %d\n"
 
 # nota: run-control és fitxer de control (i.e. .fetchmailrc)
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "no s'ha pogut verificar la data del fitxer de control\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Atenció: hi ha múltiples mencions del host %s en el fitxer de configuració\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "El suport per SSL no està compilat.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -876,656 +880,656 @@ msgstr ""
 "fetchmail: atenció: cap DNS disponible per verificar les obtencions "
 "multidrop de %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, 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:1177
+#: fetchmail.c:1181
 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:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr ""
 "la configuració de %s no és vàlida, el port no pot ser número negatiu\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%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:1216
+#: fetchmail.c:1220
 #, 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:1231
+#: fetchmail.c:1235
 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:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, 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:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no està configurat.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no està configurat.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no està configurat.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no està configurat.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "El suport per ETRN requereix la funció gethostbyname(2).\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no està configurat.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "El suport per ODMR requereix la funció gethostbyname(2).\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no està suportat.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, 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:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes és de %d segons\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre és %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions és %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrarà via syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascararà i no generarà capçaleres Recieved\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 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:1485
+#: fetchmail.c:1489
 #, 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:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per a l'obtenció de %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindrà via %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom autèntic del servidor és %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 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:1513
+#: fetchmail.c:1517
 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:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanarà la contrasenya.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificació RPOP = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol és KPOP amb autenticació per Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol és %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (usant les opcions de seguretat de xarxa %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (usant el port %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'ús d'UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els mètodes d'autenticació disponibles.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per contrasenya.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat és d'extrem a extrem.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu és: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovació del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confiança: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, 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:1605
+#: fetchmail.c:1609
 #, 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:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la bústia per defecte.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Les bústies seleccionades són:"
 
 # al tanto amb la substitució
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 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:1626
+#: fetchmail.c:1630
 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:1628
+#: fetchmail.c:1632
 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:1629
+#: fetchmail.c:1633
 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:1631
+#: fetchmail.c:1635
 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:1632
+#: fetchmail.c:1636
 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:1634
+#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està habilitada (--norewrite off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La reescriptura d'adreces locals està deshabilitada (--norewrite on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  L'eliminació de retorns de carro està habilitada (stripcr on).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  L'eliminació de retorns de carro està deshabilitada (stripcr off).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  L'inserció de retorns de carro està habilitada (forcecr on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  L'inserció de retorns de carro està deshabilitada (forcecr off).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 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:1644
+#: fetchmail.c:1648
 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:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  El desxifrat MIME està habilitat (mimedecode on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  El desxifrat MIME està deshabilitat (mimedecode off).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  La pausa després de cada obtenció està habilitada (idle on).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  La pausa després de cada obtenció està deshabilitada (idle off).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 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:1653
+#: fetchmail.c:1657
 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:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Les línies Delivered-To es descartaran (dropdelivered on)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Les línies Delivered-To es mantindran (dropdelivered off)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, 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:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, 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:1667
+#: fetchmail.c:1671
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de missatges grans a cada obtenció (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1674
 #, 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:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha límit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, 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:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 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:1684
+#: fetchmail.c:1688
 #, 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:1687
+#: fetchmail.c:1691
 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:1689
+#: fetchmail.c:1693
 #, 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:1691
+#: fetchmail.c:1695
 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:1695
+#: fetchmail.c:1699
 #, 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:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins el final (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollirà el correu són:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (per omissió)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, 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:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, 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:1737
+#: fetchmail.c:1741
 #, 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:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam són:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam està deshabilitat\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, 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:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexió.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, 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:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexió.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, 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:1795
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està habilitada.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La consulta DNS d'adreces multidrop està deshabilitada.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1804
 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:1802
+#: fetchmail.c:1806
 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:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adreça de l'embolcall està deshabilitat.\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  S'assumeix que la capçalera de l'embolcall és: %s\n"
 
 # nom de la capçalera
-#: fetchmail.c:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Recieved"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  El nombre de capçaleres de l'embolcall que s'analitzaran és: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, 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:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimirà cap prefix\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Àlies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, 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:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interfície requerida.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorarà l'interfície %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interfície a monitorar.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, 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:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, 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:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió per SMTP.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 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:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1533,7 +1537,7 @@ msgstr ""
 "  No s'afegirà el rastre de l'obtenció a la capçalera Received.\n"
 ".\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
@@ -1612,77 +1616,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:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "es farà una pausa després de l'obtenció\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "la supressió de missatges ha fallat\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "la re-obtenció ha fallat\n"
 
-#: imap.c:670
+#: imap.c:669
 #, 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:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecció de bústia\n"
 
-#: imap.c:686
+#: imap.c:685
 #, 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:714
+#: imap.c:713
 #, 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:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:769 pop3.c:675 pop3.c:687 pop3.c:904 pop3.c:911
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u és no llegit\n"
 
-#: imap.c:781 pop3.c:696
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge no llegit\n"
@@ -1872,7 +1876,7 @@ msgstr "recv fatal del servidor\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No s'ha pogut desxifrar la codificació OTP\n"
 
-#: opie.c:58 pop3.c:506
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
@@ -2173,41 +2177,49 @@ msgstr ""
 "registre\n"
 
 # timestamp: marca horària
-#: pop3.c:544
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No s'ha trobat la marca horària APOP requerida a la salutació\n"
 
-#: pop3.c:553
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxi en la marca horària de la salutació\n"
 
-#: pop3.c:575
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petició de protocol indefinida a POP3_auth\n"
 
-#: pop3.c:583
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessió activa?\n"
 
-#: pop3.c:666 pop3.c:895
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (núm=%d) s'ha esborrat, però encara està present!\n"
 
-#: pop3.c:768
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Els missatges estan inserits a la llista del servidor. No es pot continuar.\n"
 
-#: pop3.c:854
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:869
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1226
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "L'opció --remote no està suportada amb POP3\n"
 
@@ -2462,113 +2474,113 @@ msgstr "MD5 que s'aplica al bloc de dades:\n"
 msgid "MD5 result is: \n"
 msgstr "L'MD5 resultant és: \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviant a %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cos del missatge retornat)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correu de %s retornat a %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'error desat encara és %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 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:970
+#: sink.c:969
 #, 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:977
+#: sink.c:976
 #, 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:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adreça coincideix; el postmaster no està definit.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adreça coincideix; reenviant a %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "no s'ha pogut executar l'MDA\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexió %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1271
+#: 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:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1330
+#: 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:1333
+#: 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:1354
+#: 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:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1408
+#: 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:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2914,3 +2926,15 @@ msgstr "la rutina malloc ha fallat\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "la rutina realloc ha fallat\n"
+
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u és no llegit\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u és no llegit\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (núm=%d) s'ha esborrat, però encara està present!\n"
diff --git a/po/cs.po b/po/cs.po
index c16a8ed9..8759ba84 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,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-07-03 03:49+0200\n"
+"POT-Creation-Date: 2005-07-21 12:50+0200\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"
@@ -44,74 +44,74 @@ msgstr "nemohu dekódovat BASE64 výzvu\n"
 msgid "decoded as %s\n"
 msgstr "dekódována jako %s\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "chyba kerbera %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server říká '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: Varování fetchmail o příliš velkých zprávách"
 
-#: driver.c:340
+#: driver.c:342
 #, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr "Následující příliš velké zprávy zůstávají na serveru pošty %s:"
 
-#: driver.c:358
+#: driver.c:360
 #, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "  zpráva %d dlouhá %d oktetů byla fetchmailem přesko�ena."
 
-#: driver.c:498
+#: driver.c:500
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "přeskakuji zprávu %s@%s:%d"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "přeskakuji zprávu %s@%s:%d (%d oktetů)"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (délka -1)"
 
-#: driver.c:569
+#: driver.c:571
 msgid " (oversized)"
 msgstr " (příliš velká)"
 
-#: driver.c:584
+#: driver.c:586
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nemohu stáhnout hlavi�ky, zpráva %s@%s:%d (%d oktetů)\n"
 
-#: driver.c:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "�tu zprávu %s@%s:%d z %d"
 
-#: driver.c:606
+#: driver.c:608
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktetů)"
 
-#: driver.c:607
+#: driver.c:609
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetů v hlavi�ce)"
 
-#: driver.c:679
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d oktetů v těle)"
 
-#: driver.c:737
+#: driver.c:739
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -119,19 +119,19 @@ msgstr ""
 "zpráva %s@%s:%d nemá o�ekávanou velikost (%d ve skute�nosti != %d "
 "o�ekáváno)\n"
 
-#: driver.c:768
+#: driver.c:770
 msgid " retained\n"
 msgstr " zachována\n"
 
-#: driver.c:777
+#: driver.c:779
 msgid " flushed\n"
 msgstr " smazána\n"
 
-#: driver.c:794
+#: driver.c:796
 msgid " not flushed\n"
 msgstr " nesmazána\n"
 
-#: driver.c:811
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -143,40 +143,40 @@ msgstr[1] ""
 msgstr[2] ""
 "limit stahování %d dosažen; %d zpráv ponecháno na serveru %s ú�et %s\n"
 
-#: driver.c:874
+#: driver.c:876
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "MDA poslal SIGPIPE, nebo došlo k chybě socketu\n"
 
-#: driver.c:881
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "po %d sekundách vypršel �as při připojování k serveru %s.\n"
 
-#: driver.c:885
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "po %d sekundách vypršel �as při �ekání na server %s.\n"
 
-#: driver.c:889
+#: driver.c:891
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "po %d sekundách vypršel �as při �ekání na %s.\n"
 
-#: driver.c:894
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "po %d sekundách vypršel �as při �ekání odpově� poslucha�e.\n"
 
-#: driver.c:897
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "po %d sekundách vypršel �as.\n"
 
-#: driver.c:909
+#: driver.c:911
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmailu opakovaně vypršel �as"
 
-#: driver.c:912
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -184,7 +184,7 @@ msgid ""
 msgstr ""
 "Fetchmailu vypršel �as více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
 
-#: driver.c:916
+#: driver.c:918
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -199,98 +199,98 @@ msgstr ""
 "\n"
 "Fetchmail již nebude vybírat z této schránky, dokud jej znovu nespustíte.\n"
 
-#: driver.c:945
+#: driver.c:947
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "příkaz před spojením selhal se stavem %d\n"
 
-#: driver.c:976
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nemohu najít schránku HESIOD %s\n"
 
-#: driver.c:998
+#: driver.c:1000
 msgid "Lead server has no name.\n"
 msgstr "Vedoucí server nemá jméno.\n"
 
-#: driver.c:1021
+#: driver.c:1024 driver.c:1050
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "nemohu najít kanonické DNS jméno %s (%s)\n"
 
-#: driver.c:1058
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "vnitřní inkonzistence\n"
 
-#: driver.c:1068
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "spojení %s k %s selhalo"
 
-#: driver.c:1074
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "po�íta� není znám."
 
-#: driver.c:1077
+#: driver.c:1107
 msgid "name is valid but has no IP address."
 msgstr "jméno je platné, ale nemá IP adresu."
 
-#: driver.c:1080
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "nezotavitelná chyba serveru DNS."
 
-#: driver.c:1082
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "do�asná chyba serveru DNS."
 
-#: driver.c:1085
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "neznámá chyba DNS %d."
 
-#: driver.c:1103
+#: driver.c:1133
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Varování fetchmailu o nedostupnosti serveru."
 
-#: driver.c:1105
+#: driver.c:1135
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
 
-#: driver.c:1132 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "Spojení SSL selhalo.\n"
 
-#: driver.c:1185
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Chyba \"zámek se používá\" na %s@%s\n"
 
-#: driver.c:1189
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba \"server zaneprázdněn\" na %s@%s\n"
 
-#: driver.c:1194
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autorizace na %s@%s%s\n"
 
-#: driver.c:1197
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr " (dříve autorizován)"
 
-#: driver.c:1218
+#: driver.c:1248
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Předmět: autentizace fetchmailu selhala na %s@%s"
 
-#: driver.c:1222
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohl stáhnout poštu z %s@%s.\n"
 
-#: driver.c:1226
+#: driver.c:1256
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -318,7 +318,7 @@ msgstr ""
 "Démon fetchmail bude pokra�ovat v �innosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1241
+#: driver.c:1271
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -337,60 +337,60 @@ msgstr ""
 "Démon fetchmail bude pokra�ovat v �innosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1256
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okamžitě znovu kontroluji %s@%s\n"
 
-#: driver.c:1261
+#: driver.c:1291
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Neznámá chyba při přihlášení nebo autentizaci na %s@%s\n"
 
-#: driver.c:1285
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Úspěšná autorizace na %s@%s\n"
 
-#: driver.c:1291
+#: driver.c:1321
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Předmět: Autentizace fetchmailu úspěšná na %s@%s"
 
-#: driver.c:1295
+#: driver.c:1325
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail se úspěšně přihlásil k %s@%s.\n"
 
-#: driver.c:1299
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "Služba byla obnovena.\n"
 
-#: driver.c:1330
+#: driver.c:1360
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vybírám nebo znovu kontroluji složku %s\n"
 
-#: driver.c:1332
+#: driver.c:1362
 msgid "selecting or re-polling default folder\n"
 msgstr "vybírám nebo znovu kontroluji implicitní složku\n"
 
-#: driver.c:1344
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (složka %s)"
 
-#: driver.c:1347 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1352
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "Stahuji z %s\n"
 
-#: driver.c:1356
+#: driver.c:1386
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -398,14 +398,14 @@ msgstr[0] "%d zpráva (%d %s) pro %s"
 msgstr[1] "%d zprávy (%d %s) pro %s"
 msgstr[2] "%d zpráv (%d %s) pro %s"
 
-#: driver.c:1359
+#: driver.c:1389
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "pře�tena"
 msgstr[1] "pře�teny"
 msgstr[2] "pře�teno"
 
-#: driver.c:1362
+#: driver.c:1392
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -413,90 +413,90 @@ msgstr[0] "%d zpráva pro %s"
 msgstr[1] "%d zprávy pro %s"
 msgstr[2] "%d zpráv pro %s"
 
-#: driver.c:1369
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetů).\n"
 
-#: driver.c:1375
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Žádná pošta pro %s\n"
 
-#: driver.c:1408
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "nesmyslný po�et zpráv!"
 
-#: driver.c:1509
+#: driver.c:1539
 msgid "socket"
 msgstr "socketu"
 
-#: driver.c:1512
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "hlavi�ky RFC822"
 
-#: driver.c:1515
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1518
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "synchronizace mezi klientem a serverem"
 
-#: driver.c:1521
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protokolu klient/server"
 
-#: driver.c:1524
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "zámku na serveru"
 
-#: driver.c:1527
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "transakce SMTP"
 
-#: driver.c:1530
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "hledání v DNS"
 
-#: driver.c:1533
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "nedefinované\n"
 
-#: driver.c:1544
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "při odesílání po�íta�i SMTP %2$s došlo k chybě %1$s\n"
 
-#: driver.c:1546
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "při stahování z %2$s došlo k chybě %1$s\n"
 
-#: driver.c:1554
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "příkaz po spojení selhal se stavem %d\n"
 
-#: driver.c:1575
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 není podporován.\n"
 
-#: driver.c:1583
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 není podporován.\n"
 
-#: driver.c:1594
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Přepína� --flush není s %s podporován\n"
 
-#: driver.c:1600
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Přepína� --all není s %s podporován\n"
 
-#: driver.c:1608
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Přepína� --limit nepodporuje argument %s\n"
@@ -544,7 +544,7 @@ msgstr "%s: Neexistujete. Běžte pry�.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: nemohu zjistit váš po�íta�!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname pro %s selhalo\n"
@@ -613,60 +613,64 @@ msgstr "Přepína� --remote není s ETRN podporován.\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Přepína� --check není s ETRN podporován.\n"
 
-#: fetchmail.c:168
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: spuštěn s"
 
-#: fetchmail.c:192
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "nemohu získat aktuální pracovní adresář\n"
 
-#: fetchmail.c:202
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Toto je fetchmail verze %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Zpracovávám přepína�e z příkazového řádku%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " a "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nenastaven žádný poštovní server - možná chybí %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nebyl specifikován žádný poštovní server.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: žádný jiný fetchmail neběží\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: chyba při zabíjení fetchmailu %s v %d; kon�ím.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "na pozadí"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "v popředí"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail %s v %d byl zabit.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -674,7 +678,7 @@ msgstr ""
 "fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému "
 "po�íta�i.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -682,179 +686,179 @@ msgstr ""
 "fetchmail: nemohu stahovat ze zadaných serverů, když běží jiný fetchmail v %"
 "d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: v popředí běží jiný fetchmail v %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: neakceptuji přepína�e, když na fetchmail běží na pozadí.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail na pozadí v %d byl probuzen.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: starší proces v %d tajemně umřel.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nemohu najít heslo pro %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Zadejte heslo pro %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "spouštím démona fetchmail %s \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nemohu otevřít %s, kam připojovat záznamy \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nemohu zkontrolovat �as %s (chyba %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "znovu spouštím fetchmail (%s změněn)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus znovu se spustit může selhat, protože adresář nebyl obnoven\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus znovu spustit fetchmail selhal\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "stahování z %s přesko�eno (chyba autentizace nebo mnohokrát vypršel �as)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ještě nenastal �as, neptám se %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav spojení=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav spojení=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav spojení=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav spojení=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav spojení=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav spojení=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav spojení=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav spojení=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav spojení=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav spojení=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav spojení=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav spojení=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav spojení=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav spojení=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav spojení=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Žádné ze spojení není aktivní. Kon�ím.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "spím v %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "probuzen %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "probuzen signálem %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "probuzen v %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normální ukon�ení, stav %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "nemohu zkontrolovat �as konfigura�ního souboru\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varování: po�íta� %s je v konfigura�ním souboru zmíněn vícekrát\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL není podporováno.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -862,135 +866,135 @@ msgstr ""
 "fetchmail: varování: není dostupné DNS pro kontrolu výběru spole�ných "
 "schránek z %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, 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:1177
+#: fetchmail.c:1181
 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:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "Nastavení pro %s není platné, �íslo portu nesmí být záporné.\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "Nastavení %s není platné, RPOP vyžaduje privilegovaný port\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, 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:1231
+#: fetchmail.c:1235
 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:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukon�en signálem %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, 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:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "Podpora POP2 není nastavena.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "Podpora POP3 není nastavena.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "Podpora IMAPu není nastavena.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "Podpora ETRN není nastavena.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Nemohu podporovat ETRN bez gethostbyname(2).\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "Podpora ODMR není nastavena.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Nemohu podporovat ODMR bez gethostbyname(2).\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "zvolen nepodporovaný protokol.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, 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:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval stahování je %d sekund\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Soubor záznamů je %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Soubor ID je %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Zprávy o průběhu budou zaznamenávny pomocí syslogu\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se bude skrývat a nebude generovat Received\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 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:1485
+#: fetchmail.c:1489
 #, 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:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude chybové zprávy posílát postmasterovi.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude chybové zprávy posílát odesílateli.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Možnosti pro stahování z %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude stahována z %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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"
@@ -998,383 +1002,391 @@ 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:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skute�né jméno serveru je %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 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"
+msgstr ""
+"  Pokud není zadán žádný po�íta�, nebude se stahovat z tohoto po�íta�e.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1517
 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"
+msgstr ""
+"  Pokud není zadán žádný po�íta�, bude se stahovat z tohoto po�íta�e.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  Bude požadováno heslo.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Tajemství APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\"\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " Protokol je KPOP s autentizací Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr " Protokol je %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr "  (pomocí služby %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (pomocí možností zabezpe�ení sítě %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (pomocí portu %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (pomocí implicitního portu)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr "  (vynuceně používám UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budou vyzkoušeny všechny dostupné metody autentizace.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace heslem.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Předpokládám šifrované spojení.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principal poštovní služby je: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sezení šifrovaná s SSL povolena.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL povolena.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresář důvěryhodných certifikátů SSL: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, 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:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Čas �ekání na odpově� serveru je %d sekund"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (implicitní).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  Zvolena implicitní poštovní schránka.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Zvolené poštovní schránky jsou:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Budou staženy všechny zprávy (--all zapnuto).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Budou staženy jen nové zprávy (--all vypnuto).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 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:1629
+#: fetchmail.c:1633
 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:1631
+#: fetchmail.c:1635
 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"
+msgstr ""
+"  Před za�átkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1636
 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"
+msgstr ""
+"  Před za�átkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1638
 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"
+msgstr ""
+"  Přepisování adres místních naserveru je povoleno (--norewrite vypnuto).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 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"
+msgstr ""
+"  Přepisování adres místních naserveru je zakázáno (--norewrite zapnuto).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Mazání CR je povoleno (stripcr zapnuto).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Mazání CR je zakázáno (stripcr vypnuto).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynucení CR je povoleno (forcecr zapnuto).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
+msgstr ""
+"  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1648
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
+msgstr ""
+"  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódování MIME je povoleno (mimedecode zapnuto).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódování MIME je zakázáno (mimedecode vypnuto).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Ne�innost po stahování je povolena (idle zapnuto).\n"
 
-#: fetchmail.c:1650
-msgid "  Idle after poll is diabled (idle off).\n"
+#: fetchmail.c:1654
+msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Ne�innost po stahování je zakázána (idle vypnuto).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, 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:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Žádný limit velikosti zprávy (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, 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:1667
+#: fetchmail.c:1671
 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:1670
+#: fetchmail.c:1674
 #, 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:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Žádný Limit přijatých (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, 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:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 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:1684
+#: fetchmail.c:1688
 #, 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:1687
+#: fetchmail.c:1691
 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:1689
+#: fetchmail.c:1693
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky zpráv SMTP je %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1695
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Žádný limit dávky zpráv SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1699
 #, 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:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Žádná vynucená �ištění (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény, pro které se bude stahovat pošta, jsou:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (implicitní)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, 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:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Zprávy budou doru�eny pomocí \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Zprávy budou přeposlány pomocí %cMTP na:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, 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:1737
+#: fetchmail.c:1741
 #, 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:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznávané odpově�i serveru blokující spam jsou:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokování spamu zakázáno\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, 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:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  Žádný příkaz před spojením.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, 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:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  Žádný příkaz po spojení.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nedeklarována žádná místní jména tohoto po�íta�e.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Režim spole�ných schránek: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Režim soukromých schránek: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1382,119 +1394,123 @@ 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:1795
+#: fetchmail.c:1799
 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:1796
+#: fetchmail.c:1800
 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:1800
+#: fetchmail.c:1804
 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"
+msgstr ""
+"  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
+"IP adres.\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1806
 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"
+msgstr ""
+"  Přezdívky serveru budou porovnávány s adresami spole�ných schránek podle "
+"názvu.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, 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:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Po�et hlavi�ek obálky, které zpracovávat: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, 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:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  Žádné odtrhávání předpony\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Deklarované přezdívky poštovního serveru:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Místní domény:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojení musí procházet přes %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  Nezadán žádný požadavek na rozhraní.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Stahovací smy�ka bude sledovat %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  Nezadáno žádné sledované rozhraní.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, 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:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, 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:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  Nezadán žádný příkaz výstupního zásuvného modulu.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Z tohoto po�íta�e neukládána žádná UID.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Ukládáno %d UID.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 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:1883
+#: fetchmail.c:1887
 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:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Předávané vlastnosti \"%s\".\n"
@@ -1572,43 +1588,43 @@ 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:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol rozpoznán jako IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "po stahování budu ne�inný\n"
 
-#: imap.c:462
+#: imap.c:461
 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:484
+#: imap.c:483
 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:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "�ištění selhalo\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:670
+#: imap.c:669
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1616,19 +1632,20 @@ 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:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
-#: imap.c:686
 # c-format
+#: imap.c:685
+#, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 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:714
+#: imap.c:713
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1636,16 +1653,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:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepře�tených zpráv selhalo\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla pře�tena\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepře�tená\n"
@@ -1831,7 +1848,7 @@ msgstr "od serveru přijato fatální\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Nemohu dekódovat výzvu OTP\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
@@ -2121,40 +2138,48 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    zobrazovat te�ky průběhu i v souborech se záznamy\n"
 
-#: pop3.c:543
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Požadovaný �asový údaj APOP nebyl v pozdravu nalezen\n"
 
-#: pop3.c:552
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaktická chyba v �asovém údaji z pozdravu\n"
 
-#: pop3.c:574
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "zam�eno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
 
-#: pop3.c:767
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n"
 
-#: pop3.c:853
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:868
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1225
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Přepína� --remote není s POP3 podporován\n"
 
@@ -2231,6 +2256,22 @@ msgstr "Chystám se přepsat %s"
 msgid "Rewritten version is %s\n"
 msgstr "Přepsaná verze je %s\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr "Úspěch"
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr ""
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr ""
+
+#: rpa.c:120
+msgid "Deity error"
+msgstr ""
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Chyba při dekódováni Base64\n"
@@ -2391,110 +2432,110 @@ msgstr "MD5 se používá na blok dat:\n"
 msgid "MD5 result is: \n"
 msgstr "Výsledek MD5 je:\n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "přeposílám na %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tělo hlášení o chybě)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, 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:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Uložená chyba je stále %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Chyba %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "otevření souboru BSMTP nebo zápis preambule selhal\n"
 
-#: sink.c:970
+#: sink.c:969
 #, 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:977
+#: sink.c:976
 #, 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:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "neodpovídá žádná adresa; nenastaven postmaster.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nelze odeslat ani na %s!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "neodpovídá žádná adresa; přeposílám na %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "chystám se doru�it pomocí: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "otevírání MDA sehalo\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "připojení%cMTP k %s selhalo\n"
 
-#: sink.c:1271
+#: 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:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA umřel na signál %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA vrátil nenulový stav %d\n"
 
-#: sink.c:1333
+#: 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:1354
+#: 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:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "Démon SMTP odmítl doru�ení\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Chyba doru�ování LMTP při EOM\n"
 
-#: sink.c:1408
+#: 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:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2834,8 +2875,17 @@ msgstr "malloc selhalo\n"
 msgid "realloc failed\n"
 msgstr "realloc selhalo\n"
 
-#~ msgid "Success"
-#~ msgstr "Úspěch"
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u nebyla pře�tena\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u nebyla pře�tena\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
 
 #~ msgid "unknown issuer= %s"
 #~ msgstr "neznámý vydavatel= %s"
diff --git a/po/da.po b/po/da.po
index 495da9fd..7fd28801 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: 2004-11-14 21:55+0100\n"
+"POT-Creation-Date: 2005-07-06 00:35+0200\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"
@@ -41,21 +41,21 @@ msgstr "kunne ikke afkode BASE64-anråb\n"
 msgid "decoded as %s\n"
 msgstr "afkodet som %s\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberosfejl %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server siger '%*s']\n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:340
+#: driver.c:342
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -63,111 +63,115 @@ msgstr ""
 "\n"
 "Disse breve er for store og forbliver paa postserveren %s:"
 
-#: driver.c:358
+#: driver.c:360
 #, 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:498
+#: driver.c:500
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (længde -1)"
 
-#: driver.c:569
+#: driver.c:571
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:584
+#: driver.c:586
 #, 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:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "læser brev %s@%s:%d af %d"
 
-#: driver.c:609
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:608
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %soktetter)"
 
-#: driver.c:610
-msgid "header "
-msgstr "brevhoved-"
+#: driver.c:609
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:682
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:740
+#: driver.c:739
 #, 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:771
+#: driver.c:770
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:780
+#: driver.c:779
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:797
+#: driver.c:796
 msgid " not flushed\n"
 msgstr " ikke slettet\n"
 
 #: driver.c:813
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr "afhentningsgrænse %d nået; %d breve tilbage på server %s konto %s\n"
+#, 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] "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:874
+#: driver.c:876
 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:881
+#: driver.c:883
 #, 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:885
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på server %s.\n"
 
-#: driver.c:889
+#: driver.c:891
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på %s.\n"
 
-#: driver.c:894
+#: driver.c:896
 #, 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:897
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:909
+#: driver.c:911
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail har gentagne tidsafbrud\n"
 
-#: driver.c:912
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -176,7 +180,7 @@ msgstr ""
 "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%"
 "s.\n"
 
-#: driver.c:916
+#: driver.c:918
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -191,56 +195,56 @@ msgstr ""
 "\n"
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
-#: driver.c:944
+#: driver.c:947
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:975
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:997
+#: driver.c:1000
 msgid "Lead server has no name.\n"
 msgstr "Fører-server har ikke noget navn.\n"
 
-#: driver.c:1020
+#: driver.c:1024 driver.c:1050
 #, 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:1057
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "intern uoverensstemmelse\n"
 
-#: driver.c:1067
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:1073
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "værten er ukendt."
 
-#: driver.c:1076
+#: driver.c:1107
 msgid "name is valid but has no IP address."
 msgstr "navnet er gyldigt, men har ingen IP-adresse."
 
-#: driver.c:1079
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "uoprettelig navneserverfejl."
 
-#: driver.c:1081
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "midlertidig navneserverfejl."
 
-#: driver.c:1084
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "ukendt DNS-fejl %d."
 
-#: driver.c:1102
+#: driver.c:1133
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -248,45 +252,45 @@ msgstr ""
 "\n"
 "Fetchmail kunne ikke naa postserveren %s:"
 
-#: driver.c:1104
+#: driver.c:1135
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1131 imap.c:367 pop3.c:411
+#: driver.c:1162 imap.c:367 pop3.c:420
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: driver.c:1184
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lås optaget-fejl på %s@%s\n"
 
-#: driver.c:1188
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server optaget-fejl på %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Godkendelsesfejl på %s@%s%s\n"
 
-#: driver.c:1196
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
-#: driver.c:1217
+#: driver.c:1248
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail - godkendelse mislykkedes paa %s@%s\n"
 
-#: driver.c:1221
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1225
+#: driver.c:1256
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -315,7 +319,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:1240
+#: driver.c:1271
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -334,163 +338,163 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1255
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Prøver straks igen %s@%s\n"
 
-#: driver.c:1260
+#: driver.c:1291
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl på %s@%s\n"
 
-#: driver.c:1284
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden på %s@%s\n"
 
-#: driver.c:1290
+#: driver.c:1321
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail - godkendelse i orden paa %s@%s\n"
 
-#: driver.c:1294
+#: driver.c:1325
 #, 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:1298
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1329
+#: driver.c:1360
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vælger eller prøver igen brevbakke %s\n"
 
-#: driver.c:1331
+#: driver.c:1362
 msgid "selecting or re-polling default folder\n"
 msgstr "vælger eller prøver igen indbakken\n"
 
-#: driver.c:1343
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1346 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: driver.c:1351
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "Prøver %s\n"
 
-#: driver.c:1355
+#: driver.c:1386
 #, 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:1358
+#: driver.c:1389
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1361
+#: driver.c:1392
 #, 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:1368
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1374
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1407
+#: driver.c:1438
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1508
+#: driver.c:1539
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1511
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1514
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1517
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1520
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1523
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "server låst-"
 
-#: driver.c:1526
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1529
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1532
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "udefineret fejl\n"
 
-#: driver.c:1543
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%sfejl ved levering til SMTP-vært fra %s\n"
 
-#: driver.c:1545
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%sfejl ved hentning fra %s\n"
 
-#: driver.c:1553
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1574
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-støtte.\n"
 
-#: driver.c:1582
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-støtte.\n"
 
-#: driver.c:1593
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke understøttet med %s\n"
 
-#: driver.c:1599
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke understøttet med %s\n"
 
-#: driver.c:1607
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke understøttet med %s\n"
@@ -606,60 +610,60 @@ msgstr "Tilvalg --remote er ikke understøttet med ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Tilvalg --check er ikke understøttet med ETRN\n"
 
-#: fetchmail.c:164
+#: fetchmail.c:167
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:188
+#: fetchmail.c:191
 msgid "could not get current working directory\n"
 msgstr "kunne ikke få det nuværende arbejdskatalog\n"
 
-#: fetchmail.c:198
+#: fetchmail.c:201
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:342
+#: fetchmail.c:346
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:347
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:348
+#: fetchmail.c:352
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - måske mangler %s?\n"
 
-#: fetchmail.c:369
+#: fetchmail.c:373
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:378 fetchmail.c:387
+#: fetchmail.c:382 fetchmail.c:391
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail kører\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:397
 #, 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:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:399
+#: fetchmail.c:403
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %sfetchmail på %d dræbt.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:419
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -667,7 +671,7 @@ msgstr ""
 "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært "
 "kører.\n"
 
-#: fetchmail.c:421
+#: fetchmail.c:425
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -675,180 +679,180 @@ msgstr ""
 "fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail "
 "kører på %d.\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:432
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail kører på %d.\n"
 
-#: fetchmail.c:438
+#: fetchmail.c:442
 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:444
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: baggrunds fetchmail på %d vækket.\n"
 
-#: fetchmail.c:456
+#: fetchmail.c:460
 #, 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:471
+#: fetchmail.c:475
 #, 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:475
+#: fetchmail.c:479
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv kodeord for %s@%s: "
 
-#: fetchmail.c:506
+#: fetchmail.c:510
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starter fetchmail %s-dæmon\n"
 
-#: fetchmail.c:521 fetchmail.c:523
+#: fetchmail.c:525 fetchmail.c:527
 #, 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:561
+#: fetchmail.c:565
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsfæste %s (fejl %d)\n"
 
-#: fetchmail.c:566
+#: fetchmail.c:570
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s ændret)\n"
 
-#: fetchmail.c:571
+#: fetchmail.c:575
 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:598
+#: fetchmail.c:602
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "forsøg på at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:626
+#: fetchmail.c:630
 #, 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:638
+#: fetchmail.c:642
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke nået, spørger ikke %s\n"
 
-#: fetchmail.c:676
+#: fetchmail.c:680
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Spørgestatus=0 (succes)\n"
 
-#: fetchmail.c:678
+#: fetchmail.c:682
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Spørgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Spørgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Spørgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Spørgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Spørgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=6 (IOERR)\n"
 msgstr "Spørgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=7 (ERROR)\n"
 msgstr "Spørgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Spørgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Spørgestatus=9 (lås optaget)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=10 (SMTP)\n"
 msgstr "Spørgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=11 (DNS)\n"
 msgstr "Spørgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Spørgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Spørgestatus=13 (afhentningsgrænse nået)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Spørgestatus=%d\n"
 
-#: fetchmail.c:750
+#: fetchmail.c:754
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:761
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "sover %s\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:785
 #, c-format
 msgid "awakened by %s\n"
 msgstr "vækket af %s\n"
 
-#: fetchmail.c:784
+#: fetchmail.c:788
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "vækket af signal %d\n"
 
-#: fetchmail.c:791
+#: fetchmail.c:795
 #, c-format
 msgid "awakened at %s\n"
 msgstr "vækket %s\n"
 
-#: fetchmail.c:797
+#: fetchmail.c:801
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:954
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsfæste kørselskontrolfilen\n"
 
-#: fetchmail.c:983
+#: fetchmail.c:987
 #, 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:1128
+#: fetchmail.c:1134
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-understøttelse.\n"
 
-#: fetchmail.c:1159
+#: fetchmail.c:1165
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -858,615 +862,661 @@ msgstr ""
 
 #: fetchmail.c:1176
 #, c-format
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1177
+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"
 msgstr "konfiguration af %s forkert, portnummer kan ikke være negativt\n"
 
-#: fetchmail.c:1183
+#: fetchmail.c:1200
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "konfiguration af %s forkert, RPOP kræver en privilegeret port\n"
 
-#: fetchmail.c:1199
+#: fetchmail.c:1216
 #, 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:1214
+#: fetchmail.c:1231
 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:1264
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1366
 #, 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:1374
+#: fetchmail.c:1391
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-understøttelse.\n"
 
-#: fetchmail.c:1386
+#: fetchmail.c:1403
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-understøttelse.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1413
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-understøttelse.\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1419
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-understøttelse.\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1425
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Kan ikke understøtte ETRN uden gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1432
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-understøttelse.\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1438
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Kan ikke understøtte ODMR uden gethostbyname(2).\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1444
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-understøttet protokol valgt.\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1454
 #, 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:1454
+#: fetchmail.c:1471
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Prøvemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1473
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1458
+#: fetchmail.c:1475
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1478
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forløbsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1464
+#: fetchmail.c:1481
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1466
+#: fetchmail.c:1483
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forløbsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1485
 #, 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:1472
+#: fetchmail.c:1489
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1491
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1498
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1502
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1488
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Prøvning af denne server vil ske hvert %d. sekund.\n"
+#: fetchmail.c:1505
+#, 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:1491
+#: fetchmail.c:1509
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1493
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1512
+#, 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:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will not"
-msgstr "vil ikke"
-
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will"
-msgstr "vil"
+#: fetchmail.c:1513
+#, 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:1498
+#: fetchmail.c:1517
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1521
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1524
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = \"%s\".\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1527
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = \"%s\".\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1546
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1548
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (bruger netværkssikkerhedstilvalg %s)"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1551
 #, c-format
 msgid " (using port %d)"
 msgstr " (bruger port %d)"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1554
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1556
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1562
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilgængelige godkendelsesmetoder vil blive forsøgt.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1565
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er påkrævet.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1568
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1571
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1574
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1577
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1580
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1583
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1586
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1590
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1593
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1597
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1602
 #, 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:1586
+#: fetchmail.c:1605
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter på svar fra server i højst %d sekunder"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1607
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1614
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1619
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "All"
-msgstr "Alle"
+#: fetchmail.c:1626
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "Only new"
-msgstr "Kun nye"
+#: fetchmail.c:1628
+#, 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:1608
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1629
+#, 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:1611
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1631
+#, 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:1614
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1632
+#, 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:1634
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "enabled"
-msgstr "slået til"
+#: fetchmail.c:1635
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "disabled"
-msgstr "slået fra"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1638
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Indsættelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1623
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1641
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Indsættelse af vognreturtegn er %s (forcecr %s).\n"
+
+#: fetchmail.c:1643
+#, 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:1626
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1644
+#, 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
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1629
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1647
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
+
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter prøvning er %s (idle %s).\n"
 
-#: fetchmail.c:1632
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1650
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Tomgang efter prøvning er %s (idle %s).\n"
+
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "discarded"
-msgstr "slettet"
+#: fetchmail.c:1653
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "kept"
-msgstr "bevaret"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1635
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1656
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1659
 #, 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:1644
+#: fetchmail.c:1662
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1664
 #, 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:1649
+#: fetchmail.c:1667
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Størrelsesadvarsler ved hver prøvning (--warnings 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1670
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1673
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1675
 #, 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:1660
+#: fetchmail.c:1678
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1682
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1666
+#: fetchmail.c:1684
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1669
+#: fetchmail.c:1687
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1671
+#: fetchmail.c:1689
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgrænse er %d.\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1691
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgrænse (--batchlimit 0).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1695
 #, 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:1679
+#: fetchmail.c:1697
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1704
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domæner som der vil blive hentet post til:"
 
-#: fetchmail.c:1691 fetchmail.c:1711
+#: fetchmail.c:1709 fetchmail.c:1729
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1714
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilføjet %s som BSMTP\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1716
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med \"%s\".\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1723
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1734
 #, 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:1719
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1746
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1752
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er slået fra\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1755
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med \"%s\".\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1758
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1760
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med \"%s\".\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1763
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1766
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne vært.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1776
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1760
+#: fetchmail.c:1778
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1762
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d lokale navne genkendt\n"
+#: fetchmail.c:1780
+#, 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:1776
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1795
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1780
-msgid "  Server aliases will be compared with multidrop addresses by "
-msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
+#: fetchmail.c:1796
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1782
-msgid "IP address.\n"
-msgstr "IP-adresse.\n"
+#: fetchmail.c:1800
+#, 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:1784
-msgid "name.\n"
-msgstr "navn.\n"
+#: fetchmail.c:1802
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1787
+#: fetchmail.c:1805
 msgid "  Envelope-address routing is disabled\n"
 msgstr "Adressering efter konvolutadressen er slået fra\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1808
 #, 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:1791
+#: fetchmail.c:1809
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1811
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Nr. konvolutadresse som vil blive analyseret: %d\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1814
 #, 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:1799
+#: fetchmail.c:1817
 msgid "  No prefix stripping\n"
 msgstr "  Ingen præfikssletning\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1824
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderklærede postserveraliaser:"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1833
 msgid "  Local domains:"
 msgstr "  Lokale domæner:"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1843
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem grænseflade %s.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1845
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen grænsefladekrav specificeret.\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1847
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Prøveløkke vil overvåge %s.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1849
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overvågning af grænseflade specificeret.\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1853
 #, 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:1837
+#: fetchmail.c:1855
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1857
 #, 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:1841
+#: fetchmail.c:1859
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1864
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne vært.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1873
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1881
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1883
 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:1868
+#: fetchmail.c:1886
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: \"%s\".\n"
@@ -1479,7 +1529,7 @@ msgstr "alloca mislykkedes"
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "FEJL: ingen understøttelse til getpassword()-funktion\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1572,43 +1622,49 @@ msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 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:706
+#: imap.c:644 imap.c:710
 msgid "expunge failed\n"
 msgstr "sletning (EXPUNGE) mislykkedes\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:662 imap.c:695
 msgid "re-poll failed\n"
 msgstr "genprøvning mislykkedes\n"
 
 #: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d breve venter efter genprøvning\n"
+#, 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:680
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "%d breve venter efter første prøvning\n"
+#: imap.c:686
+#, 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:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "%d breve venter efter sletning\n"
+#: imap.c:714
+#, 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:733
+#: imap.c:739
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:775 pop3.c:687
+#: imap.c:781 pop3.c:695
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
@@ -1786,15 +1842,15 @@ msgstr "Tilvalg --remote er ikke understøttet med ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Tilvalg --check er ikke understøttet med ODMR\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr "fatal fejl ved læsning fra server\n"
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:59 pop3.c:496
+#: opie.c:58 pop3.c:505
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
@@ -2082,40 +2138,40 @@ msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
-#: pop3.c:534
+#: pop3.c:543
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:543
+#: pop3.c:552
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:565
+#: pop3.c:574
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:573
+#: pop3.c:582
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:657 pop3.c:886
+#: pop3.c:665 pop3.c:894
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:759
+#: pop3.c:767
 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:845
+#: pop3.c:853
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:860
+#: pop3.c:868
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1217
+#: pop3.c:1225
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke understøttet med POP3\n"
 
@@ -2193,6 +2249,23 @@ msgstr "Skal til at omskrive %s"
 msgid "Rewritten version is %s\n"
 msgstr "Omskreven version er %s\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr "Succes"
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr "Begrænset bruger (noget er galt med kontoen)"
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr "Ugyldigt brugernavn eller løsen"
+
+# Hvad i alverden er deity error?
+#: rpa.c:120
+msgid "Deity error"
+msgstr "Gudefejl"
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA symbol 2: Base64-afkodningsfejl\n"
@@ -2381,82 +2454,82 @@ msgstr "%cMTP-fejl: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP-fil åben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:966
+#: sink.c:970
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:973
+#: sink.c:977
 #, 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:1011
+#: sink.c:1015
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1023
+#: sink.c:1027
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1029
+#: sink.c:1033
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1182
+#: sink.c:1186
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1206
+#: sink.c:1210
 msgid "MDA open failed\n"
 msgstr "MDA-åbning mislykkedes\n"
 
-#: sink.c:1243
+#: sink.c:1247
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1267
+#: sink.c:1271
 #, 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:1323
+#: sink.c:1327
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1326
+#: sink.c:1330
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1329
+#: sink.c:1333
 #, 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:1350
+#: sink.c:1354
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
 
-#: sink.c:1371
+#: sink.c:1375
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1401
+#: sink.c:1405
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1404
+#: sink.c:1408
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1555
+#: sink.c:1559
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2494,151 +2567,151 @@ msgstr "ESMTP LOGIN Authentication...\n"
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:106 socket.c:132
+#: socket.c:117 socket.c:143
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:164
+#: socket.c:175
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#: socket.c:170
+#: socket.c:181
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:177
+#: socket.c:188
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:183
+#: socket.c:194
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udfører %s (server %s service %s)\n"
 
-#: socket.c:186
+#: socket.c:197
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:277
+#: socket.c:288
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:419
+#: 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:776
+#: socket.c:787
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:778
+#: socket.c:789
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (måske afskåret).\n"
 
-#: socket.c:780
+#: socket.c:791
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:782
+#: socket.c:793
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:784
+#: socket.c:795
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (måske afskåret).\n"
 
-#: socket.c:786
+#: socket.c:797
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:790
+#: socket.c:801
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Servers almennavn %s\n"
 
-#: socket.c:794
+#: socket.c:805
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dårligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:810
+#: socket.c:821
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:816
+#: socket.c:827
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anført, kunne ikke verificere certifikat!\n"
 
-#: socket.c:821
+#: socket.c:832
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:823
+#: socket.c:834
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:833
+#: socket.c:844
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:837
+#: socket.c:848
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:845
+#: socket.c:856
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:851
+#: socket.c:862
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s nøgle-fingeraftryk: %s\n"
 
-#: socket.c:855
+#: socket.c:866
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:858
+#: socket.c:869
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:867
+#: socket.c:878
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Advarsel: servercertifikat-verificering: %s\n"
 
-#: socket.c:873
+#: socket.c:884
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de første %d tegn): %s\n"
 
-#: socket.c:925
+#: socket.c:936
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert værdi til SSL"
 
-#: socket.c:942
+#: socket.c:953
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:1003
+#: socket.c:1014
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget "
 "over!\n"
 
-#: socket.c:1075
+#: socket.c:1086
 msgid "Cygwin socket read retry\n"
 msgstr "Forsøger igen at læse cygwin-sokkel\n"
 
-#: socket.c:1078
+#: socket.c:1089
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Forsøg på at læse cygwin-sokkel mislykkedes!\n"
 
@@ -2727,17 +2800,12 @@ msgstr "SMTP-modtager afviste lokal modtageradresse: "
 msgid "writing message text\n"
 msgstr "skriver brevtekst\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 "Gammel UID-liste fra %s:"
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
 msgid " <empty>"
 msgstr " <tom>"
 
@@ -2745,37 +2813,57 @@ msgstr " <tom>"
 msgid "Scratch list of UIDs:"
 msgstr "Liste af øvrige UID'er:"
 
-#: uid.c:512 uid.c:563
+#: uid.c:513 uid.c:565
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "Gammel UID-liste fra %s:"
 
-#: uid.c:514
+#: uid.c:515
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Ny UID-liste fra %s:"
 
-#: uid.c:542
+#: uid.c:544
 msgid "swapping UID lists\n"
 msgstr "Ombytter UID-lister\n"
 
-#: uid.c:550
+#: uid.c:552
 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:575
+#: uid.c:577
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "Ombytter UID-lister\n"
 
-#: uid.c:610
+#: uid.c:612
 msgid "Deleting fetchids file.\n"
 msgstr "Sletter fetchids-fil\n"
 
-#: uid.c:616
+#: uid.c:614
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Fejl ved frigivelse af akkreditiver\n"
+
+#: uid.c:620
 msgid "Writing fetchids file.\n"
 msgstr "Skriver fetchids-fil.\n"
 
+#: uid.c:639
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:643
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:647
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc mislykkedes\n"
@@ -2784,6 +2872,42 @@ msgstr "malloc mislykkedes\n"
 msgid "realloc failed\n"
 msgstr "realloc mislykkedes\n"
 
+#~ msgid "header "
+#~ msgstr "brevhoved-"
+
+#~ msgid "will not"
+#~ msgstr "vil ikke"
+
+#~ msgid "will"
+#~ msgstr "vil"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "Only new"
+#~ msgstr "Kun nye"
+
+#~ msgid "enabled"
+#~ msgstr "slået til"
+
+#~ msgid "disabled"
+#~ msgstr "slået fra"
+
+#~ msgid "discarded"
+#~ msgstr "slettet"
+
+#~ msgid "kept"
+#~ msgstr "bevaret"
+
+#~ msgid "IP address.\n"
+#~ msgstr "IP-adresse.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "navn.\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
+
 #~ msgid "partial error message buffer overflow"
 #~ msgstr "overløb i buffer til del af fejlbesked"
 
@@ -2796,16 +2920,3 @@ msgstr "realloc mislykkedes\n"
 
 #~ msgid "message"
 #~ msgstr "brev"
-
-#~ msgid "Success"
-#~ msgstr "Succes"
-
-#~ msgid "Restricted user (something wrong with account)"
-#~ msgstr "Begrænset bruger (noget er galt med kontoen)"
-
-#~ msgid "Invalid userid or passphrase"
-#~ msgstr "Ugyldigt brugernavn eller løsen"
-
-# Hvad i alverden er deity error?
-#~ msgid "Deity error"
-#~ msgstr "Gudefejl"
diff --git a/po/de.po b/po/de.po
index eca87e33..a337220e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-06 00:35+0200\n"
-"PO-Revision-Date: 2005-07-03 21:17+0200\n"
+"POT-Creation-Date: 2005-07-21 12:50+0200\n"
+"PO-Revision-Date: 2005-07-20 17:19+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -262,7 +262,7 @@ msgstr "Subject: Fetchmail-Warnung: übergroße Nachrichten"
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail konnte keine Mail von %s erhalten:"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "SSL-Verbindung fehlgeschlagen.\n"
 
@@ -434,7 +434,7 @@ msgstr " (%d Bytes).\n"
 msgid "No mail for %s\n"
 msgstr "Keine Post für %s\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "ungültige Nachrichtenanzahl!"
 
@@ -555,7 +555,7 @@ msgstr "%s: Sie existieren nicht.  Hinfort!\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: kann Ihren Host nicht bestimmen!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fehlgeschlagen für %s\n"
@@ -624,60 +624,64 @@ msgstr "Option --remote ist mit ETRN nicht unterstützt\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Option --check ist mit ETRN nicht unterstützt\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr "WARNUNG: Vom Betrieb mit root-Rechten wird abgeraten.\n"
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: aufgerufen mit"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "konnte aktuelles Arbeitsverzeichnis nicht bestimmen\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dies ist fetchmail Version %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Erhalte Optionen von Kommandozeile%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " und "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Keine Mailserver konfiguriert -- vielleicht fehlt %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: es wurden keine Mailserver spezifiziert.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: kein weiteres fetchmail läuft\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: Fehler beim Abschießen von %s-fetchmail bei %d; Abbruch.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "Hintergrund"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "Vordergrund"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s-fetchmail bei %d abgeschossen.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -685,7 +689,7 @@ msgstr ""
 "fetchmail: kann Mail nicht abholen, solange auf dem Rechner ein weiteres "
 "fetchmail läuft.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -693,184 +697,184 @@ msgstr ""
 "fetchmail: kann spezifizierte Hosts nicht abfragen, solange ein weiteres "
 "fetchmail läuft bei %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ein weiteres Vordergrund-fetchmail läuft bei %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: kann keine Optionen akzeptieren, solange Hintergrund-fetchmail "
 "läuft.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: Hintergrund-fetchmail bei %d aufgeweckt.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: älteres Geschwister bei %d ist mysteriös gestorben.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: kann kein Passwort für %s@%s finden.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Geben Sie das Passwort für %s@%s ein: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s Dämon wird gestartet \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "konnte %s nicht öffnen, um Logs anzuhängen \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "konnte keine Zeitüberprüfung bei %s durchführen (Fehler %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "starte fetchmail erneut (%s verändert)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "Versuch, fetchmail erneut auszuführen, kann fehlschlagen,\n"
 "da Verzeichnis nicht wieder hergestellt wurde\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "Versuch, fetchmail erneut auszuführen, fehlgeschlagen\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "Abfrage von %s übersprungen (fehlgeschlagene Authentifikation oder zu viele "
 "Zeitüberschreitungen)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "Intervall nicht erreicht, %s wird nicht abgefragt\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Abfragestatus=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Abfragestatus=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Abfragestatus=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Abfragestatus=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Abfragestatus=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Abfragestatus=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "Abfragestatus=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "Abfragestatus=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Abfragestatus=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Abfragestatus=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "Abfragestatus=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "Abfragestatus=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Abfragestatus=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Abfragestatus=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Abfragestatus=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle Verbindungen verkeilt. Abbruch.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "schlafe um %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "erweckt durch %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "erweckt durch Signal %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "erweckt um %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normale Beendigung, Status %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "konnte keine Zeitüberprüfung der Run-Control-Datei durchführen\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Warnung: mehrfache Erwähnung von Host %s in Konfigurationsdatei\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-Unterstützung ist nicht einkompiliert.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -878,650 +882,650 @@ msgstr ""
 "fetchmail: Warnung: Kein DNS verfügbar, um Multidrop-Abholung von %s zu "
 "überprüfen\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "Warnung: multidrop für %s erfordert envelope-Option!\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1181
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "Warnung: Fragen Sie nicht nach Hilfe, wenn alle Mail zum Postmaster geht!\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "%s-Konfiguration ungültig, Portnummer kann nicht negativ sein\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "%s-Konfiguration ungültig, RPOP erfordert einen privilegierten Port\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s-Konfiguration ungültig, LMTP kann nicht den Standard-SMTP-Port benutzen\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1235
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr ""
 "Sowohl �fetchall“ als auch �keep“ anzuschalten ist im Daemon-Modus ein "
 "Fehler!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beendet mit Signal %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s fragt ab %s (Protokoll %s) um %s: Abfrage gestartet\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Kann ETRN nicht unterstützen ohne gethostbyname(2).\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Kann ODMR nicht unterstützen ohne gethostbyname(2).\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "nicht unterstütztes Protokoll ausgewählt.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s fragt ab %s (Protokoll %s) um %s: Abfrage beendet\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Abfrageintervall ist %d Sekunden\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-Datei ist %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile ist %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Fortschrittsnachrichten werden via syslog geloggt\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail wird maskieren und kein �Received“ generieren\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail wird Fortschrittspunkte auch in Log-Dateien zeigen.\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1489
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail wird fehladressierte Multidrop-Nachricht an %s weiterleiten.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an �postmaster“ schicken.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen and den Absender schicken.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Optionen für Abholen von %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post wird abgeholt via %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Abfrage dieses Servers wird jedesmal erfolgen.\n"
 msgstr[1] "  Abfrage dieses Servers wird alle %d Intervalle erfolgen.\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Wahrer Name des Servers ist %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Dieser Host wird nicht abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1517
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Dieser Host wird abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  Nach Passwörtern wird nachgefragt.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-Geheimnis = �%s“.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = �%s“.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Passwort = �%s“.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokoll ist KPOP mit Kerberos-%s-Authentifikation"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll ist %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (unter Benutzung von Service %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (unter Benutzung der Netzwerk-Sicherheitsoptionen %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (unter Benutzung des Ports %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (unter Benutzung des Standard-Ports)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (erzwungene UIDL-Benutzung)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle verfügbaren Authentifikationsmethoden werden versucht.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  Passwort-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NILM-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos-V4-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos-V5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-zu-End-Verschlüsselung wird angenommen.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinzipal des Mailservice ist: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-verschlüsselte Sitzungen ermöglicht.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-Protokoll: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-Server-Zertifikat-Überprüfung ermöglicht.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL-Verzeichnis für vertrauenswürdige Zertifikate: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-Schlüssel-Fingerabdruck (gegen Server-Schlüssel überprüft): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Auszeit für nichtantwortenden Server ist %d Sekunden"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (Voreinstellung).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  Standard-Postfach ausgewählt.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Gewählte Postfächer sind:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle Nachrichten werden abgeholt (--all on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Nur neue Nachrichten werden abgeholt (--all off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Abgeholte Nachrichten werden auf dem Server belassen (--keep on).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1633
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Abgeholte Nachrichten werden nicht auf dem Server belassen (--keep off).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1635
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung gelöscht (--flush "
 "on).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1636
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--"
 "flush off).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist an (--norewrite off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist aus (--norewrite on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist ein (stripcr on).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist aus (stripcr off).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist ein (forcecr on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist aus (forcecr off).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist aus (pass8bits on).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1648
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist ein (pass8bits off).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-Dekodierung ist ein (mimedecode on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-Dekodierung ist aus (mimedecode off).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  �Idle“ nach Abfrage ist ein (idle on).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  �Idle“ nach Abfrage ist aus (idle off).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nichtleere Statuszeilen werden verworfen (dropstatus on)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nichtleere Statuszeilen werden beibehalten (dropstatus off)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-Zeilen werden verworfen (dropdelivered on)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-Zeilen werden beibehalten (dropdelivered off)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Nachrichtengößen-Beschränkung ist %d Bytes (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengöße (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Nachrichtengöße-Warnungsintervall ist %d Sekunden (--warnings %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1671
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Größenwarnungen bei jeder Abfragen (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1674
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit für erhaltene Nachrichten ist %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Kein Limit für erhaltene Nachrichten (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Limit für die Größe erhaltener Nachrichten ist %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengöße (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Bei jeder Abfrage binäre Suche nach UIDs durchführen (--fastuidl 1).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1688
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Binäre Suche nach UIDs bei %d von %d Abfragen durchführen (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1691
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Bei jeder Abfrage lineare Suche nach UIDs durchführen (--fastuidl 0).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1693
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit für SMTP-Stapelauslieferung ist %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1695
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Kein Limit für SMTP-Stapelauslieferung (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1699
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Anzahl der Löschvorgänge zwischen tatsächlichen Säuberungen auf %d gesetzt "
 "(--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Keine erzwungenen Säuberungen (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domänen, für die Mail abgeholt werden wird, sind:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (Voreinstellung)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Nachrichten werden an %s als BSMTP angehängt\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Nachrichten werden mit �%s“ ausgeliefert.\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Nachrichten werden mit %cMTP weitergeleitet an:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host-Teil der �MAIL FROM“-Zeile ist %s\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1741
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresse, die in �RCPT TO“-Zeilen, die an SMTP ausgeliefert werden, "
 "verwendet wird, ist %s\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Erkannte Spam-Abblock-Antworten des Lauschers sind:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-Abblocken deaktiviert\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server-Verbindung wird aktiviert mit �%s“.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  Kein Vor-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server-Verbindungs wird beendet mit �%s“.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  Kein Nach-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  Keine lokalen Namen (localnames) für diesen Host definiert.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Multi-Drop-Modus: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Einzel-Drop-Modus: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokaler Name erkannt.\n"
 msgstr[1] "%d lokale Namen erkannt.\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist ein.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist aus.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1804
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand der IP.\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1806
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand des Namens.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Umschlag-Adress-Routing ist deaktiviert\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Umschlag-Header wird angenommen als: %s\n"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Erhalten"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Anzahl der zu lesenden Umschlag-Header: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Präfix %s wird von Nutzer-ID entfernt\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  Keine Präfix-Entfernung\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Vordeklarierte Mailserver-Aliase:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Lokale Domänen:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Verbindung muss durch Schnittstelle %s geschehen.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  Kein Schnittstellen-Bindung angefordert.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Abfrageschleife wird %s überwachen.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  Kein Ãœberwachungsinterface angegeben.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serververbindungen werden mittels Plugin %s durchgeführt (--plugin %s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  Kein Plugin-Befehl angegeben.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Lauscher-Verbindungen werden mittels Plugout %s durchgeführt (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  Kein Plugout-Befehl angegeben.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Keine UIDs von diesem Host gespeichert.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gespeichert.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Abfrage-Nachverfolgungsinformationen werden dem Received-Header "
 "hinzugefügt.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1530,7 +1534,7 @@ msgstr ""
 "  hinzugefügt.\n"
 ".\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Eigenschaften zum Durchleiten �%s“.\n"
@@ -1608,77 +1612,77 @@ msgstr "Fehler beim Freigeben der Beglaubigungen\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: Thread schläft für %d Sek.\n"
 
-#: imap.c:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokoll identifiziert als IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokoll identifiziert als IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "werde nach Abfrage untätig sein\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benötigte NTlM-Fähigkeit nicht vom Server unterstützt\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "Säubern fehlgeschlagen\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "erneute Abfrage fehlgeschlagen\n"
 
-#: imap.c:670
+#: imap.c:669
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d Nachricht warte nach erneuter Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach erneuter Abfrage\n"
 
-#: imap.c:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "Postfach-Auswahl fehlgeschlagen\n"
 
-#: imap.c:686
+#: imap.c:685
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d Nachricht wartet nach der ersten Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach der ersten Abfrage\n"
 
-#: imap.c:714
+#: imap.c:713
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d Nachricht wartet nach dem Löschen\n"
 msgstr[1] "%d Nachrichten warten nach dem Löschen\n"
 
-#: imap.c:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ist ungesehen\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ist erste ungesehene\n"
@@ -1866,7 +1870,7 @@ msgstr "Server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Konnte OTP-Herausforderung nicht dekodieren\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Geheime Passphrase: "
 
@@ -2157,40 +2161,48 @@ msgstr "  -r, --folder      Namen des entfernten Ordners angeben\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    Fortschrittspunkte auch in Log-Dateien zeigen\n"
 
-#: pop3.c:543
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Erforderlicher APOP-Zeitstempel nicht in Begrüßung gefunden\n"
 
-#: pop3.c:552
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
 
-#: pop3.c:574
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Anfrage nach undefiniertem Protokoll in POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "Lock beschäftigt!  Ist eine weitere Sitzung aktiv?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr "Kann die UIDL-Antwort des Servers nicht verarbeiten.\n"
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr "Server hat mit UID der falschen Nachricht geantwortet.\n"
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (numm=%d) wurde gelöscht, ist aber immer noch da!\n"
 
-#: pop3.c:767
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Nachrichten in Liste auf Server eingefügt. Kann damit nicht umgehen.\n"
 
-#: pop3.c:853
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "Protokollfehler\n"
 
-#: pop3.c:868
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "Protokollfehler beim Holen der UIDLs\n"
 
-#: pop3.c:1225
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Option --remote wird mit POP3 nicht unterstützt\n"
 
@@ -2444,111 +2456,111 @@ msgstr "MD5 wird auf Datenblock angewandt:\n"
 msgid "MD5 result is: \n"
 msgstr "MD5-Resultat ist: \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "weitergeleitet an %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (Körper der Umleitungs-Nachricht)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "Post von %s umgeleitet zu %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gespeicherter Fehler ist immer noch %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-Fehler: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP Datei öffnen oder Präambel schreiben fehlgeschlagen\n"
 
-#: sink.c:970
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-Lauscher mag Empfängeradresse �%s“ nicht\n"
 
-#: sink.c:977
+#: sink.c:976
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP-Lauscher mag Empfänger-Adresse �%s“ irgendwie nicht\n"
 
-#: sink.c:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "keine Adressen stimmten überein; kein Postmaster gesetzt.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kann noch nicht einmal an %s senden!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "dabei, auszuliefern mit: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "MDA Öffnen fehlgeschlagen\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-Verbindung zu %s fehlgeschlagen\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kann Lauscher nicht erreichen; falle zurück auf %s"
 
-#: sink.c:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA starb durch Signal %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA gab Status %d ungleich Null zurück\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 "Merkwürdig: MDA pclose gab %d zurück, kann das nicht behandeln bei %s:%d\n"
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Nachrichtenbeendung oder Schließen der BSMTP-Datei fehlgeschlagen\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-Lauscher verweigerte Auslieferung\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-Auslieferungsfehler bei EOM\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unerwartete Nicht-503-Erwiderung auf LMTP EOM: %s\n"
 
-#: sink.c:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2891,45 +2903,3 @@ msgstr "malloc fehlgeschlagen\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc fehlgeschlagen\n"
-
-#~ msgid "header "
-#~ msgstr "Kopfzeilen "
-
-#~ msgid "will not"
-#~ msgstr " nicht "
-
-#~ msgid "will"
-#~ msgstr " "
-
-#~ msgid "All"
-#~ msgstr "Alle"
-
-#~ msgid "Only new"
-#~ msgstr "Nur neue"
-
-#~ msgid "enabled"
-#~ msgstr "eingeschaltet"
-
-#~ msgid "disabled"
-#~ msgstr "abgeschaltet"
-
-#~ msgid "discarded"
-#~ msgstr "verworfen"
-
-#~ msgid "kept"
-#~ msgstr "aufgehoben"
-
-#~ msgid "IP address.\n"
-#~ msgstr "der IP-Adresse.\n"
-
-#~ msgid "name.\n"
-#~ msgstr "des Namens.\n"
-
-#~ msgid "lstat: %s: %s\n"
-#~ msgstr "lstat: %s: %s\n"
-
-#~ msgid "partial error message buffer overflow"
-#~ msgstr "Überlauf des Puffers für Teilmeldungen"
-
-#~ msgid "alloca failed\n"
-#~ msgstr "alloca fehlgeschlagen\n"
diff --git a/po/el.po b/po/el.po
index 8170e1be..12929efb 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: 2004-11-14 21:55+0100\n"
+"POT-Creation-Date: 2005-07-06 00:35+0200\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -43,21 +43,21 @@ msgstr "áäõíáìßá áğïêùäéêïğïßçóçò ôçò BASE64 ğñüêëçóçò\n"
 msgid "decoded as %s\n"
 msgstr "áğïêùäéêïğïéŞèçêå óáí %s\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "óöÜëìá kerberos %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [ï äéá÷åéñéóôŞò ëİåé '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:340
+#: driver.c:342
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -65,54 +65,55 @@ msgstr ""
 "\n"
 "Ôá áêüëïõèá õğåñâïëéêïı ìåãİèïõò ìçíıìáôá ğáñáìİíïõí óôï äéá÷åéñéóôŞ %s:"
 
-#: driver.c:358
+#: driver.c:360
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d ìíì %d ìŞêïõò octet ğáñáâëİèçêáí áğü ôï fetchmail.\n"
 
-#: driver.c:498
+#: driver.c:500
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ğáñÜëçøç ìçíıìáôïò %s@%s:%d (%d octets)"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ğáñÜëçøç ìçíıìáôïò %s@%s:%d (%d octets)"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (ìŞêïò -1)"
 
-#: driver.c:569
+#: driver.c:571
 msgid " (oversized)"
 msgstr " (õğåñöõóéêü ìİãåèïò)"
 
-#: driver.c:584
+#: driver.c:586
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "áäõíáìßá ëŞøçò åğéêåöáëßäùí, ìŞíõìá %s@%s:%d (%d octets)\n"
 
-#: driver.c:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "áíÜãíùóç ìçíıìáôïò %s@%s:%d áğü %d"
 
-#: driver.c:609
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:608
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:610
-msgid "header "
-msgstr "åğéêåöáëßäáò "
+#: driver.c:609
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d octets óşìáôïò) "
 
-#: driver.c:682
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octets óşìáôïò) "
 
-#: driver.c:740
+#: driver.c:739
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -120,60 +121,64 @@ msgstr ""
 "ôï ìŞíõìá %s@%s:%d äåí åß÷å ôï áíáìåíüìåíï ìŞêïò(%d ğñáãìáôéêï !=%d "
 "áíáìåíüìåíï)\n"
 
-#: driver.c:771
+#: driver.c:770
 msgid " retained\n"
 msgstr "óõãêñáôŞèçêå\n"
 
-#: driver.c:780
+#: driver.c:779
 msgid " flushed\n"
 msgstr "äéáãñÜöôçêå\n"
 
-#: driver.c:797
+#: driver.c:796
 msgid " not flushed\n"
 msgstr "äåí äéáãñÜöôçêå\n"
 
 #: driver.c:813
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr ""
+#, 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] ""
+"óå üñéï ëŞøçò %d; %d ìçíıìáôá İìåéíáí óôïí äéá÷åéñéóôŞ %s ëïãáñéáóìü%s\n"
+msgstr[1] ""
 "óå üñéï ëŞøçò %d; %d ìçíıìáôá İìåéíáí óôïí äéá÷åéñéóôŞ %s ëïãáñéáóìü%s\n"
 
-#: driver.c:874
+#: driver.c:876
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "İíá SIGPIPE ğåôÜ÷ôçêå áğü İíá MDA Ş áğü óöÜëìá stream socket\n"
 
-#: driver.c:881
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá óıíäåóç óôïí %s.\n"
 
-#: driver.c:885
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôïí äéá÷åéñéóôŞ %s.\n"
 
-#: driver.c:889
+#: driver.c:891
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôï %s.\n"
 
-#: driver.c:894
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá áíáìïíŞò ãéá ôçí áğÜíôçóç ôïõ áêñïáôŞ.\n"
 
-#: driver.c:897
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "ëŞîç ÷ñüíïõ ìåôÜ áğü %d äåıôåñá.\n"
 
-#: driver.c:909
+#: driver.c:911
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: ôï fetchmail âëİğåé åğáíáëáìâáíüìåíåò ëŞîåéò ïñßùí ÷ñüíïõ\n"
 
-#: driver.c:912
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -182,7 +187,7 @@ msgstr ""
 "Ôï fetchmail åßäå ğåñéóóüôåñá áğü %d ëŞîåéò ïñßùí ÷ñüíïõ êáôá ôçí ğñïóğÜèåéá "
 "ãéá ğáñáëá⪠áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:916
+#: driver.c:918
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -199,56 +204,56 @@ msgstr ""
 "Ôï fetchmail äåí èá îáíáñùôŞóåé áõôü ôï ãñáììáôïêéâşôéï ìİ÷ñé íá ôï\n"
 "åğáíåêêéíŞóåôå.\n"
 
-#: driver.c:944
+#: driver.c:947
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "ç åíôïëŞ ğñï-óıíäåóçò áğİôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:975
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "áäõíáìßá åıñåóçò HESIOD ôá÷. èõñßäáò ãéá ôï %s\n"
 
-#: driver.c:997
+#: driver.c:1000
 msgid "Lead server has no name.\n"
 msgstr "Ï åğéêåöáëŞò äéá÷åéñéóôŞò äåí İ÷åé üíïìá.\n"
 
-#: driver.c:1020
+#: driver.c:1024 driver.c:1050
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "áäõíáìßá åıñåóçò êáíïíéêïı ïíüìáôïò DNS ôïõ %s\n"
 
-#: driver.c:1057
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "åóùôåñéêŞ áóõíİ÷åéá\n"
 
-#: driver.c:1067
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s óıíäåóç óôï %s áğİôõ÷å"
 
-#: driver.c:1073
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "Üãíùóôïò äéáêïìéóôŞò."
 
-#: driver.c:1076
+#: driver.c:1107
 msgid "name is valid but has no IP address."
 msgstr "ôï üíïìá åßíáé İãêõñï áëëÜ äåí İ÷åé äéåıèõíóç IP."
 
-#: driver.c:1079
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "ìç áíáêôŞóéìï óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
 
-#: driver.c:1081
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "ğñïóùñéíü óöÜëìá äéá÷åéñéóôŞ ïíïìÜôùí."
 
-#: driver.c:1084
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "Üãíùóôï óöÜëìá DNS %d."
 
-#: driver.c:1102
+#: driver.c:1133
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -256,45 +261,45 @@ msgstr ""
 "\n"
 "Ôï fetchmail áäõíáôåß íá ğñïóåããßóåé ôï äéáêïìéóôŞ áëëçëïãñáößáò %s:"
 
-#: driver.c:1104
+#: driver.c:1135
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Áäõíáìßá ôïõ fetchmail ëŞøçò áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:1131 imap.c:367 pop3.c:411
+#: driver.c:1162 imap.c:367 pop3.c:420
 msgid "SSL connection failed.\n"
 msgstr "ç óıíäåóç SSL áğİôõ÷å.\n"
 
-#: driver.c:1184
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "ÓöÜëìá lock-busy óôïí %s@%s\n"
 
-#: driver.c:1188
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "ÓöÜëìá busy äéáêïìéóôŞ óôïí %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Áğïôõ÷ßá åîïõóéïäüôçóçò óôïí %s@%s%s\n"
 
-#: driver.c:1196
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr " (ğñïçãïõìİíùò åîïõóéïäïôŞèçêå)"
 
-#: driver.c:1217
+#: driver.c:1248
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail áğïôõ÷ßá åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1221
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Áäõíáìßá ôïõ fetchmail ëŞøçò áëëçëïãñáößáò áğü ôï %s@%s.\n"
 
-#: driver.c:1225
+#: driver.c:1256
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -324,7 +329,7 @@ msgstr ""
 "óå êÜèå êıêëï. Äå èá óôáëèïıí ìåëëïíôéêİò åéäïğïéŞóåéò ìİ÷ñé íá \n"
 "áğïêáôáóôáèåß ç õğçñåóßá."
 
-#: driver.c:1240
+#: driver.c:1271
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -344,163 +349,163 @@ msgstr ""
 "óå êÜèå êıêëï. Äå èá óôáëèïıí ìåëëïíôéêİò åéäïğïéŞóåéò ìİ÷ñé íá\n"
 "áğïêáôáóôáèåß ç õğçñåóßá."
 
-#: driver.c:1255
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Îáíáåñşôçóç áìİóùò óôï %s@%s\n"
 
-#: driver.c:1260
+#: driver.c:1291
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "¶ãíùóôï óöÜëìá åéóüäïõ Ş åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1284
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Åîïõóéïäüôçóç ğİôõ÷å óôïí %s@%s\n"
 
-#: driver.c:1290
+#: driver.c:1321
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: åîïõóéïäüôçóç ôïõ fetchmail ğİôõ÷å óôï %s@%s\n"
 
-#: driver.c:1294
+#: driver.c:1325
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Áäõíáìßá åéóüäïõ ôïõ fetchmail óôï %s@%s.\n"
 
-#: driver.c:1298
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "Ç õğçñåóßá áğïêáôáóôÜèçêå.\n"
 
-#: driver.c:1329
+#: driver.c:1360
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "åğéëïãŞ Ş åğáíá-óõãêİíôñùóç öáêİëïõ %s\n"
 
-#: driver.c:1331
+#: driver.c:1362
 msgid "selecting or re-polling default folder\n"
 msgstr "åğéëïãŞ Ş åğáíá-óõãêİíôñùóç åî'ïñéóìïı öáêİëïõ\n"
 
-#: driver.c:1343
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s óôï  %s (öÜêåëïò %s)"
 
-#: driver.c:1346 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s óôï  %s"
 
-#: driver.c:1351
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "Óõãêİíôñùóç áğü %s\n"
 
-#: driver.c:1355
+#: driver.c:1386
 #, 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:1358
+#: driver.c:1389
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1361
+#: driver.c:1392
 #, 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:1368
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1374
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Äåí õğÜñ÷åé áëëçëïãñáößá ãéá ôï %s\n"
 
-#: driver.c:1407
+#: driver.c:1438
 msgid "bogus message count!"
 msgstr "åóöáëìİíç ìİôñçóç ìçíõìÜôùí!"
 
-#: driver.c:1508
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1511
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "÷áìİíç Ş êáêéÜ åğéêåöáëßäá RFC822"
 
-#: driver.c:1514
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1517
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "óõã÷ñïíéóìüò ğåëÜôç/åîõğçñåôçôŞ"
 
-#: driver.c:1520
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "ğñïôüêïëï ğåëÜôç/åîõğçñåôçôŞ"
 
-#: driver.c:1523
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "áğáó÷ïëçìİíï êëåßäïìá óôï äéá÷åéñéóôŞ"
 
-#: driver.c:1526
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "óõíáëëáãŞ SMTP"
 
-#: driver.c:1529
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "áíáæŞôçóç DNS"
 
-#: driver.c:1532
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "ìç ïñéóìİíï óöÜëìá\n"
 
-#: driver.c:1543
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí áğïóôïëŞ óôï äéáêïìéóôŞ SMTP %s\n"
 
-#: driver.c:1545
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí ëŞøç áğü ôï %s\n"
 
-#: driver.c:1553
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "ç åíôïëŞ ğñï-óıíäåóçò áğİôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:1574
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Ç õğïóôŞñéîç ãéá Kerberos V4 äåí İ÷åé óõíäåèåß.\n"
 
-#: driver.c:1582
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Ç õğïóôŞñéîç ãéá Kerberos V5 äåí İ÷åé óõíäåèåß.\n"
 
-#: driver.c:1593
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --flush äåí õğïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1599
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --all äåí õğïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1607
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Ç åğéëïãŞ --limit äåí õğïóôçñßæåôáé ìå ôï %s\n"
@@ -616,61 +621,61 @@ msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Ç åğéëïãŞ --check äåí õğïóôçñßæåôå ìå ôï ETRN\n"
 
-#: fetchmail.c:164
+#: fetchmail.c:167
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: êáëİóôçêå ìå"
 
-#: fetchmail.c:188
+#: fetchmail.c:191
 msgid "could not get current working directory\n"
 msgstr "áäõíáìßá ëŞøçò ôïõ ôñİ÷ïíôïò öáêİëïõ åñãáóßáò (cwd)\n"
 
-#: fetchmail.c:198
+#: fetchmail.c:201
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Áõôü åßíáé ôï fetchmail İêäïóç %s"
 
-#: fetchmail.c:342
+#: fetchmail.c:346
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "ËŞøç ğáñáìåôñùí áğü ôçí ãñáììŞ åíôïëşí%s%s\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:347
 msgid " and "
 msgstr " êáé "
 
-#: fetchmail.c:348
+#: fetchmail.c:352
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Äåí İ÷ïõí ïñéóôåß äéá÷åéñéóôİò áëëçëïãñáößáò -- ßóùò ôï %s íá ëåßğåé;\n"
 
-#: fetchmail.c:369
+#: fetchmail.c:373
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: äåí İ÷ïõí ïñéóôåß äéá÷åéñéóôİò áëëçëïãñáößáò.\n"
 
-#: fetchmail.c:378 fetchmail.c:387
+#: fetchmail.c:382 fetchmail.c:391
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: äåí ôñİ÷åé Üëëï fetchmail\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:397
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: óöÜëìá óôç èáíÜôùóç ôïõ %s fetchmail óôï %d; åãêáôÜëåéøç.\n"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "background"
 msgstr "õğüâáèñï"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "foreground"
 msgstr "ğñïóêŞíéï"
 
-#: fetchmail.c:399
+#: fetchmail.c:403
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: ôï %s fetchmail óôï %d ôåñìáôßóôçêå.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:419
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -678,7 +683,7 @@ msgstr ""
 "fetchmail: áäõíáìßá åëİã÷ïõ áëëçëïãñáößáò üôáí İíá Üëëï fetchmail ôñİ÷åéóôï "
 "ßäéï óıóôçìá.\n"
 
-#: fetchmail.c:421
+#: fetchmail.c:425
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -686,184 +691,184 @@ msgstr ""
 "fetchmail: áäõíáìßá åñşôçóçò ôùí ïñéóìİíùí äéáêïìéóôşí åíş ôñİ÷åé Üëëï\n"
 "           fetchmail óôï %d.\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:432
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: êÜğïéï Üëëï fetchmail ôñİ÷åé óôï ğñïóêŞíéï óôï %d.\n"
 
-#: fetchmail.c:438
+#: fetchmail.c:442
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: åíôïëİò ìç äåêôİò üôáí İíá fetchmail ôñİ÷åé óôï ğáñáóêŞíéï.\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: áöığíéóç ğáñáóêçíéáêïı fetchmail óôï %d.\n"
 
-#: fetchmail.c:456
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: çëéêéùìİíïò åôåñïèáëåßò áäåñöüò ğİèáíå ìõóôçñéïäşò óôï %d.\n"
 
-#: fetchmail.c:471
+#: fetchmail.c:475
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: áäõíáìßá åıñåóç ëİîçò êëåéäß ãéá ôï %s@%s.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "ĞëçêôñïëïãŞóôå ôçí ëİîç êëåéäß ãéá ôï %s@%s: "
 
-#: fetchmail.c:506
+#: fetchmail.c:510
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "åêêßíçóç äáßìïíá fetchmail %s \n"
 
-#: fetchmail.c:521 fetchmail.c:523
+#: fetchmail.c:525 fetchmail.c:527
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "áäõíáìßá áíïßãìáôïò ôïõ %s ãéá ğñüóèåóç êáôáãñáöşí óå áõôü \n"
 
-#: fetchmail.c:561
+#: fetchmail.c:565
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "áäõíáìßá åëİã÷ïõ-şñáò %s (óöÜëìá %d)\n"
 
-#: fetchmail.c:566
+#: fetchmail.c:570
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "åğáíåêêßíçóç fetchmail (%s Üëëáîå)\n"
 
-#: fetchmail.c:571
+#: fetchmail.c:575
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "ç ğñïóğÜèåéá ãéá åğáíåêê ßóùò áğïôı÷åé áöïı ï öÜêåëïò äåí İ÷åé "
 "áğïêáôáóôáèåß\n"
 
-#: fetchmail.c:598
+#: fetchmail.c:602
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "ç áğüğåéñá ãéá åğáíåêêßíçóç ôïõ fetchmail áğİôõ÷å\n"
 
-#: fetchmail.c:626
+#: fetchmail.c:630
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "ğáñÜâëåøç åñşôçóçò ôïõ %s (áğİôõ÷å ç åîïõóéïäüôçóç Ş ğïëëİò ëŞîåéò ÷ñüíïõ)\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:642
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ôï äßáëëåéìá äåí İöôáóå, äåí ãßíåôå åñşôçóç %s\n"
 
-#: fetchmail.c:676
+#: fetchmail.c:680
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=0 (SUCCESS)\n"
 
-#: fetchmail.c:678
+#: fetchmail.c:682
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=1 (NOMAIL)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=2 (SOCKET)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=2 (SOCKET)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=4 (PROTOCOL)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=5 (SYNTAX)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=6 (IOERR)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=6 (IOERR)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=7 (ERROR)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=7 (ERROR)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=8 (EXCLUDE)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=10 (SMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=10 (SMTP)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=11 (DNS)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=11 (DNS)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=12 (BSMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=12 (BSMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=13 (MAXFETCH)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 #, c-format
 msgid "Query status=%d\n"
 msgstr "ÊáôÜóôáóçò Åñşôçóçò=%d\n"
 
-#: fetchmail.c:750
+#: fetchmail.c:754
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "¼ëåò ïé óõíäİóåéò İ÷ïõí ìğëïêÜñåé. ÅãêáôÜëåéøç.\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:761
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "áäñáíİò óôï %s\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:785
 #, c-format
 msgid "awakened by %s\n"
 msgstr "áöõğíßóôçêå áğü ôï %s\n"
 
-#: fetchmail.c:784
+#: fetchmail.c:788
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "áöõğíßóôçêå áğü óŞìá %d\n"
 
-#: fetchmail.c:791
+#: fetchmail.c:795
 #, c-format
 msgid "awakened at %s\n"
 msgstr "áöõğíßóôçêå óôï %s\n"
 
-#: fetchmail.c:797
+#: fetchmail.c:801
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "öõóéïëïãéêüò ôåñìáôéóìüò, êáôÜóôáóç %d\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:954
 msgid "couldn't time-check the run-control file\n"
 msgstr "áäõíáìßá åëİã÷ïõ-şñáò ôïõ áñ÷åßï run-control\n"
 
-#: fetchmail.c:983
+#: fetchmail.c:987
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: ğïëëáğëİò áíáöïñİò ôïõ äéáêïìéóôŞ %s óôï áñ÷åßï ñõèìßóåùí\n"
 
-#: fetchmail.c:1128
+#: fetchmail.c:1134
 msgid "SSL support is not compiled in.\n"
 msgstr "ç õğïóôŞñéîç ãéá SSL äåí İ÷åé ìğåé óôç ìåôÜöñáóç.\n"
 
-#: fetchmail.c:1159
+#: fetchmail.c:1165
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -872,613 +877,661 @@ msgstr ""
 
 #: fetchmail.c:1176
 #, c-format
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1177
+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"
 msgstr ""
 "ìç İãêõñåò ñõèìßóåéò %s, ï áñéèìüò èıñáò äåí ìğïñåß íá åßíáé áñíçôéêüò\n"
 
-#: fetchmail.c:1183
+#: fetchmail.c:1200
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "ìç İãêõñåò ñõèìßóåéò %s, ôï RPOP áğáéôåß ğñïíïìéïı÷á èıñá\n"
 
-#: fetchmail.c:1199
+#: fetchmail.c:1216
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "ìç İãêõñåò ñõèìßóåéò %s, ôï LMTP äåí êÜíåé ÷ñŞóç ôçò åî ïñéóìïı èıñáò SMTP\n"
 
-#: fetchmail.c:1214
+#: fetchmail.c:1231
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Åßíáé ëÜèïò ôï fetchall êáé ìáæß ôï ğáñáìïíŞ óå êáôÜóôáóç äáßìïíá!\n"
 
-#: fetchmail.c:1264
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "İëçîå ìå óŞìá %d\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1366
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s åñşôçóç %s (ğñùôüêïëëï %s) óôï %s: Üñ÷éóå ç åñşôçóç\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1391
 msgid "POP2 support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç POP2.\n"
 
-#: fetchmail.c:1386
+#: fetchmail.c:1403
 msgid "POP3 support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç POP3.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1413
 msgid "IMAP support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç IMAP.\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1419
 msgid "ETRN support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç ETRN.\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1425
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Áäõíáìßá õğïóôŞñéîçò ETRN ÷ùñßò gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1432
 msgid "ODMR support is not configured.\n"
 msgstr "Äåí İ÷åé ñõèìéóôåß ç õğïóôŞñéîç ODMR.\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1438
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Áäõíáìßá õğïóôŞñéîçò ODMR ÷ùñßò gethostbyname(2).\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1444
 msgid "unsupported protocol selected.\n"
 msgstr "åğéëİ÷èçêå ìç õğïóôçñéæüìåíï ğñùôüêïëëï.\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1454
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s åñşôçóç %s (ğñùôüêïëëï %s) óôï %s: ïëïêëçñşèçêå ç åñşôçóç\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1471
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "ÄéÜëëåéìá åñşôçóçò åßíáé %d äåõôåñüëåğôá\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1473
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Áñ÷åßï êáôá÷şñéóçò åßíáé ôï %s\n"
 
-#: fetchmail.c:1458
+#: fetchmail.c:1475
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Áñ÷åßï Id åßíáé ôï %s\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1478
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Ôá ìçíıìáôá ğñïüäïõ èá êáôá÷ùñéèïıí ìİóù ôïõ syslog\n"
 
-#: fetchmail.c:1464
+#: fetchmail.c:1481
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Ôï fetchmail èá áğïêñõöèåß êáé äå èá ğáñÜãåé Received\n"
 
-#: fetchmail.c:1466
+#: fetchmail.c:1483
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Ôï fetchmail èá äåß÷íåé ôåëåßåò ğñïüäïõ êáé óôá áñ÷åßá êáôáãñáöŞò.\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1485
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Ôï fetchmail èá ğñïùèåß multidrop ìçíıìáôá ìå êáêŞ äéåıèõíóç óôï %s.\n"
 
-#: fetchmail.c:1472
+#: fetchmail.c:1489
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï postmaster.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1491
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï áğïóôïëİá.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1498
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Åğéëïãİò ãéá ëŞøç áğü %s@%s:\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1502
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Ç áëëçëïãñáößá èá ëçöèåß ìİóù ôïõ %s\n"
 
-#: fetchmail.c:1488
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Åñşôçóç óå áõôü ôï äéá÷åéñéóôŞ èá óõìâåß êÜèå %d äéáëåßìáôá.\n"
+#: fetchmail.c:1505
+#, 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:1491
+#: fetchmail.c:1509
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Ôï áëçèéíü üíïìá ôïõ äéá÷åéñéóôŞ åßíáé %s.\n"
 
-#: fetchmail.c:1493
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1512
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Áõôüò ï äéáêïìéóôŞò %s èá åñùôçèåß üôáí äåí İ÷åé ïñéóôåß êáíİíáò.\n"
 
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will not"
-msgstr "'äåí èá"
-
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will"
-msgstr "èá"
+#: fetchmail.c:1513
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Áõôüò ï äéáêïìéóôŞò %s èá åñùôçèåß üôáí äåí İ÷åé ïñéóôåß êáíİíáò.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1517
 msgid "  Password will be prompted for.\n"
 msgstr "  Ç ëİîç êëåéäß èá åñùôÜôå.\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1521
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ìõóôéêü APOP = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1524
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1527
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Ëİîç êëåéäß = \"%s\".\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Ôï ğñùôüêïëëï åßíáé KPOP ìå åîïõóéïäüôçóç Kerberos %s"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Ôï ğñùôüêïëëï åßíáé %s"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1546
 #, c-format
 msgid " (using service %s)"
 msgstr " (÷ñŞóç õğçñåóßáò %s)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1548
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (÷ñŞóç åğéëïãşí áóöÜëåéáò äéêôıïõ %s)"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1551
 #, c-format
 msgid " (using port %d)"
 msgstr " (÷ñçóéìïğïßçóç èıñáò %d)"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1554
 msgid " (using default port)"
 msgstr " (÷ñçóéìïğïßçóç èıñáò åî'ïñéóìïı)"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1556
 msgid " (forcing UIDL use)"
 msgstr " (åîáíáãêáóìüò ÷ñŞóçò UIDL)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1562
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ¼ëåò ïé äéáèİóéìåò ìİèïäïé åîïõóéïäüôçóçò èá äïêéìáóôïıí.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1565
 msgid "  Password authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç ìå ëİîç êëåéäß.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1568
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç NTLM.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1571
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç OTP.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1574
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç CRAM-Md5.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1577
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç GSSAPI.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1580
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V4.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1583
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V5.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1586
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ÊñõğôïãñÜöçóç Üêñç-ìå-Üêñç èåùñŞèçêå.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1590
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ÄéåõèõíôŞò õğçñåóßáò áëëçëïãñáößáò åßíáé: %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1593
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Åíåñãïğïßçóç êñõğôïãñáöçìİíùí SSL óõíåäñéşí.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Ğñùôüêïëëï SSL: %s.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1597
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Åíåñãïğïßçóç åëİã÷ïõ ğéóôïğïéçôéêïı äéá÷åéñéóôŞ SSL.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ÖÜêåëïò åìğéóôåõìİíïõ ğéóôïğïéçôéêïı SSL: %s\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1602
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Áğïôığùìá êëåéäéïı SSL (óå óıãêñéóç ìå ôï êëåéäß äéá÷åéñéóôŞ): %s\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1605
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ËŞîç ÷ñüíïõ ü÷é-áğÜíôçóçò áğü ôï äéá÷åéñéóôŞ åßíáé %d äåõôåñüëåğôá"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1607
 msgid " (default).\n"
 msgstr " (åî'ïñéóìïı).\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1614
 msgid "  Default mailbox selected.\n"
 msgstr "  Åî ïñéóìïı ãñáììáôïêéâşôéï åğéëİ÷èçêå.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1619
 msgid "  Selected mailboxes are:"
 msgstr "  Åğéëåãìİíá ãñáììáôïêéâşôéá åßíáé:"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ìçíıìáôá èá ëçöèïıí (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "All"
-msgstr "¼ëá"
+#: fetchmail.c:1626
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s ìçíıìáôá èá ëçöèïıí (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "Only new"
-msgstr "Ìüíï ôá íİá"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Ëçöèİíôá ìçíıìáôá %s èá êñáôçèïıí óôï äéá÷åéñéóôŞ (--keep %s).\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1629
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Ëçöèİíôá ìçíıìáôá %s èá êñáôçèïıí óôï äéá÷åéñéóôŞ (--keep %s).\n"
 
-#: fetchmail.c:1611
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1631
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
 
-#: fetchmail.c:1614
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1632
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  ĞáëéÜ ìçíıìáôá %s èá äéáãñáöïıí ğñéí ôç ëŞøç ìçíõìÜôùí (--flush %s).\n"
+
+#: fetchmail.c:1634
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  ÅğáíåããñáöŞ ôùí ôïğéêşí-äéá÷åéñéóôŞ äéåõèıíóåùí %s (--norewrite %s).\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "enabled"
-msgstr "óå ëåéôïõñãßá"
+#: fetchmail.c:1635
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr ""
+"  ÅğáíåããñáöŞ ôùí ôïğéêşí-äéá÷åéñéóôŞ äéåõèıíóåùí %s (--norewrite %s).\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "disabled"
-msgstr "åêôüò ëåéôïõñãßáò"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Áöáßñåóç ôïõ Carriage-return åßíáé %s (stripcr %s).\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1638
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Áöáßñåóç ôïõ Carriage-return åßíáé %s (stripcr %s).\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Åîáíáãêáóìüò ôïõ Carriage-return åßíáé %s (forcecr %s).\n"
 
-#: fetchmail.c:1623
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1641
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Åîáíáãêáóìüò ôïõ Carriage-return åßíáé %s (forcecr %s).\n"
+
+#: fetchmail.c:1643
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  ÌåôÜöñáóç ôïõ Content-Transfer-Encoding åßíáé %s (pass8bits %s).\n"
 
-#: fetchmail.c:1626
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1644
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  ÌåôÜöñáóç ôïõ Content-Transfer-Encoding åßíáé %s (pass8bits %s).\n"
+
+#: fetchmail.c:1646
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Áğïêùäéêïğïßçóç MIME åßíáé %s (mimedecode %s).\n"
 
-#: fetchmail.c:1629
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1647
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  Áğïêùäéêïğïßçóç MIME åßíáé %s (mimedecode %s).\n"
+
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Çñåìßá ìåôÜ ôçí åñşôçóç åßíáé %s (idle %s).\n"
 
-#: fetchmail.c:1632
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1650
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Çñåìßá ìåôÜ ôçí åñşôçóç åßíáé %s (idle %s).\n"
+
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ïé ãñáììİò Nonempty Status èá %s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "discarded"
-msgstr "áğïññéöèïıí"
+#: fetchmail.c:1653
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Ïé ãñáììİò Nonempty Status èá %s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "kept"
-msgstr "êñáôçèïıí"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  Ïé ãñáììİò Delivered-To èá %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1635
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1656
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Ïé ãñáììİò Delivered-To èá %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1659
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ôï üñéï ìåãİèïõí ìçíıìáôïò åßíáé %d octets (--limit %d).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1662
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Êáíİíá üñéï ìåãİèïõò ìçíıìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1664
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Ğåñßïäïò ğñïåéäïğïßçóçò ìåãİèïõò ìçíıìáôïò åßíáé %d äåıôåñá (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1667
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ĞñïåéäïğïéŞóåéò ìåãİèïõò óå êÜèå åñşôçóç (--warnings 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1670
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ¼ñéï ğáñáëçöèİí-ìçíıìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1673
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Êáíİíá üñéï ğáñáëçöèİí-ìçíıìáôïò (--fetchlimit 0).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1675
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  ¼ñéï ğáñáëçöèİí-ìçíıìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1678
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Êáíİíá üñéï ìåãİèïõò ìçíıìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1682
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1666
+#: fetchmail.c:1684
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1669
+#: fetchmail.c:1687
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1671
+#: fetchmail.c:1689
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ¼ñéï äİóìçò ìçíıìáôïò SMTP åßíáé %d.\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1691
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Êáíİíá üñéï äİóìçò ìçíıìáôïò SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1695
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Ğåñßïäïò äéáãñáöŞò ìåôáîı åîáëåßøåùí åîáíáãêÜóôçêå óå %d (--expunge %d).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1697
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ÊáììéÜ åîáíáãêáóìİíç åîÜëåéøç (--expunge 0).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1704
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Ğåñéï÷İò ãéá ôéò ïğïßåò áëëçëïãñáößá èá ëçöèåß åßíáé:"
 
-#: fetchmail.c:1691 fetchmail.c:1711
+#: fetchmail.c:1709 fetchmail.c:1729
 msgid " (default)"
 msgstr " (åî'ïñéóìïı)"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1714
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Ôá ìçíıìáôá èá ğñïóôåèïıí óå %s óáí BSMTP\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1716
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Ôá ìçíıìáôá èá äéáíåìçèïıí ìå \"%s\".\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1723
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Ôá ìçíıìáôá èá ğñïùèçèïıí %cMTP óå:"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1734
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Ôï ìİñïò äéáêïìéóôŞ ôçò ãñáììŞò MAIL FROM èá åßíáé %s\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1746
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Áíáãíùñéóìİíåò áğáíôŞóåéò ìğëïêáñßóìáôïò spam áêñïáôŞ åßíáé:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1752
 msgid "  Spam-blocking disabled\n"
 msgstr "  Áğåíåñãïğïßçóç ìğëïêáñßóìáôïò-spam\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1755
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Ç óıíäåóç äéá÷åéñéóôŞ èá áñ÷éíÜ ìå \"%s\".\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1758
 msgid "  No pre-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëŞ ğñï-óıíäåóçò.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1760
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Ç óıíäåóç äéá÷åéñéóôŞ èá ôåñìáôßæåôáé ìå \"%s\".\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1763
 msgid "  No post-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëŞ ìåôÜ-óıíäåóçò.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1766
 msgid "  No localnames declared for this host.\n"
 msgstr "  Êáíİíá ôïğéêü üíïìá äåí ïñßóôçêå ãéá áõôü ôï äéáêïìéóôŞ.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1776
 msgid "  Multi-drop mode: "
 msgstr "  ÊáôÜóôáóç multi-drop: "
 
-#: fetchmail.c:1760
+#: fetchmail.c:1778
 msgid "  Single-drop mode: "
 msgstr "  ÊáôÜóôáóç single-drop: "
 
-#: fetchmail.c:1762
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d ôïğéêü üíïìá(ôá) áíáãíùñßóôçêáí.\n"
+#: fetchmail.c:1780
+#, 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:1776
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1795
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  ÁíáæŞôçóç DNS ãéá ôéò äéåõèıíóåéò multidrop åßíáé %s.\n"
 
-#: fetchmail.c:1780
-msgid "  Server aliases will be compared with multidrop addresses by "
-msgstr "  Ôá øåõäşíõìá äéá÷åéñéóôŞ èá óõãêñéèïıí ìå äéåõèıíóåéò multidrop ìå "
+#: fetchmail.c:1796
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  ÁíáæŞôçóç DNS ãéá ôéò äéåõèıíóåéò multidrop åßíáé %s.\n"
 
-#: fetchmail.c:1782
-msgid "IP address.\n"
-msgstr "äéåıèõíóç IP.\n"
+#: fetchmail.c:1800
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  Ôá øåõäşíõìá äéá÷åéñéóôŞ èá óõãêñéèïıí ìå äéåõèıíóåéò multidrop ìå "
 
-#: fetchmail.c:1784
-msgid "name.\n"
-msgstr "üíïìá.\n"
+#: fetchmail.c:1802
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  Ôá øåõäşíõìá äéá÷åéñéóôŞ èá óõãêñéèïıí ìå äéåõèıíóåéò multidrop ìå "
 
-#: fetchmail.c:1787
+#: fetchmail.c:1805
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ÁğåíåñãïğïéŞèçêå ç äñïìïëüãçóç Åğéêåöáëßäá-öáêİëïõ\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1808
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "Åğéêåöáëßäá öáêİëïõ èåùñåßôå íá åßíáé: %s\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1809
 msgid "Received"
 msgstr "ĞáñáëŞöèçêå"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1811
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Áñéèìüò åğéêåöáëßäáò öáêİëïõ ğïõ èá åğåîåñãáóôïıí: %d\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1814
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Ôï ğñüèåìá %s èá áöáéñåèåß áğü ôï user id\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1817
 msgid "  No prefix stripping\n"
 msgstr "  ÊáììéÜ áöáßñåóç ğñïèİìáôïò\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1824
 msgid "  Predeclared mailserver aliases:"
 msgstr "Ğñïäçëùìİíá øåõäşíõìá äéá÷åéñéóôŞ-áëëçëïãñáößáò:"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1833
 msgid "  Local domains:"
 msgstr "  Ôïğéêİò ğåñéï÷İò:"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1843
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ç óıíäåóç ğñİğåé íá åßíáé ìİóù ôïõ interface %s.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1845
 msgid "  No interface requirement specified.\n"
 msgstr "  Äåí ïñßóôçêáí áğáéôŞóåéò interface.\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1847
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Âñüã÷ïò åñşôçóçò èá ğáñáêïëïõèåß ôï %s.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1849
 msgid "  No monitor interface specified.\n"
 msgstr "  Äåí ïñßóôçêå interface ğáñáêïëïıèçóçò.\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1853
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Óõíäİóåéò äéá÷åéñéóôŞ èá ãßíïõí ìİóù ôïõ plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1837
+#: fetchmail.c:1855
 msgid "  No plugin command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëŞ plugin.\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1857
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Óõíäİóåéò áêñïáôŞ èá ãßíïõí ìİóù ôïõ plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1841
+#: fetchmail.c:1859
 msgid "  No plugout command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëŞ plugout.\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1864
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Äåí áğïèçêåıôçêáí UID áğü áõôü ôï äéáêïìéóôŞ.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1873
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID áğïèçêåıôçêáí.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1881
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Ğëçñïöïñßåò åíôïğéóìïı åñşôçóçò èá ğñïóôåèåß óôçí åğéêåöáëßäá Received.\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1883
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1486,7 +1539,7 @@ msgstr ""
 "  ÊáììéÜ ğëçñïöïñßá åíôïğéóìïı åñşôçóçò äå èá ğñïóôåèåß óôçí åğéêåöáëßäá\n"
 "Received.\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1886
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Éäéüôçôåò Pass-through \"%s\".\n"
@@ -1499,7 +1552,7 @@ msgstr "alloca áğİôõ÷å"
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ÓÖÁËÌÁ: êáììßá õğïóôŞñéîç ãéá ôç ñïõôßíá getpassword()\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1592,43 +1645,49 @@ msgstr "Áğáéôïıìåíç éêáíüôçôá NTLM äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Áğáéôïıìåíç éêáíüôçôá LOGIN äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:644 imap.c:706
+#: imap.c:644 imap.c:710
 msgid "expunge failed\n"
 msgstr "åîÜëåéøç áğİôõ÷å\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:662 imap.c:695
 msgid "re-poll failed\n"
 msgstr "åğáíåñşôçóç áğİôõ÷å\n"
 
 #: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí áğáíåñşôçóç\n"
+#, 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:680
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr "ç åğéëïãŞ ãñáììáôïêéâùôßïõ áğİôõ÷å\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí ğñşôç åñşôçóç\n"
+#: imap.c:686
+#, 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:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "%d ìçíıìáôá áíáìİíïõí ìåôÜ ôçí åîÜëåéøç\n"
+#: imap.c:714
+#, 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:733
+#: imap.c:739
 msgid "search for unseen messages failed\n"
 msgstr "áíáæŞôçóç ãéá ìç éäùìİíá ìçíıìáôá áğİôõ÷å\n"
 
-#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u äåí İ÷åé åéäùèåß\n"
 
-#: imap.c:775 pop3.c:687
+#: imap.c:781 pop3.c:695
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u åßíáé ôï ğñşôï ìç éäùìİíï\n"
@@ -1808,15 +1867,15 @@ msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Ç åğéëïãŞ --check äåí õğïóôçñßæåôå ìå ôï ODMR\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr "äéá÷åéñéóôŞò İëáâå èáíÜóéìï\n"
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "Áäõíáìßá áğïêùäéêïğïßçóçò ğñüêëçóçò OTP\n"
 
-#: opie.c:59 pop3.c:496
+#: opie.c:58 pop3.c:505
 msgid "Secret pass phrase: "
 msgstr "ÌõóôéêŞ öñÜóç êëåéäß: "
 
@@ -2111,41 +2170,41 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    åìöÜíéóç ôåëåßùí ğñïüäïõ êáé óôá áñ÷åßá êáôáãñáöŞò\n"
 
-#: pop3.c:534
+#: pop3.c:543
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Äå âñİèçêå ç áğáéôïıìåíç ÷ñïíïëüãçóç óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:543
+#: pop3.c:552
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Óõíôáêôéêü óöÜëìá ÷ñïíïëüãçóçò óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:565
+#: pop3.c:574
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ìç ïñéóìİíç áßôçóç ğñùôïêüëëïõ óôï POP3_auth\n"
 
-#: pop3.c:573
+#: pop3.c:582
 msgid "lock busy!  Is another session active?\n"
 msgstr "áğáó÷ïëçìİíï êëåßäùìá!  Åßíáé åíåñãŞ êÜğïéá Üëëç óõíåäñßá;\n"
 
-#: pop3.c:657 pop3.c:886
+#: pop3.c:665 pop3.c:894
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:759
+#: pop3.c:767
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Ôá ìçíıìáôá åéóİñ÷ïíôáé óå ëßóôá óôï äéá÷åéñéóôŞ. Áäõíáìßá ÷åéñéóìïı áõôïı.\n"
 
-#: pop3.c:845
+#: pop3.c:853
 msgid "protocol error\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ\n"
 
-#: pop3.c:860
+#: pop3.c:868
 msgid "protocol error while fetching UIDLs\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ êáôÜ ôç ëŞøç UIDL\n"
 
-#: pop3.c:1217
+#: pop3.c:1225
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Ç åğéëïãŞ --remote äåí õğïóôçñßæåôáé ìå ôï POP3\n"
 
@@ -2223,6 +2282,22 @@ msgstr "Ğñüêåéôå íá åğáíåããñáöåß %s"
 msgid "Rewritten version is %s\n"
 msgstr "Îáíáãñáììİíç İêäïóç åßíáé %s\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr "Åğéôõ÷ßá"
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr "Ğåñéïñéóìİíïò ÷ñŞóôçò (êÜôé óõìâáßíåé ìå ôï ëïãáñéáóìü)"
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr "Ìç İãêõñï userid Ş öñÜóç êëåéäß"
+
+#: rpa.c:120
+msgid "Deity error"
+msgstr "ÓöÜëìá Èåüôçôáò"
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA ôåêìŞñéï 2: óöÜëìá áğïêùäéêïğïßçóçò Base64\n"
@@ -2411,82 +2486,82 @@ msgstr "%cMTP óöÜëìá: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Áíïé÷ôü áñ÷åßï BSMTP Ş áğİôõ÷å ç åéóáãùãéêŞ åããñáöŞ\n"
 
-#: sink.c:966
+#: sink.c:970
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Ï áêñïáôŞò %cMTP áğå÷èÜíåôáé ôç äéåıèõíóç ğáñáëŞğôç `%s'\n"
 
-#: sink.c:973
+#: sink.c:977
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Ï áêñïáôŞò %cMTP ğñáãìáôéêÜ áğå÷èÜíåôáé ôç äéåıèõíóç ğáñáëŞğôç `%s'\n"
 
-#: sink.c:1011
+#: sink.c:1015
 msgid "no address matches; no postmaster set.\n"
 msgstr "êáíİíá ôáßñéáóìá äéåıèõíóçò· äåí İ÷åé ïñéóôåß postmaster.\n"
 
-#: sink.c:1023
+#: sink.c:1027
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "áäõíáìßá áğïóôïëŞò áêüìá êáé óôï %s!\n"
 
-#: sink.c:1029
+#: sink.c:1033
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "êáíİíá ôáßñéáóìá äéåıèõíóçò· ğñïşèçóç óôï %s.\n"
 
-#: sink.c:1182
+#: sink.c:1186
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "ğñüêåéôå íá äéáíåìçèïıí ìå: %s\n"
 
-#: sink.c:1206
+#: sink.c:1210
 msgid "MDA open failed\n"
 msgstr "¶íïéãìá MDA áğİôõ÷å\n"
 
-#: sink.c:1243
+#: sink.c:1247
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Óıíäåóç %cMTP óôï %s áğİôõ÷å\n"
 
-#: sink.c:1267
+#: sink.c:1271
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "áäõíáìßá áíıøùóçò áêñïáôŞ· ÷ñŞóç ôïõ %s"
 
-#: sink.c:1323
+#: sink.c:1327
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "ôï MDA áğåâßùóå áğü óŞìá %d\n"
 
-#: sink.c:1326
+#: sink.c:1330
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "Ôï MDA åğİóôñåøå ìç-ìçäåíéêŞ êáôÜóôáóç %d\n"
 
-#: sink.c:1329
+#: sink.c:1333
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "ĞáñÜîåíï: ôï MDA pclose åğİóôñåøå %d, áäõíáìßá ÷åéñéóìïı óôï %s:%d\n"
 
-#: sink.c:1350
+#: sink.c:1354
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ôåñìáôéóìüò ìçíıìáôïò Ş êëåßóéìï ôïõ áñ÷åßïõ BSMTP áğİôõ÷å\n"
 
-#: sink.c:1371
+#: sink.c:1375
 msgid "SMTP listener refused delivery\n"
 msgstr "Ï áêñïáôŞò SMTP áñíŞèçêå ôç äéáíïìŞ\n"
 
-#: sink.c:1401
+#: sink.c:1405
 msgid "LMTP delivery error on EOM\n"
 msgstr "ÓöÜëìá äéáíïìŞò LMTP óôï  EOM\n"
 
-#: sink.c:1404
+#: sink.c:1408
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Ìç áíáìåíüìåíç áğÜíôçóç ü÷é-503 óôï LMTP EOM: %s\n"
 
-#: sink.c:1555
+#: sink.c:1559
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2524,152 +2599,152 @@ msgstr "Åîïõóéïäüôçóç ESMTP LOGIN...\n"
 msgid "smtp listener protocol error\n"
 msgstr "óöÜëìá ğñùôïêüëëïõ áêñïáôŞ smtp\n"
 
-#: socket.c:106 socket.c:132
+#: socket.c:117 socket.c:143
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: áğİôõ÷å ôï malloc\n"
 
-#: socket.c:164
+#: socket.c:175
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair áğİôõ÷å\n"
 
-#: socket.c:170
+#: socket.c:181
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: áğİôõ÷å ôï fork\n"
 
-#: socket.c:177
+#: socket.c:188
 msgid "dup2 failed\n"
 msgstr "dup2 áğİôõ÷å\n"
 
-#: socket.c:183
+#: socket.c:194
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "åêôåëåßôå %s (äéáêïìéóôŞò %s õğçñåóßá %s)\n"
 
-#: socket.c:186
+#: socket.c:197
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) áğİôõ÷å\n"
 
-#: socket.c:277
+#: socket.c:288
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:419
+#: socket.c:430
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: ëŞøç ğáñÜíïìïõ ìŞêïõò äéåıèõíóçò ãéá ôï äéáêïìéóôŞ %s\n"
 
-#: socket.c:776
+#: socket.c:787
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Ïñãáíéóìüò Åêäüôç: %s\n"
 
-#: socket.c:778
+#: socket.c:789
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: õğåñâïëéêÜ ìåãÜëï ¼íïìá Ïñãáíéóìïı Åêäüôç (ğéèáíÜ êïììİíï).\n"
 
-#: socket.c:780
+#: socket.c:791
 msgid "Unknown Organization\n"
 msgstr "¶ãíùóôïò Ïñãáíéóìüò\n"
 
-#: socket.c:782
+#: socket.c:793
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Åêäüôç: %s\n"
 
-#: socket.c:784
+#: socket.c:795
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Ğñïåéäïğïßçóç: Êïéíü¼íïìá Åêäüôç åßíáé õğåñâïëéêÜ ìåãÜëï (ğéèáíÜ êïììİíï).\n"
 
-#: socket.c:786
+#: socket.c:797
 msgid "Unknown Issuer CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá Åêäüôç\n"
 
-#: socket.c:790
+#: socket.c:801
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Äéá÷åéñéóôŞ: %s\n"
 
-#: socket.c:794
+#: socket.c:805
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Êáêü ğéóôïğïéçôéêü: Subject Êïéíü¼íïìá õğåñâïëéêÜ ìåãÜëï!\n"
 
-#: socket.c:810
+#: socket.c:821
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ìç ôáßñéáóìá ÊïéíïıÏíüìáôïò ÄéáêïìéóôŞ: %s != %s\n"
 
-#: socket.c:816
+#: socket.c:827
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "Äåí İ÷åé ïñéóôåß üíïìá äéá÷åéñéóôŞ, áäõíáìßá åğáëŞèåõóçò ğéóôïğïéçôéêïı!\n"
 
-#: socket.c:821
+#: socket.c:832
 msgid "Unknown Server CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá ÄéáêïìéóôŞ\n"
 
-#: socket.c:823
+#: socket.c:834
 msgid "Server name not specified in certificate!\n"
 msgstr "Äåí İ÷åé ïñéóôåß üíïìá äéáêïìéóôŞ óôï ğéóôïğïéçôéêü!\n"
 
-#: socket.c:833
+#: socket.c:844
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() áğİôõ÷å!\n"
 
-#: socket.c:837
+#: socket.c:848
 msgid "Out of memory!\n"
 msgstr "Óşèçêå ç ìíŞìç!\n"
 
-#: socket.c:845
+#: socket.c:856
 msgid "Digest text buffer too small!\n"
 msgstr "Ç ğñïóùñéíŞ ìíŞìç êåéìİíïõ ğåñßëçøçò åßíáé õğåñâïëéêÜ ìéêñŞ!\n"
 
-#: socket.c:851
+#: socket.c:862
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s áğïôığùìá êëåéäéïı: %s\n"
 
-#: socket.c:855
+#: socket.c:866
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s áğïôõğşìáôá ôáéñéÜæïõí.\n"
 
-#: socket.c:858
+#: socket.c:869
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s áğïôõğşìáôá äåí ôáéñéÜæïõí!\n"
 
-#: socket.c:867
+#: socket.c:878
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ğñïåéäïğïßçóç: åğáëŞèåõóç ğéóôïğïéçôéêïı äéáêïìéóôŞ: %s\n"
 
-#: socket.c:873
+#: socket.c:884
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Üãíùóôïò åêäüôçò (ğñşôïé %d ÷áñáêôŞñåò): %s\n"
 
-#: socket.c:925
+#: socket.c:936
 msgid "File descriptor out of range for SSL"
 msgstr "Ï ğåñéãñáöİáò áñ÷åßïõ åêôüò êëßìáêáò ãéá ôï SSL"
 
-#: socket.c:942
+#: socket.c:953
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Êáèïñßóôçêå Üêõñï ğñïôüêïëëï SSL '%s', ÷ñŞóç åî ïñéóìïı (SSLv23).\n"
 
-#: socket.c:1003
+#: socket.c:1014
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "ÅğáëŞèåõóç ğéóôïğïéçôéêïı/áğïôõğşìáôïò êÜğùò ğáñáëŞöèçêå!\n"
 
-#: socket.c:1075
+#: socket.c:1086
 msgid "Cygwin socket read retry\n"
 msgstr "ÅğáíáğñïóğÜèåéá áíÜãíùóçò õğïäï÷Şò Cygwin\n"
 
-#: socket.c:1078
+#: socket.c:1089
 msgid "Cygwin socket read retry failed!\n"
 msgstr "ÅğáíáğñïóğÜèåéá áíÜãíùóçò õğïäï÷Şò Cygwin áğİôõ÷å!\n"
 
@@ -2756,17 +2831,12 @@ msgstr "Ï áêñïáôŞò SMTP áğİññéøå ôéò äéåõèıíóåéò ôïğéêşí ğáñáëçğôşí: "
 msgid "writing message text\n"
 msgstr "åããñáöŞ êåéìİíïõ ìçíıìáôïò\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 "ĞáëéÜ ëßóôá UID áğü %s:"
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
 msgid " <empty>"
 msgstr " <Üäåéï>"
 
@@ -2774,37 +2844,57 @@ msgstr " <Üäåéï>"
 msgid "Scratch list of UIDs:"
 msgstr "Ğñü÷åéñç ëßóôá ìå UID:"
 
-#: uid.c:512 uid.c:563
+#: uid.c:513 uid.c:565
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "ĞáëéÜ ëßóôá UID áğü %s:"
 
-#: uid.c:514
+#: uid.c:515
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Íİá ëßóôá UID áğü %s:"
 
-#: uid.c:542
+#: uid.c:544
 msgid "swapping UID lists\n"
 msgstr "áíôáëëáãŞ ëéóôşí UID\n"
 
-#: uid.c:550
+#: uid.c:552
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "ü÷é áíôáëëáãŞ ëéóôşí UID, äå âñİèçêå êáíİíá UID óå áõôŞ ôçí åñşôçóç\n"
 
-#: uid.c:575
+#: uid.c:577
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "áíôáëëáãŞ ëéóôşí UID\n"
 
-#: uid.c:610
+#: uid.c:612
 msgid "Deleting fetchids file.\n"
 msgstr "ÄéáãñáöŞ áñ÷åßïõ fetchids.\n"
 
-#: uid.c:616
+#: uid.c:614
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "ÓöÜëìá óôçí áğåëåõèİñùóç äéáğéóôåõôçñßùí\n"
+
+#: uid.c:620
 msgid "Writing fetchids file.\n"
 msgstr "ÅããñáöŞ áñ÷åßïõ fetchids\n"
 
+#: uid.c:639
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:643
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:647
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "áğİôõ÷å ôï malloc\n"
@@ -2813,6 +2903,42 @@ msgstr "áğİôõ÷å ôï malloc\n"
 msgid "realloc failed\n"
 msgstr "áğİôõ÷å ôï realloc\n"
 
+#~ msgid "header "
+#~ msgstr "åğéêåöáëßäáò "
+
+#~ msgid "will not"
+#~ msgstr "'äåí èá"
+
+#~ msgid "will"
+#~ msgstr "èá"
+
+#~ msgid "All"
+#~ msgstr "¼ëá"
+
+#~ msgid "Only new"
+#~ msgstr "Ìüíï ôá íİá"
+
+#~ msgid "enabled"
+#~ msgstr "óå ëåéôïõñãßá"
+
+#~ msgid "disabled"
+#~ msgstr "åêôüò ëåéôïõñãßáò"
+
+#~ msgid "discarded"
+#~ msgstr "áğïññéöèïıí"
+
+#~ msgid "kept"
+#~ msgstr "êñáôçèïıí"
+
+#~ msgid "IP address.\n"
+#~ msgstr "äéåıèõíóç IP.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "üíïìá.\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
+
 #~ msgid "partial error message buffer overflow"
 #~ msgstr "ìåñéêü óöÜëìá êáôÜôìçóçò ìçíıìáôïò ëÜèïõò"
 
@@ -2825,15 +2951,3 @@ msgstr "áğİôõ÷å ôï realloc\n"
 
 #~ msgid "message"
 #~ msgstr "ìŞíõìá"
-
-#~ msgid "Success"
-#~ msgstr "Åğéôõ÷ßá"
-
-#~ msgid "Restricted user (something wrong with account)"
-#~ msgstr "Ğåñéïñéóìİíïò ÷ñŞóôçò (êÜôé óõìâáßíåé ìå ôï ëïãáñéáóìü)"
-
-#~ msgid "Invalid userid or passphrase"
-#~ msgstr "Ìç İãêõñï userid Ş öñÜóç êëåéäß"
-
-#~ msgid "Deity error"
-#~ msgstr "ÓöÜëìá Èåüôçôáò"
diff --git a/po/es.po b/po/es.po
index bc65b8ec..eb018573 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6-pre3\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-07-21 12:50+0200\n"
 "PO-Revision-Date: 2005-07-05 13:08-0300\n"
 "Last-Translator: Javier Kohen <jkohen@users.sourceforge.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -263,7 +263,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:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
@@ -430,7 +430,7 @@ msgstr " (%d octetos).\n"
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
@@ -550,7 +550,7 @@ msgstr "%s: No existís. Andate.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: ¡no se puede determinar su máquina!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falló para %s\n"
@@ -619,60 +619,64 @@ msgstr "La opción --remote no es soportada con ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "La opción --check no es soportada con ETRN\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocado con"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "no fue posible obtener el directorio de trabajo actual\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Esta es la versión de fetchmail %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Tomando opciones de la línea de comandos%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " y "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No hay servidores de correo configurados -- ¿por ahí falta %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no han sido especificados servidores de correo.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ningún otro fetchmail está siendo ejecutando\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "primer plano"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminando.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -680,7 +684,7 @@ msgstr ""
 "fetchmail: no es posible verificar el correo mientras otro fetchmail está en "
 "ejecución hacia la misma máquina\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -688,185 +692,185 @@ msgstr ""
 "fetchmail: no es posible inquirir las máquinas especificadas con otro "
 "fetchmail (%d) en ejecución.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: otro fetchmail (%d) está en ejecución en primer plano.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: no es posible aceptar opciones mientras un fetchmail está en "
 "ejecución en segundo plano.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: proceso hijo más antiguo (%d) murió misteriosamente.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no se puede encontrar una clave para %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Ingrese clave para %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "no fue posible abrir %s para anexarle mensajes de registro\n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no se pudo temporizar %s (error %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s cambió)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "el intento de re-ejectuar puede fallar dado que el directorio no ha sido "
 "restaurado\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "el intento de re-ejecutar fetchmail falló\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "no se consulta %s (fallo en la autenticación o demasiados excesos de "
 "espera)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo no alcanzado, no se interrogará %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado de la consulta=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas las conexiones están trabadas. Saliendo.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "durmiendo en %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertado por %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertado por señal %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertado en %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "no se pudo temporizar el archivo de control de ejecución\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Cuidado: múltiple mención de la máquina %s en el archivo de configuración\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no fue compilado.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -874,664 +878,664 @@ msgstr ""
 "fetchmail: cuidado: no hay DNS disponible para verificar recepciones "
 "‘multidrop’ de %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cuidado: ¡‘multidrop’ para %s requiere la opción envelope!\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1181
 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:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr ""
 "La configuración %s es inválida, el número de puerto no puede ser negativo\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuración de %s inválida, RPOP requiere un puerto privilegiado\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, 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:1231
+#: fetchmail.c:1235
 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:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, 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:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "No se puede soportar ETRN sin gethostbyname(2).\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "No se puede soportar ODMR sin gethostbyname(2).\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "fue seleccionado un protocolo no soportado.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, 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:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso serán registrados vía syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará ‘Received’\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 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:1485
+#: fetchmail.c:1489
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes ‘multidrop’ mal direccionados a %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al ‘postmaster’.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo será recibido vía %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 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:1513
+#: fetchmail.c:1517
 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:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  La clave será pedida.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = “%s�.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = “%s�.\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Clave = “%s�.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (usando opciones de seguridad de red %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (usando puerto %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (usando puerto por defecto)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con clave.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones encriptadas con SSL activadas.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, 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:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla por defecto está seleccionada.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Todos los mensajes serán recibidos (--all on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Sólo se recibirán mensajes nuevos (--all off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 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:1629
+#: fetchmail.c:1633
 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:1631
+#: fetchmail.c:1635
 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:1632
+#: fetchmail.c:1636
 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:1634
+#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Se reescribirán las direcciones locales (--norewrite off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  No se reescribirán las direcciones locales (--norewrite on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Los retornos de carro serán eliminados (stripcr on).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  No se eliminarán los retornos de carro (stripcr off).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Se agregarán retornos de carro (forcecr on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  No se agregarán retornos de carro (forcecr off).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 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:1644
+#: fetchmail.c:1648
 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:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  La decodificación MIME está activada (mimedecode on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  La decodificación MIME está desactivada (mimedecode off).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Se permanecerá a la espera tras la consulta (idle on).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  No se permanecerá a la espera tras la consulta (idle off).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Las líneas ‘Status’ serán descartadas (dropstatus on).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Las líneas ‘Status’ serán conservadas (dropstatus off).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán descartadas (dropdelivered on).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Las líneas ‘Delivered-To’ serán conservadas (dropdelivered off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, 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:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, 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:1667
+#: fetchmail.c:1671
 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:1670
+#: fetchmail.c:1674
 #, 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:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, 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:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 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:1684
+#: fetchmail.c:1688
 #, 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:1687
+#: fetchmail.c:1691
 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:1689
+#: fetchmail.c:1693
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensaje por lote SMTP es %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1695
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1699
 #, 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:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, 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:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes serán entregados con “%s�.\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes serán reenviados con %cMTP a:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, 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:1737
+#: fetchmail.c:1741
 #, 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:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de ‘spam’ son:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de ‘spam’ está desactivado\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, 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:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  No hay comando de pre-conexión.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, 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:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  No hay comando posconexión.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para esta máquina.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Modo ‘multi-drop’: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Modo ‘single-drop’: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, 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:1795
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  No se consultará al DNS por las direcciones ‘multidrop’.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1804
 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:1802
+#: fetchmail.c:1806
 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:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, 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:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Recibido"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Número del encabezado de la envoltura a ser procesado: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  El prefijo %s será eliminado del nombre de usuario\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  Ningún prefijo será eliminado\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, 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:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificó alguna interfaz requerida.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta monitoreará %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitoreo.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, 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:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugin’.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, 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:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó un comando para el ‘plugout’.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UIDs guardadas de esta máquina.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs guardadas.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 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:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1539,7 +1543,7 @@ msgstr ""
 "  No se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso “%s�.\n"
@@ -1617,77 +1621,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:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "descansará después de inquirir\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:670
+#: imap.c:669
 #, 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:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:686
+#: imap.c:685
 #, 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:714
+#: imap.c:713
 #, 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:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
@@ -1876,7 +1880,7 @@ msgstr "fatal recv del server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
@@ -2186,41 +2190,49 @@ msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
 "registro\n"
 
-#: pop3.c:543
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Estampa de tiempo APOP requerida no encontrada en el saludo\n"
 
-#: pop3.c:552
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la estampa de tiempo en el saludo\n"
 
-#: pop3.c:574
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pedido de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:767
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
 
-#: pop3.c:853
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:868
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDLs\n"
 
-#: pop3.c:1225
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "La opción --remote no es soportada con POP3\n"
 
@@ -2474,112 +2486,112 @@ msgstr "Aplicando MD5 al bloque de datos:\n"
 msgid "MD5 result is: \n"
 msgstr "El resultado de MD5 es: \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "El error guardado es aún %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 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:970
+#: sink.c:969
 #, 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:977
+#: sink.c:976
 #, 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:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1247
+#: 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:1271
+#: 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:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "El MDA murió por la señal %d\n"
 
-#: sink.c:1330
+#: 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:1333
+#: 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:1354
+#: 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:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1408
+#: 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:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2929,3 +2941,15 @@ msgstr "malloc falló\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc falló\n"
+
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u no fue visto\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u no fue visto\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
diff --git a/po/fr.po b/po/fr.po
index afb2332b..b39e6303 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6\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-07-21 12:50+0200\n"
 "PO-Revision-Date: 2005-07-06 01:31+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -271,7 +271,7 @@ msgstr "Subject: avertissement de serveur non accessible par Fetchmail."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s:"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "Échec de la connexion SSL\n"
 
@@ -434,7 +434,7 @@ msgstr " (%d octets).\n"
 msgid "No mail for %s\n"
 msgstr "Aucun message pour %s\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "nombre de messages erroné !"
 
@@ -554,7 +554,7 @@ msgstr "%s : Vous n'existez pas.  Allez vous en.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s : impossible de déterminer le nom de votre hôte !"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "«gethostbyname» a échoué pour %s\n"
@@ -623,60 +623,64 @@ msgstr "L'option --remote n'est pas supportée avec ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'option --check n'est pas supportée avec ETRN\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail appellé avec"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "impossible de trouver le répertoire de travail courrant\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ceci est fetchmail, version %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Lecture des options sur la ligne de commande %s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " et "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Pas de serveur de courrier paramétré -- %s est peut-être manquant ?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: aucun serveur de courrier n'a été spécifié.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: aucun autre fetchmail n'est en cours d'exécution\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erreur en terminant %s fetchmail (%d); abandon.\n"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "tâche de fond"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "premier plan"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminé.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -684,7 +688,7 @@ msgstr ""
 "fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est "
 "exécuté sur le même hôte\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -692,187 +696,187 @@ msgstr ""
 "fetchmail: impossible de récupérer le courrier si un autre fetchmail est "
 "exécuté sur %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 "fetchmail: un autre fetchmail, au premier plan, est en exécution sur %d.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne "
 "en tâche de fond.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail en tâche de fond (%d) a été réactivé.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: processus fils plus ancien (%d) terminé mystérieusement.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: ne trouve pas de mot de passe pour %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entrez le mot de passe pour %s@%s : "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "démarrage de fetchmail %s en tâche de fond \n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "impossible d'ouvrir %s pour y ajouter les messages\n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "«time-check» %s impossible (erreur %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "redémarrage de fetchmail (%s  a changé)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "la tentative de réexécution peut échouer car le répertoire n'a pas été "
 "recréé\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "la tentative d'exécuter à nouveau fetchmail a échoué\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "réception de %s ignorée (authentification échouée ou dépassements de "
 "délais)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalle non atteint, pas de requête vers %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "État de la requête=0 (SUCCES)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "État de la requête=1 (PAS DE MAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "État de la requête=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "État de la requête=3 (ECHEC DE L'AUTHENTIFICATION)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "État de la requête=4 (PROTOCOLE)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "État de la requête=5 (SYNTAXE)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "État de la requête=6 (ERREUR E/S)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "État de la requête=7 (ERREUR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "État de la requête=8 (EXCLU)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "État de la requête=9 (verrou déjà pris)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "État de la requête=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "État de la requête=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "État de la requête=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "État de la requête=13 (NOMBRE MAXIMUM DE MESSAGES ATTEINT)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "État de la requête=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Toutes les connexions sont établies. Terminé.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "mise en sommeil à %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "réveillé par %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "réveillé par un signal %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "réveillé à %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminaison normale, état %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "impossible de «time-check» le fichier run-control\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Attention : plusieurs mentions de l'hôte %s dans le fichier de "
 "configuration\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "Le support de SSL n'est pas été activé à la compilation.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -880,140 +884,140 @@ msgstr ""
 "fetchmail: attention: aucun DNS disponible pour vérifier les réceptions "
 "«multidrop» depuis %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 "attention: des réceptions «multidrop» depuis %s exigent l'option "
 "«envelope»!\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1181
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "attention: Ne chercher pas de l'aide si tout mail est expédié au "
 "postmaster!\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "configuration de %s invalide, le numéro de port ne peut être négatif\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuration de %s invalide, RPOP requiert un port privilégié\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuration de %s invalide, LMTP ne peut utiliser le port SMTP par défaut\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1235
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Utiliser «fetchall» et «keep» ensemble en mode démon est une erreur!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminé par un signal %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interroge %s (protocole %s) à %s : récupération en cours\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "Le support de POP2 n'est pas configuré.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "Le support de POP3 n'est pas configuré.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "Le support d'IMAP n'est pas configuré.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "Le support d'ETRN n'est pas configuré.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Impossible de supporter ETRN sans gethostbyname(2).\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "Le support de ODMR n'est pas configuré.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Impossible de supporter ODMR sans gethostbyname(2).\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "protocole sélectionné non supporté.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interroge %s (protocole %s) à %s : interrogation finie\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervalle entre les réceptions est de %d secondes\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Le fichier de traces est %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Le fichier des identificateurs est %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Les messages de progression sont enregistrés via syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail va se masquer et ne générer aucun «Received»\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail affichera des points de progression, même dans le journal\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1489
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail réexpédiera les messages «multidrop» mal aiguillés vers %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 "Fetchmail expédiera les erreurs de messagerie\n"
 "au maître de poste.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail expédiera les erreur de messagerie à l'envoyeur\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options pour la réception depuis %s@%s :\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le courrier sera reçu via %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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"
@@ -1022,518 +1026,518 @@ msgstr[0] ""
 msgstr[1] ""
 "  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Le vrai nom du serveur est %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Cet hôte ne sera pas interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1517
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Cet hôte sera interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  Le mot de passe sera requis.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identification RPOP = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mot de passe = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Le protocole est KPOP avec authentification Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Le protocole est %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (utilisant le service %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (utilisant les options réseaux de sécurité %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (utilisant le port %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (utilisant le port par défaut)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (forçant l'usage des UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Toutes les méthodes d'authentification vont être essayées.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "Authentification par mot de passe forcé.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "L'authentification NTLM forcée.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Authentification OTP forcée.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Authentification CRAM-Md5 forcée.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Authentification GSSAPI forcée.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Authentification de Kerberos V4 forcée.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " Authentification de Kerberos V5 forcée.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  cryptage «End-to-end» assumé.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Le principal service de mail est: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Les sessions encryptée SSL sont supportées.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocole SSL: %s\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Activation de la vérification des certificats du serveur SSL.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Répertoire des certificats SSL surs: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Signature de la clé SSL (vérifié via le serveur de clés): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Le délai d'attente d'une réponse du serveur est de %d secondes"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (par défaut).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  La boîte aux lettres par défaut est sélectionnée.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Les boîtes aux lettres sélectionnées sont :"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tous les messages seront reçus (--all on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Seulement des messages nouveaux seront reçus (--all off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Tout message récupéré sera conservé sur le serveur (--keep on).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1633
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1635
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1636
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush "
 "off).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  La ré-écriture des adresses locales est activée (--norewrite off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La ré-écriture des adresses locales est inactivée (--norewrite on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La suppression des retour-chariots est activé (stripcr on).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  La suppression des retour-chariots est inactivée (stripcr off).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Le forçage des retour-chariots est activé (forcecr on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Le forçage des retour-chariots est inactivé (forcecr off).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est inactivée (pass8bits "
 "on).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1648
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est activée (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Le décodage MIME est activé (mimedecode on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Le décodage MIME est inactivé (mimedecode off).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  L'inoccupation après la réception est activé (idle on).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  L'inoccupation après la réception est inactivé (idle off).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Les lignes «Status» non vides seront ignorés (dropstatus on).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Les lignes «Status» non vides seront conservées (dropstatus off).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront ignorées (dropdelivered on).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront conservées (dropdelivered "
 "off).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  La taille des messages est limitée à %d octets (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  La taille des messages n'est pas limitée (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Alertes sur la taille des messages toutes les %d secondes (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1671
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1674
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Le nombre de messages reçu est limité à %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Le nombre de messages reçu n'est pas limité (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  La limite de taille de récupération de messages est %d (--fetchsizelimit %"
 "d)\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 "  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1688
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1691
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1693
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Le nombre de messages expédiés est limité à %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1695
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1699
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Aucune purge forcée n'aura lieu (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domaines pour lesquels le mail est récupéré :"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (par défaut)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Les messages seront ajoutés après %s en tant que BSMTP\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Les messages seront acheminés avec \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Les messages seront réexpédiés via %cMTP vers :"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Le nom de la machine sur la ligne «MAIL FROM» sera %s\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1741
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adresse placée après la commande SMTP 'RCPT TO' sera %s\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les réponses du serveur reconnaissant des blocs de «spam» sont :"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  Le blocage du «spam» est inactivé\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexion au serveur sera initiée avec \"%s\".\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  Aucune commande de pré-connexion définie.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexion au serveur sera terminée avec \"%s\".\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  Aucune commande de post-connexion définie.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  Aucun nom local déclaré pour cet hôte.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Mode «multi-drop»: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Mode «single-drop»: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nom local reconnu.\n"
 msgstr[1] "%d noms locaux reconnus.\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est activée.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est inactivée.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1804
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs adresses IP.\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1806
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs noms.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Le routage vers l'adresse d'enveloppe est inactivé\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'en-tête d'enveloppe est pris comme étant : %s\n"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Numéro de l'en-tête d'enveloppe devant être traité : %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Le préfixe %s sera soustrait des id d'utilisateur\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  Aucun préfixe ne sera soustrait\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias pré-déclarés du serveur de courrier :"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Domaines locaux :"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexion se fera via l'interface %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  Aucun choix d'interface n'a été spécifié.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  La boucle de réception observera %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  Aucune interface à observer n'a été spécifiée.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Connexions au serveur à travers le «plugin» %s (--plugin %s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  Aucune commande de «plugin» n'a été spécifiée.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Connexions au client à travers le «plugout» %s (--plugout %s).\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  Aucune commande de «plugout» n'a été spécifiée.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Aucun UID n'a été enregistré sur cet hôte.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs enregistrés.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Information de traçage de la réception ajoutée aux en-têtes Received.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1541,7 +1545,7 @@ msgstr ""
 "  Aucune ajout d'information de traçage de la réception aux en-têtes "
 "Received.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriétés du passage \"%s\".\n"
@@ -1619,77 +1623,77 @@ msgstr "Erreur de relarguage des credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: mise en sommeil du thread pour %d secondes.\n"
 
-#: imap.c:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocole identifié comme étant IMAP4 rev \n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocole identifié comme étant IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "attendra après la réception\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité OTP requise n'est pas supportée par fetchmail\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "échec de la purge\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "échec durant la re-réception\n"
 
-#: imap.c:670
+#: imap.c:669
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message en attente après le nouveau poll\n"
 msgstr[1] "%d messages en attente après le nouveau poll\n"
 
-#: imap.c:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "échec de la sélection de boîte aux lettres\n"
 
-#: imap.c:686
+#: imap.c:685
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message en attente après le premier poll\n"
 msgstr[1] "%d messages en attente après le premier poll\n"
 
-#: imap.c:714
+#: imap.c:713
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message en attente après la purge\n"
 msgstr[1] "%d messages en attente après la purge\n"
 
-#: imap.c:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
@@ -1877,7 +1881,7 @@ msgstr "erreur fatale de recv serveur\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossible de décoder le challenge OTP\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Phrase de passe secrète : "
 
@@ -2179,40 +2183,48 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    affiche des points de progression, même dans le journal\n"
 
-#: pop3.c:543
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "L'horodatage APOP requis est absent du message d'invitation\n"
 
-#: pop3.c:552
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n"
 
-#: pop3.c:574
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Requête de protocole indéfinie dans POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "Fichier verrou en service. Y'a-t-il une autre session active ?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) a été effacé, mais est toujours présent !\n"
 
-#: pop3.c:767
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages insérés dans une liste du serveur. Impossible de gérer ça.\n"
 
-#: pop3.c:853
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "erreur de protocole\n"
 
-#: pop3.c:868
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erreur de protocole durant la réception des UIDLs\n"
 
-#: pop3.c:1225
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "L'option --remote n'est pas supportée avec POP3\n"
 
@@ -2468,111 +2480,111 @@ msgstr "Application de MD5 au bloc de données :\n"
 msgid "MD5 result is: \n"
 msgstr "Le résultat de MD5 est : \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "réexpédition vers %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (corps du message ayant rebondi)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "message depuis %s ayant rebondi sur %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'erreur mémorisée est toujours %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erreur %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Échec d'ouverture du fichier BSMTP ou à l'écriture du préambule\n"
 
-#: sink.c:970
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse de destinataire `%s'\n"
 
-#: sink.c:977
+#: sink.c:976
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse du destinataire `%s'\n"
 
-#: sink.c:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "les adresses ne correspondent pas ; pas de postmaster\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "il n'est même pas possible d'expédier vers %s\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "aucune correspondance dans les adresses ; réexpédition vers %s.\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "sur le point de délivrer le courrier à : %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "Échec d'ouverture MDA\n"
 
-#: sink.c:1247
+#: sink.c:1246
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Échec de connexion %cMTP avec %s\n"
 
-#: sink.c:1271
+#: sink.c:1270
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ne peut relever l'agent ; se replie sur %s"
 
-#: sink.c:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "le programme de livraison du courrier a été tué par un signal %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA a retourné un état non nul (%d)\n"
 
-#: sink.c:1333
+#: sink.c:1332
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 "Etrange : le MDA a retourné %d lors du pclose; cas impossible à gérer %s:%d\n"
 
-#: sink.c:1354
+#: sink.c:1353
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Échec à la terminaison du message ou à la fermeture de BSMTP\n"
 
-#: sink.c:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "Le serveur SMTP a refusé de délivrer le courrier\n"
 
-#: sink.c:1405
+#: sink.c:1404
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erreur de délivrance LMTP en EOM\n"
 
-#: sink.c:1408
+#: sink.c:1407
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Réponse non-503 inattendue à un ordre LMTP EOM: %s\n"
 
-#: sink.c:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2918,6 +2930,18 @@ msgstr "échec malloc\n"
 msgid "realloc failed\n"
 msgstr "échec realloc\n"
 
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u n'est pas vu\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u n'est pas vu\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (num=%d) a été effacé, mais est toujours présent !\n"
+
 #~ msgid "header "
 #~ msgstr "en-tête "
 
diff --git a/po/ja.po b/po/ja.po
index acf6aec9..1f13d763 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Jumpei Baba <jbaba@wb3.so-net.ne.jp>, 2002 
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.9.11\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2004-11-14 21:55+0100\n"
+"POT-Creation-Date: 2005-07-06 00:35+0200\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"
@@ -42,21 +41,21 @@ msgstr "BASE64 ÊÑ´¹¤µ¤ì¤¿ challenge ¤ò¥Ç¥³¡¼¥É¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "decoded as %s\n"
 msgstr "%s ¤È¥Ç¥³¡¼¥É¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos ¥¨¥é¡¼ : %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [¥µ¡¼¥Ğ¤Î±şÅú  '%*s']\n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:340
+#: driver.c:342
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -64,60 +63,61 @@ msgstr ""
 "\n"
 "°Ê²¼¤Ë¼¨¤¹ÍÆÎ̤òĶ²á¤·¤¿¥á¥Ã¥»¡¼¥¸¤¬¥á¡¼¥ë¥µ¡¼¥Ğ %s ¤Ë»Ä¤Ã¤Æ¤¤¤Ş¤¹ :"
 
-#: driver.c:358
+#: driver.c:360
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr ""
 "\t%d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d bytes ¤ÎŤµ¤¬¤¢¤ê¤Ş¤¹)¤ÏÆɤßÈô¤Ğ¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:498
+#: driver.c:500
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ğ¥¤¥È) ¤òÆɤßÈô¤Ğ¤·¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ğ¥¤¥È) ¤òÆɤßÈô¤Ğ¤·¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (Ťµ -1)"
 
-#: driver.c:569
+#: driver.c:571
 #, fuzzy
 msgid " (oversized)"
 msgstr "  (ÍÆÎÌĶ²á, %d ¥Ğ¥¤¥È)"
 
-#: driver.c:584
+#: driver.c:586
 #, fuzzy, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d ¥Ğ¥¤¥È) ¤Î¥Ø¥Ã¥À¤òÆɤ߽Ф»¤Ş¤»¤ó¤Ç¤·"
 "¤¿¡£"
 
-#: driver.c:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(Á´Éô¤Ç %d ÄÌ)¤òÆɤ߹ş¤ó¤Ç¤¤¤Ş¤¹"
 
-#: driver.c:609
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:608
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d ¥Ğ¥¤¥È%s)"
 
-#: driver.c:610
-msgid "header "
-msgstr " (¥Ø¥Ã¥À) "
+#: driver.c:609
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d ¥Ğ¥¤¥È (ËÜÂÎ) )"
 
-#: driver.c:682
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d ¥Ğ¥¤¥È (ËÜÂÎ) )"
 
-#: driver.c:740
+#: driver.c:739
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -125,61 +125,66 @@ msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤¬¹ç¤¤¤Ş¤»¤ó (%d (¼Âºİ) != %d (ͽ"
 "ÁÛ)) \n"
 
-#: driver.c:771
+#: driver.c:770
 msgid " retained\n"
 msgstr " ¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤Ë¤½¤Î¤Ş¤Ş¤Ë¤·¤Æ¤¢¤ê¤Ş¤¹¡£\n"
 
-#: driver.c:780
+#: driver.c:779
 msgid " flushed\n"
 msgstr " ¥µ¡¼¥Ğ¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:797
+#: driver.c:796
 msgid " not flushed\n"
 msgstr " ¥µ¡¼¥Ğ¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
 #: driver.c:813
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr ""
+#, 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] ""
+"ºÇÂç¼è¤ê¹ş¤ß¿ô¤Ç¤¢¤ë %d Ä̤Ë㤷¤Ş¤·¤¿; ¥á¥Ã¥»¡¼¥¸¤¬ %d ÄÌ¡¢¥µ¡¼¥Ğ %s ¤Ë¥¢¥«"
+"¥¦¥ó¥È %s °¸¤Ç»Ä¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
+msgstr[1] ""
 "ºÇÂç¼è¤ê¹ş¤ß¿ô¤Ç¤¢¤ë %d Ä̤Ë㤷¤Ş¤·¤¿; ¥á¥Ã¥»¡¼¥¸¤¬ %d ÄÌ¡¢¥µ¡¼¥Ğ %s ¤Ë¥¢¥«"
 "¥¦¥ó¥È %s °¸¤Ç»Ä¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: driver.c:874
+#: driver.c:876
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "MDA ¤è¤ê SIGPIPE ¤¬È¯¿®¤µ¤ì¤¿¤« stream socket ¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:881
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ğ %s ¤ÎÀܳ±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:885
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ğ %s ¤Î±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:889
+#: driver.c:891
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%d ÉÃ´Ö %s ¤Î±şÅú¤òÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:894
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "žÁ÷Àè¤Î¥×¥í¥°¥é¥à¤Î±şÅú¤ò %d ÉôÖÂÔ¤Á¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:897
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d ÉôÖÂÔµ¡¤·¤Ş¤·¤¿¤¬À©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:909
+#: driver.c:911
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ¼Â¹ÔÃæ¤Ë·«¤êÊÖ¤·À©¸Â»ş´Ö¤ÎĶ²á¤¬È¯À¸¤·¤Ş¤·¤¿\n"
 
-#: driver.c:912
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -188,7 +193,7 @@ msgstr ""
 "Fetchmail ¼Â¹ÔÃæ¤Ë %d ²ó°Ê¾å¡¢%s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¼õ¿®¤ò»î¤ß¤Ş¤·¤¿¤¬¡¢¤½¤Î"
 "ÅÙ¤ËÀ©¸Â»ş´Ö¤òĶ²á¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:916
+#: driver.c:918
 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,58 +209,58 @@ msgstr ""
 "ºÆµ¯Æ°¤·¤Ê¤¤¸Â¤ê fetchmail ¤Ï¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤è¤ê\n"
 "¥á¡¼¥ë¤ò¼è¤ê½Ğ¤·¤Ş¤»¤ó¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: driver.c:944
+#: driver.c:947
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 "¥µ¡¼¥Ğ¤Ø¤ÎÀܳ³«»ÏÁ°¤Ë¼Â¹Ô¤·¤¿¥³¥Ş¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Ş¤·"
 "¤¿¡£\n"
 
-#: driver.c:975
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s ¤Ë¤¢¤ë¤Ù¤­ HESIOD pobox ¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:997
+#: driver.c:1000
 msgid "Lead server has no name.\n"
 msgstr "Lead server ¤Î̾Á°¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1020
+#: driver.c:1024 driver.c:1050
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "%s ¤Î canonical DNS ̾¤ò¸¡º÷¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1057
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "ÆâÉô¤Ç¤ÎÉÔ°ìÃפ¬¤¢¤ê¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1067
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤¿ %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£"
 
-#: driver.c:1073
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "ÉÔÌÀ¤Ê¥Û¥¹¥È¤Ç¤¹¡£"
 
-#: driver.c:1076
+#: driver.c:1107
 msgid "name is valid but has no IP address."
 msgstr "̾Á°¤ÏÍ­¸ú¤Ç¤¹¤¬ IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Ş¤»¤ó¡£"
 
-#: driver.c:1079
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "¥Í¡¼¥à¥µ¡¼¥Ğ¤Î²óÉüÉÔǽ¤Ê¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: driver.c:1081
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "°ì»şÅª¤Ê¥Í¡¼¥à¥µ¡¼¥Ğ¤Î¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: driver.c:1084
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "ÉÔÌÀ¤Ê DNS ¤Î¥¨¥é¡¼ %d ¤Ç¤¹¡£"
 
-#: driver.c:1102
+#: driver.c:1133
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -263,45 +268,45 @@ msgstr ""
 "\n"
 "Fetchmail ¼Â¹ÔÃæ¤Ë¥á¡¼¥ë¥µ¡¼¥Ğ %s ¤È¸ò¿®½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£"
 
-#: driver.c:1104
+#: driver.c:1135
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ¼Â¹ÔÃæ¤Ë %s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¤ò¼è¤ê½Ğ¤»¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1131 imap.c:367 pop3.c:411
+#: driver.c:1162 imap.c:367 pop3.c:420
 msgid "SSL connection failed.\n"
 msgstr "SSL ¤Ë¤è¤ëÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1184
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "¥¢¥«¥¦¥ó¥È %s@%s ¤¬ Lock-busy ¾õÂ֤Ǥ¹¡£\n"
 
-#: driver.c:1188
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s ¤Î¥µ¡¼¥Ğ¤¬ busy ¾õÂ֤Ǥ¹¡£\n"
 
-#: driver.c:1193
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s ¤Îǧ¾Ú¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: driver.c:1196
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr "(°ÊÁ°¤Ïǧ¾Ú¤µ¤ì¤Ş¤·¤¿)"
 
-#: driver.c:1217
+#: driver.c:1248
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail ¼Â¹ÔÃæ %s@%s ¤Îǧ¾Ú¤Ë¼ºÇÔ\n"
 
-#: driver.c:1221
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ¼Â¹ÔÃæ¤Ë %s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¤ò¼è¤ê½Ğ¤»¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1225
+#: driver.c:1256
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -331,7 +336,7 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ğ¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Ş¤¹¡£\n"
 " "
 
-#: driver.c:1240
+#: driver.c:1271
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -352,64 +357,64 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ğ¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Ş¤¹¡£\n"
 "\n"
 
-#: driver.c:1255
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1260
+#: driver.c:1291
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëÉÔÌÀ¤Ê¥í¥°¥¤¥óËô¤Ïǧ¾Ú¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:1284
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëǧ¾Ú¤¬¹Ô¤ï¤ì¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1290
+#: driver.c:1321
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail %s@%s ǧ¾Ú´°Î»\n"
 
-#: driver.c:1294
+#: driver.c:1325
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 "%s@%s ¤Î¥í¥°¥¤¥ó¤¬´°Î»¤· fetchmail ¤Ë¤è¤ë¥¢¥¯¥»¥¹¤¬²Äǽ¤È¤Ê¤ê¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1298
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "¥µ¡¼¥Ó¥¹¤¬Éüµ¢¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1329
+#: driver.c:1360
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Õ¥©¥ë¥À %s ¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Ş¤¹¡£\n"
 
-#: driver.c:1331
+#: driver.c:1362
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ë¥À¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Ş"
 "¤¹¡£\n"
 
-#: driver.c:1343
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ğ %s (¥Õ¥©¥ë¥À %s)"
 
-#: driver.c:1346 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ğ %s"
 
-#: driver.c:1351
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: driver.c:1355
+#: driver.c:1386
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -418,103 +423,103 @@ msgstr[0] ""
 msgstr[1] ""
 "%d %s ( ¤½¤Î¤¦¤Á %d Ä̤ϴû¤ËÆɤ߹ş¤ó¤Ç¤¤¤Ş¤¹ ) ¤¬%s°¸¤ËÆϤ¤¤Æ¤¤¤Ş¤¹¡£"
 
-#: driver.c:1358
+#: driver.c:1389
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1361
+#: driver.c:1392
 #, 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:1368
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d ¥Ğ¥¤¥È)\n"
 
-#: driver.c:1374
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s °¸¤Ë¥á¥Ã¥»¡¼¥¸¤ÏÆϤ¤¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1407
+#: driver.c:1438
 msgid "bogus message count!"
 msgstr "µ¶Â¤¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¿ô!"
 
-#: driver.c:1508
+#: driver.c:1539
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1511
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ¥Ø¥Ã¥À¤Î·çÍ¸íɵ"
 
-#: driver.c:1514
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1517
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥ĞƱ´ü"
 
-#: driver.c:1520
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥Ğ¥×¥í¥È¥³¥ë"
 
-#: driver.c:1523
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "¥µ¡¼¥Ğ¤Î lock busy"
 
-#: driver.c:1526
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP ÄÌ¿®"
 
-#: driver.c:1529
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS »²¾È"
 
-#: driver.c:1532
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼\n"
 
-#: driver.c:1543
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s¥¨¥é¡¼¤¬ SMTP ¥µ¡¼¥Ğ %s ¤Ø¤Î¥á¡¼¥ëÁ÷¿®Ãæ¤ËȯÀ¸¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1545
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%s¥¨¥é¡¼¤¬ %s ¤è¤ê¥á¡¼¥ë¤ò¼õ¿®¤·¤Æ¤¤¤ëºÇÃæ¤ËȯÀ¸¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1553
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Àܳ½ªÎ»¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Ş¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Ş¤·¤¿¡£\n"
 
-#: driver.c:1574
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 ¤Ë¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1582
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 ¤Ë¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1593
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --flush ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1599
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --all ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: driver.c:1607
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --limit ¤È %s ¤ÏƱ»ş¤ËÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
@@ -632,60 +637,60 @@ msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "¥ª¥×¥·¥ç¥ó --check ¤Ï ETRN ¤È¤ÏƱ»ş¤ËÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:164
+#: fetchmail.c:167
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: ¼¡¤Îʪ¤ò±çÍѤ·¤Æ¤¤¤Ş¤¹¡£"
 
-#: fetchmail.c:188
+#: fetchmail.c:191
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:198
+#: fetchmail.c:201
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail ¥ê¥ê¡¼¥¹ %s "
 
-#: fetchmail.c:342
+#: fetchmail.c:346
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "¥³¥Ş¥ó¥É¥é¥¤¥ó%s%s¤è¤ê¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Ş¤¹¡£\n"
 
-#: fetchmail.c:343
+#: fetchmail.c:347
 msgid " and "
 msgstr "µÚ¤Ó"
 
-#: fetchmail.c:348
+#: fetchmail.c:352
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "¥á¡¼¥ë¥µ¡¼¥Ğ¤Î½àÈ÷¤¬À°¤¤¤Ş¤»¤ó -- ¤ª¤½¤é¤¯ %s ¤¬Â¸ºß¤·¤Ê¤¤¤¿¤á¤Ç¤¹\n"
 
-#: fetchmail.c:369
+#: fetchmail.c:373
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ¥á¡¼¥ë¥µ¡¼¥Ğ¤¬»ØÄꤵ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:378 fetchmail.c:387
+#: fetchmail.c:382 fetchmail.c:391
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ¾¤Î fetchmail ¤¬¼Â¹ÔÃæ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:397
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: ¥¨¥é¡¼¤ÎȯÀ¸¤Ë¤è¤ê%s fetchmail (PID=%d)¤ò½ªÎ»¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "background"
 msgstr "¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "foreground"
 msgstr "¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:399
+#: fetchmail.c:403
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (PID=%d) ¤¬½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:419
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -693,7 +698,7 @@ msgstr ""
 "fetchmail: Ʊ¤¸¥Û¥¹¥È¤ËÂФ·¤ÆÊ̤Πfetchmail ¤¬¸ò¿®¤·¤Æ¤¤¤ë¤¿¤á¥á¡¼¥ë¤Î³Îǧ¤¬"
 "½ĞÍè¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:421
+#: fetchmail.c:425
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -701,182 +706,182 @@ msgstr ""
 "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¼Â¹ÔÃæ¤Î¤¿¤á»ØÄꤵ¤ì¤¿¥Û¥¹¥È¤ÈÀܳ¤Ç¤­¤Ş"
 "¤»¤ó¡£\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:432
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¥Õ¥©¥¢¥°¥é¥¦¥ó¥ÉÆ°ºîÃæ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:438
+#: fetchmail.c:442
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: ¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç fetchmail ¤¬Æ°ºîÃæ¤Î¤¿¤á¥ª¥×¥·¥ç¥ó¤¬¼õ¤±ÉÕ¤±¤é"
 "¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 "fetchmail: ¥Ğ¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î fetchmail (PID=%d) ¤¬Æ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:456
+#: fetchmail.c:460
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: Ʊ»ş¤ËÆ°ºî¤·¤Æ¤¤¤¿ fetchmail (PID=%d) ¤¬ÆÍÁ³¾ÃÌǤ·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:471
+#: fetchmail.c:475
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆşÎϤ·¤Æ²¼¤µ¤¤ : "
 
-#: fetchmail.c:506
+#: fetchmail.c:510
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s ¥Ç¡¼¥â¥ó¤òÆ°ºî³«»Ï¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:521 fetchmail.c:523
+#: fetchmail.c:525 fetchmail.c:527
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "¥í¥°¤òÄɲ乤뤿¤á¤Ë %s ¤ò³«¤¯¤³¤È¤¬½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿\n"
 
-#: fetchmail.c:561
+#: fetchmail.c:565
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "%s ¤ÎÊÔ½¸¤µ¤ì¤¿»ş´Ö¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¡£(¥¨¥é¡¼ %d)\n"
 
-#: fetchmail.c:566
+#: fetchmail.c:570
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "%s ¤¬ÊÔ½¸¤µ¤ì¤¿¤¿¤á fetchmail ¤òºÆµ¯Æ°¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:571
+#: fetchmail.c:575
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:598
+#: fetchmail.c:602
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail ¤ÎºÆµ¯Æ°¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:626
+#: fetchmail.c:630
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "ǧ¾Ú¼ºÇÔ¤«À©¸Â»ş´ÖĶ²á¤¬ÉÑȯ¤·¤¿¤¿¤á %s ¤È¤Î¸ò¿®¤òÈô¤Ğ¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:638
+#: fetchmail.c:642
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "»ş´Ö´Ö³Ö¤Ë㤷¤Æ¤¤¤Ê¤¤¤Î¤Ç %s ¤Î°ì»şÊݴɤò¹Ô¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:676
+#: fetchmail.c:680
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:678
+#: fetchmail.c:682
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:750
+#: fetchmail.c:754
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Á´¤Æ¤ÎÀܳ¤¬Æ°ºîÉÔÁ´¤Ë´Ù¤Ã¤Æ¤·¤Ş¤¤¤Ş¤·¤¿¡£½ªÎ»¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:761
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "%s ¤ËµÙ̲¾õÂÖ¤È¤Ê¤ê¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:785
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s ¿®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:784
+#: fetchmail.c:788
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:791
+#: fetchmail.c:795
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s ¤ËÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:797
+#: fetchmail.c:801
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "Ä̾ï¤Î½ªÎ»¤Ç¤¹¡£status %d\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:954
 msgid "couldn't time-check the run-control file\n"
 msgstr "Æ°ºîÀ©¸æ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸»ş´Ö¤ò³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: fetchmail.c:983
+#: fetchmail.c:987
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "·Ù¹ğ : ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¥Û¥¹¥È %s ¤òÊ£¿ô²óµ­½Ò¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: fetchmail.c:1128
+#: fetchmail.c:1134
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL Âбş¤¬¥³¥ó¥Ñ¥¤¥ë¤Î»şÅÀ¤ÇÍ­¸ú¤Ë¤µ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1159
+#: fetchmail.c:1165
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -886,618 +891,664 @@ msgstr ""
 
 #: fetchmail.c:1176
 #, c-format
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1177
+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"
 msgstr "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£¥İ¡¼¥ÈÈÖ¹æ¤ÏÉé¤Î¿ô¤Ç¤Ï¤¤¤±¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1183
+#: fetchmail.c:1200
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£ RPOP ¤Ç¤Ï privileged port ¤òÍøÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Ş"
 "¤¹¡£\n"
 
-#: fetchmail.c:1199
+#: fetchmail.c:1216
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "¥µ¡¼¥Ğ %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£LMTP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î SMTP ¥İ¡¼¥È¤òÍøÍѤǤ­¤Ş¤»"
 "¤ó¡£\n"
 
-#: fetchmail.c:1214
+#: fetchmail.c:1231
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall ¤È keep ¥ª¥×¥·¥ç¥ó¤Ï¥Ç¡¼¥â¥ó¥â¡¼¥É¤ÇÀßÄê¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1264
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "¥·¥°¥Ê¥ë %d ¤Ç½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1366
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Ş¤¹¡£¸ò¿®¤¬³«»Ï¤µ¤ì¤Ş¤·"
 "¤¿¡£\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1391
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1386
+#: fetchmail.c:1403
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1413
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1419
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1425
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "gethostbyname(2) ̵¤·¤Ç ETRN ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1432
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR ¤ËÂбş¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1438
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "gethostbyname(2) ̵¤·¤Ç ODMR ¤ËÂбş¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1444
 msgid "unsupported protocol selected.\n"
 msgstr "Âбş¤·¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬ÁªÂò¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1454
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Ş¤¹¡£¸ò¿®¤¬½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1471
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "¸ò¿®´Ö³Ö¤Ï %d ÉäǤ¹¡£\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1473
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "¥í¥°¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1458
+#: fetchmail.c:1475
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID ¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1478
 msgid "Progress messages will be logged via syslog\n"
 msgstr "¿Ê¹Ô¾õ¶·¤Î¥á¥Ã¥»¡¼¥¸¤Ï syslog ¤òÄ̤·¤Æµ­Ï¿¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1464
+#: fetchmail.c:1481
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ¤Ï¥¢¥É¥ì¥¹¤ò½ñ¤­´¹¤¨¡¢Received ¤òÀ¸À®¤·¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1466
+#: fetchmail.c:1483
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail ¤Ï¥í¥°¥Õ¥¡¥¤¥ëÃæ¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹ş¤ß¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1485
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ¤Ï¸í¤Ã¤¿°¸Àè¤Î½ñ¤«¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò %s ¤ËžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1472
+#: fetchmail.c:1489
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ¤Ï postmaster °¸¤Ë¥¨¥é¡¼¥á¡¼¥ë¤òÁ÷¿®¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1491
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ¤ÏÁ÷¤ê¼ç¤Ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1498
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "¥¢¥«¥¦¥ó¥È %s@%s ¤Ç¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1502
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ¥á¡¼¥ë¤Ï¥Û¥¹¥È %s ¤ò²ğ¤·¤Æ¤ä¤ê¤È¤ê¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1488
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  ¤³¤Î¥µ¡¼¥Ğ¤ËÂФ·¤Æ¤Î¥¢¥¯¥»¥¹¤Ï %d ¤Î´Ö³Ö¤Ç¹Ô¤ï¤ì¤Ş¤¹¡£\n"
+#: fetchmail.c:1505
+#, 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:1491
+#: fetchmail.c:1509
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  ¥µ¡¼¥Ğ¤ÎËÜ̾¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1493
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1512
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤Ï¥Û¥¹¥È¤¬»Ø¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ë¥¢¥¯¥»¥¹%s\n"
 
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will not"
-msgstr "¤µ¤ì¤Ş¤»¤ó¡£"
-
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will"
-msgstr "¤µ¤ì¤Ş¤¹¡£"
+#: fetchmail.c:1513
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  ¤³¤Î¥Û¥¹¥È¤Ï¥Û¥¹¥È¤¬»Ø¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ë¥¢¥¯¥»¥¹%s\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1517
 msgid "  Password will be prompted for.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥ÉÆşÎϤ¬É¬ÍפǤ¹¡£\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1521
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1524
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1527
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É = \"%s\"\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Kerberos %s ǧ¾Ú¤Ë¤è¤ë KPOP ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1546
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s ¥µ¡¼¥Ó¥¹¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1548
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (%s ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¥ª¥×¥·¥ç¥ó¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1551
 #, c-format
 msgid " (using port %d)"
 msgstr " (¥İ¡¼¥È %d ¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1554
 msgid " (using default port)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¤Î¥İ¡¼¥È¤òÍøÍѤ·¤Ş¤¹)"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1556
 msgid " (forcing UIDL use)"
 msgstr " (UIDL ¤ÎÍøÍѤò¶¯À©¤·¤Ş¤¹)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1562
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ÍøÍѲÄǽ¤ÊÁ´¤Æ¤Îǧ¾ÚÊı¼°¤ò»î¤ß¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1565
 msgid "  Password authentication will be forced.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1568
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM ǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1571
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP ¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1574
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1577
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1580
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1583
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 Êı¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1586
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end °Å¹æ²½¤Ç¤¢¤ë¤È¤·¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1590
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ¥á¡¼¥ë¥µ¡¼¥Ó¥¹¤Ï %s ¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1593
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ¤Ë¤è¤ë°Å¹æ²½ÄÌ¿®¤¬¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1595
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Ş¤¹¡£"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1597
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL ¥µ¡¼¥Ğ¾ÚÌÀ½ñ¤Î³Îǧ¤¬ÀßÄꤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL ¿®ÍѲÄǽ¾ÚÌÀ½ñ¤Ï %s ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1602
 #, 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:1586
+#: fetchmail.c:1605
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ¥µ¡¼¥Ğ¤Î±şÅúÀ©¸Â»ş´Ö¤Ï %d ÉäǤ¹¡£"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1607
 msgid " (default).\n"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)¡£\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1614
 msgid "  Default mailbox selected.\n"
 msgstr "  ¥Ç¥Õ¥©¥ë¥È¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ÁªÂò¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1619
 msgid "  Selected mailboxes are:"
 msgstr "  ÁªÂò¤µ¤ì¤¿¥á¡¼¥ë¥Ü¥Ã¥¯¥¹:"
 
-#: fetchmail.c:1605
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s¼èÆÀ¤·¤Ş¤¹¡£ (--all %s)\n"
 
-#: fetchmail.c:1606
-msgid "All"
-msgstr "Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò"
+#: fetchmail.c:1626
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s¼èÆÀ¤·¤Ş¤¹¡£ (--all %s)\n"
 
-#: fetchmail.c:1606
-msgid "Only new"
-msgstr "¿·µ¬¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  ¼èÆÀ¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤ËÊİ»ı%s (--keep %s)\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1629
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  ¼èÆÀ¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ğ¤ËÊİ»ı%s (--keep %s)\n"
 
-#: fetchmail.c:1611
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1631
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
 
-#: fetchmail.c:1614
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1632
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
+
+#: fetchmail.c:1634
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local ¥¢¥É¥ì¥¹¤Ø¤Î½ñ¤­´¹¤¨%s (--norewrite %s)\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "enabled"
-msgstr "¤¬¹Ô¤ï¤ì¤Ş¤¹¡£"
+#: fetchmail.c:1635
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  server-local ¥¢¥É¥ì¥¹¤Ø¤Î½ñ¤­´¹¤¨%s (--norewrite %s)\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "disabled"
-msgstr "¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  ²ş¹Ôµ­¹æ¤Î½üµî%s (stripcr %s)\n"
 
-#: fetchmail.c:1617
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1638
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤Î½üµî%s (stripcr %s)\n"
 
-#: fetchmail.c:1620
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ²ş¹Ôµ­¹æ¤ÎÄɲÃ%s (forcecr %s)\n"
 
-#: fetchmail.c:1623
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1641
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  ²ş¹Ôµ­¹æ¤ÎÄɲÃ%s (forcecr %s)\n"
+
+#: fetchmail.c:1643
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding ¤ÎÊÑ´¹%s (pass8bits %s)\n"
 
-#: fetchmail.c:1626
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1644
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Content-Transfer-Encoding ¤ÎÊÑ´¹%s (pass8bits %s)\n"
+
+#: fetchmail.c:1646
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME ¤Î¥Ç¥³¡¼¥É%s (mimedecode %s)\n"
 
-#: fetchmail.c:1629
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1647
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  MIME ¤Î¥Ç¥³¡¼¥É%s (mimedecode %s)\n"
+
+#: fetchmail.c:1649
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¸å¤ÎÂÔµ¡%s (idle %s)\n"
 
-#: fetchmail.c:1632
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1650
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¸å¤ÎÂÔµ¡%s (idle %s)\n"
+
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  µ­½Ò¤Î¤¢¤ë Status ¹Ô¤Ï%s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "discarded"
-msgstr "ºï½ü¤µ¤ì¤Ş¤¹¡£"
+#: fetchmail.c:1653
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  µ­½Ò¤Î¤¢¤ë Status ¹Ô¤Ï%s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "kept"
-msgstr "Êİ»ı¤µ¤ì¤Ş¤¹¡£"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  Delivered-To ¹Ô¤Ï%s (dropdelivered %s)\n"
 
-#: fetchmail.c:1635
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1656
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To ¹Ô¤Ï%s (dropdelivered %s)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1659
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ÎºÇÂç %d ¥Ğ¥¤¥È¤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£ (--limit %d)\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1662
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1664
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÂФ¹¤ë·Ù¹ğ¤Ï %d ÉÃËè¤Ë¹Ô¤ï¤ì¤Ş¤¹¡£ (--warnings %d)\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1667
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  ¥µ¡¼¥Ğ¥¢¥¯¥»¥¹¤ÎÅ٤˥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤Î·Ù¹ğ¤ò¹Ô¤¤¤Ş¤¹¡£ (--warnings 0)\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1670
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1673
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--fetchlimit 0)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1675
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1678
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1682
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1666
+#: fetchmail.c:1684
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1669
+#: fetchmail.c:1687
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1671
+#: fetchmail.c:1689
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1691
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Ş¤»¤ó¡£ (--batchlimit 0)\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1695
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤Ï %d ÄÌËè¤Ëºï½ü¤µ¤ì¤Ş¤¹¡£ (--expunge %d)\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1697
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë´Ö³Ö¤ÏÀßÄꤵ¤ì¤Æ¤ª¤ê¤Ş¤»¤ó¡£ (--expunge 0)\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1704
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  ¥á¡¼¥ë¤ò¼èÆÀ¤¹¤ë¥É¥á¥¤¥ó¤Ï : "
 
-#: fetchmail.c:1691 fetchmail.c:1711
+#: fetchmail.c:1709 fetchmail.c:1729
 msgid " (default)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1714
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ¥Õ¥¡¥¤¥ë %s ¤Ë BSMTP ·Á¼°¤Ç¥á¥Ã¥»¡¼¥¸¤¬Äɵ­¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1716
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó\"%s\"¤Ë¤è¤Ã¤Æ¥á¥Ã¥»¡¼¥¸¤¬Á÷¿®¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1723
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  ¼õ¿®¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï %cMTP ¤Ë¤è¤Ã¤Æ¼¡¤Ë¼¨¤¹¥µ¡¼¥Ğ¤ØžÁ÷¤µ¤ì¤Ş¤¹ :"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1734
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ¥Û¥¹¥È¤Î MAIL FROM ¹Ô¤Î¥¢¥É¥ì¥¹¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1746
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Á÷¿®Àè¤Î¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤ËÂФ¹¤ë±şÅú¤Ï : "
 
-#: fetchmail.c:1734
+#: fetchmail.c:1752
 msgid "  Spam-blocking disabled\n"
 msgstr "  ¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1755
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1758
 msgid "  No pre-connection command.\n"
 msgstr "  ÀܳÁ°¤Ë¼Â¹Ô¤¹¤ëÌ¿Îá¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1760
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤ÆÀÚÃǤµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1763
 msgid "  No post-connection command.\n"
 msgstr "  Àܳ½ªÎ»»ş¤Ë¹Ô¤¦Ì¿Îá¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1766
 msgid "  No localnames declared for this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤ËÂФ¹¤ë localname ¤ÏÀë¸À¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1776
 msgid "  Multi-drop mode: "
 msgstr "  `multi-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1760
+#: fetchmail.c:1778
 msgid "  Single-drop mode: "
 msgstr "  `single-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1762
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d ¸Ä¤Î localname ¤¬Â¸ºß¤·¤Ş¤¹¡£\n"
+#: fetchmail.c:1780
+#, 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:1776
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1795
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  multidrop ¥¢¥É¥ì¥¹¤ò¸¡º÷¤¹¤ë DNS ¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1780
-msgid "  Server aliases will be compared with multidrop addresses by "
-msgstr "  ¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Ş¤¹ : "
+#: fetchmail.c:1796
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
+msgstr "  multidrop ¥¢¥É¥ì¥¹¤ò¸¡º÷¤¹¤ë DNS ¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1782
-msgid "IP address.\n"
-msgstr "IP ¥¢¥É¥ì¥¹ \n"
+#: fetchmail.c:1800
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr "  ¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Ş¤¹ : "
 
-#: fetchmail.c:1784
-msgid "name.\n"
-msgstr "̾Á° \n"
+#: fetchmail.c:1802
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  ¥µ¡¼¥Ğ¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Ş¤¹ : "
 
-#: fetchmail.c:1787
+#: fetchmail.c:1805
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address ¤Ë¤è¤ë¥ë¡¼¥Æ¥£¥ó¥°¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1808
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header ¤Ï %s ¤È¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1809
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1811
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  %d ¸Ä¤Î Envelope header ¤¬²òÀϤµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1814
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s ¤Ï¥æ¡¼¥¶ ID ¤«¤é½üµî¤µ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1817
 msgid "  No prefix stripping\n"
 msgstr "  Prefix ¤Ï½üµî¤µ¤ì¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1824
 msgid "  Predeclared mailserver aliases:"
 msgstr "  ͽ¤áÀë¸À¤µ¤ì¤¿¥á¡¼¥ë¥µ¡¼¥Ğ¤ÎÊÌ̾:"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1833
 msgid "  Local domains:"
 msgstr "  ¥í¡¼¥«¥ë¥É¥á¥¤¥ó:"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1843
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Àܳ¤Ï¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹ %s ¤òÄ̤·¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1845
 msgid "  No interface requirement specified.\n"
 msgstr "  Àܳ¤ËÍøÍѤ¹¤Ù¤­¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1847
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Àܳ¤Ï %s ¤Î¾õÂÖ¤ò´Æ»ë¤·¤Æ¹Ô¤ï¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1849
 msgid "  No monitor interface specified.\n"
 msgstr "  ¾õÂÖ¤ò´Æ»ë¤·¤ÆÀܳ¤Ï¤ª¤³¤Ê¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1853
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¤¥ó \"%s\" ¤òÍøÍѤ·¤Ş¤¹¡£(--plugin %s)\n"
 
-#: fetchmail.c:1837
+#: fetchmail.c:1855
 msgid "  No plugin command specified.\n"
 msgstr "  ¥µ¡¼¥Ğ¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¤¥ó¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1857
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¢¥¦¥È\"%s\"¤òÍøÍѤ·¤Ş¤¹¡£(--plugout %"
 "s)\n"
 
-#: fetchmail.c:1841
+#: fetchmail.c:1859
 msgid "  No plugout command specified.\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¢¥¦¥È¤Î»ØÄê¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1864
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤«¤é¤Î UID ¤Ïµ­Ï¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1873
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d ¸Ä¤Î UID ¤¬µ­Ï¿¤µ¤ì¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1881
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Àܳ¾ğÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲäµ¤ì¤Ş¤¹¡£\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1883
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1505,7 +1556,7 @@ msgstr ""
 "  Àܳ¾ğÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲäµ¤ì¤Ş¤»¤ó¡£\n"
 "\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1886
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ¥×¥í¥Ñ¥Æ¥£ \"%s\" ¤Ï̵»ë¤µ¤ì¤Ş¤¹¡£\n"
@@ -1518,7 +1569,7 @@ msgstr "alloca ¤¬¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£"
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "¥¨¥é¡¼ : getpassword() ¤ËÂбş¤·¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1612,43 +1663,49 @@ msgstr "Í׵ᤵ¤ì¤¿ NTLM ½èÍıǽÎÏ¤Ï fetchmail ¤ËÁȤ߹ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Í׵ᤵ¤ì¤¿ LOGIN ½èÍıǽÎϤϥµ¡¼¥Ğ¤Ç¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: imap.c:644 imap.c:706
+#: imap.c:644 imap.c:710
 msgid "expunge failed\n"
 msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:662 imap.c:695
 msgid "re-poll failed\n"
 msgstr "ºÆ¥¢¥¯¥»¥¹¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
 #: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬ºÆ¥¢¥¯¥»¥¹¤Î¸å¤Ë¸ºß¤·¤Ş¤¹¡£\n"
+#, 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:680
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "ºÇ½é¤Î¥¢¥¯¥»¥¹¤«¤é %d Ä̤Υá¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Ş¤¹¡£\n"
+#: imap.c:686
+#, 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:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "ºï½ü¤Î¸å¡¢%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬»Ä¤Ã¤Æ¤¤¤Ş¤¹¡£\n"
+#: imap.c:714
+#, 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:733
+#: imap.c:739
 msgid "search for unseen messages failed\n"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
 
-#: imap.c:775 pop3.c:687
+#: imap.c:781 pop3.c:695
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
@@ -1829,15 +1886,15 @@ msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "¥ª¥×¥·¥ç¥ó --check ¤Ï ODMR ¤Ç¤ÏÂбş¤·¤Æ¤ª¤ê¤Ş¤»¤ó¡£\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge ¤Î¥Ç¥³¡¼¥É¤¬½ĞÍè¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: opie.c:59 pop3.c:496
+#: opie.c:58 pop3.c:505
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -2137,41 +2194,41 @@ msgstr "  -r, --folder      ¥µ¡¼¥Ğ¤Î¥á¡¼¥ë¥Õ¥©¥ë¥À¤ò»ØÄꤷ¤Ş¤¹\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹ş¤ß¤Ş¤¹\n"
 
-#: pop3.c:534
+#: pop3.c:543
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting Ãæ¤Ë APOP timestamp ¤¬Â¸ºß¤·¤Ş¤»¤ó¡£\n"
 
-#: pop3.c:543
+#: pop3.c:552
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting Ãæ¤Î timestamp ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: pop3.c:565
+#: pop3.c:574
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth Ãæ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬Í׵ᤵ¤ì¤Ş¤·¤¿¡£\n"
 
-#: pop3.c:573
+#: pop3.c:582
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy ¾õÂ֤Ǥ¹¡£Ê̤θò¿®¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: pop3.c:657 pop3.c:886
+#: pop3.c:665 pop3.c:894
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:759
+#: pop3.c:767
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "¥µ¡¼¥Ğ¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤¬ÁŞÆş¤µ¤ì¤Æ¤¤¤Ş¤¹¡£¼è¤ê°·¤¦¤³¤È¤¬¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: pop3.c:845
+#: pop3.c:853
 msgid "protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: pop3.c:860
+#: pop3.c:868
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL ¤ò¼è¤ê¹ş¤ßÃæ¤Ë¥×¥í¥È¥³¥ë¥¨¥é¡¼¤¬È¯À¸¤·¤Ş¤·¤¿¡£\n"
 
-#: pop3.c:1217
+#: pop3.c:1225
 msgid "Option --remote is not supported with POP3\n"
 msgstr "POP3 ¤Ç¤Ï --remote ¥ª¥×¥·¥ç¥ó¤ÏÍøÍѤǤ­¤Ş¤»¤ó¡£\n"
 
@@ -2249,6 +2306,22 @@ msgstr "%s ¤ÎºÆ½ñ¤­¹ş¤ß¤Ë¤Ä¤¤¤Æ"
 msgid "Rewritten version is %s\n"
 msgstr "Rewritten ¥Ğ¡¼¥¸¥ç¥ó¤Ï %s ¤Ç¤¹¡£\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr "À®¸ù¤·¤Ş¤·¤¿¡£"
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr "À©Ìó¤ò¼õ¤±¤Æ¤¤¤ë¥æ¡¼¥¶¤Ç¤¹¡£(²¿¤«¤³¤Î¥¢¥«¥¦¥ó¥È¤ËÌäÂ꤬¤¢¤ê¤Ş¤¹¡£)"
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶ ID ¤«¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£"
+
+#: rpa.c:120
+msgid "Deity error"
+msgstr "Deity ¥¨¥é¡¼"
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 ¥Ç¥³¡¼¥É¥¨¥é¡¼\n"
@@ -2438,86 +2511,86 @@ msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "BSMTP ¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¡¢¤Ş¤¿¤Ï¡¢¥×¥ê¥¢¥ó¥Ö¥ë¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:966
+#: sink.c:970
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Ş¤»"
 "¤ó¡£\n"
 
-#: sink.c:973
+#: sink.c:977
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Ş¤»"
 "¤ó¡£\n"
 
-#: sink.c:1011
+#: sink.c:1015
 msgid "no address matches; no postmaster set.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤»¤ó¡£postmaster ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: sink.c:1023
+#: sink.c:1027
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "%s ¤ËÂФ·¤Æ¤µ¤¨Á÷¿®¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: sink.c:1029
+#: sink.c:1033
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Ş¤»¤ó¡£%s ¤ØžÁ÷¤·¤Ş¤¹¡£\n"
 
-#: sink.c:1182
+#: sink.c:1186
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "%s ¤òÍøÍѤ·¤¿ÇÛ¿®¤Ë¤Ä¤¤¤Æ\n"
 
-#: sink.c:1206
+#: sink.c:1210
 msgid "MDA open failed\n"
 msgstr "MDA ¤Îµ¯Æ°¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1243
+#: sink.c:1247
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP ¤Ë¤è¤ë %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1267
+#: sink.c:1271
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¸ò¿®¤Ç¤­¤Ş¤»¤ó¡£%s ¤È¸ò¿®¤·¤Ş¤¹¡£"
 
-#: sink.c:1323
+#: sink.c:1327
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1326
+#: sink.c:1330
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ¤¬ 0 °Ê³°¤Î¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1329
+#: sink.c:1333
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1350
+#: sink.c:1354
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»¡¢¤Ş¤¿¤Ï¡¢BSMTP ¥Õ¥¡¥¤¥ë¤Î½ªÎ»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1371
+#: sink.c:1375
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÇÛ¿®¤òµñ¤ß¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1401
+#: sink.c:1405
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP ¤Î EOM ¤Ë¤ª¤±¤ëÇÛ¿®¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: sink.c:1404
+#: sink.c:1408
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM ¤ËÂФ·¤Æ 503 °Ê³°¤Îͽ´ü¤»¤Ì±şÅú %s ¤¬¤¢¤ê¤Ş¤·¤¿¡£\n"
 
-#: sink.c:1555
+#: sink.c:1559
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2557,152 +2630,152 @@ msgstr "ESMTP ¤Ç LOGIN ǧ¾Ú¤ò¤·¤Ş¤¹...\n"
 msgid "smtp listener protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: socket.c:106 socket.c:132
+#: socket.c:117 socket.c:143
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:164
+#: socket.c:175
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡£\n"
 
-#: socket.c:170
+#: socket.c:181
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:177
+#: socket.c:188
 msgid "dup2 failed\n"
 msgstr "dup2 ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:183
+#: socket.c:194
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹¡£(¥Û¥¹¥È %s ¥µ¡¼¥Ó¥¹ %s)\n"
 
-#: socket.c:186
+#: socket.c:197
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:277
+#: socket.c:288
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:419
+#: socket.c:430
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: ¥Û¥¹¥È %s ¤Î¥¢¥É¥ì¥¹¤ÎŤµ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: socket.c:776
+#: socket.c:787
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "ȯ¹Ô¸µ¤ÎÁÈ¿¥: %s\n"
 
-#: socket.c:778
+#: socket.c:789
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "·Ù¹ğ : ȯ¹Ô¸µ¤ÎÁÈ¿¥Ì¾¤¬Ä¹²á¤®¤Ş¤¹¡£(ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Ş¤¹)\n"
 
-#: socket.c:780
+#: socket.c:791
 msgid "Unknown Organization\n"
 msgstr "ÉÔÌÀ¤ÊÁÈ¿¥¤Ç¤¹¡£\n"
 
-#: socket.c:782
+#: socket.c:793
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "ȯ¹Ô¸µ¤Î CommonName: %s\n"
 
-#: socket.c:784
+#: socket.c:795
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "·Ù¹ğ : ȯ¹Ô¸µ¤Î CommonName ¤¬Ä¹²á¤®¤Ş¤¹¡£ (ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Ş¤¹)\n"
 
-#: socket.c:786
+#: socket.c:797
 msgid "Unknown Issuer CommonName\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¸µ¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:790
+#: socket.c:801
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "¥µ¡¼¥Ğ¤Î CommonName: %s\n"
 
-#: socket.c:794
+#: socket.c:805
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "ÉÔÀµ¾ÚÌÀ½ñ : Subject CommonName ¤¬Ä¹²á¤®¤Ş¤¹¡£\n"
 
-#: socket.c:810
+#: socket.c:821
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "¥µ¡¼¥Ğ¤Î CommonName ¤¬°ìÃפ·¤Ş¤»¤ó : %s != %s\n"
 
-#: socket.c:816
+#: socket.c:827
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "¥µ¡¼¥Ğ̾¤¬ÀßÄꤵ¤ì¤Æ¤ª¤é¤º¡¢¾ÚÌÀ½ñ¤ò¸¡¾Ú¤Ç¤­¤Ş¤»¤ó¡£\n"
 
-#: socket.c:821
+#: socket.c:832
 msgid "Unknown Server CommonName\n"
 msgstr "ÉÔÌÀ¤Ê¥µ¡¼¥Ğ¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:823
+#: socket.c:834
 msgid "Server name not specified in certificate!\n"
 msgstr "¾ÚÌÀ½ñÃæ¤Ë¥µ¡¼¥Ğ̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó¡£\n"
 
-#: socket.c:833
+#: socket.c:844
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:837
+#: socket.c:848
 msgid "Out of memory!\n"
 msgstr "¥á¥â¥êÉÔ­¤Ç¤¹¡£\n"
 
-#: socket.c:845
+#: socket.c:856
 msgid "Digest text buffer too small!\n"
 msgstr "¥À¥¤¥¸¥§¥¹¥È¥Æ¥­¥¹¥È¥Ğ¥Ã¥Õ¥¡¤¬¾¯¤Ê²á¤®¤Ş¤¹¡£\n"
 
-#: socket.c:851
+#: socket.c:862
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ¤Î key fingerprint ¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£: %s \n"
 
-#: socket.c:855
+#: socket.c:866
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Ş¤·¤¿¡£\n"
 
-#: socket.c:858
+#: socket.c:869
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:867
+#: socket.c:878
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "·Ù¹ğ : ¥µ¡¼¥Ğ¾ÚÌÀ½ñ¸¡¾Ú: %s\n"
 
-#: socket.c:873
+#: socket.c:884
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¼Ô (¤Ï¤¸¤á¤Î %d ʸ»ú): %s\n"
 
-#: socket.c:925
+#: socket.c:936
 msgid "File descriptor out of range for SSL"
 msgstr "¥Õ¥¡¥¤¥ë¼±Ê̻Ҥ¬ SSL ¤È¤·¤Æ¤ÏĹ²á¤®¤Ş¤¹¡£"
 
-#: socket.c:942
+#: socket.c:953
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "̵¸ú¤Ê SSL ¥×¥í¥È¥³¥ë `%s' ¤¬»ØÄꤵ¤ì¤¿¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È (SSLv23)¤òÍøÍѤ·¤Ş"
 "¤¹¡£\n"
 
-#: socket.c:1003
+#: socket.c:1014
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "¾ÚÌÀ½ñ/fingerprint ¸¡¾Ú¤¬´ö¤Ä¤«Èô¤Ğ¤µ¤ì¤Ş¤·¤¿¡£\n"
 
-#: socket.c:1075
+#: socket.c:1086
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1078
+#: socket.c:1089
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -2792,17 +2865,12 @@ msgstr "SMTP ¼õ¿®¥×¥í¥°¥é¥à¤¬¼¡¤Î¥¢¥É¥ì¥¹¤Î¼õ¿®¤òµñÈݤ·¤Ş¤·¤¿ : "
 msgid "writing message text\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹ş¤ó¤Ç¤¤¤Ş¤¹\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 "¥µ¡¼¥Ğ %s ¤«¤é¤Î¸Å¤¤ UID ¥ê¥¹¥È :"
 
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
 msgid " <empty>"
 msgstr " <¤¢¤ê¤Ş¤»¤ó>"
 
@@ -2810,37 +2878,57 @@ msgstr " <¤¢¤ê¤Ş¤»¤ó>"
 msgid "Scratch list of UIDs:"
 msgstr "UID ¤Î¥¹¥¯¥é¥Ã¥Á¥ê¥¹¥È :"
 
-#: uid.c:512 uid.c:563
+#: uid.c:513 uid.c:565
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "¥µ¡¼¥Ğ %s ¤«¤é¤Î¸Å¤¤ UID ¥ê¥¹¥È :"
 
-#: uid.c:514
+#: uid.c:515
 #, c-format
 msgid "New UID list from %s:"
 msgstr "¥µ¡¼¥Ğ %s ¤«¤é¤Î¿·¤¿¤Ê UID ¥ê¥¹¥È :"
 
-#: uid.c:542
+#: uid.c:544
 msgid "swapping UID lists\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:550
+#: uid.c:552
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Ş¤»¤ó¡£¤³¤Î¸ò¿®¤ËÂФ¹¤ë UID ¤Ï¤¢¤ê¤Ş¤»¤ó¡£\n"
 
-#: uid.c:575
+#: uid.c:577
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "UID ¥ê¥¹¥È¤ò¸ò´¹¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:610
+#: uid.c:612
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¤¤Ş¤¹¡£\n"
 
-#: uid.c:616
+#: uid.c:614
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "¾ÚÌÀ½ñ¤Îȯ¹Ô¥¨¥é¡¼¤Ç¤¹¡£\n"
+
+#: uid.c:620
 msgid "Writing fetchids file.\n"
 msgstr "fetchids ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹ş¤ßÃæ¤Ç¤¹¡£\n"
 
+#: uid.c:639
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:643
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:647
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
@@ -2849,6 +2937,42 @@ msgstr "malloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "realloc failed\n"
 msgstr "realloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
+#~ msgid "header "
+#~ msgstr " (¥Ø¥Ã¥À) "
+
+#~ msgid "will not"
+#~ msgstr "¤µ¤ì¤Ş¤»¤ó¡£"
+
+#~ msgid "will"
+#~ msgstr "¤µ¤ì¤Ş¤¹¡£"
+
+#~ msgid "All"
+#~ msgstr "Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò"
+
+#~ msgid "Only new"
+#~ msgstr "¿·µ¬¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß"
+
+#~ msgid "enabled"
+#~ msgstr "¤¬¹Ô¤ï¤ì¤Ş¤¹¡£"
+
+#~ msgid "disabled"
+#~ msgstr "¤Ï¹Ô¤ï¤ì¤Ş¤»¤ó¡£"
+
+#~ msgid "discarded"
+#~ msgstr "ºï½ü¤µ¤ì¤Ş¤¹¡£"
+
+#~ msgid "kept"
+#~ msgstr "Êİ»ı¤µ¤ì¤Ş¤¹¡£"
+
+#~ msgid "IP address.\n"
+#~ msgstr "IP ¥¢¥É¥ì¥¹ \n"
+
+#~ msgid "name.\n"
+#~ msgstr "̾Á° \n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
+
 #~ msgid "partial error message buffer overflow"
 #~ msgstr "ÉôʬŪ¤Ê¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ÎÍÆÎÌĶ²á¤Ç¤¹¡£"
 
@@ -2861,15 +2985,3 @@ msgstr "realloc ¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 
 #~ msgid "message"
 #~ msgstr "Ä̤Υá¥Ã¥»¡¼¥¸"
-
-#~ msgid "Success"
-#~ msgstr "À®¸ù¤·¤Ş¤·¤¿¡£"
-
-#~ msgid "Restricted user (something wrong with account)"
-#~ msgstr "À©Ìó¤ò¼õ¤±¤Æ¤¤¤ë¥æ¡¼¥¶¤Ç¤¹¡£(²¿¤«¤³¤Î¥¢¥«¥¦¥ó¥È¤ËÌäÂ꤬¤¢¤ê¤Ş¤¹¡£)"
-
-#~ msgid "Invalid userid or passphrase"
-#~ msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶ ID ¤«¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£"
-
-#~ msgid "Deity error"
-#~ msgstr "Deity ¥¨¥é¡¼"
diff --git a/po/pl.po b/po/pl.po
index c02d6eda..c14cd0e3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6-pre4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-07-11 00:38+0200\n"
+"POT-Creation-Date: 2005-07-21 12:50+0200\n"
 "PO-Revision-Date: 2005-07-11 18:05+0200\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:171
 #, c-format
@@ -113,8 +114,11 @@ msgstr " (%d bajtów tre¶ci) "
 
 #: driver.c:739
 #, 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:770
 msgid " retained\n"
@@ -131,10 +135,17 @@ msgstr " nie zosta³ skasowany\n"
 #: driver.c:813
 #, 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:876
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
@@ -143,7 +154,8 @@ msgstr "SIGPIPE otrzymany od MDA lub b³±d gniazda strumienia\n"
 #: driver.c:883
 #, 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:887
 #, c-format
@@ -171,7 +183,9 @@ msgstr "Subject: fetchmail zg³asza wielokrotne przekroczenie czasu oczekiwania"
 
 #: driver.c:914
 #, 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:918
@@ -248,7 +262,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:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "po³±czenie SSL nie powiod³o siê.\n"
 
@@ -415,7 +429,7 @@ msgstr "(%d bajtów).\n"
 msgid "No mail for %s\n"
 msgstr "Nie ma poczty dla %s\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "b³êdna liczba listów!"
 
@@ -503,7 +517,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"
@@ -513,7 +528,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 ""
@@ -534,7 +550,7 @@ msgstr "%s: Nie istniejesz. Odejd¼.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: nie mogê znale¼æ nazwy twojego hosta!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zwróci³o b³±d dla %s\n"
@@ -603,369 +619,392 @@ msgstr "Opcja --remote nie dzia³a z ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Opcja --check nie dzia³a z ETRN\n"
 
-#: fetchmail.c:167
+#: fetchmail.c:159
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:171
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: uruchomiony z"
 
-#: fetchmail.c:191
+#: fetchmail.c:195
 msgid "could not get current working directory\n"
 msgstr "nie mo¿na uzyskaæ bie¿±cego katalogu\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Tu fetchmail, wersja %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Pobieram opcje z linii poleceñ%s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " i "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Brak skonfigurowany serwerów pocztowych -- mo¿e brakuje %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nie podano ¿adnych serwerów pocztowych.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nie dzia³a ¿aden inny proces fetchmaila\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, 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:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "background"
 msgstr "dzia³aj±cego w tle"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "dzia³aj±cego na terminalu"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: zabito %s fetchmaila o numerze procesu %d.\n"
 
-#: fetchmail.c:419
-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:423
+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:425
+#: fetchmail.c:429
 #, 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:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: dzia³a inny chodz±cy z konsoli fetchmail (proces %d).\n"
 
-#: fetchmail.c:442
-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:446
+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:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: chodz±cy w tle fetchmail (proces %d) zosta³ uaktywniony.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, 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:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nie mo¿na znale¼æ has³a dla %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Podaj has³o dla %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "startuje fetchmail %s w trybie demona\n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nie mo¿na otworzyæ %s w celu do³±czania logów \n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nie mo¿na sprawdziæ czasu %s (b³±d %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restart fetchmaila (zmieniono %s)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 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:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "próba ponownego uruchomienia fetchmaila nie powiod³a siê\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "po³±czenie z %s pominiête (b³êdy autoryzacji lub timeouty)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "fetchmail: nie nadszed³ jeszcze czas na po³±czenie z %s\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Wynik zapytania=0 (SUKCES)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Wynik zapytania=1 (BRAK POCZTY)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Wynik zapytania=2 (GNIAZDO)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Wynik zapytania=3 (B£¡D AUTORYZACJI)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Wynik zapytania=4 (PROTOKÓ£)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Wynik zapytania=5 (SK£ADNIA)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "Wynik zapytania=6 (B£¡D IO)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "Wynik zapytania=7 (B£¡D)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Wynik zapytania=8 (WY£¡CZENIE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Wynik zapytania=9 (BLOKADA)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "Wynik zapytania=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "Wynik zapytania=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Wynik zapytania=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Wynik zapytania=13 (MAKSIMUM POBRANO)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Wynik zapytania=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Nie mogê pobraæ poczty z ¿adnego serwera. Koñczê pracê.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "usypiam o godzinie %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "uaktywniony przez %s\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "uaktywniony przez sygna³ %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "uaktywniony o %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "praca zakoñczona poprawnie, kod wyj¶cia %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "nie mo¿na sprawdziæ czasu pliku kontroli uruchomienia\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Uwaga: host %s wystêpuje wielokrotnie w pliku konfiguracyjnym\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, 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:1176
+#: fetchmail.c:1180
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "uwaga: multidrop dla %s wymaga opcji envelope!\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1181
 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:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "konfiguracja dla %s jest b³êdna - numer portu nie mo¿e byæ ujemny\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
-msgstr "konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego portu (<1024)\n"
+msgstr ""
+"konfiguracja dla %s jest b³êdna - RPOP wymaga uprzywilejowanego portu "
+"(<1024)\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, 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:1231
+#: fetchmail.c:1235
 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:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "przerwany sygna³em %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, 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:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "obs³uga protoko³u POP2 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "obs³uga protoko³u POP3 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "obs³uga protoko³u IMAP nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "obs³uga polecenia ETRN nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Obs³uga polecenia ETRN bez gethostbyname(2) jest niemo¿liwa.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "obs³uga protoko³u ODMR nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Obs³uga polecenia ODMR bez gethostbyname(2) jest niemo¿liwa.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "Wybrany protokó³ nie jest obs³ugiwany przez fetchmaila.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, 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:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Czas miêdzy sprawdzaniem skrzynek wynosi %d sekund\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Plik diagnostyczny to %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Plik identyfikacyjny to %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 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:1481
+#: fetchmail.c:1485
 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:1483
+#: fetchmail.c:1487
 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:1485
+#: fetchmail.c:1489
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail wy¶le ¼le zaadresowane listy do %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do postmastera.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do nadawcy.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Poczta bêdzie pobierana przez %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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"
@@ -973,380 +1012,413 @@ 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:1509
+#: fetchmail.c:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 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:1513
+#: fetchmail.c:1517
 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:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  Bêdê pyta³ o has³o.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Has³o APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  U¿ytkownik RPOP = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Has³o = \"%s\".\n"
 
 # %s zawiera numer wersji protoko³u -PK
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  U¿ywam protoko³u KPOP z uwierzytelnieniem przez Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  U¿ywam protoko³u %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (us³uga %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (opcje bezpieczeñstwa %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (po³±czenie na port %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (po³±czenie na domy¶lny port)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (bêd± stosowane UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Bêd± próbowane wszystkie dostêpne metody uwierzytelnienia.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie przy pomocy has³a.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Zak³adam szyfrowanie end-to-end.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Zarz±dc± us³ugi pocztowej jest: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesje kodowane SSL w³±czone.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokó³ SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Sprawdzanie certyfikatu SSL serwera w³±czone.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog zaufanego certyfikatu SSL: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, 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:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limit czasu na odpowied¼ serwera wynosi %d sekund"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (domy¶lne).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  Wybrana jest domy¶lna skrzynka odbiorcza.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  Wybrano nastêpuj±ce skrzynki:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Zostan± pobrane wszystkie listy (--all w³±czone).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Zostan± pobrane tylko nowe listy (--all wy³±czone).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 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:1629
+#: fetchmail.c:1633
 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:1631
+#: fetchmail.c:1635
 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:1632
-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:1636
+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:1634
+#: 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:1635
+#: fetchmail.c:1639
 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:1637
+#: fetchmail.c:1641
 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:1638
+#: fetchmail.c:1642
 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:1640
+#: fetchmail.c:1644
 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:1641
+#: fetchmail.c:1645
 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:1643
-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: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:1644
-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: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
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekodowanie MIME jest w³±czone (mimedecode w³±czone).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekodowanie MIME jest wy³±czone (mimedecode wy³±czone).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Zw³oka po odpytaniu jest w³±czona (idle w³±czone).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Zw³oka po odpytaniu jest wy³±czona (idle wy³±czone).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niepuste nag³ówki Status bêd± usuwane (dropstatus w³±czone).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niepuste nag³ówki Status bêd± zachowane (dropstatus wy³±czone).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Linie Delivered-To bêd± usuwane (dropdelivered w³±czone).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Linie Delivered-To bêd± zachowane (dropdelivered wy³±czone).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, 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:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, 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:1667
+#: fetchmail.c:1671
 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:1670
+#: fetchmail.c:1674
 #, 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:1673
+#: fetchmail.c:1677
 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:1675
+#: fetchmail.c:1679
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit wielko¶ci listu wynosi %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 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:1684
+#: fetchmail.c:1688
 #, 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:1687
+#: fetchmail.c:1691
 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:1689
+#: fetchmail.c:1693
 #, 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:1691
+#: fetchmail.c:1695
 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:1695
+#: fetchmail.c:1699
 #, 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:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Listy nie bêd± kasowane (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeny dla których poczta bêdzie ¶ci±gana to:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (domy¶ny)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Listy bêd± dopisywane do %s jako BSMTP\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Listy bêd± lokalne dorêczane przy u¿yciu \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Listy bêd± przes³ane przy pomocy %cMTP do:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, 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:1737
+#: fetchmail.c:1741
 #, 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:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznawane odpowiedzi blokad antyspamowych to:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokowanie spamu wy³±czone\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, 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:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  Przed po³±czeniem nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, 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:1763
+#: fetchmail.c:1767
 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:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  Brak nazw lokalnych ustawionych dla tego hosta.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  Tryb wielu skrzynek: "
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  Tryb jednej skrzynki: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1354,107 +1426,112 @@ msgstr[0] "%d znana nazwa lokalna.\n"
 msgstr[1] "%d znane nazwy lokalne.\n"
 msgstr[2] "%d znanych nazw lokalnych.\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest w³±czone.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Odpytywanie DNS dla adresów wieloskrzynkowych jest wy³±czone.\n"
 
-#: fetchmail.c:1800
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1804
+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:1802
+#: fetchmail.c:1806
 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:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Obs³uga poczty wed³ug adresów w kopercie jest wy³±czone\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag³ówek koperty zosta³ ustawiony na: %s\n"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Liczba nag³ówków koperty, które bêd± sprawdzane: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, 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:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  ¯adne przedrostki nie bêd± usuwane\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Zadeklarowane aliasy serwera pocztowego:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  Domeny lokalne:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Po³±czenia bêd± nawi±zywane tylko przez interfejs %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  Nie jest okre¶lony ¿aden obowi±zkowy interfejs.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, 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:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  ¯aden interfejs nie bêdzie monitorowany.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, 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:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie nawi±zuj±ce po³±czenie\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, 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:1859
+#: fetchmail.c:1863
 msgid "  No plugout command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie zamykaj±ce po³±czenie.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¯adne UID-y nie zosta³y zachowane z sesji z tym hostem.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Zachowano %d UID-ów.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 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:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1463,7 +1540,7 @@ msgstr ""
 ".\n"
 
 # XXX -PK
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  W³asno¶ci przepuszczania \"%s\".\n"
@@ -1543,43 +1620,43 @@ 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:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokó³ rozpoznany jako IMAP2 lub IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod³o siê\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "ponowne po³±czenie nie powiod³o siê\n"
 
-#: imap.c:670
+#: imap.c:669
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1587,11 +1664,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:682
+#: imap.c:681
 msgid "mailbox selection failed\n"
 msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
 
-#: imap.c:686
+#: imap.c:685
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1599,7 +1676,7 @@ 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:714
+#: imap.c:713
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1607,23 +1684,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:739
+#: imap.c:738
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nie przeczytanych listów nie powiod³o siê\n"
 
-#: imap.c:769 pop3.c:675 pop3.c:687 pop3.c:904 pop3.c:911
+#: imap.c:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nie przeczytany\n"
 
-#: imap.c:781 pop3.c:696
+#: imap.c:780 pop3.c:726
 #, 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
@@ -1804,7 +1882,7 @@ msgstr "recv z serwera nie powiod³o siê\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Rozkodowanie wyzwania OTP by³o niemo¿liwe\n"
 
-#: opie.c:58 pop3.c:506
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "Tajne has³o: "
 
@@ -1885,12 +1963,17 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     podaje nazwê pliku kroniki\n"
 
 #: options.c:672
-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:673
 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:674
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
@@ -1933,8 +2016,12 @@ msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ¶cie¿ka do certyfikatów ssl\n"
 
 #: options.c:687
-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:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
@@ -1942,15 +2029,21 @@ msgstr "      --sslproto    wymusza protokó³ ssl (ssl2/ssl3/tls1)\n"
 
 #: options.c:690
 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:691
 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:693
 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:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
@@ -1962,7 +2055,9 @@ msgstr "  -P, --port        okre¶la port TCP/IP na który nale¿y siê ³±czyæ\n"
 
 #: options.c:696
 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:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
@@ -1970,11 +2065,13 @@ msgstr "  -t, --timeout     limit czasu oczekiwania na odpowied¼ serwera\n"
 
 #: options.c:698
 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:699
 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:700
 msgid "      --principal   mail service principal\n"
@@ -1982,7 +2079,8 @@ msgstr "      --principal   zarz±dca us³ugi pocztowej\n"
 
 #: options.c:701
 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:703
 msgid "  -u, --username    specify users's login on server\n"
@@ -2022,7 +2120,8 @@ msgstr "  -T, --netsec      okre¶la funkcjê bezpieczeñstwa IP\n"
 
 #: options.c:715
 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:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
@@ -2030,7 +2129,9 @@ msgstr "      --fetchdomains pobiera pocztê dla podanych domen\n"
 
 #: options.c:717
 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:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
@@ -2042,11 +2143,13 @@ msgstr "  -Z, --antispam    okre¶la odpowiedzi blokad antyspamowych\n"
 
 #: options.c:720
 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:721
 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:722
 msgid "      --fetchsizelimit set fetch message size limit\n"
@@ -2058,11 +2161,13 @@ msgstr "      --fastuidl    wykonuje binarne poszukiwanie UIDL-i\n"
 
 #: options.c:724
 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:725
 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:726
 msgid "      --bsmtp       set output BSMTP file\n"
@@ -2078,42 +2183,52 @@ msgstr "  -r, --folder      okre¶la nazwê skrzynki na serwerze\n"
 
 #: options.c:729
 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:544
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
 
-#: pop3.c:553
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "B³±d sk³adni znacznika czasu w powitaniu\n"
 
-#: pop3.c:575
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pro¶ba o nieznany protokó³ w POP3_auth\n"
 
-#: pop3.c:583
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:666 pop3.c:895
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) zosta³ skasowany, ale nadal istnieje!\n"
 
-#: pop3.c:768
+#: pop3.c:798
 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:854
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "b³±d protoko³u\n"
 
-#: pop3.c:869
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b³±d protoko³u podczas pobierania UIDL\n"
 
-#: pop3.c:1226
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Opcja --remote nie dzia³a z POP3\n"
 
@@ -2134,12 +2249,20 @@ msgid "network-security support disabled"
 msgstr "obs³uga funkcji bezpieczeñstwa sieciowego jest wy³±czona"
 
 #: rcfile_y.y:235
-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:242
-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:354
 msgid "SSL is not enabled"
@@ -2359,110 +2482,110 @@ msgstr "MD5 zastosowany do bloku danych:\n"
 msgid "MD5 result is: \n"
 msgstr "Wynik MD5: \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "przesy³anie do %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cia³o odbitego listu)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "poczta od %s odbita do %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Zachowany b³±d to nadal %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "b³±d %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
 
-#: sink.c:970
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "demon %cMTP nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:977
+#: sink.c:976
 #, 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:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "brak pasuj±cych adresów; postmaster nie ustawiony.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nie mogê wys³aæ poczty nawet do %s!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "brak pasuj±cych lokalnych adresów, przesy³am do %s\n"
 
-#: sink.c:1186
+#: sink.c:1185
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "list zostanie dorêczony przy pomocy: %s\n"
 
-#: sink.c:1210
+#: sink.c:1209
 msgid "MDA open failed\n"
 msgstr "b³±d podczas uruchamiania MDA (programu dorêczaj±cego pocztê)\n"
 
-#: sink.c:1247
+#: 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:1271
+#: 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:1327
+#: sink.c:1326
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna³ %d\n"
 
-#: sink.c:1330
+#: sink.c:1329
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwróci³ niezerowy kod b³êdu %d\n"
 
-#: sink.c:1333
+#: 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:1354
+#: 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:1375
+#: sink.c:1374
 msgid "SMTP listener refused delivery\n"
 msgstr "serwer SMTP odmówi³ dostarczenia listu\n"
 
-#: sink.c:1405
+#: 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:1408
+#: 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:1559
+#: sink.c:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2782,7 +2905,8 @@ msgstr "Zapisujê plik fetchids.\n"
 #: uid.c:639
 #, 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:643
 #, c-format
@@ -2801,3 +2925,15 @@ msgstr "b³±d malloc\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "b³±d realloc\n"
+
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u jest nie przeczytany\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u jest nie przeczytany\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (num=%d) zosta³ skasowany, ale nadal istnieje!\n"
diff --git a/po/ru.po b/po/ru.po
index 4698b225..53b140a8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.2.6-pre3\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-07-21 12:50+0200\n"
 "PO-Revision-Date: 2005-07-06 19:33+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -263,7 +263,7 @@ msgstr "ôÅÍÁ: ğÒÅÄÕĞÒÅÖÄÅÎÉÅ Fetchmail Ï ÎÅÄÏÓÔÕĞÎÏÓÔÉ ÓÅÒ×ÅÒÁ."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ÎÅ ÓÍÏÇ ÕÓÔÁÎÏ×ÉÔØ Ó×ÑÚØ Ó ĞÏŞÔÏ×ÙÍ ÓÅÒ×ÅÒÏÍ %s:"
 
-#: driver.c:1162 imap.c:367 pop3.c:420
+#: driver.c:1162 imap.c:366 pop3.c:424
 msgid "SSL connection failed.\n"
 msgstr "ğÏÄËÌÀŞÅÎÉÅ ŞÅÒÅÚ SSL ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ.\n"
 
@@ -434,7 +434,7 @@ msgstr " (%d ÏËÔÅÔÏ×).\n"
 msgid "No mail for %s\n"
 msgstr "äÌÑ %s ĞÏŞÔÙ ÎÅÔ\n"
 
-#: driver.c:1438
+#: driver.c:1438 imap.c:70
 msgid "bogus message count!"
 msgstr "ÆÉËÔÉ×ÎÏÅ ËÏÌÉŞÅÓÔ×Ï ÓÏÏÂİÅÎÉÊ!"
 
@@ -556,7 +556,7 @@ msgstr "%s: ôÙ ÓÕİÅÓÔ×ÕÅÛØ.  ÷ÁÌÉ ÏÔÓÀÄÁ.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏĞÒÅÄÅÌÉÔØ ×ÁÛ ÈÏÓÔ!"
 
-#: env.c:158
+#: env.c:159
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ %s\n"
@@ -625,61 +625,65 @@ msgstr "ïĞÃÉÑ --remote ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ Ó ETRN\n"
 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 "ÎÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ĞÏÌÕŞÉÔØ ÔÅËÕİÉÊ ÒÁÂÏŞÉÊ ËÁÔÁÌÏÇ\n"
 
-#: fetchmail.c:201
+#: fetchmail.c:205
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "üÔÏ fetchmail ×ÅÒÓÉÉ %s"
 
-#: fetchmail.c:346
+#: fetchmail.c:350
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "ïĞÃÉÉ ÂÅÒÕÔÓÑ ÉÚ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ %s%s\n"
 
-#: fetchmail.c:347
+#: fetchmail.c:351
 msgid " and "
 msgstr " É "
 
-#: fetchmail.c:352
+#: fetchmail.c:356
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "îÅÔ ÎÁÓÔÒÏÅÎÎÙÈ ĞÏŞÔÏ×ÙÈ ÓÅÒ×ÅÒÏ× -- ÍÏÖÅÔ ÏÔÓÕÔÓÔ×ÕÅÔ %s?\n"
 
-#: fetchmail.c:373
+#: fetchmail.c:377
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ÎÅ ÂÙÌÉ ÕËÁÚÁÎÙ ĞÏŞÔÏ×ÙÅ ÓÅÒ×ÅÒÙ.\n"
 
-#: fetchmail.c:382 fetchmail.c:391
+#: fetchmail.c:386 fetchmail.c:395
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ÄÒÕÇÉÅ ÚÁĞÕİÅÎÎÙÅ fetchmail ÏÔÓÕÔÓÔ×ÕÀÔ\n"
 
-#: fetchmail.c:397
+#: fetchmail.c:401
 #, 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:402 fetchmail.c:408
 msgid "background"
 msgstr "ÆÏÎÏ×ÙÊ ÒÅÖÉÍ"
 
-#: fetchmail.c:398 fetchmail.c:404
+#: fetchmail.c:402 fetchmail.c:408
 msgid "foreground"
 msgstr "ĞÒÉÏÒÉÔÅÔÎÙÊ ÒÅÖÉÍ"
 
-#: fetchmail.c:403
+#: fetchmail.c:407
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail ÎÁ %d ÏÓÔÁÎÏ×ÌÅÎ.\n"
 
-#: fetchmail.c:419
+#: fetchmail.c:423
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -687,7 +691,7 @@ msgstr ""
 "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏ×ÅÒÉÔØ ĞÏŞÔÕ, ĞÏËÁ ÎÁ ÔÏÍ ÖÅ ÈÏÓÔÅ ÚÁĞÕİÅÎ ÄÒÕÇÏÊ "
 "fetchmail.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:429
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -695,184 +699,184 @@ msgstr ""
 "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ÏĞÒÏÓÉÔØ ÕËÁÚÁÎÎÙÅ ÈÏÓÔÙ ÉÚ-ÚÁ ÄÒÕÇÏÇÏ fetchmail, "
 "ÚÁĞÕİÅÎÎÏÇÏ ÎÁ %d.\n"
 
-#: fetchmail.c:432
+#: fetchmail.c:436
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ÎÁ %d ÚÁĞÕİÅÎ ÄÒÕÇÏÊ ĞÒÉÏÒÉÔÅÔÎÙÊ fetchmail.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:446
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÉÍÅÎÉÔØ ÏĞÃÉÉ, ĞÏËÁ ÚÁĞÕİÅÎ ÆÏÎÏ×ÙÊ fetchmail.\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:452
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: ÎÁ %d ÉÚ ÆÏÎÏ×ÏÇÏ ÒÅÖÉÍÁ ×ÅÒÎÕÌÓÑ  fetchmail.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:464
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: ÎÁ %d ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ ÂÏÌÅÅ ÓÔÁÒÛÉÊ ĞÒÏÃÅÓÓ ÔÏÇÏ ÖÅ "
 "ÕÒÏ×ÎÑ.\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:479
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ĞÁÒÏÌØ ÄÌÑ %s@%s.\n"
 
-#: fetchmail.c:479
+#: fetchmail.c:483
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "÷×ÅÄÉÔÅ ĞÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: fetchmail.c:510
+#: fetchmail.c:514
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "ÚÁĞÕÓËÁÅÔÓÑ ÄÅÍÏÎ fetchmail %s\n"
 
-#: fetchmail.c:525 fetchmail.c:527
+#: fetchmail.c:529 fetchmail.c:531
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÏÔËÒÙÔØ %s ÄÌÑ ĞÒÉÓÏÅÄÉÎÅÎÉÑ Ë ÎÅÍÕ ÌÏÇÏ×\n"
 
-#: fetchmail.c:565
+#: fetchmail.c:569
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ĞÒÏ×ÅÒÉÔØ ×ÒÅÍÑ %s (ÏÛÉÂËÁ %d)\n"
 
-#: fetchmail.c:570
+#: fetchmail.c:574
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "ĞÅÒÅÚÁĞÕÓËÁÅÔÓÑ fetchmail (%s ÉÚÍÅÎÅÎ)\n"
 
-#: fetchmail.c:575
+#: fetchmail.c:579
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "ĞÏĞÙÔËÁ ĞÅÒÅÚÁĞÕÓËÁ ÍÏÖÅÔ ÚÁ×ÅÒÛÉÔØÓÑ ÎÅÕÄÁŞÅÊ, Ô.Ë. ËÁÔÁÌÏÇ ÎÅ ÂÙÌ "
 "×ÏÓÓÔÁÎÏ×ÌÅÎ\n"
 
-#: fetchmail.c:602
+#: fetchmail.c:606
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "ĞÏĞÙÔËÁ ĞÅÒÅÚÁĞÕÓÔÉÔØ  fetchmail ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:634
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "ÏĞÒÏÓ %s ĞÒÏĞÕİÅÎ (ÏÛÉÂËÁ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÉÌÉ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÔÁÊÍ-ÁÕÔÏ×)\n"
 
-#: fetchmail.c:642
+#: fetchmail.c:646
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ÉÎÔÅÒ×ÁÌ ÎÅ ÄÏÓÔÉÇÎÕÔ, %s ÎÅ ÚÁĞÒÁÛÉ×ÁÅÔÓÑ\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=0 (SUCCESS)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=1 (NOMAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=2 (SOCKET)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=2 (SOCKET)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=4 (PROTOCOL)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=5 (SYNTAX)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=6 (IOERR)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=6 (IOERR)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=7 (ERROR)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=7 (ERROR)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=8 (EXCLUDE)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=10 (SMTP)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=10 (SMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=11 (DNS)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=11 (DNS)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 msgid "Query status=12 (BSMTP)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=12 (BSMTP)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:710
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=13 (MAXFETCH)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:712
 #, c-format
 msgid "Query status=%d\n"
 msgstr "óÔÁÔÕÓ ÚÁĞÒÏÓÁ=%d\n"
 
-#: fetchmail.c:754
+#: fetchmail.c:758
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "÷ÓÅ ÓÏÅÄÉÎÅÎÉÑ ĞÅÒÅÇÒÕÖÅÎÙ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:765
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "× ÓĞÑİÅÍ ÒÅÖÉÍÅ ÎÁ %s\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:789
 #, c-format
 msgid "awakened by %s\n"
 msgstr "ÒÁÚÂÕÖÅÎ %s'ÏÍ\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:792
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "ÒÁÚÂÕÖÅÎ ĞÏ ÓÉÇÎÁÌÕ %d\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:799
 #, c-format
 msgid "awakened at %s\n"
 msgstr "ÒÁÚÂÕÖÅÎ ÎÁ %s\n"
 
-#: fetchmail.c:801
+#: fetchmail.c:805
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "ÎÏÒÍÁÌØÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ, ÓÔÁÔÕÓ %d\n"
 
-#: fetchmail.c:954
+#: fetchmail.c:958
 msgid "couldn't time-check the run-control file\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ĞÒÏ×ÅÒÉÔØ ×ÒÅÍÑ ÆÁÊÌÁ ËÏÎÔÒÏÌÑ ÚÁĞÕÓËÁ\n"
 
-#: fetchmail.c:987
+#: fetchmail.c:991
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "ğÒÅÄÕĞÒÅÖÄÅÎÉÅ: ĞÏ×ÔÏÒÎÙÅ ÓÓÙÌËÉ ÎÁ ÈÏÓÔ %s × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ\n"
 
-#: fetchmail.c:1134
+#: fetchmail.c:1138
 msgid "SSL support is not compiled in.\n"
 msgstr "ğÏÄÄÅÒÖËÁ SSL ÎÅ ÂÙÌÁ ×ËÌÀŞÅÎÁ ĞÒÉ ËÏÍĞÉÌÑÃÉÉ.\n"
 
-#: fetchmail.c:1165
+#: fetchmail.c:1169
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -880,645 +884,645 @@ msgstr ""
 "fetchmail: ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: ÎÅ ÄÏÓÔÕĞÅÎ DNS ÄÌÑ ĞÒÏ×ÅÒËÉ ÍÎÏÇÏËÁÎÁÌØÎÏÊ "
 "×ÙÂÏÒËÉ ÉÚ %s\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1180
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: multidrop ÄÌÑ %s ÔÒÅÂÕÅÔ ÏĞÃÉÀ envelope!\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1181
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: îÅ ĞÒÏÓÉÔÅ ÔÅÈÎÉŞÅÓËÏÊ ĞÏÄÄÅÒÖËÉ, ÅÓÌÉ ×ÓÅ ÓÏÏÂİÅÎÉÑ "
 "ÏÔĞÒÁ×ÌÑÀÔÓÑ ĞÏÓÔÍÁÓÔÅÒÕ!\n"
 
-#: fetchmail.c:1193
+#: fetchmail.c:1197
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÎÏÍÅÒ ĞÏÒÔÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÔÒÉÃÁÔÅÌØÎÙÍ\n"
 
-#: fetchmail.c:1200
+#: fetchmail.c:1204
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, ÄÌÑ RPOP ÔÒÅÂÕÅÔÓÑ ĞÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÊ ĞÏÒÔ\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1220
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "ËÏÎÆÉÇÕÒÁÃÉÑ %s ÎÅ ×ÅÒÎÁ, LMTP ÎÅ ÍÏÖÅÔ ÉÓĞÏÌØÚÏ×ÁÔØ ĞÏÒÔ SMTP ĞÏ ÕÍÏÌŞÁÎÉÀ\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1235
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "úÁĞÕÓËÁÔØ fetchall, ÏÓÔÁ×ÌÑÑ ÅÇÏ ĞÒÉ ÜÔÏÍ × ÒÅÖÉÍÅ ÄÅÍÏÎÁ, ÎÅÌØÚÑ!\n"
 
-#: fetchmail.c:1281
+#: fetchmail.c:1285
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ÚÁ×ÅÒÛÅÎ ĞÏ ÓÉÇÎÁÌÕ %d\n"
 
-#: fetchmail.c:1366
+#: fetchmail.c:1370
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ÚÁĞÒÁÛÉ×ÁÅÔ %s (ĞÒÏÔÏËÏÌ %s) ÎÁ %s: ÏĞÒÏÓ ÎÁŞÁÔ\n"
 
-#: fetchmail.c:1391
+#: fetchmail.c:1395
 msgid "POP2 support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ POP2 ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1407
 msgid "POP3 support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ POP3 ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1413
+#: fetchmail.c:1417
 msgid "IMAP support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ IMAP ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1419
+#: fetchmail.c:1423
 msgid "ETRN support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ ETRN ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1429
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "ğÏÄÄÅÒÖËÁ ETRN ÂÅÚ gethostbyname(2) ÎÅ×ÏÚÍÏÖÎÁ.\n"
 
-#: fetchmail.c:1432
+#: fetchmail.c:1436
 msgid "ODMR support is not configured.\n"
 msgstr "ğÏÄÄÅÒÖËÁ ODMR ÎÅ ÎÁÓÔÒÏÅÎÁ.\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1442
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "ğÏÄÄÅÒÖËÁ ODMR ÂÅÚ gethostbyname(2) ÎÅ×ÏÚÍÏÖÎÁ.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1448
 msgid "unsupported protocol selected.\n"
 msgstr "×ÙÂÒÁÎ ÎÅĞÏÄÄÅÒÖÉ×ÁÅÍÙÊ ĞÒÏÔÏËÏÌ.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1458
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ÚÁĞÒÁÛÉ×ÁÅÔ %s (ĞÒÏÔÏËÏÌ %s) ÎÁ %s: ÏĞÒÏÓ ÚÁ×ÅÒÛÅÎ\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1475
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "éÎÔÅÒ×ÁÌ ÏĞÒÏÓÁ - %d ÓÅËÕÎÄ\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1477
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "ìÏÇ-ÆÁÊÌ - %s\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1479
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-ÆÁÊÌ - %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1482
 msgid "Progress messages will be logged via syslog\n"
 msgstr "ïÂÒÁÂÏÔËÁ ÓÏÏÂİÅÎÉÊ ÂÕÄÅÔ ÒÅÇÉÓÔÒÉÒÏ×ÁÔØÓÑ ŞÅÒÅÚ syslog\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1485
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ÓÙÍÉÔÉÒÕÅÔ É ÎÅ ÓÏÚÄÁÓÔ Received\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1487
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 "Fetchmail ÂÕÄÅÔ ÏÔÏÂÒÁÖÁÔØ ÔÏŞÅŞÎÕÀ ÓÔÒÏËÕ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ.\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1489
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ĞÅÒÅÁÄÒÅÓÕÅÔ ÍÎÏÇÏËÁÎÁÌØÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÅÚ ÁÄÒÅÓÁ ÎÁ %s.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1493
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ÎÁĞÒÁ×ÉÔ ÏÛÉÂÏŞÎÏÅ ĞÉÓØÍÏ ĞÏÓÔÍÁÓÔÅÒÕ.\n"
 
-#: fetchmail.c:1491
+#: fetchmail.c:1495
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ÎÁĞÒÁ×ÉÔ ÏÛÉÂÏŞÎÏÅ ĞÉÓØÍÏ ÏÔĞÒÁ×ÉÔÅÌÀ.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1502
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "ğÁÒÁÍÅÔÒÙ ÄÌÑ ĞÏÌÕŞÅÎÉÑ ÉÚ %s@%s:\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1506
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ğÏŞÔÁ ÂÕÄÅÔ ĞÏÌÕŞÅÎÁ ŞÅÒÅÚ %s\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1509
 #, 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:1513
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  îÁÓÔÏÑİÅÅ ÉÍÑ ÓÅ×ÅÒÁ - %s.\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1516
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ëÏÇÄÁ ÈÏÓÔ ÎÅ ÕËÁÚÁÎ, ÜÔÏÔ ÈÏÓÔ ÎÅ ÂÕÄÅÔ ÚÁĞÒÏÛÅÎ.\n"
 
-#: fetchmail.c:1513
+#: fetchmail.c:1517
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ëÏÇÄÁ ÈÏÓÔ ÎÅ ÕËÁÚÁÎ, ÂÕÄÅÔ ÚÁĞÒÏÛÅÎ ÜÔÏÔ ÈÏÓÔ.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1521
 msgid "  Password will be prompted for.\n"
 msgstr "  âÕÄÅÔ ÚÁÔÒÅÂÏ×ÁÎ ĞÁÒÏÌØ.\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1525
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  óÅËÒÅÔ APOP = \"%s\".\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1528
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1531
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ğÁÒÏÌØ = \"%s\".\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1544
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  ğÒÏÔÏËÏÌ - KPOP Ó ÁÕÔÅÎÔÉÆÉËÁÃÉÅÊ Kerberos %s"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1547
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  ğÒÏÔÏËÏÌ - %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1550
 #, c-format
 msgid " (using service %s)"
 msgstr " (ÉÓĞÏÌØÚÕÅÔÓÑ ÓÌÕÖÂÁ %s)"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1552
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (ÉÓĞÏÌØÚÕÀÔÓÑ ĞÁÒÁÍÅÔÒÙ ÚÁİÉÔÙ ÓÅÔÉ %s)"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1555
 #, c-format
 msgid " (using port %d)"
 msgstr " (ÉÓĞÏÌØÚÕÅÔÓÑ ĞÏÒÔ %d)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1558
 msgid " (using default port)"
 msgstr " (ÉÓĞÏÌØÚÕÅÔÓÑ ĞÏÒÔ ĞÏ ÕÍÏÌŞÁÎÉÀ)"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1560
 msgid " (forcing UIDL use)"
 msgstr " (ĞÒÉÎÕÄÉÔÅÌØÎÏ ÉÓĞÏÌØÚÕÅÔÓÑ UIDL)"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1566
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  âÕÄÕÔ ÉÓĞÒÏÂÏ×ÁÎÙ ×ÓÅ ÄÏÓÔÕĞÎÙÅ ÓĞÏÓÏÂÙ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ.\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1569
 msgid "  Password authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Ó ĞÁÒÏÌÅÍ.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1572
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ NTLM.\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1575
 msgid "  OTP authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ OTP.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1578
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ CRAM-Md5.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1581
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ GSSAPI.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1584
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Kerberos V4.\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1587
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  âÕÄÅÔ ÉÓĞÏÌØÚÏ×ÁÎÁ ĞÒÉÎÕÄÉÔÅÌØÎÁÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÑ Kerberos V5.\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1590
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  äÏĞÕÓËÁÅÔÓÑ ÏĞÅÒÁÔÉ×ÎÏÅ ÛÉÆÒÏ×ÁÎÉÅ.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1594
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ğÒÉÎÃÉĞÁÌ ĞÏŞÔÏ×ÏÊ ÓÌÕÖÂÙ: %s\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1597
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ÷ËÌÀŞÅÎÙ ÓÅÓÓÉÉ, ÚÁÛÉÆÒÏ×ÁÎÎÙÅ SSL.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ğÒÏÔÏËÏÌ SSL: %s.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1601
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  ÷ËÌÀŞÅÎÁ ĞÒÏ×ÅÒËÁ ÓÅÒÔÉÆÉËÁÔÁ ÓÅÒ×ÅÒÁ SSL.\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1603
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ëÁÔÁÌÏÇ ÄÏ×ÅÒÅÎÎÙÈ ÓÅÒÔÉÆÉËÁÔÏ× SSL: %s\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1606
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ïÔĞÅŞÁÔÏË ËÌÀŞÁ SSL (Ó×ÅÒÅÎÎÙÊ Ó ËÌÀŞÏÍ ÓÅÒ×ÅÒÁ): %s\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1609
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ôÁÊÍÁÕÔ ÍÏÌŞÁÎÉÑ ÓÅÒ×ÅÒÁ - %d ÓÅËÕÎÄ"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1611
 msgid " (default).\n"
 msgstr " (ĞÏ ÕÍÏÌŞÁÎÉÀ).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1618
 msgid "  Default mailbox selected.\n"
 msgstr "  ÷ÙÂÒÁÎ ĞÏŞÔÏ×ÙÊ ÑİÉË ĞÏ ÕÍÏÌŞÁÎÉÀ.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1623
 msgid "  Selected mailboxes are:"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ĞÏŞÔÏ×ÙÅ ÑİÉËÉ:"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1629
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  âÕÄÕÔ ĞÏÌÕŞÅÎÙ ×ÓÅ ÓÏÏÂİÅÎÉÑ (--all on).\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1630
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  âÕÄÕÔ ĞÏÌÕŞÅÎÙ ÔÏÌØËÏ ÎÏ×ÙÅ ÓÏÏÂİÅÎÉÑ (--all off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1632
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÏÓÔÁ×ÌÅÎÙ ÎÁ ÓÅÒ×ÅÒÅ (--keep on).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1633
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  ÷ÙÂÒÁÎÎÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ Ó ÓÅÒ×ÅÒÁ (--keep off).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1635
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush on).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1636
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  óÔÁÒÙÅ ÓÏÏÂİÅÎÉÑ ÎÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ ĞÅÒÅÄ ĞÏÌÕŞÅÎÉÅÍ ÓÏÏÂİÅÎÉÑ (--flush "
 "off).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1638
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  ğÅÒÅÚÁĞÉÓØ ÌÏËÁÌØÎÙÈ ÁÄÒÅÓÏ× ÓÅÒ×ÅÒÁ ×ËÌÀŞÅÎÁ (--norewrite off).\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1639
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  ğÅÒÅÚÁĞÉÓØ ÌÏËÁÌØÎÙÈ ÁÄÒÅÓÏ× ÓÅÒ×ÅÒÁ ×ÙËÌÀŞÅÎÁ (--norewrite on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1641
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  õÄÁÌÅÎÉÅ ×ÏÚ×ÒÁÔÁ ËÁÒÅÔËÉ ×ËÌÀŞÅÎÏ (stripcr on).\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1642
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  õÄÁÌÅÎÉÅ ×ÏÚ×ÒÁÔÁ ËÁÒÅÔËÉ ×ÙËÌÀŞÅÎÏ (stripcr off).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1644
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ğÒÉÎÕÄÉÔÅÌØÎÙÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ ×ËÌÀŞÅÎ (forcecr on).\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1645
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  ğÒÉÎÕÄÉÔÅÌØÎÙÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ ×ÙËÌÀŞÅÎ (forcecr off).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1647
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ÙËÌÀŞÅÎÁ (pass8bits on).\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1648
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  éÎÔÅÒĞÒÅÔÁÃÉÑ ËÏÄÉÒÏ×ËÉ ĞÅÒÅÄÁ×ÁÅÍÏÇÏ ËÏÎÔÅÎÔÁ ×ËÌÀŞÅÎÁ (pass8bits off).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1650
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-ÄÅËÏÄÉÒÏ×ÁÎÉÅ ×ËÌÀŞÅÎÏ (mimedecode on).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1651
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-ÄÅËÏÄÉÒÏ×ÁÎÉÅ ×ÙËÌÀŞÅÎÏ (mimedecode off).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1653
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ğÒÏÓÔÏÊ ĞÏÓÌÅ ÏĞÒÏÓÁ ×ËÌÀŞÅÎ (idle on).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1654
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ğÒÏÓÔÏÊ ĞÏÓÌÅ ÏĞÒÏÓÁ ×ÙËÌÀŞÅÎ (idle off).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1656
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  îÅĞÕÓÔÙÅ ÓÔÒÏËÉ ÓÏÓÔÏÑÎÉÑ ÂÕÄÕÔ ÕÄÁÌÅÎÙ (dropstatus on)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1657
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  îÅĞÕÓÔÙÅ ÓÔÒÏËÉ ÓÏÓÔÏÑÎÉÑ ÂÕÄÕÔ ÓÏÈÒÁÎÅÎÙ (dropstatus off)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1659
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  óÔÒÏËÉ Delivered-To ÂÕÄÕÔ ÕÄÁÌÅÎÙ (dropdelivered on)\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1660
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  óÔÒÏËÉ Delivered-To ÂÕÄÕÔ ÓÏÈÒÁÎÅÎÙ (dropdelivered off)\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1663
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ ÓÏÏÂİÅÎÉÑ - %d ÏËÔÅÔÏ× (--limit %d).\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1666
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ÓÏÏÂİÅÎÉÑ (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1668
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ĞÒÅÄÕĞÒÅÖÄÅÎÉÑÍÉ Ï ÒÁÚÍÅÒÅ ÓÏÏÂİÅÎÉÑ - %d ÓÅËÕÎÄ (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1671
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ğÒÅÄÕĞÒÅÖÄÅÎÉÑ Ï ÒÁÚÍÅÒÅ ĞÒÉ ËÁÖÄÏÍ ÏĞÒÏÓÅ (--warnings 0).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1674
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ĞÏÌÕŞÅÎÎÙÅ ÓÏÏÂİÅÎÉÑ - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1677
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÏÌÕŞÅÎÎÙÅ ÓÏÏÂİÅÎÉÑ (--fetchlimit 0).\n"
 
-#: fetchmail.c:1675
+#: fetchmail.c:1679
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1682
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ÒÁÚÍÅÒ ×ÙÂÏÒËÉ ÓÏÏÂİÅÎÉÊ (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1686
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl -1).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1688
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  ÷ÙĞÏÌÎÑÔØ Ä×ÏÉŞÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ %d ÉÚ %d ÏĞÒÏÓÏ× (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1691
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   ÷ÙĞÏÌÎÑÔØ ÌÉÎÅÊÎÙÊ ĞÏÉÓË UID'Ï× ×Ï ×ÒÅÍÑ ËÁÖÄÏÇÏ ÏĞÒÏÓÁ (--fastuidl 0).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1693
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ïÇÒÁÎÉŞÅÎÉÅ ÎÁ ĞÁËÅÔ SMTP-ÓÏÏÂİÅÎÉÊ - %d.\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1695
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  îÅÔ ÏÇÒÁÎÉŞÅÎÉÑ ÎÁ ĞÁËÅÔ SMTP-ÓÏÏÂİÅÎÉÊ (--batchlimit 0).\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1699
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  éÎÔÅÒ×ÁÌ ÍÅÖÄÕ ÕÄÁÌÅÎÉÑÍÉ ĞÒÉÎÕÄÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÌÅÎ × %d (--expunge %d).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1701
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  îÅÔ ĞÒÉÎÕÄÉÔÅÌØÎÙÈ ÕÄÁÌÅÎÉÊ (--expunge 0).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1708
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  äÏÍÅÎÙ, ÄÌÑ ËÏÔÏÒÙÈ ÂÕÄÅÔ ×ÙĞÏÌÎÑÔØÓÑ ×ÙÂÏÒËÁ ĞÏŞÔÙ:"
 
-#: fetchmail.c:1709 fetchmail.c:1729
+#: fetchmail.c:1713 fetchmail.c:1733
 msgid " (default)"
 msgstr " (ĞÏ ÕÍÏÌŞÁÎÉÀ)"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1718
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ĞÒÉËÒÅĞÌÅÎÙ Ë %s ËÁË BSMTP\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ÄÏÓÔÁ×ÌÅÎÙ Ó \"%s\".\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1727
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  óÏÏÂİÅÎÉÑ ÂÕÄÕÔ ĞÅÒÅÁÄÒÅÓÏ×ÁÎÙ ĞÏ %cMTP ÎÁ:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1738
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  şÁÓÔØ ÈÏÓÔÁ ÉÚ ÓÔÒÏËÉ MAIL FROM ÂÕÄÅÔ %s\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1741
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  áÄÒÅÓ, ×ÓÔÁ×ÌÑÅÍÙÊ × ÓÔÒÏËÉ RCPT TO, ÏÔĞÒÁ×ÌÑÅÍÙÅ ĞÏ SMTP, ÂÕÄÅÔ %s\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1750
 msgid "  Recognized listener spam block responses are:"
 msgstr "  ïÔ×ÅÔÎÙÅ ÄÅÊÓÔ×ÉÑ ÎÁ ÒÁÓĞÏÚÎÁÎÎÙÅ ÓÌÕÛÁÔÅÌÅÍ ÓĞÁÍ-ÂÌÏËÉ:"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1756
 msgid "  Spam-blocking disabled\n"
 msgstr "  âÌÏËÉÒÏ×ËÁ ÓĞÁÍÁ ÏÔËÌÀŞÅÎÁ\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1759
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ Ë ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ Ó \"%s\".\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1762
 msgid "  No pre-connection command.\n"
 msgstr "  îÅÔ ËÏÍÁÎÄÙ, ×ÙĞÏÌÎÑÅÍÏÊ ÄÏ ÓÏÅÄÉÎÅÎÉÑ.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1764
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ Ë ÓÅÒ×ÅÒÕ ÂÕÄÅÔ ÒÁÚÏÒ×ÁÎÏ Ó \"%s\".\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1767
 msgid "  No post-connection command.\n"
 msgstr "  îÅÔ ËÏÍÁÎÄÙ, ×ÙĞÏÌÎÑÅÍÏÊ ĞÏÓÌÅ ÓÏÅÄÉÎÅÎÉÑ.\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1770
 msgid "  No localnames declared for this host.\n"
 msgstr "  îÅÔ ÌÏËÁÌØÎÙÈ ÉÍÅÎ, ÏÂßÑ×ÌÅÎÎÙÈ ÄÌÑ ÜÔÏÇÏ ÈÏÓÔÁ.\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1780
 msgid "  Multi-drop mode: "
 msgstr "  íÎÏÇÏËÁÎÁÌØÎÙÊ ÒÅÖÉÍ:"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1782
 msgid "  Single-drop mode: "
 msgstr "  ïÄÎÏËÁÎÁÌØÎÙÊ ÒÅÖÉÍ: "
 
-#: fetchmail.c:1780
+#: fetchmail.c:1784
 #, 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:1799
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-ÚÁĞÒÏÓ ÄÌÑ ÍÎÏÇÏËÁÎÁÌØÎÙÈ ÁÄÒÅÓÏ× ×ËÌÀŞÅÎ.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1800
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-ÚÁĞÒÏÓ ÄÌÑ ÍÎÏÇÏËÁÎÁÌØÎÙÈ ÁÄÒÅÓÏ× ×ÙËÌÀŞÅÎ.\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1804
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  áÌÉÓÙ ÓÅÒ×ÅÒÁ ÂÕÄÕÔ ÓÒÁ×ÎÅÎÙ Ó ÍÎÏÇÏËÁÎÁÌØÎÙÍÉ ÁÄÒÅÓÁÍÉ ĞÏ IP-ÁÄÒÅÓÕ.\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1806
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  áÌÉÓÙ ÓÅÒ×ÅÒÁ ÂÕÄÕÔ ÓÒÁ×ÎÅÎÙ Ó ÍÎÏÇÏËÁÎÁÌØÎÙÍÉ ÁÄÒÅÓÁÍÉ ĞÏ ÉÍÅÎÉ.\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1809
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  íÁÒÛÒÕÔÉÚÁÃÉÑ ÏÈ×ÁÔÙ×ÁÀİÅÇÏ ÁÄÒÅÓÁ ÏÔËÌÀŞÅÎÁ\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1812
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  ïÈ×ÁÔÙ×ÁÀİÉÊ ÚÁÇÏÌÏ×ÏË ÄÏÌÖÅÎ ÂÙÔØ: %s\n"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1813
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1815
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  ëÏÌÉŞÅÓÔ×Ï ÏÈ×ÁÔÙ×ÁÀİÉÈ ÚÁÇÏÌÏ×ËÏ× ÄÌÑ ĞÁÒÓÉÎÇÁ: %d\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1818
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  ğÒÅÆÉËÓ %s ÂÕÄÅÔ ÕÄÁÌÅÎ ÉÚ id ĞÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1821
 msgid "  No prefix stripping\n"
 msgstr "  îÅÔ ÒÁÚÂÏÒËÉ ĞÒÅÆÉËÓÁ\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1828
 msgid "  Predeclared mailserver aliases:"
 msgstr "  òÁÎÅÅ ÏÂßÑ×ÌÅÎÎÙÅ ÁÌÉÁÓÙ ĞÏŞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ:"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1837
 msgid "  Local domains:"
 msgstr "  ìÏËÁÌØÎÙÅ ÄÏÍÅÎÙ:"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1847
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  ğÏÄËÌÀŞÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ %s.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1849
 msgid "  No interface requirement specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÙ ÔÒÅÂÏ×ÁÎÉÑ ÉÎÔÅÒÆÅÊÓÁ.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1851
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ãÉËÌ ÏĞÒÏÓÁ ÂÕÄÅÔ ÎÁÂÌÀÄÁÔØ ÚÁ %s.\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1853
 msgid "  No monitor interface specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎ ÉÎÔÅÒÆÅÊÓ ÍÏÎÉÔÏÒÁ.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1857
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  ğÏÄËÌÀŞÅÎÉÑ Ë ÓÅÒ×ÅÒÕ ÂÕÄÕÔ ×ÙĞÏÌÎÑÔØÓÑ ĞÏÓÒÅÄÓÔ×ÏÍ ĞÌÁÇÉÎÁ %s (--plugin %"
 "s).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1859
 msgid "  No plugin command specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÁ ËÏÍÁÎÄÁ ĞÌÁÇÉÎÁ.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1861
 #, 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:1863
 msgid "  No plugout command specified.\n"
 msgstr "  îÅ ÕËÁÚÁÎÁ ËÏÍÁÎÄÁ plugout'Á.\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1868
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ó ÜÔÏÇÏ ÈÏÓÔÁ ÎÅÔ ÓÏÈÒÁÎÅÎÎÙÈ UID'Ï×.\n"
 
-#: fetchmail.c:1873
+#: fetchmail.c:1877
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  óÏÈÒÁÎÅÎÏ %d UID'Ï×.\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1885
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  éÎÆÏÒÍÁÃÉÑ Ó ÔÒÁÓÓÉÒÏ×ËÏÊ ÏĞÒÏÓÁ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ÚÁÇÏÌÏ×ÏË Received.\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1887
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1526,7 +1530,7 @@ msgstr ""
 "  éÎÆÏÒÍÁÃÉÑ Ó ÔÒÁÓÓÉÒÏ×ËÏÊ ÏĞÒÏÓÁ ÎÅ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ÚÁÇÏÌÏ×ÏË Received.\n"
 ".\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1890
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ó×ÏÊÓÔ×Á ÒÅÔÒÁÎÓÌÑÃÉÉ \"%s\".\n"
@@ -1604,77 +1608,77 @@ msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÙÈ ÄÁÎÎÙÈ\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ĞÏÔÏË ĞÒÉÏÓÔÁÎÏ×ÌÅÎ × ÔÅŞÅÎÉÅ %d ÓÅËÕÎÄ.\n"
 
-#: imap.c:281
+#: imap.c:280
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP4 ÒÅ×ÉÚÉÑ 1\n"
 
-#: imap.c:287
+#: imap.c:286
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP4 ÒÅ×ÉÚÉÑ 0\n"
 
-#: imap.c:294
+#: imap.c:293
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "ğÒÏÔÏËÏÌ ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎ ËÁË IMAP2 ÉÌÉ IMAP2BIS\n"
 
-#: imap.c:309
+#: imap.c:308
 msgid "will idle after poll\n"
 msgstr "ÂÕÄÅÔ ĞÒÉÏÓÔÁÎÏ×ÌÅÎ ĞÏÓÌÅ ÏĞÒÏÓÁ\n"
 
-#: imap.c:462
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail ÏÔËÏÍĞÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ĞÏÄÄÅÒÖËÉ OTP\n"
 
-#: imap.c:484
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail ÏÔËÏÍĞÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ĞÏÄÄÅÒÖËÉ NTLM\n"
 
-#: imap.c:493
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "ôÒÅÂÕÅÍÁÑ ÏĞÃÉÑ LOGIN ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÓÅÒ×ÅÒÏÍ\n"
 
-#: imap.c:644 imap.c:710
+#: imap.c:643 imap.c:709
 msgid "expunge failed\n"
 msgstr "ÕÄÁÌÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:662 imap.c:695
+#: imap.c:661 imap.c:694
 msgid "re-poll failed\n"
 msgstr "ĞÏ×ÔÏÒÎÙÊ ÏĞÒÏÓ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:670
+#: imap.c:669
 #, 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:681
 msgid "mailbox selection failed\n"
 msgstr "×ÙÂÏÒ ĞÏŞÔÏ×ÏÇÏ ÑİÉËÁ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 
-#: imap.c:686
+#: imap.c:685
 #, 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:713
 #, 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:738
 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:768 pop3.c:705 pop3.c:717 pop3.c:939 pop3.c:946
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ÎÅ ĞÒÏÓÍÏÔÒÅÎÏ\n"
 
-#: imap.c:781 pop3.c:695
+#: imap.c:780 pop3.c:726
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ĞÅÒ×ÏÅ ÎÅ ĞÒÏÓÍÏÔÒÅÎÎÏÅ\n"
@@ -1862,7 +1866,7 @@ msgstr "ÓÅÒ×ÅÒ ĞÒÅËÒÁÔÉÌ ĞÏÌÕŞÅÎÉÅ\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÄÅËÏÄÉÒÏ×ÁÔØ ÚÁĞÒÏÓ OTP\n"
 
-#: opie.c:58 pop3.c:505
+#: opie.c:58 pop3.c:510
 msgid "Secret pass phrase: "
 msgstr "óÅËÒÅÔÎÁÑ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÁÑ ÆÒÁÚÁ:"
 
@@ -2165,40 +2169,48 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ÏÔÏÂÒÁÖÅÎÉÅ ÔÏŞÅŞÎÏÊ ÓÔÒÏËÉ ĞÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ\n"
 
-#: pop3.c:543
+#: pop3.c:548
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "÷ ĞÒÉ×ÅÔÓÔ×ÉÉ ÎÅ ÎÁÊÄÅÎÁ ÔÒÅÂÕÅÍÁÑ ×ÒÅÍÅÎÎÁÑ ÍÅÔËÁ APOP\n"
 
-#: pop3.c:552
+#: pop3.c:557
 msgid "Timestamp syntax error in greeting\n"
 msgstr "÷ ĞÒÉ×ÅÔÓÔ×ÉÉ ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ ×ÒÅÍÅÎÎÏÊ ÍÅÔËÉ\n"
 
-#: pop3.c:574
+#: pop3.c:579
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "îÅÏĞÒÅÄÅÌÅÎÎÙÊ ÚÁĞÒÏÓ ĞÒÏÔÏËÏÌÁ × POP3_auth\n"
 
-#: pop3.c:582
+#: pop3.c:587
 msgid "lock busy!  Is another session active?\n"
 msgstr "ÂÌÏËÉÒÏ×ËÁ ÚÁÎÑÔÏÓÔÉ!  íÏÖÅÔ ÁËÔÉ×ÅÎ ÄÒÕÇÏÊ ÓÅÁÎÓ?\n"
 
-#: pop3.c:665 pop3.c:894
+#: pop3.c:649
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:669
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:696 pop3.c:930
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (ÎÏÍÅÒ=%d) ÂÙÌÏ ÕÄÁÌÅÎÏ, ÎÏ ×ÓÅ ÅİÅ ĞÒÉÓÕÔÓÔ×ÕÅÔ!\n"
 
-#: pop3.c:767
+#: pop3.c:798
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "óÏÏÂİÅÎÉÑ ÄÏÂÁ×ÌÅÎÙ × ÓĞÉÓÏË ÎÁ ÓÅÒ×ÅÒÅ. ïÂÒÁÂÏÔËÁ ÎÅ×ÏÚÍÏÖÎÁ.\n"
 
-#: pop3.c:853
+#: pop3.c:884
 msgid "protocol error\n"
 msgstr "ÏÛÉÂËÁ ĞÒÏÔÏËÏÌÁ\n"
 
-#: pop3.c:868
+#: pop3.c:899
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ÏÛÉÂËÁ ĞÒÏÔÏËÏÌÁ ĞÒÉ ×ÙÂÏÒËÅ UIDL'Ï×\n"
 
-#: pop3.c:1225
+#: pop3.c:1261
 msgid "Option --remote is not supported with POP3\n"
 msgstr "ïĞÃÉÑ --remote ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ Ó POP3\n"
 
@@ -2451,110 +2463,110 @@ msgstr "MD5 ĞÒÉÍÅÎÑÅÔÓÑ Ë ÂÌÏËÕ ÄÁÎÎÙÈ:\n"
 msgid "MD5 result is: \n"
 msgstr "òÅÚÕÌØÔÁÔ MD5: \n"
 
-#: sink.c:247
+#: sink.c:246
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "ĞÅÒÅÁÄÒÅÓÏ×Ù×ÁÅÔÓÑ ÎÁ %s\n"
 
-#: sink.c:332
+#: sink.c:331
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (ÔÅÌÏ ÓÏÏÂİÅÎÉÑ-ÒÉËÏÛÅÔÁ)\n"
 
-#: sink.c:335
+#: sink.c:334
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "ĞÉÓØÍÏ ÏÔ %s ÏÔĞÒÁ×ÌÅÎÏ ÒÉËÏÛÅÔÏÍ ÎÁ %s\n"
 
-#: sink.c:467
+#: sink.c:466
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "óÏÈÒÁÎÅÎÎÁÑ ÏÛÉÂËÁ ×ÓÅ ÅİÅ %d\n"
 
-#: sink.c:526 sink.c:606
+#: sink.c:525 sink.c:605
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "ïÛÉÂËÁ %cMTP: %s\n"
 
-#: sink.c:761
+#: sink.c:760
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "ïÔËÒÙÔÉÅ ÆÁÊÌÁ BSMTP ÉÌÉ ÚÁĞÉÓØ ÚÁÇÏÌÏ×ËÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁŞÅÊ\n"
 
-#: sink.c:970
+#: sink.c:969
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "óÌÕÛÁÔÅÌÀ %cMTP ÎÅ ĞÏÎÒÁ×ÉÌÓÑ ÁÄÒÅÓ ĞÏÌÕŞÁÔÅÌÑ `%s'\n"
 
-#: sink.c:977
+#: sink.c:976
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "óÌÕÛÁÔÅÌÀ %cMTP × ÓÁÍÏÍ ÄÅÌÅ ÎÅ ĞÏÎÒÁ×ÉÌÓÑ ÁÄÒÅÓ ĞÏÌÕŞÁÔÅÌÑ `%s'\n"
 
-#: sink.c:1015
+#: sink.c:1014
 msgid "no address matches; no postmaster set.\n"
 msgstr "ÎÅÔ ÓÏĞÏÓÔÁ×ÌÅÎÎÙÈ ÁÄÒÅÓÏ×; ĞÏÓÔÍÁÓÔÅÒ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ.\n"
 
-#: sink.c:1027
+#: sink.c:1026
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ÄÁÖÅ ÎÅ×ÏÚÍÏÖÎÏ ÏÔĞÒÁ×ÉÔØ ÎÁ %s!\n"
 
-#: sink.c:1033
+#: sink.c:1032
 #, 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:1558
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2897,3 +2909,15 @@ msgstr "malloc ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁŞÅÊ\n"
+
+#, fuzzy
+#~ msgid "%d is unseen\n"
+#~ msgstr "%u ÎÅ ĞÒÏÓÍÏÔÒÅÎÏ\n"
+
+#, fuzzy
+#~ msgid "%lu is unseen\n"
+#~ msgstr "%u ÎÅ ĞÒÏÓÍÏÔÒÅÎÏ\n"
+
+#, fuzzy
+#~ msgid "id=%s (num=%lu) was deleted, but is still present!\n"
+#~ msgstr "id=%s (ÎÏÍÅÒ=%d) ÂÙÌÏ ÕÄÁÌÅÎÏ, ÎÏ ×ÓÅ ÅİÅ ĞÒÉÓÕÔÓÔ×ÕÅÔ!\n"
diff --git a/po/sq.po b/po/sq.po
index 75693e08..84902e99 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5.991\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-04-25 19:21+0200\n"
+"POT-Creation-Date: 2005-07-06 00:35+0200\n"
 "PO-Revision-Date: 2005-04-25 15:00+0300\n"
 "Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -45,21 +45,21 @@ msgstr "nuk munda të çkodoj BASE64 challenge\n"
 msgid "decoded as %s\n"
 msgstr "çkoduar si  %s\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "gabim kerberos %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [shërbyesi thotë '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subjekt: Sinjalizim nga Fetchmail rreth mesazhesh tej mase"
 
-#: driver.c:340
+#: driver.c:342
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -67,114 +67,119 @@ msgstr ""
 "\n"
 "Mesazhet vijues tej mase mbesin në shërbyesin e postës %s:"
 
-#: driver.c:358
+#: driver.c:360
 #, fuzzy, c-format
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d msg me gjatësi %d oktete u anashkaluan prej fetchmail-it.\n"
 
-#: driver.c:498
+#: driver.c:500
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "po anashkaloj mesazh %s@%s:%d"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "po anashkaloj mesazh %s@%s:%d (%d tetëshe)"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (gjatësi -1)"
 
-#: driver.c:569
+#: driver.c:571
 msgid " (oversized)"
 msgstr " (tej mase)"
 
-#: driver.c:584
+#: driver.c:586
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nuk munda të sjell tituj, mesazh %s@%s:%d (%d tetëshe)\n"
 
-#: driver.c:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "po lexoj mesazh %s@%s:%d nga %d"
 
-#: driver.c:609
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:608
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %s tetëshe)"
 
-#: driver.c:610
-msgid "header "
-msgstr "titull "
+#: driver.c:609
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d tetëshe trupi) "
 
-#: driver.c:682
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d tetëshe trupi) "
 
-#: driver.c:740
+#: driver.c:739
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: driver.c:771
+#: driver.c:770
 msgid " retained\n"
 msgstr "mbjatur\n"
 
-#: driver.c:780
+#: driver.c:779
 msgid " flushed\n"
 msgstr " zbrazur\n"
 
-#: driver.c:797
+#: driver.c:796
 msgid " not flushed\n"
 msgstr " i pa zbrazur\n"
 
 #: driver.c:813
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr ""
+#, 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] ""
+"mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
+msgstr[1] ""
 "mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
 
-#: driver.c:875
+#: driver.c:876
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE hedhur nga një MDA ose gabim \"stream socket\"\n"
 
-#: driver.c:882
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "mbarim kohe pas %d sekondash po pres për t'u lidhur me shërbyesin %s.\n"
 
-#: driver.c:886
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për shërbyesin %s.\n"
 
-#: driver.c:890
+#: driver.c:891
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për %s.\n"
 
-#: driver.c:895
+#: driver.c:896
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "mbarim kohe pas %d sekondash po pres të përgjigjet dëgjuesi.\n"
 
-#: driver.c:898
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "mbarim kohe pas %d sekondash.\n"
 
-#: driver.c:910
+#: driver.c:911
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjekt: fetchmail-i sheh mbarime të përsëritur kohe\n"
 
-#: driver.c:913
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -183,7 +188,7 @@ msgstr ""
 "Fetchmail-i vërejti më tepër se %d mbarime kohe ndërsa përpiqej të merrte "
 "postë prej %s@%s.\n"
 
-#: driver.c:917
+#: driver.c:918
 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"
@@ -200,56 +205,56 @@ msgstr ""
 "\n"
 "Fetchmail-i nuk do të vjelë sërish prej kësaj kutie para se ta rinisni.\n"
 
-#: driver.c:946
+#: driver.c:947
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "urdhri para-lidhje dështoi me përfundim %d\n"
 
-#: driver.c:977
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nuk munda të gjej kuti postare HESIOD for %s\n"
 
-#: driver.c:999
+#: driver.c:1000
 msgid "Lead server has no name.\n"
 msgstr "Shërbyesi udhëheqës nuk ka emër.\n"
 
-#: driver.c:1022
+#: driver.c:1024 driver.c:1050
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "nuk munda të gjej emër DNS kanonikal të %s (%s)\n"
 
-#: driver.c:1059
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "paqëndrueshmëri e brendshme\n"
 
-#: driver.c:1069
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "lidhja %s me %s dështoi"
 
-#: driver.c:1075
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "streha është e panjohur."
 
-#: driver.c:1078
+#: driver.c:1107
 msgid "name is valid but has no IP address."
 msgstr "emri është i vlefshëm por nuk ka vendndodhje IP."
 
-#: driver.c:1081
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "gabim i pandreqshëm emri shërbyesi."
 
-#: driver.c:1083
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "gabim i përkohshëm emri shërbyesi."
 
-#: driver.c:1086
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "gabim i panjohur DNS %d."
 
-#: driver.c:1104
+#: driver.c:1133
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -257,45 +262,45 @@ msgstr ""
 "\n"
 "Fetchmail-i nuk mundi të kapë shërbyes poste %s:"
 
-#: driver.c:1106
+#: driver.c:1135
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail-i nuk mundi të marrë postë prej %s@%s.\n"
 
-#: driver.c:1133 imap.c:367 pop3.c:410
+#: driver.c:1162 imap.c:367 pop3.c:420
 msgid "SSL connection failed.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: driver.c:1186
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gabim duket-i-zënë te %s@%s\n"
 
-#: driver.c:1190
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gabim shërbyes i zënë te %s@%s\n"
 
-#: driver.c:1195
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Dështim autorizimi te %s@%s%s\n"
 
-#: driver.c:1198
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr " (autorizuar dikur)"
 
-#: driver.c:1219
+#: driver.c:1248
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subjekt: mirëfilltësimi fetchmail dështoi te %s@%s"
 
-#: driver.c:1223
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail-i nuk mundi të marrë postë prej %s@%s.\n"
 
-#: driver.c:1227
+#: driver.c:1256
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -326,7 +331,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1242
+#: driver.c:1271
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -347,163 +352,163 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1257
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Rivil menjëherë te %s@%s\n"
 
-#: driver.c:1262
+#: driver.c:1291
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Gabim mirëfilltësimi ose hyrje e panjohur te %s@%s\n"
 
-#: driver.c:1286
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "OK autorizimi te %s@%s\n"
 
-#: driver.c:1292
+#: driver.c:1321
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subjekt: OK mirëfilltësimi fetchmail-i te %s@%s\n"
 
-#: driver.c:1296
+#: driver.c:1325
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail-i mundi të hyjë te %s@%s.\n"
 
-#: driver.c:1300
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "Shërbimi është rivendosur.\n"
 
-#: driver.c:1331
+#: driver.c:1360
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "po përzgjedh ose vjel prej dosjes %s\n"
 
-#: driver.c:1333
+#: driver.c:1362
 msgid "selecting or re-polling default folder\n"
 msgstr "po përzgjedh ose vjel prej dosjes parazgjedhje\n"
 
-#: driver.c:1345
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s te %s (dosja %s)"
 
-#: driver.c:1348 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s te %s"
 
-#: driver.c:1353
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "Po mbledh %s\n"
 
-#: driver.c:1357
+#: driver.c:1386
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mesazh (%d %s) për %s"
 msgstr[1] "%d mesazhe (%d %s) për %s"
 
-#: driver.c:1360
+#: driver.c:1389
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "parë"
 msgstr[1] "parë"
 
-#: driver.c:1363
+#: driver.c:1392
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mesazh për %s"
 msgstr[1] "%d mesazhe për %s"
 
-#: driver.c:1370
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktete).\n"
 
-#: driver.c:1376
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Pa postë për %s\n"
 
-#: driver.c:1409
+#: driver.c:1438
 msgid "bogus message count!"
 msgstr "numërim i gabuar mesazhesh!"
 
-#: driver.c:1510
+#: driver.c:1539
 msgid "socket"
 msgstr "\"socket\""
 
-#: driver.c:1513
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "titull RFC822 mungues ose i dëmtuar"
 
-#: driver.c:1516
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1519
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "njëkohësim klient/server"
 
-#: driver.c:1522
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "protokoll klient/server"
 
-#: driver.c:1525
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr ""
 
-#: driver.c:1528
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "shkëmbim SMTP"
 
-#: driver.c:1531
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "kërkim DNS"
 
-#: driver.c:1534
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "gabim i papërcaktuar\n"
 
-#: driver.c:1545
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "gabim %s gjatë shpërndarjes te strehë SMTP %s\n"
 
-#: driver.c:1547
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "gabim %s përgjatë sjelljes prej %s\n"
 
-#: driver.c:1555
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "urdhër pas-lidhjeje dështoi me gjendje %d\n"
 
-#: driver.c:1576
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr ""
 
-#: driver.c:1584
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr ""
 
-#: driver.c:1595
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Mundësia --zbrazje nuk mbulohet me %s\n"
 
-#: driver.c:1601
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Mundësia --all nuk mbulohet me %s\n"
 
-#: driver.c:1609
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Mundësi --limit nuk mbulohet me %s\n"
@@ -620,15 +625,15 @@ msgstr "Mundësia --remote nuk mbulohet me ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Mundësia --check nuk mbulohet me ETRN\n"
 
-#: fetchmail.c:168
+#: fetchmail.c:167
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: thirrur me"
 
-#: fetchmail.c:192
+#: fetchmail.c:191
 msgid "could not get current working directory\n"
 msgstr "nuk munda të kem drejtori punuese të çastit\n"
 
-#: fetchmail.c:202
+#: fetchmail.c:201
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ky është versioni %s i fetchmail-it"
@@ -1007,502 +1012,546 @@ msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do të merret përmes %s\n"
 
 #: fetchmail.c:1505
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Vjelja e këtij shërbyesi do të ngjasë çdo %d intervale.\n"
+#, 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] "  Vjelja e këtij shërbyesi do të ngjasë çdo %d intervale.\n"
+msgstr[1] "  Vjelja e këtij shërbyesi do të ngjasë çdo %d intervale.\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1509
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i vërtetë i shërbyesit është %s.\n"
 
-#: fetchmail.c:1510
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1512
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Kjo strehë %s pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1511 fetchmail.c:1626 fetchmail.c:1629
-msgid "will not"
-msgstr "nuk do të"
-
-#: fetchmail.c:1511 fetchmail.c:1626 fetchmail.c:1629
-msgid "will"
-msgstr "do të"
+#: fetchmail.c:1513
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Kjo strehë %s pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1517
 msgid "  Password will be prompted for.\n"
 msgstr "  Do të kërkohet fjalëkalim.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1521
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Sekret APOP= \"%s\".\n"
 
-#: fetchmail.c:1522
+#: fetchmail.c:1524
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1527
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjalëkalim = \"%s\".\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli është KPOP me mirëfilltësim Kerberos %s"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll është %s"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1546
 #, c-format
 msgid " (using service %s)"
 msgstr " (po përdor shërbim %s)"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1548
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (po përdor mundësi sigurie rrjeti %s)"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1551
 #, c-format
 msgid " (using port %d)"
 msgstr " (po përdor portë %d)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1554
 msgid " (using default port)"
 msgstr " (po përdor portë parazgjedhje)"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1556
 msgid " (forcing UIDL use)"
 msgstr " (po detyroj përdorim UIDL)"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1562
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Do të provohen tërë metodat e mundshme për mirëfilltësim.\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1565
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim me fjalëkalim.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1568
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim NTLM.\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1571
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1574
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-Md5.\n"
 
-#: fetchmail.c:1575
+#: fetchmail.c:1577
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim GSSAPI.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1580
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V4.\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1583
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V5.\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1586
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Nënkuptohet kodim cep-më-cep.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1590
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Parësori i shërbimit postar është: %s\n"
 
-#: fetchmail.c:1591
+#: fetchmail.c:1593
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Mundësuar sesione SSL të koduar.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1597
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Mundësuar kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  drejtori dëshmish SSL të besueshme: %s\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1602
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  shenjë gishtash kyçi SSL (kontrolluar kundrejt kyçi shërbyesi): %s\n"
 
-#: fetchmail.c:1603
+#: fetchmail.c:1605
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mospërgjigjes së shërbyesit është %d sekonda"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1607
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1614
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e përzgjedhur.\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1619
 msgid "  Selected mailboxes are:"
 msgstr "  Kutitë postare të përzgjedhura janë:"
 
-#: fetchmail.c:1622
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  do të merren %s mesazhet (--all %s).\n"
 
-#: fetchmail.c:1623
-msgid "All"
-msgstr "Tërë"
+#: fetchmail.c:1626
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  do të merren %s mesazhet (--all %s).\n"
 
-#: fetchmail.c:1623
-msgid "Only new"
-msgstr "Vetëm të rinjtë"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Mesazhet e sjellë %s mbahen në shërbyes (--keep %s).\n"
 
-#: fetchmail.c:1625
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1629
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesazhet e sjellë %s mbahen në shërbyes (--keep %s).\n"
 
-#: fetchmail.c:1628
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1631
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mesazhet e vjetër %s zbrazen para marrjes së mesazheve (--flush %s).\n"
 
-#: fetchmail.c:1631
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1632
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Mesazhet e vjetër %s zbrazen para marrjes së mesazheve (--flush %s).\n"
+
+#: fetchmail.c:1634
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  Rishkrimi i vendndodhjeve vendore të shërbyesit është %s (--norewrite %"
 "s).\n"
 
-#: fetchmail.c:1632 fetchmail.c:1635 fetchmail.c:1638 fetchmail.c:1641
-#: fetchmail.c:1644 fetchmail.c:1647 fetchmail.c:1794
-msgid "enabled"
-msgstr "veprues"
+#: fetchmail.c:1635
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr ""
+"  Rishkrimi i vendndodhjeve vendore të shërbyesit është %s (--norewrite %"
+"s).\n"
 
-#: fetchmail.c:1632 fetchmail.c:1635 fetchmail.c:1638 fetchmail.c:1641
-#: fetchmail.c:1644 fetchmail.c:1647 fetchmail.c:1794
-msgid "disabled"
-msgstr "joveprues"
+#: fetchmail.c:1637
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Heqja e \"carriage-return\"-it është %s (stripcr %s).\n"
 
-#: fetchmail.c:1634
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1638
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e \"carriage-return\"-it është %s (stripcr %s).\n"
 
-#: fetchmail.c:1637
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "Detyrimi i \"carriage-return\"-it %s (forcecr %s).\n"
 
-#: fetchmail.c:1640
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1641
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "Detyrimi i \"carriage-return\"-it %s (forcecr %s).\n"
+
+#: fetchmail.c:1643
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është %s (pass8bits %"
 "s).\n"
 
-#: fetchmail.c:1643
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
-msgstr "  Kodimi MIME është %s (mimedecode %s).\n"
+#: fetchmail.c:1644
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është %s (pass8bits %"
+"s).\n"
 
 #: fetchmail.c:1646
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
-msgstr "Plogështia pas vjeljes është %s (plogështi %s). \n"
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
+msgstr "  Kodimi MIME është %s (mimedecode %s).\n"
+
+#: fetchmail.c:1647
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  Kodimi MIME është %s (mimedecode %s).\n"
 
 #: fetchmail.c:1649
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
+msgstr "Plogështia pas vjeljes është %s (plogështi %s). \n"
+
+#: fetchmail.c:1650
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "Plogështia pas vjeljes është %s (plogështi %s). \n"
+
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Rreshta Gjendjeje Joboshe do të jenë %s (dropstatus %s)\n"
 
-#: fetchmail.c:1650 fetchmail.c:1653
-msgid "discarded"
-msgstr "hedhur tej"
+#: fetchmail.c:1653
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Rreshta Gjendjeje Joboshe do të jenë %s (dropstatus %s)\n"
 
-#: fetchmail.c:1650 fetchmail.c:1653
-msgid "kept"
-msgstr "mbajtur"
+#: fetchmail.c:1655
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  Rreshtat Nisur Për do të jenë %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1652
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1656
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur Për do të jenë %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1659
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Kufiri i madhësisë së mesazheve është %d tetëshe (--limit %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1662
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1664
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1666
+#: fetchmail.c:1667
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madhësie në çdo vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1670
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Kufiri për mesazhe të marrë është %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1673
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa kufi për mesazhe të marrë (--fetchlimit 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1675
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Kufi madhësie mesazhesh që sillen është %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1678
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh që sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1682
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1684
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1687
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Kryej kërkim linear të UID-ve gjatë çdo vjeljeje (--fastuidl 0).\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1689
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Kufiri për tufë mesazhesh SMTP është %d.\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1691
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa kufi për tufë mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1695
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval fshirjesh ndërmjet shuarjesh detyruar në %d (--expunge %d).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1697
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje të detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1704
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Përkatësitë për të cilat do të jepet postë janë:"
 
-#: fetchmail.c:1708 fetchmail.c:1728
+#: fetchmail.c:1709 fetchmail.c:1729
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1714
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesazhet do të vargëzohen te %s si BSMTP\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1716
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do të shpërndahen me \"%s\".\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1723
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do të përcillen si %cMTP te:"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1734
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1737
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Vendndodhja që do vendoset tek rreshtat RCPT TO të dërguar te SMTP do të "
 "jetë %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1746
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Përgjigje të pranuara blloqesh spam dëgjuesi janë:"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1752
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokim spamesh i çaktivizuar\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1755
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të sillet me \"%s\".\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1758
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdhër para-lidhjeje.\n"
 
-#: fetchmail.c:1759
+#: fetchmail.c:1760
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të lihet me \"%s\".\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1763
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdhër pas-lidhjeje.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1766
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendorë të deklaruar për këtë strehë.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1776
 msgid "  Multi-drop mode: "
 msgstr "  Mënyrë shpërndarje e shumëfishtë: "
 
-#: fetchmail.c:1777
+#: fetchmail.c:1778
 msgid "  Single-drop mode: "
 msgstr "  Mënyrë shpërndarje njëshe: "
 
-#: fetchmail.c:1779
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d emra vendorë të pranuar.\n"
+#: fetchmail.c:1780
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d emra vendorë të pranuar.\n"
+msgstr[1] "%d emra vendorë të pranuar.\n"
 
-#: fetchmail.c:1793
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1795
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
+msgstr "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është %s.\n"
+
+#: fetchmail.c:1796
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është %s.\n"
 
-#: fetchmail.c:1797
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1800
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
 "shumëfishta nga "
 
-#: fetchmail.c:1799
-msgid "IP address.\n"
-msgstr "Vendndodhje IP.\n"
-
-#: fetchmail.c:1801
-msgid "name.\n"
-msgstr "emër.\n"
+#: fetchmail.c:1802
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr ""
+"  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
+"shumëfishta nga "
 
-#: fetchmail.c:1804
+#: fetchmail.c:1805
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Përcjellje vendndodhjesh zarf është çaktivizuar\n"
 
-#: fetchmail.c:1807
+#: fetchmail.c:1808
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Titulli zarf nënkuptohet të jetë: %s\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1809
 msgid "Received"
 msgstr "Marrë"
 
-#: fetchmail.c:1810
+#: fetchmail.c:1811
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Numër titujsh zarf për t'u përtypur: %d\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1814
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Parashtesa %s do të hiqet prej id-je përdoruesi\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1817
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1824
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash shërbyesi të paradeklaruar:"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1833
 msgid "  Local domains:"
 msgstr "  Përkatësi vendore:"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1843
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet të jetë përmes ndërfaqes %s.\n"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1845
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht të përcaktuar rreth ndërfaqes.\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1847
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do të mbikqyrë %s.\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1849
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa ndërfaqe mbikqyrjeje të përcaktuar.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1853
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n"
 
-#: fetchmail.c:1854
+#: fetchmail.c:1855
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1857
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Lidhje dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1859
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdhër shtojce daljeje të përcaktuar.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1864
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID të ruajtura prej kësaj strehe.\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1873
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID të ruajtur.\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1881
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Të dhëna gjurmimi vjeljeje do të shtohen te titulli Të Marrë.\n"
 
-#: fetchmail.c:1882
+#: fetchmail.c:1883
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1510,7 +1559,7 @@ msgstr ""
 "  Nuk do të shtohen të dhëna gjurmimi vjeljeje te titulli Të Marrë.\n"
 ".\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1886
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-nëpër \"%s\".\n"
@@ -1614,43 +1663,49 @@ msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
 
-#: imap.c:644 imap.c:706
+#: imap.c:644 imap.c:710
 msgid "expunge failed\n"
 msgstr "shuarja dështoi\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:662 imap.c:695
 msgid "re-poll failed\n"
 msgstr "rivjelja dështoi\n"
 
 #: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d mesazhe në pritje pas rivjeljes\n"
+#, fuzzy, c-format
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "%d mesazhe në pritje pas rivjeljes\n"
+msgstr[1] "%d mesazhe në pritje pas rivjeljes\n"
 
-#: imap.c:680
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr "përzgjedhja e kutisë postare dështoi\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "%d mesazhe në pritje pas vjeljes së parë\n"
+#: imap.c:686
+#, fuzzy, c-format
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "%d mesazhe në pritje pas vjeljes së parë\n"
+msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n"
 
-#: imap.c:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "%d mesazhe në pritje pas shuarjes\n"
+#: imap.c:714
+#, fuzzy, c-format
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "%d mesazhe në pritje pas shuarjes\n"
+msgstr[1] "%d mesazhe në pritje pas shuarjes\n"
 
-#: imap.c:733
+#: imap.c:739
 msgid "search for unseen messages failed\n"
 msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
 
-#: imap.c:763 pop3.c:665 pop3.c:677 pop3.c:894 pop3.c:901
+#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:775 pop3.c:686
+#: imap.c:781 pop3.c:695
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\n"
@@ -1840,7 +1895,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:58 pop3.c:495
+#: opie.c:58 pop3.c:505
 msgid "Secret pass phrase: "
 msgstr "Frazë pass sekrete: "
 
@@ -2133,41 +2188,41 @@ msgstr "  -r, --folder      cakto emër dosjeje të largët\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika përparimi edhe në kartela regjistrimi\n"
 
-#: pop3.c:533
+#: pop3.c:543
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
 
-#: pop3.c:542
+#: pop3.c:552
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore në përshëndetje\n"
 
-#: pop3.c:564
+#: pop3.c:574
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
 
-#: pop3.c:572
+#: pop3.c:582
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:656 pop3.c:885
+#: pop3.c:665 pop3.c:894
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:758
+#: pop3.c:767
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
 
-#: pop3.c:844
+#: pop3.c:853
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:859
+#: pop3.c:868
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 
-#: pop3.c:1216
+#: pop3.c:1225
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Mundësia --remote nuk mbulohet me POP3\n"
 
@@ -2245,6 +2300,22 @@ msgstr "Gati për rishkrimin e %s"
 msgid "Rewritten version is %s\n"
 msgstr "Versioni i rishkruar është %s\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr ""
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr ""
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr ""
+
+#: rpa.c:120
+msgid "Deity error"
+msgstr ""
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: gabim çkodimi Base64\n"
@@ -2435,82 +2506,82 @@ msgstr "gabim %cMTP: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
 
-#: sink.c:966
+#: sink.c:970
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Dëgjesi %cMTP nuk e pëlqen vendndodhjen e marrësit `%s'\n"
 
-#: sink.c:973
+#: sink.c:977
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "dëgjuesi %cMTP nuk e ka dhe aq qejf vendndodhjen e marrësit `%s'\n"
 
-#: sink.c:1011
+#: sink.c:1015
 msgid "no address matches; no postmaster set.\n"
 msgstr "pa përputhje vendndodhjesh; s'është caktuar \"postmaster\".\n"
 
-#: sink.c:1023
+#: sink.c:1027
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "s'mund as të dërgoj te %s!\n"
 
-#: sink.c:1029
+#: sink.c:1033
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "pa përputhje vendndodhjesh; po përcjell drejt %s.\n"
 
-#: sink.c:1182
+#: sink.c:1186
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "gati për të shpërndarë me: %s\n"
 
-#: sink.c:1206
+#: sink.c:1210
 msgid "MDA open failed\n"
 msgstr "Hapja e MDA-s dështoi\n"
 
-#: sink.c:1243
+#: sink.c:1247
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Lidhja %cMTP me %s dështoi\n"
 
-#: sink.c:1267
+#: sink.c:1271
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "s'ia dal dot me dëgjuesin; po rikthehem te %s"
 
-#: sink.c:1323
+#: sink.c:1327
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA-ja vdiq nga sinjali %d\n"
 
-#: sink.c:1326
+#: sink.c:1330
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA riktheu gjendje jo zero %d\n"
 
-#: sink.c:1329
+#: sink.c:1333
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "Çudi: MDA pclose riktheu %d, nuk mund të trajtojë %s:%d\n"
 
-#: sink.c:1350
+#: sink.c:1354
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Dështoi përfundim mesazhi ose mbyllje e kartelës BSMTP\n"
 
-#: sink.c:1371
+#: sink.c:1375
 msgid "SMTP listener refused delivery\n"
 msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
 
-#: sink.c:1401
+#: sink.c:1405
 msgid "LMTP delivery error on EOM\n"
 msgstr "Gabim shpërndarjeje LMTP në EOM\n"
 
-#: sink.c:1404
+#: sink.c:1408
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Përgjigje jo-503 e papritur për LMTP EOM: %s\n"
 
-#: sink.c:1555
+#: sink.c:1559
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2852,5 +2923,38 @@ msgstr "dështoi malloc\n"
 msgid "realloc failed\n"
 msgstr "dështoi realloc\n"
 
+#~ msgid "header "
+#~ msgstr "titull "
+
+#~ msgid "will not"
+#~ msgstr "nuk do të"
+
+#~ msgid "will"
+#~ msgstr "do të"
+
+#~ msgid "All"
+#~ msgstr "Tërë"
+
+#~ msgid "Only new"
+#~ msgstr "Vetëm të rinjtë"
+
+#~ msgid "enabled"
+#~ msgstr "veprues"
+
+#~ msgid "disabled"
+#~ msgstr "joveprues"
+
+#~ msgid "discarded"
+#~ msgstr "hedhur tej"
+
+#~ msgid "kept"
+#~ msgstr "mbajtur"
+
+#~ msgid "IP address.\n"
+#~ msgstr "Vendndodhje IP.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "emër.\n"
+
 #~ msgid "lstat: %s: %s\n"
 #~ msgstr "lstat: %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 67490bcd..11056914 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: 2004-11-14 21:55+0100\n"
+"POT-Creation-Date: 2005-07-06 00:35+0200\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"
@@ -42,21 +42,21 @@ msgstr "BASE64 challenge'ının kodunu çözemedim\n"
 msgid "decoded as %s\n"
 msgstr "%s olarak kodu çözüldü\n"
 
-#: driver.c:192
+#: driver.c:195
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos hatası %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:253 driver.c:258
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
-#: driver.c:337
+#: driver.c:339
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:340
+#: driver.c:342
 #, fuzzy, c-format
 msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
@@ -64,54 +64,55 @@ msgstr ""
 "\n"
 "Aşağıda yazılı çok büyük iletiler sunucu %s üzerinde bırakıldı:"
 
-#: driver.c:358
+#: driver.c:360
 #, 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:498
+#: driver.c:500
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlanıyor (%d sekizlik)"
 
-#: driver.c:550
+#: driver.c:552
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ileti %s@%s:%d atlanıyor (%d sekizlik)"
 
-#: driver.c:566
+#: driver.c:568
 msgid " (length -1)"
 msgstr " (büyüklük -1)"
 
-#: driver.c:569
+#: driver.c:571
 msgid " (oversized)"
 msgstr " (çok büyük)"
 
-#: driver.c:584
+#: driver.c:586
 #, 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:601
+#: driver.c:603
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:609
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:608
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %ssekizlik)"
 
-#: driver.c:610
-msgid "header "
-msgstr "başlık "
+#: driver.c:609
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (ileti gövdesi %d sekizlik) "
 
-#: driver.c:682
+#: driver.c:681
 #, c-format
 msgid " (%d body octets) "
 msgstr " (ileti gövdesi %d sekizlik) "
 
-#: driver.c:740
+#: driver.c:739
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -119,60 +120,64 @@ msgstr ""
 "%s@%s:%d iletisinin uzunluğu beklendiği kadar değil (gerçekte %d != beklenen "
 "%d)\n"
 
-#: driver.c:771
+#: driver.c:770
 msgid " retained\n"
 msgstr " bırakıldı\n"
 
-#: driver.c:780
+#: driver.c:779
 msgid " flushed\n"
 msgstr " boşaltıldı\n"
 
-#: driver.c:797
+#: driver.c:796
 msgid " not flushed\n"
 msgstr " boşaltılmadı\n"
 
 #: driver.c:813
-#, c-format
-msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr ""
+#, 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 ulaşıldı; %d ileti %s sunucusunda %s hesabında bırakıldı\n"
+msgstr[1] ""
 "`fetchlimit' %d ulaşıldı; %d ileti %s sunucusunda %s hesabında bırakıldı\n"
 
-#: driver.c:874
+#: driver.c:876
 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:881
+#: driver.c:883
 #, 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:885
+#: driver.c:887
 #, 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:889
+#: driver.c:891
 #, 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:894
+#: driver.c:896
 #, 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:897
+#: driver.c:899
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamanaşımı süresi doldu.\n"
 
-#: driver.c:909
+#: driver.c:911
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail çok sayıda zamanaşımı ile karşılaşıyor\n"
 
-#: driver.c:912
+#: driver.c:914
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -181,7 +186,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:916
+#: driver.c:918
 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"
@@ -198,59 +203,59 @@ msgstr ""
 "Fetchmail yeniden çalıştırılana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:944
+#: driver.c:947
 #, 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:975
+#: driver.c:978
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s için HESIOD pobox bulunamadı\n"
 
-#: driver.c:997
+#: driver.c:1000
 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:1020
+#: driver.c:1024 driver.c:1050
 #, 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:1057
+#: driver.c:1088
 msgid "internal inconsistency\n"
 msgstr "iç tutarsızlık\n"
 
-#: driver.c:1067
+#: driver.c:1098
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s bağlantısı başarısız oldu"
 
-#: driver.c:1073
+#: driver.c:1104
 msgid "host is unknown."
 msgstr "makina bilinmiyor."
 
-#: driver.c:1076
+#: 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:1079
+#: driver.c:1110
 msgid "unrecoverable name server error."
 msgstr "düzeltilemeyen ad sunucusu hatası."
 
-#: driver.c:1081
+#: driver.c:1112
 msgid "temporary name server error."
 msgstr "geçici ad sunucusu hatası."
 
-#: driver.c:1084
+#: driver.c:1115
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "bilinmeyen DNS hatası %d."
 
-#: driver.c:1102
+#: driver.c:1133
 #, fuzzy
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
@@ -258,45 +263,45 @@ msgstr ""
 "\n"
 "Fetchmail posta sunucusuna (%s) ulaşamadı:"
 
-#: driver.c:1104
+#: driver.c:1135
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail %s@%s'den posta alamadı.\n"
 
-#: driver.c:1131 imap.c:367 pop3.c:411
+#: driver.c:1162 imap.c:367 pop3.c:420
 msgid "SSL connection failed.\n"
 msgstr "SSL bağlantısı başarısız oldu.\n"
 
-#: driver.c:1184
+#: driver.c:1215
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Meşgul kilit hatası (%s@%s)\n"
 
-#: driver.c:1188
+#: driver.c:1219
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Sunucu meşgul hatası (%s@%s)\n"
 
-#: driver.c:1193
+#: driver.c:1224
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s'te yetkilendirme hatası\n"
 
-#: driver.c:1196
+#: driver.c:1227
 msgid " (previously authorized)"
 msgstr " (önceden yetkilendirilmiş)"
 
-#: driver.c:1217
+#: driver.c:1248
 #, 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:1221
+#: driver.c:1252
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamadı.\n"
 
-#: driver.c:1225
+#: driver.c:1256
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -326,7 +331,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:1240
+#: driver.c:1271
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -345,71 +350,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:1255
+#: driver.c:1286
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1260
+#: driver.c:1291
 #, 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:1284
+#: driver.c:1315
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1290
+#: driver.c:1321
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1294
+#: driver.c:1325
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi başardı.\n"
 
-#: driver.c:1298
+#: driver.c:1329
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden sağlanıyor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1329
+#: driver.c:1360
 #, 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:1331
+#: driver.c:1362
 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:1343
+#: driver.c:1374
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klasör %3$s)"
 
 # kaynak koduna bakılacak
-#: driver.c:1346 rcfile_y.y:401
+#: driver.c:1377 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#: driver.c:1351
+#: driver.c:1382
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklanıyor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1355
+#: driver.c:1386
 #, 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:1358
+#: driver.c:1389
 #, fuzzy
 msgid "seen"
 msgid_plural "seen"
@@ -417,98 +422,98 @@ msgstr[0] "görülmüş"
 msgstr[1] "görülmüş"
 
 # önceki iki ileti ile ilgili.
-#: driver.c:1361
+#: driver.c:1392
 #, 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:1368
+#: driver.c:1399
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1374
+#: driver.c:1405
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s için mektup yok\n"
 
-#: driver.c:1407
+#: driver.c:1438
 msgid "bogus message count!"
 msgstr "sahte ileti sayısı!"
 
-#: driver.c:1508
+#: driver.c:1539
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1511
+#: driver.c:1542
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 başlığı ya hiç yok ya da formatı kötü"
 
-#: driver.c:1514
+#: driver.c:1545
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1517
+#: driver.c:1548
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1520
+#: driver.c:1551
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokolü"
 
-#: driver.c:1523
+#: driver.c:1554
 msgid "lock busy on server"
 msgstr "sunucuda kilit meşgul"
 
 # transaction'ı işlem diye çevirdim. Doğru mu?
-#: driver.c:1526
+#: driver.c:1557
 msgid "SMTP transaction"
 msgstr "SMTP işlemi"
 
-#: driver.c:1529
+#: driver.c:1560
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1532
+#: driver.c:1563
 msgid "undefined error\n"
 msgstr "tanımlanmamış hata\n"
 
-#: driver.c:1543
+#: driver.c:1574
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "SMTP makinası %2$s'e dağıtılırken %1$s hatası\n"
 
-#: driver.c:1545
+#: driver.c:1576
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%2$s'den getirilirken %1$s hatası\n"
 
-#: driver.c:1553
+#: driver.c:1584
 #, 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:1574
+#: driver.c:1605
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 desteği yok.\n"
 
-#: driver.c:1582
+#: driver.c:1613
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 desteği yok.\n"
 
-#: driver.c:1593
+#: driver.c:1624
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush seçeneği %s ile desteklenmiyor\n"
 
-#: driver.c:1599
+#: driver.c:1630
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all seçeneği %s ile desteklenmiyor\n"
 
-#: driver.c:1607
+#: driver.c:1638
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit seçeneği %s ile desteklenmiyor\n"
@@ -626,68 +631,68 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "--check seçeneği ETRN ile desteklenmiyor\n"
 
 # bu Türkçe'nin sözdizimine uymuyor??? Ne biçim 'i18n'!! :((
-#: fetchmail.c:164
+#: fetchmail.c:167
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: bunlarla başlatıldı"
 
-#: fetchmail.c:188
+#: fetchmail.c:191
 msgid "could not get current working directory\n"
 msgstr "çalışma dizini bulunamadı\n"
 
-#: fetchmail.c:198
+#: fetchmail.c:201
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail sürüm %s"
 
-#: fetchmail.c:342
+#: fetchmail.c:346
 #, 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:343
+#: fetchmail.c:347
 msgid " and "
 msgstr " ve "
 
-#: fetchmail.c:348
+#: fetchmail.c:352
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Hiçbir posta sunucusu yok; belki %s eksik?\n"
 
-#: fetchmail.c:369
+#: fetchmail.c:373
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: hiçbir posta sunucusu belirtilmedi.\n"
 
-#: fetchmail.c:378 fetchmail.c:387
+#: fetchmail.c:382 fetchmail.c:391
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: başka bir fetchmail çalışmıyor\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:397
 #, 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:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "background"
 msgstr "arkaplan"
 
-#: fetchmail.c:394 fetchmail.c:400
+#: fetchmail.c:398 fetchmail.c:404
 msgid "foreground"
 msgstr "önplan"
 
-#: fetchmail.c:399
+#: fetchmail.c:403
 #, 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:415
+#: fetchmail.c:419
 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:421
+#: fetchmail.c:425
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -695,68 +700,68 @@ msgstr ""
 "fetchmail: %d'de çalışan başka bir fetchmail ile belirtilen makinaları "
 "yoklayamam.\n"
 
-#: fetchmail.c:428
+#: fetchmail.c:432
 #, 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:438
+#: fetchmail.c:442
 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:444
+#: fetchmail.c:448
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: %d'de arkaplanda çalışan fetchmail uyandırıldı.\n"
 
-#: fetchmail.c:456
+#: fetchmail.c:460
 #, 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:471
+#: fetchmail.c:475
 #, 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:475
+#: fetchmail.c:479
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s'in parolasını yazınız: "
 
-#: fetchmail.c:506
+#: fetchmail.c:510
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s daemon başlatılıyor \n"
 
-#: fetchmail.c:521 fetchmail.c:523
+#: fetchmail.c:525 fetchmail.c:527
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "kayıt eklemek için %s açılamadı \n"
 
-#: fetchmail.c:561
+#: fetchmail.c:565
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "dosya zamanı kontrol edilemedi %s (hata kodu %d)\n"
 
-#: fetchmail.c:566
+#: fetchmail.c:570
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail yeniden başlatılıyor (%s değişti)\n"
 
-#: fetchmail.c:571
+#: fetchmail.c:575
 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:598
+#: fetchmail.c:602
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail'i yeniden başlatma denemesi başarısız oldu\n"
 
-#: fetchmail.c:626
+#: fetchmail.c:630
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
@@ -764,118 +769,118 @@ msgstr ""
 "zamamaşımı)\n"
 
 # interval ne? time interval mi?? kaynak koduna bak
-#: fetchmail.c:638
+#: fetchmail.c:642
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "aralık ulaşılmadı, %s'i sorgulamıyorum\n"
 
-#: fetchmail.c:676
+#: fetchmail.c:680
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sorgulama durumu=0 (SUCCESS)\n"
 
-#: fetchmail.c:678
+#: fetchmail.c:682
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sorgulama durumu=1 (NOMAIL)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:684
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sorgulama durumu=2 (SOCKET)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:686
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sorgulama durumu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:688
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sorgulama durumu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:690
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sorgulama durumu=5 (SYNTAX)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:692
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sorgulama durumu=6 (IOERR)\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:694
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sorgulama durumu=7 (ERROR)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:696
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sorgulama durumu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:698
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sorgulama durumu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:700
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sorgulama durumu=10 (SMTP)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:702
 msgid "Query status=11 (DNS)\n"
 msgstr "Sorgulama durumu=11 (DNS)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:704
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sorgulama durumu=12 (BSMTP)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:706
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sorgulama durumu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:708
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sorgulama durumu=%d\n"
 
 # wedge'yi sıkışmak diye çevirdim. Uygun mu?
-#: fetchmail.c:750
+#: fetchmail.c:754
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tüm bağlantılar sıkıştı. Çıkıyorum.\n"
 
-#: fetchmail.c:757
+#: fetchmail.c:761
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "fetchmail: %s'de uyuyorum\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:785
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s tarafından uyandırıldım\n"
 
-#: fetchmail.c:784
+#: fetchmail.c:788
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d sinyali ile tarafından uyandırıldım\n"
 
-#: fetchmail.c:791
+#: fetchmail.c:795
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s'de uyandırıldım\n"
 
-#: fetchmail.c:797
+#: fetchmail.c:801
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal bitiş, durum kodu %d\n"
 
-#: fetchmail.c:950
+#: fetchmail.c:954
 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:983
+#: fetchmail.c:987
 #, 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:1128
+#: fetchmail.c:1134
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL desteği derlenirken eklenmemiş.\n"
 
 # multidrop'u çeviremedim.
-#: fetchmail.c:1159
+#: fetchmail.c:1165
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -884,69 +889,78 @@ msgstr ""
 
 #: fetchmail.c:1176
 #, c-format
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1177
+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"
 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:1183
+#: fetchmail.c:1200
 #, c-format
 msgid "%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:1199
+#: fetchmail.c:1216
 #, 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:1214
+#: fetchmail.c:1231
 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:1264
+#: fetchmail.c:1281
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1349
+#: fetchmail.c:1366
 #, 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:1374
+#: fetchmail.c:1391
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1386
+#: fetchmail.c:1403
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1413
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1419
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1425
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1432
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR desteği yapılandırılmamış.\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1438
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1444
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol seçilmiş.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1437
+#: fetchmail.c:1454
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -954,587 +968,623 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1454
+#: fetchmail.c:1471
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nabız yoklama aralığı %d saniye\n"
 
 # logfile = kayıt dosyası ?
-#: fetchmail.c:1456
+#: fetchmail.c:1473
 #, 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:1458
+#: fetchmail.c:1475
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyası %s\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1478
 msgid "Progress messages will be logged via syslog\n"
 msgstr "İlerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1464
+#: fetchmail.c:1481
 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:1466
+#: fetchmail.c:1483
 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:1468
+#: fetchmail.c:1485
 #, 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:1472
+#: fetchmail.c:1489
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1491
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini göndericiye iletecek.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1498
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek için seçenekler:\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1502
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1488
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr "  Bu sunucunun yoklaması her %d zaman aralığında yapılacak.\n"
+#: fetchmail.c:1505
+#, 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:1491
+#: fetchmail.c:1509
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun gerçek adı %s.\n"
 
 # Bu çeviriyi kontrol et.
-#: fetchmail.c:1493
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1512
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Hiçbir makina belirtilmediğinde %s sorgulanacak.\n"
 
-# Harika. Nasıl çevrilecek bu?
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will not"
-msgstr ""
-
-# Harika! Nasıl çevrilecek şimdi bu?? :(
-#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
-msgid "will"
-msgstr ""
+# Bu çeviriyi kontrol et.
+#: fetchmail.c:1513
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Hiçbir makina belirtilmediğinde %s sorgulanacak.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1517
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1502
+#: fetchmail.c:1521
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1524
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullanıcı adı = \"%s\".\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1527
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1521
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullanılıyor"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1543
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1527
+#: fetchmail.c:1546
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullanıyorum)"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1548
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (şu ağ güvenliği seçeneklerini kullanıyorum: %s)"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1551
 #, c-format
 msgid " (using port %d)"
 msgstr " (port %d kullanılıyor)"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1554
 msgid " (using default port)"
 msgstr " (öntanımlı port kullanılıyor)"
 
 # 'to force' nasıl çevrilebilir?
-#: fetchmail.c:1537
+#: fetchmail.c:1556
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullanımı istenecek)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1562
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Tüm kimlik denetleme yöntemleri denenecek.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1565
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1568
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1571
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1574
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1577
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1580
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1583
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kanıtlaması istenecek.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1586
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Uçtan uca şifreleme varsayılıyor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1571
+#: fetchmail.c:1590
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1593
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile şifrelenmiş oturumlar etkinleştirildi.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokolü: %s.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1597
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikası kontrolü etkinleştirildi.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1599
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL güvenilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1602
 #, 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:1586
+#: fetchmail.c:1605
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamanaşımı %d saniye"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1607
 msgid " (default).\n"
 msgstr " (öntanımlı).\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1614
 msgid "  Default mailbox selected.\n"
 msgstr "  Öntanımlı posta kutusu seçildi.\n"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1619
 msgid "  Selected mailboxes are:"
 msgstr "  Seçilen posta kutuları:"
 
 #  bu çeviriyi kontrol et
-#: fetchmail.c:1605
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1625
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "All"
-msgstr "Hepsi"
+#  bu çeviriyi kontrol et
+#: fetchmail.c:1626
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1606
-msgid "Only new"
-msgstr "Yalnızca yeniler"
+#: fetchmail.c:1628
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1608
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1629
+#, 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:1611
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1631
+#, 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:1614
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1632
+#, 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:1634
+#, 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:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "enabled"
-msgstr "etkin"
+#: fetchmail.c:1635
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  server-local adreslerin yeniden yazılması %s (--norewrite %s).\n"
 
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
-#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
-msgid "disabled"
-msgstr "etkin değil"
+# carriage-return?? Başkalarına sor
+#: fetchmail.c:1637
+#, 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:1617
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1638
+#, 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:1620
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1640
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return'lerin zorunlu kullanımı %s (orcecr %s).\n"
 
-#: fetchmail.c:1623
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+# carriage-return?? Başkalarına sor
+#: fetchmail.c:1641
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Carriage-return'lerin zorunlu kullanımı %s (orcecr %s).\n"
+
+#: fetchmail.c:1643
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1626
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1644
+#, 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
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
+msgstr "  MIME kod çözümü %s (mimedecode %s).\n"
+
+#: fetchmail.c:1647
+#, 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:1629
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1649
+#, 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
+#, 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:1632
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1652
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Boş olmayan Status satırları %s (dropstatus %s)\n"
 
-# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
-# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropstatus ? "on" : "off");
-# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
-# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropdelivered ? "on" : "off");
-#
-# DIKKAT: 'discarded' ve 'kept'in durumlari özel; atılacak ve tutulacak
-# olarak çevrilmeleri gerekiyor.
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "discarded"
-msgstr "atılacak"
+# Bunun aşağıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
+# düşünülmeliler.
+#: fetchmail.c:1653
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Boş olmayan Status satırları %s (dropstatus %s)\n"
 
-#: fetchmail.c:1633 fetchmail.c:1636
-msgid "kept"
-msgstr "tutulacak"
+# Bunun yukarıdaki 'discarded' ve 'kept' ile ilişkisi var, birlikte
+# düşünülmeliler.
+#: fetchmail.c:1655
+#, 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:1635
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1656
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To satırları %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1659
 #, 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:1644
+#: fetchmail.c:1662
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  İleti boyut sınırı yok (--limit 0).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1664
 #, 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:1649
+#: fetchmail.c:1667
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada büyüklük uyarısı (--warnings 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1670
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Alınan ileti sınırı %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1673
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Alınan ileti sınırı yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1675
 #, 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:1660
+#: fetchmail.c:1678
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  İleti boyut sınırı yok (--limit 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1682
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1666
+#: fetchmail.c:1684
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1669
+#: fetchmail.c:1687
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
 # batch = ?
-#: fetchmail.c:1671
+#: fetchmail.c:1689
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1673
+#: fetchmail.c:1691
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1695
 #, 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:1679
+#: fetchmail.c:1697
 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:1686
+#: fetchmail.c:1704
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Şu alanlar (domains) için posta getirilecek:"
 
-#: fetchmail.c:1691 fetchmail.c:1711
+#: fetchmail.c:1709 fetchmail.c:1729
 msgid " (default)"
 msgstr " (öntanımlı)"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1714
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  İletiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1716
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  İletiler \"%s\" ile ulaştırılacak.\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1723
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  İletiler %cMTP ile aşağıdakilere iletilecek:"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1734
 #, 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:1719
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1746
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yanıtları şöyle:"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1752
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin değil\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1755
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu bağlantısı \"%s\" ile açılacak.\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1758
 msgid "  No pre-connection command.\n"
 msgstr "  Hiçbir bağlantı öncesi komutu yok.\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1760
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu bağlantısı \"%s\" ile kopatılacak.\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1763
 msgid "  No post-connection command.\n"
 msgstr "  Hiçbir bağlantı öncesi komutu yok.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1766
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina için hiçbir yerel ad tanımlanmamış.\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1776
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1760
+#: fetchmail.c:1778
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1762
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d yerel ad tanındı.\n"
+#: fetchmail.c:1780
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d yerel ad tanındı.\n"
+msgstr[1] "%d yerel ad tanındı.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1776
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1795
+#, 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
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Multidrop adresler için DNS sorgulaması %s.\n"
 
 # Bu string'den hemen sonra aşağıdaki iki string geliyor ("IP address."
 # 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:1780
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1800
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  "
 
-# Niçin böyle çevrildiğini anlamak için yukarıdaki iletiye
-# bakınız.
-#: fetchmail.c:1782
-msgid "IP address.\n"
-msgstr "Sunucu takma adları IP adresleri kullanılarak karşılaştırılacak.\n"
-
-# Niçin böyle çevrildiğini anlamak için yukarıdaki iletiye
-# bakınız.
-#: fetchmail.c:1784
-msgid "name.\n"
-msgstr "Sunucu takma adları, adları kullanılarak karşılaştırılacak.\n"
+# Bu string'den hemen sonra aşağıdaki iki string geliyor ("IP address."
+# 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
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  "
 
-#: fetchmail.c:1787
+#: fetchmail.c:1805
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin değil\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1808
 #, 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:1791
+#: fetchmail.c:1809
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1793
+#: fetchmail.c:1811
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Parse edilecek envelope başlığı sayısı: %d\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1814
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s öneki kullanıcı kimliğinden silinecek\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1817
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1824
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Önceden tanımlanmış posta sunucusu takma adları:"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1833
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1843
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Bağlatı %s arayüzünden olmalı.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1845
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir arayüzün kullanılması zorunlu koşulmamış.\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1847
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama döngüsü %s'i gözleyecek.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1849
 msgid "  No monitor interface specified.\n"
 msgstr "  Gözleme arayüzü belirtilmemiş.\n"
 
 # plugin == ?
-#: fetchmail.c:1835
+#: fetchmail.c:1853
 #, 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:1837
+#: fetchmail.c:1855
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemiş.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:1839
+#: fetchmail.c:1857
 #, 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:1841
+#: fetchmail.c:1859
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemiş.\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1864
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hiçbir UID saklanmadı.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1873
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID saklandı.\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1881
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received başlığına yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1883
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1542,7 +1592,7 @@ msgstr ""
 "  Received başlığına yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1886
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Özellikler geçiriliyor \"%s\".\n"
@@ -1555,7 +1605,7 @@ msgstr "alloca başarısız oldu"
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "HATA: getpassword() desteklenmiyor\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1648,43 +1698,49 @@ msgstr "fetchmail gerekli NTLM desteği ile derlenmemiş\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yeteneğini desteklemiyor\n"
 
-#: imap.c:644 imap.c:706
+#: imap.c:644 imap.c:710
 msgid "expunge failed\n"
 msgstr "silme başarısız oldu\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:662 imap.c:695
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama başarısız oldu\n"
 
 #: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "yeniden yokladıktan sonra %d ileti bekliyor\n"
+#, 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:680
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu seçimi başarısız oldu\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "ilk yoklamadan sonra %d ileti bekliyor\n"
+#: imap.c:686
+#, 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:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "silinmeden sonra %d ileti bekliyor\n"
+#: imap.c:714
+#, 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:733
+#: imap.c:739
 msgid "search for unseen messages failed\n"
 msgstr "görülmemiş iletileri arama işlemi başarısız oldu\n"
 
-#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:769 pop3.c:674 pop3.c:686 pop3.c:903 pop3.c:910
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u görülmemiş\n"
 
-#: imap.c:775 pop3.c:687
+#: imap.c:781 pop3.c:695
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ilk görülmemiş\n"
@@ -1862,15 +1918,15 @@ msgstr "--remote seçeneği ODMR ile desteklenmiyor\n"
 msgid "Option --check is not supported with ODMR\n"
 msgstr "--check seçeneği ODMR ile desteklenmiyor\n"
 
-#: opie.c:37
+#: opie.c:36
 msgid "server recv fatal\n"
 msgstr "sunucu recv ölümcül\n"
 
-#: opie.c:51
+#: opie.c:50
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'ının kodu çözülemedi\n"
 
-#: opie.c:59 pop3.c:496
+#: opie.c:58 pop3.c:505
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
@@ -2168,40 +2224,40 @@ msgstr ""
 
 # timestamp = zaman damgası (zaman belirteci daha doğal olurdu bence ama böyle kullanılmış
 # başka yerlerde)
-#: pop3.c:534
+#: pop3.c:543
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgası selamlama içerisinde bulunamadı\n"
 
-#: pop3.c:543
+#: pop3.c:552
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama içindeki zaman damgasında sözdizim yanlışı var\n"
 
-#: pop3.c:565
+#: pop3.c:574
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tanımlanmamış protokol isteği\n"
 
-#: pop3.c:573
+#: pop3.c:582
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit meşgul!  Başka bir oturum açık olabilir\n"
 
-#: pop3.c:657 pop3.c:886
+#: pop3.c:665 pop3.c:894
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:759
+#: pop3.c:767
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmuş. Bu durumu idare edemem.\n"
 
-#: pop3.c:845
+#: pop3.c:853
 msgid "protocol error\n"
 msgstr "protokol hatası\n"
 
-#: pop3.c:860
+#: pop3.c:868
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatası\n"
 
-#: pop3.c:1217
+#: pop3.c:1225
 msgid "Option --remote is not supported with POP3\n"
 msgstr "--remote seçeneği POP3 ile desteklenmiyor\n"
 
@@ -2280,6 +2336,24 @@ msgstr "%s'i yeniden yazmak üzereyim"
 msgid "Rewritten version is %s\n"
 msgstr "Yeniden yazılan %s\n"
 
+#: rpa.c:117
+msgid "Success"
+msgstr "Başarılı"
+
+#: rpa.c:118
+msgid "Restricted user (something wrong with account)"
+msgstr ""
+"Sınırlı kullanıcı (kullanıcı hesabı ile ilgili yanlış birşeyler olabilir)"
+
+#: rpa.c:119
+msgid "Invalid userid or passphrase"
+msgstr "Kullanıcı adı ya da parolası geçersiz"
+
+# deity error???
+#: rpa.c:120
+msgid "Deity error"
+msgstr "`Deity' hatası"
+
 #: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 kod çözme hatası\n"
@@ -2469,86 +2543,86 @@ msgstr "%cMTP hatası: %s\n"
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP dosya açılamadı ya da önsöz yazılamadı\n"
 
-#: sink.c:966
+#: sink.c:970
 #, 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:973
+#: sink.c:977
 #, 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:1011
+#: sink.c:1015
 msgid "no address matches; no postmaster set.\n"
 msgstr "hiçbir adres uyuşmadı; postmaster yok.\n"
 
-#: sink.c:1023
+#: sink.c:1027
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile gönderilemedi!\n"
 "\n"
 
-#: sink.c:1029
+#: sink.c:1033
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hiçbir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1182
+#: sink.c:1186
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek üzereyim: %s\n"
 
-#: sink.c:1206
+#: sink.c:1210
 msgid "MDA open failed\n"
 msgstr "MDA açma başarısız oldu\n"
 
-#: sink.c:1243
+#: sink.c:1247
 #, 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:1267
+#: sink.c:1271
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici çalıştırılamadı; %s denenecek"
 
-#: sink.c:1323
+#: sink.c:1327
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile öldürüldü\n"
 
-#: sink.c:1326
+#: sink.c:1330
 #, 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:1329
+#: sink.c:1333
 #, 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:1350
+#: sink.c:1354
 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:1371
+#: sink.c:1375
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi dağıtımı reddetti\n"
 
-#: sink.c:1401
+#: sink.c:1405
 msgid "LMTP delivery error on EOM\n"
 msgstr "İleti sonunda LMTP dağıtım hatası\n"
 
-#: sink.c:1404
+#: sink.c:1408
 #, 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:1555
+#: sink.c:1559
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2586,151 +2660,151 @@ msgstr "ESMTP LOGIN Kimlik kanıtlaması...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatası\n"
 
-#: socket.c:106 socket.c:132
+#: socket.c:117 socket.c:143
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc başarısız oldu\n"
 
-#: socket.c:164
+#: socket.c:175
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair başarısız oldu\n"
 
-#: socket.c:170
+#: socket.c:181
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork başarısız oldu\n"
 
-#: socket.c:177
+#: socket.c:188
 msgid "dup2 failed\n"
 msgstr "dup2 başarısız oldu\n"
 
-#: socket.c:183
+#: socket.c:194
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s çalıştırılıyor (makina %s hizmet %s)\n"
 
-#: socket.c:186
+#: socket.c:197
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) başarısız oldu\n"
 
-#: socket.c:277
+#: socket.c:288
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:419
+#: 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:776
+#: socket.c:787
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Çıkaran Kurum: %s\n"
 
-#: socket.c:778
+#: socket.c:789
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uyarı: Çıkaran Kurum Adı çok uzun (sonundan kesilmiş olabilir).\n"
 
-#: socket.c:780
+#: socket.c:791
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:782
+#: socket.c:793
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Çıkaran `CommonName'i: %s\n"
 
-#: socket.c:784
+#: socket.c:795
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uyarı: Çıkaran `CommonName'i çok uzun (sonundan kesilmiş olabilir).\n"
 
-#: socket.c:786
+#: socket.c:797
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen Çıkaran `CommonName'i\n"
 
-#: socket.c:790
+#: socket.c:801
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Sunucu `CommonName'i: %s\n"
 
-#: socket.c:794
+#: socket.c:805
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Kötü sertifika: `Subject CommonName' çok uzun!\n"
 
-#: socket.c:810
+#: socket.c:821
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyuşmazlığı: %s != %s\n"
 
-#: socket.c:816
+#: socket.c:827
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu adı ayarlanmamış, sertifikayı doğrulayamıyorum!\n"
 
-#: socket.c:821
+#: socket.c:832
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:823
+#: socket.c:834
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu adı sertifikada belirtilmemiş!\n"
 
-#: socket.c:833
+#: socket.c:844
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() başarısız oldu!\n"
 
-#: socket.c:837
+#: socket.c:848
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:845
+#: socket.c:856
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu çok küçük!\n"
 
-#: socket.c:851
+#: socket.c:862
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtarı parmak izi: %s\n"
 
-#: socket.c:855
+#: socket.c:866
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyuşuyor.\n"
 
-#: socket.c:858
+#: socket.c:869
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s parmak izleri uyuşmuyor!\n"
 
-#: socket.c:867
+#: socket.c:878
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Uyarı: sunucu sertifikası doğrulaması: %s\n"
 
-#: socket.c:873
+#: socket.c:884
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "bilinmeyen çıkaran firma adı (ilk %d karakter): %s\n"
 
-#: socket.c:925
+#: socket.c:936
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL için sınırlar dışında"
 
-#: socket.c:942
+#: socket.c:953
 #, 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:1003
+#: socket.c:1014
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi doğrulaması bir biçimde atlandı!\n"
 
-#: socket.c:1075
+#: socket.c:1086
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1078
+#: socket.c:1089
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma başarısız oldu!\n"
 
@@ -2824,18 +2898,13 @@ msgstr "SMTP dinleyicisi yerel alıcı adreslerini reddetti: "
 msgid "writing message text\n"
 msgstr "ileti metni yazılıyor\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 "%s'den eski UID listesi:"
 
 # kaynak koduna bakılacak
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:253 uid.c:264 uid.c:519 uid.c:569
 msgid " <empty>"
 msgstr " <boş>"
 
@@ -2843,37 +2912,57 @@ msgstr " <boş>"
 msgid "Scratch list of UIDs:"
 msgstr "Müsvedde UID listesi:"
 
-#: uid.c:512 uid.c:563
+#: uid.c:513 uid.c:565
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "%s'den eski UID listesi:"
 
-#: uid.c:514
+#: uid.c:515
 #, c-format
 msgid "New UID list from %s:"
 msgstr "%s'den yeni UID listesi:"
 
-#: uid.c:542
+#: uid.c:544
 msgid "swapping UID lists\n"
 msgstr "UID listeleri takas ediliyor\n"
 
-#: uid.c:550
+#: uid.c:552
 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:575
+#: uid.c:577
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "UID listeleri takas ediliyor\n"
 
-#: uid.c:610
+#: uid.c:612
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids dosyası siliniyor.\n"
 
-#: uid.c:616
+#: uid.c:614
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Credential'lar bırakılırken hata\n"
+
+#: uid.c:620
 msgid "Writing fetchids file.\n"
 msgstr "fetchids dosyası yazılıyor.\n"
 
+#: uid.c:639
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:643
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:647
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc başarısız oldu\n"
@@ -2882,6 +2971,49 @@ msgstr "malloc başarısız oldu\n"
 msgid "realloc failed\n"
 msgstr "realloc başarısız oldu\n"
 
+#~ msgid "header "
+#~ msgstr "başlık "
+
+#~ msgid "All"
+#~ msgstr "Hepsi"
+
+#~ msgid "Only new"
+#~ msgstr "Yalnızca yeniler"
+
+#~ msgid "enabled"
+#~ msgstr "etkin"
+
+#~ msgid "disabled"
+#~ msgstr "etkin değil"
+
+# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
+# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropstatus ? "on" : "off");
+# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
+# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropdelivered ? "on" : "off");
+#
+# DIKKAT: 'discarded' ve 'kept'in durumlari özel; atılacak ve tutulacak
+# olarak çevrilmeleri gerekiyor.
+#~ msgid "discarded"
+#~ msgstr "atılacak"
+
+#~ msgid "kept"
+#~ msgstr "tutulacak"
+
+# Niçin böyle çevrildiğini anlamak için yukarıdaki iletiye
+# bakınız.
+#~ msgid "IP address.\n"
+#~ msgstr "Sunucu takma adları IP adresleri kullanılarak karşılaştırılacak.\n"
+
+# Niçin böyle çevrildiğini anlamak için yukarıdaki iletiye
+# bakınız.
+#~ msgid "name.\n"
+#~ msgstr "Sunucu takma adları, adları kullanılarak karşılaştırılacak.\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
+
 #~ msgid "partial error message buffer overflow"
 #~ msgstr "hata ileti tamponu taşması"
 
@@ -2898,20 +3030,6 @@ msgstr "realloc başarısız oldu\n"
 #~ msgid "message"
 #~ msgstr "ileti"
 
-#~ msgid "Success"
-#~ msgstr "Başarılı"
-
-#~ msgid "Restricted user (something wrong with account)"
-#~ msgstr ""
-#~ "Sınırlı kullanıcı (kullanıcı hesabı ile ilgili yanlış birşeyler olabilir)"
-
-#~ msgid "Invalid userid or passphrase"
-#~ msgstr "Kullanıcı adı ya da parolası geçersiz"
-
-# deity error???
-#~ msgid "Deity error"
-#~ msgstr "`Deity' hatası"
-
 #~ msgid "Skipping message %d, length -1\n"
 #~ msgstr "İleti %d atlanıyor, uzunluk -1\n"