Remove bogus file.

svn path=/trunk/; revision=4017

10 files changed, 4061 insertions, 6002 deletions

diff --git a/po/.pot b/po/.pot
deleted file mode 100644
index 7f2ab664..00000000
--- a/po/.pot
+++ /dev/null
@@ -1,1885 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-30 16:34-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: checkalias.c:142
-#, c-format
-msgid "Checking if %s is really the same node as %s"
-msgstr ""
-
-#: checkalias.c:146
-msgid "Yes, their IP addresses match"
-msgstr ""
-
-#: checkalias.c:150
-msgid "No, their IP addresses don't match"
-msgstr ""
-
-#: checkalias.c:168 checkalias.c:193
-#, c-format
-msgid "nameserver failure while looking for `%s' during poll of %s."
-msgstr ""
-
-#: driver.c:137
-#, c-format
-msgid "mapped %s to local %s"
-msgstr ""
-
-#: driver.c:192
-#, c-format
-msgid "passed through %s matching %s"
-msgstr ""
-
-#: driver.c:246
-#, c-format
-msgid ""
-"analyzing Received line:\n"
-"%s"
-msgstr ""
-
-#: driver.c:285
-#, c-format
-msgid "line accepted, %s is an alias of the mailserver"
-msgstr ""
-
-#: driver.c:291
-#, c-format
-msgid "line rejected, %s is not an alias of the mailserver"
-msgstr ""
-
-#: driver.c:362
-msgid "no Received address found"
-msgstr ""
-
-#: driver.c:371
-#, c-format
-msgid "found Received address `%s'"
-msgstr ""
-
-#: driver.c:730
-msgid "message delimiter found while scanning headers"
-msgstr ""
-
-#: driver.c:854
-#, c-format
-msgid "no local matches, forwarding to %s"
-msgstr ""
-
-#: driver.c:868
-msgid "forwarding and deletion suppressed due to DNS errors"
-msgstr ""
-
-#: driver.c:965
-msgid "writing RFC822 msgblk.headers"
-msgstr ""
-
-#: driver.c:985
-msgid "no recipient addresses matched declared local names"
-msgstr ""
-
-#: driver.c:991
-#, c-format
-msgid "recipient address %s didn't match any local name"
-msgstr ""
-
-#: driver.c:999
-msgid "message has embedded NULs"
-msgstr ""
-
-#: driver.c:1006
-msgid "SMTP listener rejected local recipient addresses: "
-msgstr ""
-
-#: driver.c:1121
-msgid "writing message text"
-msgstr ""
-
-#: driver.c:1164
-#, c-format
-msgid "kerberos error %s"
-msgstr ""
-
-#: driver.c:1223
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] "
-msgstr ""
-
-#: driver.c:1318
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail."
-msgstr ""
-
-#: driver.c:1353
-msgid "Kerberos V4 support not linked."
-msgstr ""
-
-#: driver.c:1361
-msgid "Kerberos V5 support not linked."
-msgstr ""
-
-#: driver.c:1372
-#, c-format
-msgid "Option --flush is not supported with %s"
-msgstr ""
-
-#: driver.c:1378
-#, c-format
-msgid "Option --all is not supported with %s"
-msgstr ""
-
-#: driver.c:1386
-#, c-format
-msgid "Option --limit is not supported with %s"
-msgstr ""
-
-#: driver.c:1404
-#, c-format
-msgid "timeout after %d seconds waiting to connect to server %s."
-msgstr ""
-
-#: driver.c:1408
-#, c-format
-msgid "timeout after %d seconds waiting for server %s."
-msgstr ""
-
-#: driver.c:1412
-#, c-format
-msgid "timeout after %d seconds waiting for %s."
-msgstr ""
-
-#: driver.c:1417
-#, c-format
-msgid "timeout after %d seconds waiting for listener to respond."
-msgstr ""
-
-#: driver.c:1419
-#, c-format
-msgid "timeout after %d seconds."
-msgstr ""
-
-#: driver.c:1435
-msgid "Subject: fetchmail sees repeated timeouts\r\n"
-msgstr ""
-
-#: driver.c:1437
-#, c-format
-msgid ""
-"Fetchmail saw more than %d timouts while attempting to get mail from %s@%s."
-msgstr ""
-
-#: driver.c:1442
-msgid ""
-"This could mean that your mailserver is stuck, or that your SMTP listener"
-msgstr ""
-
-#: driver.c:1444
-msgid ""
-"is wedged, or that your mailbox file on the server has been corrupted by"
-msgstr ""
-
-#: driver.c:1446
-msgid "a server error.  You can run `fetchmail -v -v' to diagnose the problem."
-msgstr ""
-
-#: driver.c:1448
-msgid "Fetchmail won't poll this mailbox again until you restart it."
-msgstr ""
-
-#: driver.c:1469
-#, c-format
-msgid "pre-connection command failed with status %d"
-msgstr ""
-
-#: driver.c:1496
-msgid "fetchmail: internal inconsistency"
-msgstr ""
-
-#: driver.c:1506
-#, c-format
-msgid "fetchmail: %s connection to %s failed"
-msgstr ""
-
-#: driver.c:1512
-msgid ": host is unknown"
-msgstr ""
-
-#: driver.c:1514
-msgid ": name is valid but has no IP address"
-msgstr ""
-
-#: driver.c:1516
-msgid ": unrecoverable name server error"
-msgstr ""
-
-#: driver.c:1518
-msgid ": temporary name server error"
-msgstr ""
-
-#: driver.c:1520
-#, c-format
-msgid ": unknown DNS error %d"
-msgstr ""
-
-#: driver.c:1576
-#, c-format
-msgid "Lock-busy error on %s@%s"
-msgstr ""
-
-#: driver.c:1583
-#, c-format
-msgid "Authorization failure on %s@%s"
-msgstr ""
-
-#: driver.c:1597
-msgid "Subject: fetchmail authentication failed\r\n"
-msgstr ""
-
-#: driver.c:1599
-#, c-format
-msgid "Fetchmail could not get mail from %s@%s."
-msgstr ""
-
-#: driver.c:1603
-msgid "The attempt to get authorization failed."
-msgstr ""
-
-#: driver.c:1605
-msgid "This probably means your password is invalid."
-msgstr ""
-
-#: driver.c:1626
-#, c-format
-msgid "selecting or re-polling folder %s"
-msgstr ""
-
-#: driver.c:1628
-msgid "selecting or re-polling default folder"
-msgstr ""
-
-#: driver.c:1664
-#, c-format
-msgid "%s at %s (folder %s)"
-msgstr ""
-
-#: driver.c:1667
-#, c-format
-msgid "%s at %s"
-msgstr ""
-
-#. only used for ETRN
-#: driver.c:1671
-#, c-format
-msgid "Polling %s"
-msgstr ""
-
-#: driver.c:1675
-#, c-format
-msgid "%d %s (%d seen) for %s"
-msgstr ""
-
-#: driver.c:1676 driver.c:1681
-msgid "messages"
-msgstr ""
-
-#: driver.c:1677 driver.c:1682
-msgid "message"
-msgstr ""
-
-#: driver.c:1680
-#, c-format
-msgid "%d %s for %s"
-msgstr ""
-
-#: driver.c:1686
-#, c-format
-msgid " (%d octets)."
-msgstr ""
-
-#: driver.c:1692
-#, c-format
-msgid "No mail for %s"
-msgstr ""
-
-#: driver.c:1766
-#, c-format
-msgid "Skipping message %d, length -1"
-msgstr ""
-
-#: driver.c:1776
-#, c-format
-msgid "skipping message %d"
-msgstr ""
-
-#: driver.c:1821
-#, c-format
-msgid " (oversized, %d octets)"
-msgstr ""
-
-#: driver.c:1844
-#, c-format
-msgid "reading message %d of %d"
-msgstr ""
-
-#: driver.c:1848
-#, c-format
-msgid " (%d %soctets)"
-msgstr ""
-
-#: driver.c:1849
-msgid "header "
-msgstr ""
-
-#: driver.c:1894
-#, c-format
-msgid " (%d body octets) "
-msgstr ""
-
-#: driver.c:1963
-#, c-format
-msgid "message %d was not the expected length (%d actual != %d expected)"
-msgstr ""
-
-#: driver.c:2001
-msgid " retained"
-msgstr ""
-
-#: driver.c:2009
-msgid " flushed"
-msgstr ""
-
-#: driver.c:2018
-msgid " not flushed"
-msgstr ""
-
-#: driver.c:2024
-#, c-format
-msgid "fetchlimit reached; %d messages left on server"
-msgstr ""
-
-#: driver.c:2066
-msgid "socket"
-msgstr ""
-
-#: driver.c:2069
-msgid "authorization"
-msgstr ""
-
-#: driver.c:2072
-msgid "missing or bad RFC822 header"
-msgstr ""
-
-#: driver.c:2075
-msgid "MDA"
-msgstr ""
-
-#: driver.c:2078
-msgid "client/server synchronization"
-msgstr ""
-
-#: driver.c:2081
-msgid "client/server protocol"
-msgstr ""
-
-#: driver.c:2084
-msgid "lock busy on server"
-msgstr ""
-
-#: driver.c:2087
-msgid "SMTP transaction"
-msgstr ""
-
-#: driver.c:2090
-msgid "DNS lookup"
-msgstr ""
-
-#: driver.c:2093
-msgid "undefined"
-msgstr ""
-
-#: driver.c:2099
-#, c-format
-msgid "%s error while fetching from %s"
-msgstr ""
-
-#: driver.c:2107
-#, c-format
-msgid "post-connection command failed with status %d"
-msgstr ""
-
-#: env.c:59
-#, c-format
-msgid "%s: can't find your name and home directory!\n"
-msgstr ""
-
-#: env.c:84
-#, c-format
-msgid "%s: can't determine your host!"
-msgstr ""
-
-#: env.c:100
-#, c-format
-msgid "gethostbyname failed for %s\n"
-msgstr ""
-
-#: error.c:109
-msgid "Unknown system error"
-msgstr ""
-
-#: error.c:140
-#, c-format
-msgid "%s (log message incomplete)"
-msgstr ""
-
-#: error.c:236
-#, c-format
-msgid ": Error %d"
-msgstr ""
-
-#: error.c:340 error.c:368 error.c:442 error.c:470
-msgid "partial error message buffer overflow"
-msgstr ""
-
-#: etrn.c:44
-#, c-format
-msgid "%s's SMTP listener does not support ESMTP"
-msgstr ""
-
-#: etrn.c:50
-#, c-format
-msgid "%s's SMTP listener does not support ETRN"
-msgstr ""
-
-#. OK, queuing for node <x> started
-#: etrn.c:73
-#, c-format
-msgid "Queuing for %s started"
-msgstr ""
-
-#. OK, no messages waiting for node <x>
-#: etrn.c:77
-#, c-format
-msgid "No messages waiting for %s"
-msgstr ""
-
-#. OK, pending messages for node <x> started
-#. OK, <n> pending messages for node <x> started
-#: etrn.c:82
-#, c-format
-msgid "Pending messages for %s started"
-msgstr ""
-
-#. Unable to queue messages for node <x>
-#: etrn.c:86
-#, c-format
-msgid "Unable to queue messages for node %s"
-msgstr ""
-
-#. Node <x> not allowed: <reason>
-#: etrn.c:90
-#, c-format
-msgid "Node %s not allowed: %s"
-msgstr ""
-
-#. Syntax Error
-#: etrn.c:94
-msgid "ETRN syntax error"
-msgstr ""
-
-#. Syntax Error in Parameters
-#: etrn.c:98
-msgid "ETRN syntax error in parameters"
-msgstr ""
-
-#: etrn.c:102
-#, c-format
-msgid "Unknown ETRN error %d"
-msgstr ""
-
-#: etrn.c:146
-msgid "Option --keep is not supported with ETRN\n"
-msgstr ""
-
-#: etrn.c:150
-msgid "Option --flush is not supported with ETRN\n"
-msgstr ""
-
-#: etrn.c:154
-msgid "Option --remote is not supported with ETRN\n"
-msgstr ""
-
-#: etrn.c:158
-msgid "Option --check is not supported with ETRN\n"
-msgstr ""
-
-#: fetchmail.c:134
-#, c-format
-msgid "fetchmail: thread sleeping for %d sec.\n"
-msgstr ""
-
-#: fetchmail.c:174
-#, c-format
-msgid "This is fetchmail release %s"
-msgstr ""
-
-#: fetchmail.c:238
-msgid "Taking options from command line"
-msgstr ""
-
-#: fetchmail.c:242
-#, c-format
-msgid " and %s\n"
-msgstr ""
-
-#: fetchmail.c:244
-#, c-format
-msgid "Lockfile at %s\n"
-msgstr ""
-
-#: fetchmail.c:248
-#, c-format
-msgid "No mailservers set up -- perhaps %s is missing?\n"
-msgstr ""
-
-#: fetchmail.c:265
-msgid "fetchmail: cannot allocate memory for lock name.\n"
-msgstr ""
-
-#: fetchmail.c:275
-msgid "fetchmail: removing stale lockfile\n"
-msgstr ""
-
-#: fetchmail.c:285
-msgid "fetchmail: no mailservers have been specified.\n"
-msgstr ""
-
-#: fetchmail.c:294
-msgid "fetchmail: no other fetchmail is running\n"
-msgstr ""
-
-#: fetchmail.c:300
-#, c-format
-msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr ""
-
-#: fetchmail.c:301 fetchmail.c:307
-msgid "background"
-msgstr ""
-
-#: fetchmail.c:301 fetchmail.c:307
-msgid "foreground"
-msgstr ""
-
-#: fetchmail.c:306
-#, c-format
-msgid "fetchmail: %s fetchmail at %d killed.\n"
-msgstr ""
-
-#: fetchmail.c:322
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-
-#: fetchmail.c:328
-#, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr ""
-
-#: fetchmail.c:335
-#, c-format
-msgid "fetchmail: another foreground fetchmail is running at %d.\n"
-msgstr ""
-
-#: fetchmail.c:342
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-
-#: fetchmail.c:348
-#, c-format
-msgid "fetchmail: background fetchmail at %d awakened.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr ""
-
-#: fetchmail.c:419
-#, c-format
-msgid "Enter password for %s@%s: "
-msgstr ""
-
-#: fetchmail.c:459
-#, c-format
-msgid "starting fetchmail %s daemon "
-msgstr ""
-
-#: fetchmail.c:519
-#, c-format
-msgid "poll of %s skipped (failed authentication or too many timeouts)"
-msgstr ""
-
-#: fetchmail.c:532
-#, c-format
-msgid "interval not reached, not querying %s"
-msgstr ""
-
-#: fetchmail.c:559
-msgid "saved UID List"
-msgstr ""
-
-#: fetchmail.c:565
-#, c-format
-msgid "Query status=%d"
-msgstr ""
-
-#: fetchmail.c:621
-msgid "All connections are wedged.  Exiting."
-msgstr ""
-
-#: fetchmail.c:626
-#, c-format
-msgid "fetchmail: sleeping at %s"
-msgstr ""
-
-#: fetchmail.c:721
-#, c-format
-msgid "awakened by %s"
-msgstr ""
-
-#: fetchmail.c:723
-#, c-format
-msgid "awakened by signal %d"
-msgstr ""
-
-#: fetchmail.c:734
-#, c-format
-msgid "awakened at %s"
-msgstr ""
-
-#: fetchmail.c:740
-#, c-format
-msgid "normal termination, status %d"
-msgstr ""
-
-#: fetchmail.c:867
-#, c-format
-msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-
-#: fetchmail.c:975
-#, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-
-#: fetchmail.c:1014
-#, c-format
-msgid "couldn't find HESIOD pobox for %s"
-msgstr ""
-
-#: fetchmail.c:1040
-#, c-format
-msgid "couldn't find canonical DNS name of %s"
-msgstr ""
-
-#: fetchmail.c:1064
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
-msgstr ""
-
-#: fetchmail.c:1071
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-
-#: fetchmail.c:1091
-#, c-format
-msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-
-#: fetchmail.c:1156
-#, c-format
-msgid "terminated with signal %d"
-msgstr ""
-
-#: fetchmail.c:1216
-#, c-format
-msgid "fetchmail: %s querying %s (protocol %s) at %s"
-msgstr ""
-
-#: fetchmail.c:1235
-msgid "POP2 support is not configured.\n"
-msgstr ""
-
-#: fetchmail.c:1245
-msgid "POP3 support is not configured.\n"
-msgstr ""
-
-#: fetchmail.c:1257
-msgid "IMAP support is not configured.\n"
-msgstr ""
-
-#: fetchmail.c:1263
-msgid "ETRN support is not configured.\n"
-msgstr ""
-
-#: fetchmail.c:1269
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr ""
-
-#: fetchmail.c:1274
-msgid "unsupported protocol selected."
-msgstr ""
-
-#: fetchmail.c:1286
-#, c-format
-msgid "Poll interval is %d seconds\n"
-msgstr ""
-
-#: fetchmail.c:1288
-#, c-format
-msgid "Logfile is %s\n"
-msgstr ""
-
-#: fetchmail.c:1290
-#, c-format
-msgid "Idfile is %s\n"
-msgstr ""
-
-#: fetchmail.c:1293
-msgid "Progress messages will be logged via syslog\n"
-msgstr ""
-
-#: fetchmail.c:1296
-msgid "Fetchmail will masquerade and will not generate Received\n"
-msgstr ""
-
-#: fetchmail.c:1298
-#, c-format
-msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr ""
-
-#: fetchmail.c:1306
-#, c-format
-msgid "Options for retrieving from %s@%s:\n"
-msgstr ""
-
-#: fetchmail.c:1310
-#, c-format
-msgid "  Mail will be retrieved via %s\n"
-msgstr ""
-
-#: fetchmail.c:1313
-#, c-format
-msgid "  Poll of this server will occur every %d intervals.\n"
-msgstr ""
-
-#: fetchmail.c:1316
-#, c-format
-msgid "  True name of server is %s.\n"
-msgstr ""
-
-#: fetchmail.c:1318
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
-msgstr ""
-
-#: fetchmail.c:1319 fetchmail.c:1391 fetchmail.c:1394
-msgid "will not"
-msgstr ""
-
-#: fetchmail.c:1319 fetchmail.c:1391 fetchmail.c:1394
-msgid "will"
-msgstr ""
-
-#: fetchmail.c:1329
-msgid "  Password will be prompted for.\n"
-msgstr ""
-
-#: fetchmail.c:1332
-#, c-format
-msgid "  APOP secret = \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1334
-#, c-format
-msgid "  RPOP id = \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1336
-#, c-format
-msgid "  Password = \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1345
-#, c-format
-msgid "  Protocol is KPOP with Kerberos %s authentication"
-msgstr ""
-
-#: fetchmail.c:1348
-#, c-format
-msgid "  Protocol is %s"
-msgstr ""
-
-#: fetchmail.c:1351
-#, c-format
-msgid " (using service %s)"
-msgstr ""
-
-#: fetchmail.c:1353
-#, c-format
-msgid " (using network security options %s)"
-msgstr ""
-
-#: fetchmail.c:1356
-#, c-format
-msgid " (using port %d)"
-msgstr ""
-
-#: fetchmail.c:1359
-msgid " (using default port)"
-msgstr ""
-
-#: fetchmail.c:1361
-msgid " (forcing UIDL use)"
-msgstr ""
-
-#: fetchmail.c:1365
-msgid "  Kerberos V4 preauthentication enabled.\n"
-msgstr ""
-
-#: fetchmail.c:1367
-msgid "  Kerberos V5 preauthentication enabled.\n"
-msgstr ""
-
-#: fetchmail.c:1369
-#, c-format
-msgid "  Server nonresponse timeout is %d seconds"
-msgstr ""
-
-#: fetchmail.c:1371
-msgid " (default).\n"
-msgstr ""
-
-#: fetchmail.c:1377
-msgid "  Default mailbox selected.\n"
-msgstr ""
-
-#: fetchmail.c:1382
-msgid "  Selected mailboxes are:"
-msgstr ""
-
-#: fetchmail.c:1387
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
-msgstr ""
-
-#: fetchmail.c:1388
-msgid "All"
-msgstr ""
-
-#: fetchmail.c:1388
-msgid "Only new"
-msgstr ""
-
-#: fetchmail.c:1390
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
-msgstr ""
-
-#: fetchmail.c:1393
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
-msgstr ""
-
-#: fetchmail.c:1396
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
-msgstr ""
-
-#: fetchmail.c:1397 fetchmail.c:1400 fetchmail.c:1403 fetchmail.c:1406
-#: fetchmail.c:1409 fetchmail.c:1517
-msgid "enabled"
-msgstr ""
-
-#: fetchmail.c:1397 fetchmail.c:1400 fetchmail.c:1403 fetchmail.c:1406
-#: fetchmail.c:1409 fetchmail.c:1517
-msgid "disabled"
-msgstr ""
-
-#: fetchmail.c:1399
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
-msgstr ""
-
-#: fetchmail.c:1402
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
-msgstr ""
-
-#: fetchmail.c:1405
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
-msgstr ""
-
-#: fetchmail.c:1408
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
-msgstr ""
-
-#: fetchmail.c:1411
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
-msgstr ""
-
-#: fetchmail.c:1412
-msgid "discarded"
-msgstr ""
-
-#: fetchmail.c:1412
-msgid "kept"
-msgstr ""
-
-#: fetchmail.c:1417
-#, c-format
-msgid "  Message size limit is %d bytes (--limit %d).\n"
-msgstr ""
-
-#: fetchmail.c:1420
-msgid "  No message size limit (--limit 0).\n"
-msgstr ""
-
-#: fetchmail.c:1422
-#, c-format
-msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-
-#: fetchmail.c:1425
-msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-
-#: fetchmail.c:1428
-#, c-format
-msgid "  Received-message limit is %d (--fetchlimit %d).\n"
-msgstr ""
-
-#: fetchmail.c:1431
-msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr ""
-
-#: fetchmail.c:1433
-#, c-format
-msgid "  SMTP message batch limit is %d.\n"
-msgstr ""
-
-#: fetchmail.c:1435
-msgid "  No SMTP message batch limit (--batchlimit 0).\n"
-msgstr ""
-
-#: fetchmail.c:1438
-#, c-format
-msgid "  Deletion interval between expunges is %d (--expunge %d).\n"
-msgstr ""
-
-#: fetchmail.c:1440
-msgid "  No expunges (--expunge 0).\n"
-msgstr ""
-
-#: fetchmail.c:1443
-#, c-format
-msgid "  Messages will be appended to %s as BSMTP\n"
-msgstr ""
-
-#: fetchmail.c:1445
-#, c-format
-msgid "  Messages will be delivered with \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1450
-#, c-format
-msgid "  Messages will be %cMTP-forwarded to:"
-msgstr ""
-
-#: fetchmail.c:1455
-msgid " (default)"
-msgstr ""
-
-#: fetchmail.c:1459
-#, c-format
-msgid "  Host part of MAIL FROM line will be %s\n"
-msgstr ""
-
-#: fetchmail.c:1468
-msgid "  Recognized listener spam block responses are:"
-msgstr ""
-
-#: fetchmail.c:1474
-msgid "  Spam-blocking disabled\n"
-msgstr ""
-
-#: fetchmail.c:1477
-#, c-format
-msgid "  Server connection will be brought up with \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1480
-msgid "  No pre-connection command.\n"
-msgstr ""
-
-#: fetchmail.c:1482
-#, c-format
-msgid "  Server connection will be taken down with \"%s\".\n"
-msgstr ""
-
-#: fetchmail.c:1485
-msgid "  No post-connection command.\n"
-msgstr ""
-
-#: fetchmail.c:1488
-msgid "  No localnames declared for this host.\n"
-msgstr ""
-
-#: fetchmail.c:1498
-msgid "  Multi-drop mode: "
-msgstr ""
-
-#: fetchmail.c:1500
-msgid "  Single-drop mode: "
-msgstr ""
-
-#: fetchmail.c:1502
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr ""
-
-#: fetchmail.c:1516
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
-msgstr ""
-
-#: fetchmail.c:1520
-msgid "  Server aliases will be compared with multidrop addresses by "
-msgstr ""
-
-#: fetchmail.c:1522
-msgid "IP address.\n"
-msgstr ""
-
-#: fetchmail.c:1524
-msgid "name.\n"
-msgstr ""
-
-#: fetchmail.c:1527
-msgid "  Envelope-address routing is disabled\n"
-msgstr ""
-
-#: fetchmail.c:1530
-#, c-format
-msgid "  Envelope header is assumed to be: %s\n"
-msgstr ""
-
-#: fetchmail.c:1531
-msgid "Received"
-msgstr ""
-
-#: fetchmail.c:1533
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
-msgstr ""
-
-#: fetchmail.c:1536
-#, c-format
-msgid "  Prefix %s will be removed from user id\n"
-msgstr ""
-
-#: fetchmail.c:1539
-msgid "  No prefix stripping\n"
-msgstr ""
-
-#: fetchmail.c:1546
-msgid "  Predeclared mailserver aliases:"
-msgstr ""
-
-#: fetchmail.c:1555
-msgid "  Local domains:"
-msgstr ""
-
-#: fetchmail.c:1565
-#, c-format
-msgid "  Connection must be through interface %s.\n"
-msgstr ""
-
-#: fetchmail.c:1567
-msgid "  No interface requirement specified.\n"
-msgstr ""
-
-#: fetchmail.c:1569
-#, c-format
-msgid "  Polling loop will monitor %s.\n"
-msgstr ""
-
-#: fetchmail.c:1571
-msgid "  No monitor interface specified.\n"
-msgstr ""
-
-#: fetchmail.c:1575
-#, c-format
-msgid "  Server connections will be mode via plugin %s (--plugin %s).\n"
-msgstr ""
-
-#: fetchmail.c:1577
-msgid "  No plugin command specified.\n"
-msgstr ""
-
-#: fetchmail.c:1579
-#, c-format
-msgid "  Listener connections will be mode via plugout %s (--plugout %s).\n"
-msgstr ""
-
-#: fetchmail.c:1581
-msgid "  No plugout command specified.\n"
-msgstr ""
-
-#: fetchmail.c:1585
-msgid "  No UIDs saved from this host.\n"
-msgstr ""
-
-#: fetchmail.c:1594
-#, c-format
-msgid "  %d UIDs saved.\n"
-msgstr ""
-
-#: fetchmail.c:1601
-#, c-format
-msgid "  Pass-through properties \"%s\".\n"
-msgstr ""
-
-#: getpass.c:73
-msgid "ERROR: no support for getpassword() routine\n"
-msgstr ""
-
-#: getpass.c:195
-msgid ""
-"\n"
-"Caught signal... bailing out."
-msgstr ""
-
-#: imap.c:147
-msgid "Could not decode initial BASE64 challenge"
-msgstr ""
-
-#: imap.c:163
-msgid "Could not decode OTP challenge"
-msgstr ""
-
-#: imap.c:170 pop3.c:183
-msgid "Secret pass phrase: "
-msgstr ""
-
-#: imap.c:246
-msgid "could not decode initial BASE64 challenge"
-msgstr ""
-
-#: imap.c:296
-#, c-format
-msgid "principal %s in ticket does not match -u %s"
-msgstr ""
-
-#: imap.c:302
-#, c-format
-msgid "non-null instance (%s) might cause strange behavior"
-msgstr ""
-
-#: imap.c:368
-msgid "could not decode BASE64 ready response"
-msgstr ""
-
-#: imap.c:375
-msgid "challenge mismatch"
-msgstr ""
-
-#: imap.c:448
-#, c-format
-msgid "Couldn't get service name for [%s]"
-msgstr ""
-
-#: imap.c:454
-#, c-format
-msgid "Using service name [%s]"
-msgstr ""
-
-#: imap.c:470
-msgid "Sending credentials"
-msgstr ""
-
-#: imap.c:476
-msgid "Error exchanging credentials"
-msgstr ""
-
-#: imap.c:512
-msgid "Couldn't unwrap security level data"
-msgstr ""
-
-#: imap.c:517
-msgid "Credential exchange complete"
-msgstr ""
-
-#: imap.c:521
-msgid "Server requires integrity and/or privacy"
-msgstr ""
-
-#: imap.c:530
-#, c-format
-msgid "Unwrapped security level flags: %s%s%s"
-msgstr ""
-
-#: imap.c:534
-#, c-format
-msgid "Maximum GSS token size is %ld"
-msgstr ""
-
-#: imap.c:547
-msgid "Error creating security level request"
-msgstr ""
-
-#: imap.c:552
-#, c-format
-msgid "Requesting authorisation as %s"
-msgstr ""
-
-#: imap.c:564
-msgid "Releasing GSS credentials"
-msgstr ""
-
-#: imap.c:567
-msgid "Error releasing credentials"
-msgstr ""
-
-#: imap.c:614
-msgid "Protocol identified as IMAP4 rev 1"
-msgstr ""
-
-#: imap.c:620
-msgid "Protocol identified as IMAP4 rev 0"
-msgstr ""
-
-#: imap.c:627
-msgid "Protocol identified as IMAP2 or IMAP2BIS"
-msgstr ""
-
-#: imap.c:638
-msgid "OTP authentication is supported"
-msgstr ""
-
-#: imap.c:650
-msgid "GSS authentication is supported"
-msgstr ""
-
-#: imap.c:656
-msgid "Required GSS capability not supported by server"
-msgstr ""
-
-#: imap.c:665
-msgid "KERBEROS_V4 authentication is supported"
-msgstr ""
-
-#: imap.c:682
-msgid "Required KERBEROS_V4 capability not supported by server"
-msgstr ""
-
-#: imap.c:690
-msgid "Required LOGIN capability not supported by server"
-msgstr ""
-
-#: imap.c:744
-msgid "re-poll failed"
-msgstr ""
-
-#: imap.c:761
-msgid "mailbox selection failed"
-msgstr ""
-
-#: interface.c:173
-msgid "missing IP interface address"
-msgstr ""
-
-#: interface.c:185
-msgid "invalid IP interface address"
-msgstr ""
-
-#: interface.c:187
-msgid "invalid IP interface mask"
-msgstr ""
-
-#: interface.c:223
-#, c-format
-msgid "activity on %s -noted- as %d"
-msgstr ""
-
-#: interface.c:237
-#, c-format
-msgid "skipping poll of %s, %s down"
-msgstr ""
-
-#: interface.c:246
-#, c-format
-msgid "skipping poll of %s, %s IP address excluded"
-msgstr ""
-
-#: interface.c:257
-#, c-format
-msgid "activity on %s checked as %d"
-msgstr ""
-
-#: interface.c:264
-#, c-format
-msgid "skipping poll of %s, %s inactive"
-msgstr ""
-
-#: netrc.c:228
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr ""
-
-#: netrc.c:232
-#, c-format
-msgid "%s:%d: warning: found \"%s\" before any host names\n"
-msgstr ""
-
-#: netrc.c:268
-#, c-format
-msgid "%s:%d: warning: unknown token \"%s\"\n"
-msgstr ""
-
-#: options.c:163 options.c:207
-#, c-format
-msgid "String '%s' is not a valid number string.\n"
-msgstr ""
-
-#: options.c:172
-#, c-format
-msgid "Value of string '%s' is %s than %d.\n"
-msgstr ""
-
-#: options.c:173
-msgid "smaller"
-msgstr ""
-
-#: options.c:173
-msgid "larger"
-msgstr ""
-
-#: options.c:347
-#, c-format
-msgid "Invalid protocol `%s' specified.\n"
-msgstr ""
-
-#: options.c:378
-#, c-format
-msgid "Invalid preauthentication `%s' specified.\n"
-msgstr ""
-
-#: options.c:496
-msgid "fetchmail: network security support is disabled\n"
-msgstr ""
-
-#: options.c:551
-msgid "usage:  fetchmail [options] [server ...]\n"
-msgstr ""
-
-#: options.c:552
-msgid "  Options are as follows:\n"
-msgstr ""
-
-#: options.c:553
-msgid "  -?, --help        display this option help\n"
-msgstr ""
-
-#: options.c:554
-msgid "  -V, --version     display version info\n"
-msgstr ""
-
-#: options.c:556
-msgid "  -c, --check       check for messages without fetching\n"
-msgstr ""
-
-#: options.c:557
-msgid "  -s, --silent      work silently\n"
-msgstr ""
-
-#: options.c:558
-msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr ""
-
-#: options.c:559
-msgid "  -d, --daemon      run as a daemon once per n seconds\n"
-msgstr ""
-
-#: options.c:560
-msgid "  -N, --nodetach    don't detach daemon process\n"
-msgstr ""
-
-#: options.c:561
-msgid "  -q, --quit        kill daemon process\n"
-msgstr ""
-
-#: options.c:562
-msgid "  -L, --logfile     specify logfile name\n"
-msgstr ""
-
-#: options.c:563
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-
-#: options.c:564
-msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr ""
-
-#: options.c:565
-msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-
-#: options.c:566
-msgid "  -i, --idfile      specify alternate UIDs file\n"
-msgstr ""
-
-#: options.c:567
-msgid "      --postmaster  specify recipient of last resort\n"
-msgstr ""
-
-#: options.c:569
-msgid "  -I, --interface   interface required specification\n"
-msgstr ""
-
-#: options.c:570
-msgid "  -M, --monitor     monitor interface for activity\n"
-msgstr ""
-
-#: options.c:572
-msgid "      --plugin      specify external command to open connection\n"
-msgstr ""
-
-#: options.c:573
-msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr ""
-
-#: options.c:575
-msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr ""
-
-#: options.c:576
-msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr ""
-
-#: options.c:577
-msgid "  -P, --port        TCP/IP service port to connect to\n"
-msgstr ""
-
-#: options.c:578
-msgid "  -A, --auth        authentication type (password or kerberos)\n"
-msgstr ""
-
-#: options.c:579
-msgid "  -t, --timeout     server nonresponse timeout\n"
-msgstr ""
-
-#: options.c:580
-msgid "  -E, --envelope    envelope address header\n"
-msgstr ""
-
-#: options.c:581
-msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr ""
-
-#: options.c:583
-msgid "  -u, --username    specify users's login on server\n"
-msgstr ""
-
-#: options.c:584
-msgid "  -a, --all         retrieve old and new messages\n"
-msgstr ""
-
-#: options.c:585
-msgid "  -K, --nokeep      delete new messages after retrieval\n"
-msgstr ""
-
-#: options.c:586
-msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr ""
-
-#: options.c:587
-msgid "  -F, --flush       delete old messages from server\n"
-msgstr ""
-
-#: options.c:588
-msgid "  -n, --norewrite   don't rewrite header addresses\n"
-msgstr ""
-
-#: options.c:589
-msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr ""
-
-#: options.c:590
-msgid "  -w, --warnings   interval between warning mail notification\n"
-msgstr ""
-
-#: options.c:593
-msgid "  -T, --netsec      set IP security request\n"
-msgstr ""
-
-#: options.c:595
-msgid "  -S, --smtphost    set SMTP forwarding host\n"
-msgstr ""
-
-#: options.c:596
-msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr ""
-
-#: options.c:597
-msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr ""
-
-#: options.c:598
-msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr ""
-
-#: options.c:599
-msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr ""
-
-#: options.c:600
-msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr ""
-
-#: options.c:601
-msgid "      --mda         set MDA to use for forwarding\n"
-msgstr ""
-
-#: options.c:602
-msgid "      --bsmtp       set output BSMTP file\n"
-msgstr ""
-
-#: options.c:603
-msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
-msgstr ""
-
-#: options.c:604
-msgid "  -r, --folder      specify remote folder name\n"
-msgstr ""
-
-#: pop3.c:209
-msgid "Required APOP timestamp not found in greeting"
-msgstr ""
-
-#: pop3.c:217
-msgid "Timestamp syntax error in greeting"
-msgstr ""
-
-#: pop3.c:239
-msgid "Undefined protocol request in POP3_auth"
-msgstr ""
-
-#: pop3.c:247
-msgid "lock busy!  Is another session active?"
-msgstr ""
-
-#: pop3.c:355
-msgid "Messages inserted into list on server. Cannot handle this."
-msgstr ""
-
-#: pop3.c:429
-msgid "protocol error"
-msgstr ""
-
-#: pop3.c:442
-msgid "protocol error while fetching UIDLs"
-msgstr ""
-
-#: pop3.c:666
-msgid "Option --remote is not supported with POP3\n"
-msgstr ""
-
-#: rpa.c:116
-msgid "Success"
-msgstr ""
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr ""
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr ""
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr ""
-
-#: rpa.c:172
-msgid "RPA token 2: Base64 decode error\n"
-msgstr ""
-
-#: rpa.c:183
-#, c-format
-msgid "Service chose RPA version %d.%d\n"
-msgstr ""
-
-#: rpa.c:189
-#, c-format
-msgid "Service challenge (l=%d):"
-msgstr ""
-
-#: rpa.c:198
-#, c-format
-msgid "Service timestamp %s\n"
-msgstr ""
-
-#: rpa.c:203
-msgid "RPA token 2 length error\n"
-msgstr ""
-
-#: rpa.c:207
-#, c-format
-msgid "Realm list: %s\n"
-msgstr ""
-
-#: rpa.c:211
-msgid "RPA error in service@realm string\n"
-msgstr ""
-
-#: rpa.c:248
-msgid "RPA token 4: Base64 decode error\n"
-msgstr ""
-
-#: rpa.c:259
-#, c-format
-msgid "User authentication (l=%d):"
-msgstr ""
-
-#: rpa.c:273
-#, c-format
-msgid "RPA status: %02X\n"
-msgstr ""
-
-#: rpa.c:279
-msgid "RPA token 4 length error\n"
-msgstr ""
-
-#: rpa.c:286
-#, c-format
-msgid "RPA rejects you: %s\n"
-msgstr ""
-
-#: rpa.c:288
-msgid "RPA rejects you, reason unknown\n"
-msgstr ""
-
-#: rpa.c:293
-#, c-format
-msgid "RPA User Authentication length error: %d\n"
-msgstr ""
-
-#: rpa.c:298
-#, c-format
-msgid "RPA Session key length error: %d\n"
-msgstr ""
-
-#: rpa.c:304
-msgid "RPA _service_ auth fail. Spoof server?\n"
-msgstr ""
-
-#: rpa.c:309
-msgid "Session key established:"
-msgstr ""
-
-#: rpa.c:340
-msgid "RPA authorisation complete\n"
-msgstr ""
-
-#: rpa.c:369
-msgid "Get response\n"
-msgstr ""
-
-#: rpa.c:399
-#, c-format
-msgid "Get response return %d [%s]\n"
-msgstr ""
-
-#: rpa.c:461
-msgid "Hdr not 60\n"
-msgstr ""
-
-#: rpa.c:482
-msgid "Token length error\n"
-msgstr ""
-
-#: rpa.c:487
-#, c-format
-msgid "Token Length %d disagrees with rxlen %d\n"
-msgstr ""
-
-#: rpa.c:493
-msgid "Mechanism field incorrect\n"
-msgstr ""
-
-#: rpa.c:530
-#, c-format
-msgid "dec64 error at char %d: %x\n"
-msgstr ""
-
-#: rpa.c:545
-msgid "Inbound binary data:\n"
-msgstr ""
-
-#: rpa.c:583
-msgid "Outbound data:\n"
-msgstr ""
-
-#: rpa.c:649
-msgid "RPA String too long\n"
-msgstr ""
-
-#: rpa.c:654
-msgid "Unicode:"
-msgstr ""
-
-#: rpa.c:716
-msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
-msgstr ""
-
-#: rpa.c:717
-msgid "    prevent you logging in, but means you\n"
-msgstr ""
-
-#: rpa.c:718
-msgid "    cannot be sure you are talking to the\n"
-msgstr ""
-
-#: rpa.c:719
-msgid "    service that you think you are (replay\n"
-msgstr ""
-
-#: rpa.c:720
-msgid "    attacks by a dishonest service are possible.)\n"
-msgstr ""
-
-#: rpa.c:731
-msgid "User challenge:"
-msgstr ""
-
-#: rpa.c:889
-msgid "MD5 being applied to data block:\n"
-msgstr ""
-
-#: rpa.c:902
-msgid "MD5 result is: "
-msgstr ""
-
-#: sink.c:162
-#, c-format
-msgid "forwarding to %s"
-msgstr ""
-
-#: sink.c:380
-msgid "BSMTP file open or preamble write failed"
-msgstr ""
-
-#: sink.c:501
-#, c-format
-msgid "about to deliver with: %s"
-msgstr ""
-
-#: sink.c:524
-msgid "MDA open failed"
-msgstr ""
-
-#: sink.c:538
-#, c-format
-msgid "%cMTP connect to %s failed"
-msgstr ""
-
-#: sink.c:620
-#, c-format
-msgid "%cMTP error: %s"
-msgstr ""
-
-#: sink.c:691
-#, c-format
-msgid "%cMTP listener doesn't like recipient address `%s'"
-msgstr ""
-
-#: sink.c:705
-#, c-format
-msgid "can't even send to %s!"
-msgstr ""
-
-#: sink.c:758
-msgid "MDA exited abnormally or returned nonzero status"
-msgstr ""
-
-#: sink.c:770
-msgid "Message termination or close of BSMTP file failed"
-msgstr ""
-
-#: sink.c:779
-msgid "SMTP listener refused delivery"
-msgstr ""
-
-#: sink.c:806
-msgid "LMTP delivery error on EOM"
-msgstr ""
-
-#: sink.c:809
-#, c-format
-msgid "Unexpected non-503 response to LMTP EOM: %s"
-msgstr ""
-
-#: socket.c:57
-#, c-format
-msgid "fetchmail: socketpair failed: %s(%d)"
-msgstr ""
-
-#: socket.c:65
-#, c-format
-msgid "running %s %s %s"
-msgstr ""
-
-#: socket.c:67
-#, c-format
-msgid "execl(%s) failed: %s (%d)"
-msgstr ""
-
-#: socket.c:92
-#, c-format
-msgid "fetchmail: getaddrinfo(%s.%s): %s(%d)"
-msgstr ""
-
-#: socket.c:170
-#, c-format
-msgid "fetchmail: illegal address length received for host %s"
-msgstr ""
-
-#: xmalloc.c:32
-msgid "malloc failed"
-msgstr ""
-
-#: xmalloc.c:43
-msgid "realloc failed"
-msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7ed9576f..62dc99ff 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2003-07-27 17:54+0200\n"
 "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -28,7 +28,7 @@ msgid "No, their IP addresses don't match\n"
 msgstr "Negatiu, les adreces IP no coincideixen\n"
 
 # poll of
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "no s'ha pogut resoldre el nom `%s' quan es consultava %s.\n"
@@ -42,110 +42,101 @@ msgstr "no s'ha pogut desxifrar la codificació BASE64\n"
 msgid "decoded as %s\n"
 msgstr "desxifrat com a %s\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "error de kerberos %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [el servidor diu: '%*s'] \n"
 
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
 # "avís de" o "avís per"?
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+#: driver.c:340
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Subject: fetchmail: avís de missatges excessivament grans.\n"
 "\n"
 "Els següents missatges de mida excessiva s'han deixat al servidor %s:"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:358
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\tmissatge %d de %d octets: s'ha omès.\n"
 
-#: driver.c:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ometent el missatge %s@%s:%d (%d octets)"
 
-#: driver.c:549
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ometent el missatge %s@%s:%d (%d octets)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (mida -1)"
 
-#: driver.c:568
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (massa gran)"
 
-#: driver.c:583
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "falta l'encapçalament, missatge %s@%s:%d (%d octets)\n"
 
-#: driver.c:600
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "llegint el missatge %s@%s:%d de %d"
 
 # %s pot ser nul, o bé "header "
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d octets%s)"
 
 # en o a?
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr " en l'encapçalament"
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octets en el cos) "
 
-#: driver.c:736
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "el missatge %s@%s:%d no tenia la mida esperada (%d real != %d esperada)\n"
 
-#: driver.c:767
+#: driver.c:771
 msgid " retained\n"
 msgstr " retingut\n"
 
 # lliurat, expedit, despatxat, esborrat, eliminat...
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr " eliminat\n"
 
 # ídem
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " no eliminat\n"
 
 # traducció de "fetchlimit"
-#: driver.c:809
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
@@ -153,40 +144,41 @@ msgstr ""
 "servidor %s\n"
 
 # socket o sòcol?
-#: driver.c:869
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE rebut des d'un MDA, o error de flux de socket\n"
 
-#: driver.c:876
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "temps esgotat després de %d segons esperant connectar amb %s.\n"
 
-#: driver.c:880
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "temps esgotat després de %d segons esperant el servidor %s.\n"
 
-#: driver.c:884
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "temps esgotat després de %d segons esperant per a %s.\n"
 
-#: driver.c:889
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "temps esgotat després de %d segons esperant resposta del receptor.\n"
 
-#: driver.c:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "temps d'espera esgotat després de %d segons.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail: s'esgota el temps d'espera molt sovint\n"
 
-#: driver.c:906
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -195,7 +187,7 @@ msgstr ""
 "El fetchmail ha excedit el temps d'espera més de %d cops quan intentava "
 "obtenir el correu de %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:916
 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"
@@ -212,47 +204,47 @@ msgstr ""
 "El fetchmail no tornarà a comprovar més aquesta bústia fins que el\n"
 "reinicieu.\n"
 
-#: driver.c:940
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "l'ordre de preconnexió ha fallat amb estat %d\n"
 
-#: driver.c:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no s'ha pogut trobar cap casella HESIOD per %s\n"
 
-#: driver.c:993
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "El servidor principal no té nom.\n"
 
-#: driver.c:1016
+#: driver.c:1020
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "no s'ha pogut trobar el nom canònic DNS de %s (%s)\n"
 
-#: driver.c:1053
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "inconsistència interna\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "la connexió %s amb %s ha fallat"
 
-#: driver.c:1069
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "host desconegut."
 
-#: driver.c:1072
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "el nom és vàlid, però no té cap adreça IP."
 
-#: driver.c:1075
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "error no recuperable del servidor de noms."
 
-#: driver.c:1077
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "error passatger del servidor de noms."
 
@@ -262,17 +254,19 @@ msgid "unknown DNS error %d."
 msgstr "error de DNS %d no identificat."
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: fetchmail: servidor inaccessible.\n"
 "\n"
 "El fetchmail no pot contactar amb el servidor de correu %s:"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "El fetchmail no ha pogut obtenir el correu de %s@%s.\n"
+
+#: driver.c:1131 imap.c:367 pop3.c:411
 msgid "SSL connection failed.\n"
 msgstr "La conexió SSL ha fallat.\n"
 
@@ -296,16 +290,16 @@ msgid " (previously authorized)"
 msgstr " (prèviament autoritzat)"
 
 #: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail: l'autenticació de %s@%s ha fallat\n"
 
-#: driver.c:1220
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "El fetchmail no ha pogut obtenir el correu de %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -334,7 +328,7 @@ msgstr ""
 "El fetchmail continarà intentant connectar-s'hi a cada cicle, però\n"
 "no us enviarà més notificacions fins que el servei es restableixi."
 
-#: driver.c:1239
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -353,173 +347,170 @@ msgstr ""
 "El dimoni fetchmail continuarà funcionant i intentant connectar-s'hi a cada\n"
 "cicle, però no us enviarà més notificacions fins que restabliu el servei."
 
-#: driver.c:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Es torna a recollir el correu immediatament de %s@%s\n"
 
-#: driver.c:1259
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Error no identificat de login o autenticació a %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorització reeixida a %s@%s\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1290
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail: autenticació reeixida a %s@%s\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "El fetchmail ha estat capaç d'accedir a %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "El servei s'ha restablert.\n"
 
-#: driver.c:1327
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionant o re-comprovant la carpeta %s\n"
 
-#: driver.c:1329
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionant o re-comprovant la carpeta per omissió\n"
 
-#: driver.c:1345
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s a %s (carpeta %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Consultant %s\n"
 
 # seen
-#: driver.c:1362
+#: driver.c:1355
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d vistos) per %s"
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d vistos) per %s"
+msgstr[1] "%d %s (%d vistos) per %s"
 
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "missatges"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "missatge"
-
-#: driver.c:1366
+#: driver.c:1358
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s per %s"
+#: driver.c:1361
+#, fuzzy, c-format
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] "%d %s per %s"
+msgstr[1] "%d %s per %s"
 
-#: driver.c:1375
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1381
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hi ha correu per %s\n"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "recompte de missatges fals!"
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "de socket"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "de capçalera RFC822"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "de MDA"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "de sincronització client/servidor"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "de protocol client/servidor"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "de `lock busy' al servidor"
 
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "de transacció SMTP"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "de consulta DNS"
 
 # aquest missatge va directe a stderr
-#: driver.c:1539
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "error no definit\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "error %s mentre es lliurava via SMTP al host %s\n"
 
-#: driver.c:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "error %s mentre es recollia de %s\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "l'ordre de postconnexió ha fallat amb estat %d\n"
 
-#: driver.c:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "El suport per Kerberos V4 no està enllaçat.\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "El suport per Kerberos V5 no està enllaçat.\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "L'opció --flush no està suportada amb %s\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "L'opció --all no està suportada amb %s\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "L'opció --limit no està suportada amb %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -534,7 +525,7 @@ msgstr ""
 "Proveu \"env QMAILINJECT= %s ELS VOSTRES ARGUMENTS AQUÍ\"\n"
 "%s: Avorta.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -551,17 +542,17 @@ msgstr ""
 "Proveu \"env NULLMAILER_FLAGS= %s ELS VOSTRES ARGUMENTS AQUÍ\"\n"
 "%s: Avorta.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: No existeixes. Escampa la boira.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: no s'ha pogut determinar el vostre host!"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "ha fallat la funció gethostbyname per %s\n"
@@ -591,24 +582,20 @@ msgstr "No hi han missatges pendents per %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "S'ha iniciat la cua de missatges pendents per %s\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Els missatges pel node %s no s'han pogut posar a la cua\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "El node %s no està permès: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "error de sintaxi d'ETRN\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "error de sintaxi d'ETRN en els paràmetres\n"
@@ -634,62 +621,62 @@ 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:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocat amb"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "no s'ha pogut determinar quin és el directori actual\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Aquesta és la versió del fetchmail %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, 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:330
+#: fetchmail.c:343
 msgid " and "
 msgstr " i de "
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, 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:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no heu especificat cap servidor de correu.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no hi ha cap altre fetchmail funcionant\n"
 
 # bailing out
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, 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:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "en segon terme"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "en primer terme"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: el fetchmail %s a %d ha finalitzat.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -697,7 +684,7 @@ msgstr ""
 "fetchmail: no es pot comprovar el correu mentre funcioni un altre procés del "
 "fetchmail.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -705,186 +692,186 @@ msgstr ""
 "fetchmail: no es poden consultar els hosts especificats amb un altre "
 "fetchmail funcionant a %d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, 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:425
+#: fetchmail.c:438
 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:431
+#: fetchmail.c:444
 #, 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:443
+#: fetchmail.c:456
 #, 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:458
+#: fetchmail.c:471
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: no s'ha trobat cap contrasenya per %s@%s.\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entreu la contrasenya per %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciant el dimoni fetchmail %s \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "no s'ha pogut obrir %s per afegir-hi els registres \n"
 
-#: fetchmail.c:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no s'ha pogut verificar l'hora de %s (error %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciant fetchmail (%s ha canviat)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 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:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "l'intent de reexecutar el fetchmail ha fallat\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, 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 excedits)\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "no s'ha completat l'interval, no es consultarà %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estat de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estat de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estat de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estat de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estat de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estat de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estat de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estat de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estat de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estat de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estat de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Estat de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estat de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estat de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estat de la consulta=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Totes les connexions estan bloquejades. Sortint.\n"
 
 # %s és la sortida de timestamp()
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "dormint el %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertat per %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertat pel senyal %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertat el %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, 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:939
+#: fetchmail.c:950
 msgid "couldn't time-check the run-control file\n"
 msgstr "no s'ha pogut verificar l'hora del fitxer de control\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:983
 #, 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:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "El suport per SSL no està compilat.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -892,627 +879,627 @@ msgstr ""
 "fetchmail: atenció: cap DNS disponible per verificar les obtencions "
 "`multidrop' de %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr ""
 "la configuració de %s no és vàlida, el nombre d'un port no pot ser negatiu\n"
 
-#: fetchmail.c:1171
+#: fetchmail.c:1183
 #, 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:1187
+#: fetchmail.c:1199
 #, 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:1202
+#: fetchmail.c:1214
 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:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "finalitzat amb senyal %d\n"
 
 # conflicte query-poll
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogant %s (protocol %s) el %s: s'inicia la consulta\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "el suport per POP2 no està configurat.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "el suport per POP3 no està configurat.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "el suport per IMAP no està configurat.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "el suport per ETRN no està configurat.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "El suport per ETRN necessita la funció gethostbyname(2).\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "El suport per ODMR no està configurat.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "El suport per ODMR necessita la funció gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "heu seleccionat un protocol que no està suportat.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogant %s (protocol %s) el %s: la consulta ha finalitzat\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'interval entre consultes és de %d segons\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El fitxer de registre és %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El fitxer d'identificacions és %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "L'activitat es registrarà via syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "El fetchmail enmascararà i no generarà capçaleres `Recieved'\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1466
 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:1456
+#: fetchmail.c:1468
 #, 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:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al postmaster.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "El fetchmail dirigirà els missatges d'error al remitent.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opcions per l'obtenció de %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correu d'obtindrà via %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1488
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr "  Aquest servidor es consultarà cada %d intervals.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nom autèntic del servidor és %s.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr ""
 "  Aquest host%ses consultarà quan no se'n hagi especificat cap altre.\n"
 
 # comprovar on s'apliquen aquestes substitucions
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr " no "
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr " "
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  Es demanarà la contrasenya.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificació RPOP = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasenya = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocol és KPOP amb autenticació per Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocol és %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (usant el servei %s)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (usant les opcions de seguretat de xarxa %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (usant el port %d)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (usant el port per defecte)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (obligant l'ús d'UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  S'intentaran tots els mètodes d'autenticació disponibles.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per contrasenya.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per NTLM.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per OTP.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per CRAM-Md5.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per GSSAPI.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V4.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  S'obligarà l'autenticació per Kerberos V5.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  S'assumeix que el xifrat és d'extrem a extrem.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El servei principal de correu és: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sessions encriptades amb SSL habilitades.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocol SSL: %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprovació del certificat SSL del servidor habilitada.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directori de certificats SSL de confiança: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, 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:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (per defecte).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  Seleccionada la bústia per defecte.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  Les bústies seleccionades són:"
 
 # al tanto amb la substitució
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  S'obtindran els missatges %s (--all %s).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "tant nous com vells"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "nous"
 
 # la substitució és: "<espai>/ no "
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Els missatges obtinguts%ses conservaran al servidor (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr ""
 "  Els missatges vells%ss'eliminaran abans d'obtenir el correu (--flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  La reescriptura d'adreces locals està %sda (--norewrite %s).\n"
 
 # nota: s'ha d'escriure la terminació masculina o femenina segons
 # convingui, per exemple: %st o bé %sda.
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "enabled"
 msgstr "habilita"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "disabled"
 msgstr "deshabilita"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  L'eliminació de retorns de carro està %sda (stripcr %s).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  L'inserció de retorns de carro està %sa (forcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr ""
 "  L'interpretació del Content-Transfer-Encoding està %sda (pass8bits %s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  El desxifrat MIME està %st (mimedecode %s).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  La pausa després de cada obtenció està %sda (idle %s).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Les línies Status que no estiguin en blanc es %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "descartaran"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "mantindran"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Les línies Delivered-To es %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, 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:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  L'interval d'avisos de grandària dels missatges és de %d segons (--"
 "warnings %d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Avisos de la grandària dels missatges a cada obtenció (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, 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:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No hi ha límit de missatges rebuts (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  El límit de missatges obtinguts és de %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1660
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No hi ha límit de mida dels missatges (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, 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:1661
+#: fetchmail.c:1673
 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:1665
+#: fetchmail.c:1677
 #, 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:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No es suprimiran els missatges fins al final (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Els dominis pels quals es recollirà el correu són:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (per omissió)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, 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:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Els missatges es lliuraran amb \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Els missatges es reenviaran per %cMTP a:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, 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:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les respostes del servidor reconegudes com a bloqueig d'spam són:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueig d'spam està deshabilitat\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  No hi ha cap ordre de preconnexió.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, 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:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  No hi ha cap ordre de postconnexió.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  No s'ha declarat cap nom local per aquest host.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  Mode multi-drop: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  Mode single-drop: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "S'ha(n) reconegut %d nom(s) local(s).\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  La consulta DNS d'adreces `multidrop' està %sda.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  Els àlies del servidor es compararan amb les adreces `multidrop' "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "per l'adreça IP.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "pel nom.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  L'encaminament per l'adreça de l'embolcall està deshabilitat.\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, 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:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Recieved"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, 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:1784
+#: fetchmail.c:1796
 #, 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:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  No es suprimirà cap prefix\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Àlies predeclarats del servidor de correu:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  Dominis locals:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, 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:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  No s'ha especificat cap interfície requerida.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Es monitorarà l'interfície %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  No s'ha especificat cap interfície a monitorar.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, 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:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, 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:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  No s'ha especificat cap ordre de connexió per SMTP.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No s'ha desat cap UID d'aquest host.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  S'han desat %d UIDs.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 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:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1520,16 +1507,12 @@ msgstr ""
 "  No s'afegirà el rastre de l'obtenció a la capçalera Received.\n"
 ".\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propietats de pas \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "ha fallat la rutina alloca"
 
@@ -1603,154 +1586,153 @@ 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:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "S'ha identificat el protocol com a IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "es farà una pausa després de l'obtenció\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "la supressió de missatges ha fallat\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "la re-obtenció ha fallat\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "hi ha %d missatge(s) esperant després de la re-obtenció\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecció de bústia\n"
 
-#: imap.c:685
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "hi ha %d missatge(s) esperant després de la primera obtenció\n"
 
-#: imap.c:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "hi ha %d missatge(s) esperant després de la supressió\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges nous ha fallat\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u és nou\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u és el primer missatge nou\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "No s'ha pogut obrir l'interfície kvm. Asseguereu-vos que el fetchmail és "
 "SGID kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "No s'ha pogut analitzar el nom de la interfície de %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist estimate) ha fallat"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc ha fallat"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) ha fallat"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "El missatge d'encaminament versió %d és incomprensible."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "No s'ha trobat cap interfície amb el nom de %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "No s'ha trobat cap adreça IP per %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "falta l'adreça IP de l'interfície\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "l'adreça IP de l'interfície no és vàlida\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "la màscara IP de l'interfície no és vàlida\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activitat a %s -vista- com %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr ""
 "ometent l'obtenció de %s, %s apagada\n"
 "\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "ometent l'obtenció de %s, l'adreça IP de %s està exclosa\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activitat a %s comprovada com %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "ometent l'obtenció de %s, %s inactiva\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "activitat a %s era %d, és %d\n"
@@ -1777,11 +1759,11 @@ msgstr "no s'ha pogut desxifrar la resposta de disponibilitat en BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "la codificació no encaixa\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: esborrant el fitxer de bloqueig antic\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: ha fallat la creació del bloqueig.\n"
 
@@ -1813,7 +1795,6 @@ msgstr "S'inicia el període de descarrega ara...\n"
 msgid "ATRN request refused.\n"
 msgstr "La petició ATRN ha estat refusada.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "No es pot processar la petició ATRN en aquests moments\n"
@@ -1822,12 +1803,10 @@ msgstr "No es pot processar la petició ATRN en aquests moments\n"
 msgid "You have no mail.\n"
 msgstr "No teniu correu.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Ordre no implementada\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Autenticació requerida.\n"
@@ -1861,7 +1840,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:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
@@ -1992,200 +1971,211 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificat ssl del client\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     certificat ssl del client\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    obliga l'ús del protocol ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica l'ordre externa per obrir una connexió\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plogout     especifica l'ordre externa per obrir una connexió smtp\n"
 
-#: options.c:691
+#: options.c:693
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica el protocol que s'usa per obtenir el correu\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        obliga l'ús d'UIDLs (només pop3)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        port TCP/IP al qual connectar-se\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipus d'autenticació (password/kerberos/ssh/otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     temps d'espera per la resposta del servidor\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    capçalera que conté l'adreça de l'embolcall\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix que es suprimeix del nom d'usuari local\n"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   servei de correu principal\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  afegeix el rastre de l'obtenció a la capçalera Received\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    especifica el nom de login al servidor\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         recull els missatges tant nous com vells\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 "  -K, --nokeep      esborra els missatges nous després de recollir-los\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        deixa els missatges al servidor un cop recollits\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       esborra els missatges vells del servidor\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescriu les adreces de l'encapçalament\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recull els missatges que superin la mida "
 "especificada\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval entre avisos de notificació de correu\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      efectua una petició de seguretat IP\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    estableix el host pel reenviament via SMTP\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recull el correu pels dominis especificats\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress estableix el domini usat pel lliurament via SMTP\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    estableix el nom complet SMTP nomusuari@domini\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   estableix els valors reconeguts com a resposta antispam\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  estableix el límit de missatges SMTP enviats en sèrie\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  estableix el límit de missatges obtinguts per connexió\n"
 
-#: options.c:720
+#: options.c:722
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains recull el correu pels dominis especificats\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     estableix el màxim de missatges eliminats entre "
 "supressions\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         estableix l'MDA que s'utilitza pel reenviament\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       estableix el fitxer de sortida BSMTP\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) pel lliurament\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      estableix el nom de la carpeta remota\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostra punts de progressió àdhuc als fitxers de "
 "registre\n"
 
 # timestamp: marca horària
-#: pop3.c:538
+#: pop3.c:534
 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:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxi en la marca horària de la salutació\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petició de protocol indefinida a POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessió activa?\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:759
 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:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "L'opció --remote no està suportada amb POP3\n"
 
@@ -2244,163 +2234,143 @@ msgstr "El fitxer %s no pot tenir permisos més que -rwx--x--- (0710).\n"
 msgid "File %s must be owned by you.\n"
 msgstr "El fitxer %s ha de ser propietat vostra.\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Error no identificat del sistema"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (missatge de registre incomplet)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "error parcial pel desbordament del buffer del missatge"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "Es reescriurà la capçalera %s"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "La versió reescrita és %s\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "Reeixit"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr "Usuari restringit (hi ha algun problema amb el compte)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "El nom d'usuari o la contrasenya no són vàlids"
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr "Error fatal"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "Component RPA 2: Error del desxifrat Base64\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "El servei ha elegit la versió RPA %d.%d\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Clau del servei (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Marca horària del servei %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "La mida del component RPA 2 és incorrecta\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Llista de reialmes: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "Error d'RPA a la cadena servei@reialme\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "Component RPA 4: Error de desxifrat Base64\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Autenticació de l'usuari (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Estat RPA: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "La mida del component RPA 4 és incorrecta\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA us rebutja: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA us rebutja, motiu desconegut\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "La mida del component RPA User Authentication és incorrecta: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "La mida del component RPA Session key és incorrecta: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "Fallada en l'autenticació del _servei_ RPA. Nom del servidor fals?\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Clau de sessió establerta:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Autorització RPA completada\n"
 
 # és un nom?
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Petició de resposta\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "La petició de resposta ha retornat %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Capçalera diferent de 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "La mida del component és incorrecta\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "La mida del component %d no lliga amb rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Mecanisme de camp incorrecte\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "error de dec64 al caràcter %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Dades binàries entrants:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Dades sortints:\n"
 
@@ -2412,349 +2382,345 @@ msgstr "Cadena RPA massa llarga\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA no ha pogut obrir /dev/urandom. Això no impedeix\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    que entreu al sistema, però vol dir que no\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    podeu estar segurs d'estar parlant amb el\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    servei que creieu (són possibles atacs\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    per repetició per part d'un servei deshonest).\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Clau de l'usuari:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 que s'aplica al bloc de dades:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "L'MD5 resultant és: \n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "reenviant a %s\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cos del missatge retornat)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correu de %s retornat a %s\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'error desat encara és %d\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error %cMTP: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Ha fallat l'obertura del fitxer BSMTP o l'escriptura del preàmbul\n"
 
-#: sink.c:979
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adreça del destinatari `%s'\n"
 
-#: sink.c:986
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "El receptor %cMTP no admet l'adreça de destinació `%s'\n"
 
-#: sink.c:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "cap adreça coincideix; el postmaster no està definit.\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "ni tan sols es pot enviar a %s!\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "cap adreça coincideix; reenviant a %s.\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punt de lliurar amb: %s\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "l'obertura de l'MDA ha fallat\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "La connexió %cMTP amb %s ha fallat\n"
 
 # raise
-#: sink.c:1280
+#: sink.c:1267
 #, 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:1336
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA finalitzat pel senyal %d\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "L'MDA ha retornat un estat no nul: %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, 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:1363
+#: sink.c:1350
 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:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "El receptor SMTP refusa el lliurament\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de lliurament LMTP a EOM\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, 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:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\tEl Dimoni Fetchmail\n"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticació CRAM-MD5 per ESMTP...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "El servidor ha rebutjat l'ordre AUTH.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "La resposta en base64 del servidor és incorrecta.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Codificació desxifrada com a %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autenticació per ESMTP sense xifrat...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticació de LOGIN per ESMTP...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "error de protocol del receptor smtp\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: la rutina malloc ha fallat\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: la rutina socketpair ha fallat\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: la rutina fork ha fallat\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "la rutina dup2 ha fallat\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "executant %s (host %s servei %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "la rutina execvp(%s) ha fallat\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: s'ha rebut una adreça de llargada incorrecta pel host %s\n"
 
-#: socket.c:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organització emissora: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Atenció: El nom de l'organització emissora és massa llarg (pot estar "
 "truncat).\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Organització desconeguda\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nom comú de l'emissor: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Atenció: El nom comú de l'emissor és massa llarg (pot estar truncat).\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nom comú de l'emissor desconegut\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Nom comú del servidor: %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificat incorrecte: El component CommonName és massa llarg!\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "El nom comú del servidor no encaixa: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nom del servidor no està definit, no es pot verificar el certificat!\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Nom comú del servidor desconegut\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "El certificat no especifica el nom del servidor!\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ha fallat!\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Memòria exhaurida!\n"
 
 # digest text
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "El buffer del sumari de text és massa petit!\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Empremta de la clau de %s: %s\n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Les empremtes digitals de %s encaixen.\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Les empremtes digitals de %s no encaixen!\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Atenció: verificació del certificat del servidor: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emissor desconegut (primers %d caràcters): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor del fitxer fora d'abast per SSL"
 
-#: socket.c:948
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "El protocol SSL especificat `%s' no és vàlid, s'usa SSLv23.\n"
 
-#: socket.c:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La verificació del certificat o de l'empremta s'ha omès!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s s'ha assignat al nom local %s\n"
 
 # què significa?
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "el %s processat encaixa amb %s\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2763,70 +2729,70 @@ msgstr ""
 "analitzant la línea Received:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "línia acceptada, %s és un àlies del servidor de correu\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "línia rebutjada, %s no és un àlies del servidor de correu\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "no s'ha trobat cap adreça a la capçalera Received\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "s'ha trobat l'adreça `%s' a la capçalera Received\n"
 
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr ""
 "s'ha trobat un delimitador de missatge quan s'analitzava l'encapçalament\n"
 
-#: transact.c:552
+#: transact.c:549
 msgid "incorrect header line found while scanning headers\n"
 msgstr "s'ha trobat una línia incorrecta quan s'analitzava l'encapçalament\n"
 
-#: transact.c:554
+#: transact.c:551
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Consultant %s\n"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "cap conincidència local, reenviant a %s\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenviament i eliminació omesos a causa d'errors de DNS\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrivint l'encapçalament RFC822 msgblk\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "cap adreça de destinatari coincideix amb els noms locals declarats"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'adreça del destinatari %s no lliga amb cap nom local"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "el missatge conté caràcters NUL"
 
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "el receptor SMTP ha rebutjat les adreces locals de destinació: "
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "escrivint el text del missatge\n"
 
@@ -2848,8 +2814,6 @@ msgstr " <buit>"
 msgid "Scratch list of UIDs:"
 msgstr "Esborrany de llista d'UIDs:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
@@ -2889,3 +2853,28 @@ msgstr "la rutina malloc ha fallat\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "la rutina realloc ha fallat\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "error parcial pel desbordament del buffer del missatge"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "ha fallat la rutina alloca"
+
+#~ msgid "messages"
+#~ msgstr "missatges"
+
+#~ msgid "message"
+#~ msgstr "missatge"
+
+#~ msgid "Success"
+#~ msgstr "Reeixit"
+
+#~ msgid "Restricted user (something wrong with account)"
+#~ msgstr "Usuari restringit (hi ha algun problema amb el compte)"
+
+#~ msgid "Invalid userid or passphrase"
+#~ msgstr "El nom d'usuari o la contrasenya no són vàlids"
+
+#~ msgid "Deity error"
+#~ msgstr "Error fatal"
diff --git a/po/da.po b/po/da.po
index 04dda642..495da9fd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2003-04-10 18:50+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -27,7 +27,7 @@ msgstr "Ja, deres IP-adresser stemmer overens\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "Nej, deres IP-adresser stemmer ikke overens\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "navneserverfejl ved opslag på \"%s\" ved prøvning af %s.\n"
@@ -41,141 +41,133 @@ msgstr "kunne ikke afkode BASE64-anråb\n"
 msgid "decoded as %s\n"
 msgstr "afkodet som %s\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberosfejl %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server siger '%*s']\n"
 
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:340
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Subject: Fetchmail-advarsel om for store breve\n"
 "\n"
 "Disse breve er for store og forbliver paa postserveren %s:"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:358
+#, 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:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#: driver.c:549
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Springer brev %s@%s:%d over (%d oktetter)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (længde -1)"
 
-#: driver.c:568
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:583
+#: driver.c:584
 #, 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:600
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "læser brev %s@%s:%d af %d"
 
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %soktetter)"
 
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr "brevhoved-"
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:736
+#: driver.c:740
 #, 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:767
+#: driver.c:771
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " ikke slettet\n"
 
-#: driver.c:809
+#: 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"
 
-#: driver.c:869
+#: driver.c:874
 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:876
+#: driver.c:881
 #, 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:880
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på server %s.\n"
 
-#: driver.c:884
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten på %s.\n"
 
-#: driver.c:889
+#: driver.c:894
 #, 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:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail har gentagne tidsafbrud\n"
 
-#: driver.c:906
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -184,7 +176,7 @@ msgstr ""
 "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%"
 "s.\n"
 
-#: driver.c:911
+#: driver.c:916
 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,47 +191,47 @@ msgstr ""
 "\n"
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
-#: driver.c:940
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:993
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Fører-server har ikke noget navn.\n"
 
-#: driver.c:1016
+#: driver.c:1020
 #, 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:1053
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "intern uoverensstemmelse\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:1069
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "værten er ukendt."
 
-#: driver.c:1072
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "navnet er gyldigt, men har ingen IP-adresse."
 
-#: driver.c:1075
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "uoprettelig navneserverfejl."
 
-#: driver.c:1077
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "midlertidig navneserverfejl."
 
@@ -249,17 +241,19 @@ msgid "unknown DNS error %d."
 msgstr "ukendt DNS-fejl %d."
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetchmail-advarsel om utilgaengelig server.\n"
 "\n"
 "Fetchmail kunne ikke naa postserveren %s:"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, 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
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
@@ -283,16 +277,16 @@ msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
 #: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail - godkendelse mislykkedes paa %s@%s\n"
 
-#: driver.c:1220
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -321,7 +315,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:1239
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -340,171 +334,168 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Prøver straks igen %s@%s\n"
 
-#: driver.c:1259
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl på %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden på %s@%s\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1290
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail - godkendelse i orden paa %s@%s\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, 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:1296
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1327
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vælger eller prøver igen brevbakke %s\n"
 
-#: driver.c:1329
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "vælger eller prøver igen indbakken\n"
 
-#: driver.c:1345
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Prøver %s\n"
 
-#: driver.c:1362
+#: driver.c:1355
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d gamle) til %s"
+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:1363 driver.c:1370
-msgid "messages"
-msgstr "breve"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "brev"
-
-#: driver.c:1366
+#: driver.c:1358
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s til %s"
+#: driver.c:1361
+#, 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:1375
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1381
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "server låst-"
 
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1539
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "udefineret fejl\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, 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:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%sfejl ved hentning fra %s\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-støtte.\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-støtte.\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke understøttet med %s\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke understøttet med %s\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke understøttet med %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -519,7 +510,7 @@ msgstr ""
 "Prøv \"env QMAILINJECT= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -536,17 +527,17 @@ msgstr ""
 "Prøv \"env NULLMAILER_FLAGS= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Du findes ikke.  Fjern dig.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: kan ikke bestemme din værtsmaskine!"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fejlede for %s\n"
@@ -576,24 +567,20 @@ msgstr "Ingen breve venter på %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "Ikke-leverede breve til %s gjort klar\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Kan ikke stille breve i kø til maskine %s\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Maskine %s ikke tilladt: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "ETRN-syntaksfejl\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "ETRN-syntaksfejl i parametre\n"
@@ -619,60 +606,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:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "kunne ikke få det nuværende arbejdskatalog\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:343
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - måske mangler %s?\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail kører\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, 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:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %sfetchmail på %d dræbt.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -680,7 +667,7 @@ msgstr ""
 "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme vært "
 "kører.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -688,180 +675,180 @@ msgstr ""
 "fetchmail: kan ikke prøve de specificerede værter mens en anden fetchmail "
 "kører på %d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail kører på %d.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:438
 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:431
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: baggrunds fetchmail på %d vækket.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:456
 #, 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:458
+#: fetchmail.c:471
 #, 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:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv kodeord for %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starter fetchmail %s-dæmon\n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, 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:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsfæste %s (fejl %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s ændret)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 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:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "forsøg på at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, 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:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke nået, spørger ikke %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Spørgestatus=0 (succes)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Spørgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Spørgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Spørgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Spørgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Spørgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Spørgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Spørgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Spørgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Spørgestatus=9 (lås optaget)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Spørgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Spørgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Spørgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Spørgestatus=13 (afhentningsgrænse nået)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Spørgestatus=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "sover %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "vækket af %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "vækket af signal %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "vækket %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsfæste kørselskontrolfilen\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:983
 #, 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:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-understøttelse.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -869,626 +856,622 @@ msgstr ""
 "fetchmail: advarsel: DNS er ikke tilgængelig til at tjekke flermodtager-"
 "afhentninger fra %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, 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:1171
+#: fetchmail.c:1183
 #, 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:1187
+#: fetchmail.c:1199
 #, 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:1202
+#: fetchmail.c:1214
 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:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, 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:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-understøttelse.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-understøttelse.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-understøttelse.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-understøttelse.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Kan ikke understøtte ETRN uden gethostbyname(2).\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-understøttelse.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Kan ikke understøtte ODMR uden gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-understøttet protokol valgt.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, 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:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Prøvemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forløbsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1466
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forløbsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1468
 #, 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:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1476
+#: 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:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s 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:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr "vil ikke"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr "vil"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (bruger netværkssikkerhedstilvalg %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (bruger port %d)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilgængelige godkendelsesmetoder vil blive forsøgt.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er påkrævet.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er påkrævet.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter på svar fra server i højst %d sekunder"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "Alle"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "Kun nye"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Hentede breve %s blive gemt på serveren (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr "  Gamle breve %s blive slettede før afhentning (--flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  Indsættelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  Tomgang efter prøvning er %s (idle %s).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "slettet"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "bevaret"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, 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:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, 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:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Størrelsesadvarsler ved hver prøvning (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, 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:1648
+#: fetchmail.c:1660
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ingen maksimal størrelse på breve (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgrænse er %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgrænse (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, 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:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domæner som der vil blive hentet post til:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilføjet %s som BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, 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:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er slået fra\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med \"%s\".\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne vært.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d lokale navne genkendt\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "IP-adresse.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "navn.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "Adressering efter konvolutadressen er slået fra\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, 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:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Nr. konvolutadresse som vil blive analyseret: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1796
 #, 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:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  Ingen præfikssletning\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderklærede postserveraliaser:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  Lokale domæner:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem grænseflade %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen grænsefladekrav specificeret.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Prøveløkke vil overvåge %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overvågning af grænseflade specificeret.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, 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:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, 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:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hjælpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne vært.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilføjet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1865
 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:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Egenskaber som ignoreres af fetchmail: \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca mislykkedes"
 
@@ -1561,150 +1544,149 @@ msgstr "Fejl ved frigivelse af akkreditiver\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: tråd sover i %d sekunder.\n"
 
-#: imap.c:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "går i tomgang efter prøvning\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som påkrævet\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som påkrævet\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server understøtter ikke den krævede indlogningsmåde\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "sletning (EXPUNGE) mislykkedes\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "genprøvning mislykkedes\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d breve venter efter genprøvning\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:685
+#: 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:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "%d breve venter efter sletning\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "søgning efter usete breve mislykkedes\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er første usete\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr "Kan ikke åbne kvm-grænseflade. Sørg for at fetchmail er SGID kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Kan ikke udlede grænsefladenavn fra %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (få iflist-størrelse) mislykkedes"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc mislykkedes"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (få iflist) mislykkedes"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Forstår ikke version %d af dirigeringsbeskeder."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Ingen grænseflade med navnet %s fundet"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "ingen IP-adresse fundet for %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "manglende IP-grænsefladeadresse\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "Ugyldig IP-grænsefladeadresse\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "Ugyldig IP-grænseflademaske\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivitet på %s opfattet som %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "springer prøvning af %s over, %s er nede\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "springer prøvning af %s over, %s's IP-adresse er fravalgt\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivitet på %s tjekket som %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "springer prøvning af %s over, %s er inaktiv\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivitet på %s var %d, er %d\n"
@@ -1731,11 +1713,11 @@ msgstr "kunne ikke afkode BASE64 klar-svar\n"
 msgid "challenge mismatch\n"
 msgstr "uoverensstemmelse i anråb\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: fjerner efterladt låsefil\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: oprettelse af låsefil mislykkedes\n"
 
@@ -1767,7 +1749,6 @@ msgstr "Vender nu...\n"
 msgid "ATRN request refused.\n"
 msgstr "ATRN-anmodning afvist.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "Kan ikke behandle ATRN-anmodning nu.\n"
@@ -1776,12 +1757,10 @@ msgstr "Kan ikke behandle ATRN-anmodning nu.\n"
 msgid "You have no mail.\n"
 msgstr "Du har ingen post.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Kommando ikke implementeret.\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Godkendelse påkrævet.\n"
@@ -1815,7 +1794,7 @@ msgstr "fatal fejl ved læsning fra server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anråb\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt løsen: "
 
@@ -1943,189 +1922,200 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     ssl-klientcertifikat\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      -ssl          brug bestemt af ssl-protokol (ssl2/ss3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hjælpeprogram til at åbne forbindelse\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     specificer hjælpeprogram til at åbne smtp-forbindelse\n"
 
-#: options.c:691
+#: options.c:693
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    præfiks som skal slettes fra lokale bruger-id'er\n"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  tilføj sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specificer brugernavn på server\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         hent gamle og nye breve\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve på server\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       hent ikke breve over den anførte størrelse\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      anfør IP-sikkerhedsanmodning\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anfør vært til SMTP-levering\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anfør SMTP-afleveringsdomæne at bruge\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anfør fuldt SMTP-navn - brugernavn@domæne\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anfør antispam-svarværdier\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  anfør maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  anfør maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:720
+#: options.c:722
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains hent post til anførte domæner\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     anfør maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anfør MDA til brug for levering\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anfør BSMTP-uddatafil\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn på brevbakke på server\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forløbsprikker selv i logfiler\n"
 
-#: pop3.c:538
+#: pop3.c:534
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Påkrævet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokolønske i POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "lås optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:759
 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:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke understøttet med POP3\n"
 
@@ -2184,163 +2174,142 @@ msgstr "Filen %s må ikke flere tilladelser end -rwx--x--- (0710).\n"
 msgid "File %s must be owned by you.\n"
 msgstr "Filen %s skal være ejet af dig.\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (logbesked ikke komplet)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "overløb i buffer til del af fejlbesked"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "Skal til at omskrive %s"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "Omskreven version er %s\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "Succes"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr "Begrænset bruger (noget er galt med kontoen)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "Ugyldigt brugernavn eller løsen"
-
-# Hvad i alverden er deity error?
-#: rpa.c:119
-msgid "Deity error"
-msgstr "Gudefejl"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA symbol 2: Base64-afkodningsfejl\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service valgte RPA-version %d.%d\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service anråb (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service tidsstempel %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "RPA symbol 2 længdefejl\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Områdeliste: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "RPA-fejl i service@område-streng\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA symbol 4: Base64-afkodningsfejl\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Brugergodkendelse (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA-status: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "RPA symbol 4 længdefejl\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA afviser dig: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA afviser dig, årsag ukendt\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA-brugergodkendelses-længdefejl: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA-sessionsnøgle-længdefejl: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth-fejl. Narreserver?\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Sessionsnøgle etableret:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "RPA-godkendelse komplet\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Får svar\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Får svar %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Hdr ikke 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "Symbollængdefejl\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Symbollængde %d stemmer ikke overens med rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanismefelt ukorrekt\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64-fejl ved tegn %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Indgående binære data:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Udgående data:\n"
 
@@ -2352,342 +2321,338 @@ msgstr "RPA-streng for lang\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA Åbning af /dev/urandom mislykkedes. Det skulle ikke\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    forhindre dig i at logge ind, men betyder at du\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    ikke kan være sikker på at du taler med den\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    service som du tror (gentagelses-\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    angreb af en uærlig service er mulig).\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Brugeranråb:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 bliver anvendt på datablok:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "MD5-resultatet er:\n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst til afvisningsbrev)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "afvisning af brev fra %s sendt til %s\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gemt fejlkode er stadig %d\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP-fil åben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:979
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:986
+#: sink.c:973
 #, 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:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "MDA-åbning mislykkedes\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1280
+#: sink.c:1267
 #, 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:1336
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA døde af signal %d\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, 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:1363
+#: sink.c:1350
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
 
-#: sink.c:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl på EOM\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\tFetchmail Daemonen\n"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5-godkendelse...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Serveren afviste AUTH-kommandoen til godkendelse.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "Fejl i base64-svar fra server.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Anråb afkodet: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN-godkendelse...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Authentication...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udfører %s (server %s service %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, 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:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (måske afskåret).\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (måske afskåret).\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Servers almennavn %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dårligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anført, kunne ikke verificere certifikat!\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s nøgle-fingeraftryk: %s\n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Advarsel: servercertifikat-verificering: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de første %d tegn): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert værdi til SSL"
 
-#: socket.c:948
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev på en eller anden måde sprunget "
 "over!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Forsøger igen at læse cygwin-sokkel\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Forsøg på at læse cygwin-sokkel mislykkedes!\n"
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s svarer til %s lokalt\n"
 
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "Undersøgt %s som passer med %s\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2696,69 +2661,69 @@ msgstr ""
 "analyserer Received-linje:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "linjen accepteret, %s er et alias for postserveren\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "linjen afvist, %s er ikke et alias for postserveren\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "ingen \"Received\"-adresse fundet\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "fandt \"Received\"-adresse `%s'\n"
 
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr "brev afsluttet under læsningen af brevhovedet\n"
 
-#: transact.c:552
+#: transact.c:549
 msgid "incorrect header line found while scanning headers\n"
 msgstr "ukorrekt brevhovedlinje fundet under læsningen af brevhovedet\n"
 
-#: transact.c:554
+#: transact.c:551
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Prøver %s\n"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erklærede lokale navne"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "skriver brevtekst\n"
 
@@ -2780,8 +2745,6 @@ msgstr " <tom>"
 msgid "Scratch list of UIDs:"
 msgstr "Liste af øvrige UID'er:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
@@ -2820,3 +2783,29 @@ msgstr "malloc mislykkedes\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc mislykkedes\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "overløb i buffer til del af fejlbesked"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "alloca mislykkedes"
+
+#~ msgid "messages"
+#~ msgstr "breve"
+
+#~ 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 8ba5d075..9b9b4ebd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2004-11-10 01:32+0100\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2004-10-20 00:59+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -68,50 +68,50 @@ msgstr ""
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "  %d Nachricht, %d Oktetts lang, von fetchmail ausgelassen."
 
-#: driver.c:503
+#: driver.c:498
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "Nachricht %s@%s:%d wird ausgelassen"
 
-#: driver.c:555
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "Nachricht %s@%s:%d (%d Oktetts) wird ausgelassen"
 
-#: driver.c:571
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (Länge -1)"
 
-#: driver.c:574
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (übergroß)"
 
-#: driver.c:589
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "Kopfzeilen konnten nicht geholt werden, Nachricht %s@%s:%d (%d Oktetts)\n"
 
-#: driver.c:606
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "Nachricht %s@%s:%d von %d wird gelesen"
 
-#: driver.c:614
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %sOktetts)"
 
-#: driver.c:615
+#: driver.c:610
 msgid "header "
 msgstr "Kopfzeilen "
 
-#: driver.c:687
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d Oktetts im Nachrichtenkörper) "
 
-#: driver.c:745
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -119,60 +119,60 @@ msgstr ""
 "Nachricht %s@%s:%d hatte nicht die erwartete Länge (%d tatsächlich != %d "
 "erwartet\n"
 
-#: driver.c:776
+#: driver.c:771
 msgid " retained\n"
 msgstr " aufbewart\n"
 
-#: driver.c:785
+#: driver.c:780
 msgid " flushed\n"
 msgstr " gelöscht\n"
 
-#: driver.c:802
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " nicht gelöscht\n"
 
-#: driver.c:818
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr "fetchlimit %d erreicht; %d Nachrichten übrig auf Server %s Konto %s\n"
 
-#: driver.c:879
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE geworfen von einem MDA oder Stream-Socket-Fehler\n"
 
-#: driver.c:886
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "Zeitüberschreitung nach %d Sekunden beim Warten auf Verbindung mit Server %"
 "s.\n"
 
-#: driver.c:890
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf Server %s.\n"
 
-#: driver.c:894
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf %s.\n"
 
-#: driver.c:899
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "Zeitüberschreitung nach %d Sekunden beim Warten Antwort des Lauschers.\n"
 
-#: driver.c:902
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "Zeitüberschreitung nach %d Sekunden.\n"
 
-#: driver.c:914
+#: driver.c:909
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail erlebt wiederholte Zeitüberschreitungen"
 
-#: driver.c:917
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -181,7 +181,7 @@ msgstr ""
 "Fetchmail hat mehr als %d Zeitüberschreitungen erhalten beim Versuch, Mail "
 "von %s@%s abzuholen.\n"
 
-#: driver.c:921
+#: driver.c:916
 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,99 +198,99 @@ msgstr ""
 "\n"
 "Fetchmail wird diese Mailbox nicht mehr abfragen, bis Sie es erneut starten\n"
 
-#: driver.c:949
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "Vor-Verbindungs-Befehl scheiterte mit Status %d\n"
 
-#: driver.c:980
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "konnte das HESIOD-Postfach für %s nicht finden\n"
 
-#: driver.c:1002
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Erster Server hat keinen Namen.\n"
 
-#: driver.c:1025
+#: driver.c:1020
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "konnte kanonischen DNS-Namen von %s (%s) nicht finden\n"
 
-#: driver.c:1062
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "interne Inkonsistenz\n"
 
-#: driver.c:1072
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s Verbindung zu %s fehlgeschlagen"
 
-#: driver.c:1078
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "Host ist unbekannt."
 
-#: driver.c:1081
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "Name ist gültig, hat aber keine IP-Adresse."
 
-#: driver.c:1084
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "nicht behebbarer Nameserver-Fehler"
 
-#: driver.c:1086
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "temporärer Nameserver-Fehler"
 
-#: driver.c:1097
+#: driver.c:1084
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "unbekannter DNS-Fehler %d."
 
-#: driver.c:1115
+#: driver.c:1102
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail-Warnung: übergroße Nachrichten"
 
-#: driver.c:1117
+#: driver.c:1104
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail konnte keine Mail von %s erhalten:"
 
-#: driver.c:1144 imap.c:367 pop3.c:411
+#: driver.c:1131 imap.c:367 pop3.c:411
 msgid "SSL connection failed.\n"
 msgstr "SSL-Verbindung fehlgeschlagen.\n"
 
-#: driver.c:1197
+#: driver.c:1184
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-beschäftigt-Fehler bei %s@%s\n"
 
-#: driver.c:1201
+#: driver.c:1188
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server-beschäftigt-Fehler bei %s@%s\n"
 
-#: driver.c:1206
+#: driver.c:1193
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authentifikationsfehlschlag bei %s@%s%s\n"
 
-#: driver.c:1209
+#: driver.c:1196
 msgid " (previously authorized)"
 msgstr " (vormals autorisiert)"
 
-#: driver.c:1230
+#: driver.c:1217
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail: Authentifikation fehlgeschlagen bei %s@%s"
 
-#: driver.c:1234
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail konnte keine Mail von %s@%s erhalten.\n"
 
 #
-#: driver.c:1238
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet."
 
 #
-#: driver.c:1253
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -344,164 +344,164 @@ msgstr ""
 "versuchen, eine Verbindung herzustellen. Es werden bis zur\n"
 "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet."
 
-#: driver.c:1268
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Sofortige erneute Abfrage von %s@%s\n"
 
-#: driver.c:1273
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unbekannter Einlogg- oder Authentifikationsfehler bei %s@%s\n"
 
-#: driver.c:1297
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authentifikation OK bei %s@%s\n"
 
-#: driver.c:1303
+#: driver.c:1290
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: Fetchmail: Authentifikation OK bei %s@%s"
 
-#: driver.c:1307
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail war in der Lage, sich bei %s@%s einzuloggen.\n"
 
 #
-#: driver.c:1311
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "Der Dienst ist wieder hergestellt.\n"
 
-#: driver.c:1342
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "Ordner %s wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1344
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "Vorgabe-Ordner wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1360
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s bei %s (Ordner %s)"
 
-#: driver.c:1368 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s bei %s"
 
-#: driver.c:1373
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Frage %s ab\n"
 
-#: driver.c:1377
+#: driver.c:1355
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d Nachricht (%d %s) für %s"
 msgstr[1] "%d Nachrichten (%d %s) für %s"
 
-#: driver.c:1380
+#: driver.c:1358
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gesehene"
 msgstr[1] "gesehene"
 
-#: driver.c:1383
+#: driver.c:1361
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d Nachricht für %s"
 msgstr[1] "%d Nachrichten für %s"
 
-#: driver.c:1390
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d Oktetts).\n"
 
-#: driver.c:1396
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Keine Post für %s\n"
 
-#: driver.c:1429
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "ungültige Nachrichtenanzahl!"
 
-#: driver.c:1530
+#: driver.c:1508
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1533
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "fehlende oder fehlerhafte RFC822-Kopfzeile"
 
-#: driver.c:1536
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1539
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "Klient/Server-Synchronisation"
 
-#: driver.c:1542
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "Klient/Server-Protokoll"
 
-#: driver.c:1545
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "Lock auf Server beschäftigt"
 
-#: driver.c:1548
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "SMTP-Transaktion"
 
-#: driver.c:1551
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "DNS-Nachschlag"
 
-#: driver.c:1554
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "undefinierter Fehler\n"
 
-#: driver.c:1565
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s-Fehler bei Auslieferung zu SMTP-Host %s\n"
 
-#: driver.c:1567
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%s-Fehler beim Abholen von %s\n"
 
-#: driver.c:1575
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Nach-Verbindungs-Befehl scheiterte mit Status %d\n"
 
-#: driver.c:1596
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos-V4-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1604
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos-V5-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1615
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush ist mit %s nicht unterstützt\n"
 
-#: driver.c:1621
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all ist mit %s nicht unterstützt\n"
 
-#: driver.c:1629
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit ist mit %s nicht unterstützt\n"
@@ -1504,7 +1504,7 @@ msgstr ""
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Eigenschaften zum Durchleiten „%s“.\n"
 
-#: fetchmail.h:609 fetchmail.h:615
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca fehlgeschlagen"
 
@@ -1605,123 +1605,123 @@ msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benötigte NTlM-Fähigkeit nicht vom Server unterstützt\n"
 
-#: imap.c:650 imap.c:712
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "Säubern fehlgeschlagen\n"
 
-#: imap.c:668 imap.c:697
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "erneute Abfrage fehlgeschlagen\n"
 
-#: imap.c:676
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d Nachrichten warten nach der erneuter Abfrage\n"
 
-#: imap.c:686
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "Postfach-Auswahl fehlgeschlagen\n"
 
-#: imap.c:690
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "%d Nachrichten warten nach der ersten Abfrage\n"
 
-#: imap.c:716
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "%d Nachrichten warten nach Säuberung\n"
 
-#: imap.c:739
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
 
-#: imap.c:769 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ist ungesehen\n"
 
-#: imap.c:781 pop3.c:687
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ist erste ungesehene\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Kann kvm-Schnittstelle nicht öffnen. Stellen Sie sicher, dass fetchmail mit "
 "SGID kmem läuft."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Kann Interfacenamen nicht aus %s lesen"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist-Schätzung) fehlgeschlagen"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc fehlgeschlagen"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) fehlgeschlagen"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Routing-Nachricht Version %d nicht verstanden."
 
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Kein Schnittstelle mit dem Namen %s gefunden"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "Keine IP-Adresse für %s gefunden"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "fehlende IP-Adresse\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "ungültige IP-Schnittstellen-Adresse\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "ungültige IP-Schnittstellen-Maske\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "Aktivität auf %s -festgestellt- als %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "überspringe Abfrage von %s, %s ist aus\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "überspringe Abfrage von %s, %s IP-Adresse ausgeschlossen\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "Aktivität auf %s überprüft als %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "überspringe Abfrage von %s, %s inaktiv\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "Aktivität auf %s war %d, ist %d\n"
@@ -1748,11 +1748,11 @@ msgstr "konnte BASE64-Bestätigungs-Erwiderung nicht dekodieren\n"
 msgid "challenge mismatch\n"
 msgstr "Herausforderung stimmt nicht überein\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: entferne alte Lockdatei\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: Lock-Herstellung fehlgeschlagen.\n"
 
@@ -2221,10 +2221,6 @@ msgstr "Unbekannter Systemfehler"
 msgid "%s (log message incomplete)"
 msgstr "%s (Log-Meldung unvollständig)"
 
-#: report.c:262 report.c:290 report.c:362 report.c:390
-msgid "partial error message buffer overflow"
-msgstr "Überlauf des Puffers für Teilmeldungen"
-
 #: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
@@ -2400,106 +2396,106 @@ msgstr "MD5-Resultat ist: \n"
 msgid "forwarding to %s\n"
 msgstr "weitergeleitet an %s\n"
 
-#: sink.c:349
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (Körper der Umleitungs-Nachricht)\n"
 
-#: sink.c:352
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "Post von %s umgeleitet zu %s\n"
 
-#: sink.c:484
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gespeicherter Fehler ist immer noch %d\n"
 
-#: sink.c:547 sink.c:627
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-Fehler: %s\n"
 
-#: sink.c:782
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP Datei öffnen oder Präambel schreiben fehlgeschlagen\n"
 
-#: sink.c:1003
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-Lauscher mag Empfängeradresse „%s“ nicht\n"
 
-#: sink.c:1010
+#: sink.c:973
 #, 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:1048
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "keine Adressen stimmten überein; kein Postmaster gesetzt.\n"
 
-#: sink.c:1060
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kann noch nicht einmal an %s senden!\n"
 
-#: sink.c:1066
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
 
-#: sink.c:1219
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "dabei, auszuliefern mit: %s\n"
 
-#: sink.c:1243
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "MDA Öffnen fehlgeschlagen\n"
 
-#: sink.c:1280
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-Verbindung zu %s fehlgeschlagen\n"
 
-#: sink.c:1304
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "kann Lauscher nicht erreichen; falle zurück auf %s"
 
-#: sink.c:1360
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA starb durch Signal %d\n"
 
-#: sink.c:1363
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA gab Status %d ungleich Null zurück\n"
 
-#: sink.c:1366
+#: sink.c:1329
 #, 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:1387
+#: sink.c:1350
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Nachrichtenbeendung oder Schließen der BSMTP-Datei fehlgeschlagen\n"
 
-#: sink.c:1408
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-Lauscher verweigerte Auslieferung\n"
 
-#: sink.c:1438
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-Auslieferungsfehler bei EOM\n"
 
-#: sink.c:1441
+#: sink.c:1404
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unerwartete Nicht-503-Erwiderung auf LMTP EOM: %s\n"
 
-#: sink.c:1600
+#: sink.c:1555
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2507,32 +2503,32 @@ msgstr ""
 "-- \n"
 "Der Fetchmail-Dämon"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP-CRAM-MD5-Authentifikation...\n"
 
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Server lehnte AUTH-Befehl ab.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "Ungültige base64-Antwort vom Server.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Herausforderung dekodiert: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP-PLAIN-Authentifikation...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP-LOGIN-Authentifikation...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "Protokollfehler im SMTP-Lauscher\n"
 
@@ -2567,122 +2563,122 @@ msgstr "execvp(%s) fehlgeschlagen\n"
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:424
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: illegale Adresslänge empfangen für Host %s\n"
 
-#: socket.c:785
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Herausgeber-Organisation: %s\n"
 
-#: socket.c:787
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Warnung: Herausgeber-Organisations-Name zu lang (möglicherweise "
 "beschnitten).\n"
 
-#: socket.c:789
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Unbekannte Organisation\n"
 
-#: socket.c:791
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Herausgeber-CommonName: %s\n"
 
-#: socket.c:793
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Warnung: Herausgeber-CommonName zu lang (möglicherweise beschnitten).\n"
 
-#: socket.c:795
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unbekannter Herausgeber-CommonName\n"
 
-#: socket.c:799
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Server-CommonName: %s\n"
 
-#: socket.c:803
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Ungültiges Zertifikat: Server-CommonName zu lang!\n"
 
-#: socket.c:819
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server-CommonName stimmt nicht überein: %s != %s\n"
 
-#: socket.c:825
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server-Name nicht gesetzt, konnte Zertifikat nicht verifizieren!\n"
 
-#: socket.c:830
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Unbekannter Server-CommonName\n"
 
-#: socket.c:832
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Server-Name nicht in Zertifikat spezifiziert!\n"
 
-#: socket.c:842
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() fehlgeschlagen!\n"
 
-#: socket.c:846
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Kein Speicher mehr frei!\n"
 
-#: socket.c:858
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "Textpuffer für Digest zu klein!\n"
 
-#: socket.c:864
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s-Schlüssel-Fingerabdruck: %s\n"
 
-#: socket.c:868
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s-Fingerabdrücke stimmen überein.\n"
 
-#: socket.c:871
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s-Fingerabdrücke stimmen nicht überein!\n"
 
-#: socket.c:880
+#: socket.c:867
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fehler bei Server-Zertifikat-Überprüfung: %s\n"
 
-#: socket.c:886
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "unbekannter Herausgeber (erste %d Zeichen): %s\n"
 
-#: socket.c:938
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
 
-#: socket.c:955
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
 
-#: socket.c:1016
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
 
-#: socket.c:1088
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung\n"
 
-#: socket.c:1091
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
 
@@ -2737,37 +2733,37 @@ msgstr "inkorrekte Kopfzeile gefunden beim Scannen der Kopfzeilen\n"
 msgid "line: %s"
 msgstr "Zeile: %s"
 
-#: transact.c:1071
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "keine lokalen Ãœbereinstimmungen, Weiterleitung an %s\n"
 
-#: transact.c:1086
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "Weiterleiten und Löschen wegen DNS-Fehlern unterdrückt\n"
 
-#: transact.c:1222
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "schreibe RFC822 msgblk.headers\n"
 
-#: transact.c:1243
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "keine Empfängeradresse stimmt mit deklarierten lokalen Namen überein"
 
-#: transact.c:1254
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "Empfängeradresse %s stimmt mit keinem lokalen Namen überein"
 
-#: transact.c:1268
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "Nachricht hat eingebettete NUL-Zeichen"
 
-#: transact.c:1281
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-Lauscher lehnte Adressen mit lokalem Empfänger ab: "
 
-#: transact.c:1406
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "Nachrichtentext wird geschrieben\n"
 
@@ -2828,5 +2824,8 @@ msgstr "malloc fehlgeschlagen\n"
 msgid "realloc failed\n"
 msgstr "realloc fehlgeschlagen\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 05abd32e..8170e1be 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -27,7 +27,7 @@ msgstr "Íáé, ïé IP äéåõèýíóåéò ôïõò ôáéñéÜæïõí\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "¼÷é, ïé IP äéåõèýíóåéò ôïõò äåí ôáéñéÜæïõí\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -43,85 +43,76 @@ msgstr "áäõíáìßá áðïêùäéêïðïßçóçò ôçò BASE64 ðñüêëçóçò\n"
 msgid "decoded as %s\n"
 msgstr "áðïêùäéêïðïéÞèçêå óáí %s\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "óöÜëìá kerberos %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [ï äéá÷åéñéóôÞò ëÝåé '%*s'] \n"
 
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:340
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Subject: Ðñïåéäïðïßçóç fetchmail õðåñìåãÝèïõò-ìçíõìÜôùí.\n"
 "\n"
 "Ôá áêüëïõèá õðåñâïëéêïý ìåãÝèïõò ìçíýìáôá ðáñáìÝíïõí óôï äéá÷åéñéóôÞ %s:"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:358
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\t%d ìíì %d ìÞêïõò octet ðáñáâëÝèçêáí áðü ôï fetchmail.\n"
 
-#: driver.c:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ðáñÜëçøç ìçíýìáôïò %s@%s:%d (%d octets)"
 
-#: driver.c:549
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ðáñÜëçøç ìçíýìáôïò %s@%s:%d (%d octets)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (ìÞêïò -1)"
 
-#: driver.c:568
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (õðåñöõóéêü ìÝãåèïò)"
 
-#: driver.c:583
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "áäõíáìßá ëÞøçò åðéêåöáëßäùí, ìÞíõìá %s@%s:%d (%d octets)\n"
 
-#: driver.c:600
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "áíÜãíùóç ìçíýìáôïò %s@%s:%d áðü %d"
 
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr "åðéêåöáëßäáò "
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octets óþìáôïò) "
 
-#: driver.c:736
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -129,59 +120,60 @@ msgstr ""
 "ôï ìÞíõìá %s@%s:%d äåí åß÷å ôï áíáìåíüìåíï ìÞêïò(%d ðñáãìáôéêï !=%d "
 "áíáìåíüìåíï)\n"
 
-#: driver.c:767
+#: driver.c:771
 msgid " retained\n"
 msgstr "óõãêñáôÞèçêå\n"
 
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr "äéáãñÜöôçêå\n"
 
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr "äåí äéáãñÜöôçêå\n"
 
-#: driver.c:809
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 "óå üñéï ëÞøçò %d; %d ìçíýìáôá Ýìåéíáí óôïí äéá÷åéñéóôÞ %s ëïãáñéáóìü%s\n"
 
-#: driver.c:869
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "Ýíá SIGPIPE ðåôÜ÷ôçêå áðü Ýíá MDA Þ áðü óöÜëìá stream socket\n"
 
-#: driver.c:876
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "ëÞîç ÷ñüíïõ ìåôÜ áðü %d äåýôåñá áíáìïíÞò ãéá óýíäåóç óôïí %s.\n"
 
-#: driver.c:880
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "ëÞîç ÷ñüíïõ ìåôÜ áðü %d äåýôåñá áíáìïíÞò ãéá ôïí äéá÷åéñéóôÞ %s.\n"
 
-#: driver.c:884
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "ëÞîç ÷ñüíïõ ìåôÜ áðü %d äåýôåñá áíáìïíÞò ãéá ôï %s.\n"
 
-#: driver.c:889
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "ëÞîç ÷ñüíïõ ìåôÜ áðü %d äåýôåñá áíáìïíÞò ãéá ôçí áðÜíôçóç ôïõ áêñïáôÞ.\n"
 
-#: driver.c:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "ëÞîç ÷ñüíïõ ìåôÜ áðü %d äåýôåñá.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: ôï fetchmail âëÝðåé åðáíáëáìâáíüìåíåò ëÞîåéò ïñßùí ÷ñüíïõ\n"
 
-#: driver.c:906
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -190,7 +182,7 @@ msgstr ""
 "Ôï fetchmail åßäå ðåñéóóüôåñá áðü %d ëÞîåéò ïñßùí ÷ñüíïõ êáôá ôçí ðñïóðÜèåéá "
 "ãéá ðáñáëáâÞ áëëçëïãñáößáò áðü ôï %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:916
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -207,47 +199,47 @@ msgstr ""
 "Ôï fetchmail äåí èá îáíáñùôÞóåé áõôü ôï ãñáììáôïêéâþôéï ìÝ÷ñé íá ôï\n"
 "åðáíåêêéíÞóåôå.\n"
 
-#: driver.c:940
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "ç åíôïëÞ ðñï-óýíäåóçò áðÝôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "áäõíáìßá åýñåóçò HESIOD ôá÷. èõñßäáò ãéá ôï %s\n"
 
-#: driver.c:993
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Ï åðéêåöáëÞò äéá÷åéñéóôÞò äåí Ý÷åé üíïìá.\n"
 
-#: driver.c:1016
+#: driver.c:1020
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "áäõíáìßá åýñåóçò êáíïíéêïý ïíüìáôïò DNS ôïõ %s\n"
 
-#: driver.c:1053
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "åóùôåñéêÞ áóõíÝ÷åéá\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s óýíäåóç óôï %s áðÝôõ÷å"
 
-#: driver.c:1069
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "Üãíùóôïò äéáêïìéóôÞò."
 
-#: driver.c:1072
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "ôï üíïìá åßíáé Ýãêõñï áëëÜ äåí Ý÷åé äéåýèõíóç IP."
 
-#: driver.c:1075
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "ìç áíáêôÞóéìï óöÜëìá äéá÷åéñéóôÞ ïíïìÜôùí."
 
-#: driver.c:1077
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "ðñïóùñéíü óöÜëìá äéá÷åéñéóôÞ ïíïìÜôùí."
 
@@ -257,17 +249,19 @@ msgid "unknown DNS error %d."
 msgstr "Üãíùóôï óöÜëìá DNS %d."
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Ðñïåéäïðïßçóç áðñïóðÝëáóôïõ-äéáêïìéóôÞ óôï fetchmail.\n"
 "\n"
 "Ôï fetchmail áäõíáôåß íá ðñïóåããßóåé ôï äéáêïìéóôÞ áëëçëïãñáößáò %s:"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, 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
 msgid "SSL connection failed.\n"
 msgstr "ç óýíäåóç SSL áðÝôõ÷å.\n"
 
@@ -291,16 +285,16 @@ msgid " (previously authorized)"
 msgstr " (ðñïçãïõìÝíùò åîïõóéïäïôÞèçêå)"
 
 #: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail áðïôõ÷ßá åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1220
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Áäõíáìßá ôïõ fetchmail ëÞøçò áëëçëïãñáößáò áðü ôï %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -330,7 +324,7 @@ msgstr ""
 "óå êÜèå êýêëï. Äå èá óôáëèïýí ìåëëïíôéêÝò åéäïðïéÞóåéò ìÝ÷ñé íá \n"
 "áðïêáôáóôáèåß ç õðçñåóßá."
 
-#: driver.c:1239
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -350,171 +344,168 @@ msgstr ""
 "óå êÜèå êýêëï. Äå èá óôáëèïýí ìåëëïíôéêÝò åéäïðïéÞóåéò ìÝ÷ñé íá\n"
 "áðïêáôáóôáèåß ç õðçñåóßá."
 
-#: driver.c:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Îáíáåñþôçóç áìÝóùò óôï %s@%s\n"
 
-#: driver.c:1259
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "¶ãíùóôï óöÜëìá åéóüäïõ Þ åîïõóéïäüôçóçò óôï %s@%s\n"
 
-#: driver.c:1283
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Åîïõóéïäüôçóç ðÝôõ÷å óôïí %s@%s\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1290
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: åîïõóéïäüôçóç ôïõ fetchmail ðÝôõ÷å óôï %s@%s\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Áäõíáìßá åéóüäïõ ôïõ fetchmail óôï %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "Ç õðçñåóßá áðïêáôáóôÜèçêå.\n"
 
-#: driver.c:1327
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "åðéëïãÞ Þ åðáíá-óõãêÝíôñùóç öáêÝëïõ %s\n"
 
-#: driver.c:1329
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "åðéëïãÞ Þ åðáíá-óõãêÝíôñùóç åî'ïñéóìïý öáêÝëïõ\n"
 
-#: driver.c:1345
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s óôï  %s (öÜêåëïò %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s óôï  %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "ÓõãêÝíôñùóç áðü %s\n"
 
-#: driver.c:1362
+#: driver.c:1355
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (åßäå %d) ãéá ôï %s"
+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:1363 driver.c:1370
-msgid "messages"
-msgstr "ìçíýìáôá"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "ìÞíõìá"
-
-#: driver.c:1366
+#: driver.c:1358
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s ãéá ôï %s"
+#: driver.c:1361
+#, 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:1375
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1381
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Äåí õðÜñ÷åé áëëçëïãñáößá ãéá ôï %s\n"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "åóöáëìÝíç ìÝôñçóç ìçíõìÜôùí!"
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "÷áìÝíç Þ êáêéÜ åðéêåöáëßäá RFC822"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "óõã÷ñïíéóìüò ðåëÜôç/åîõðçñåôçôÞ"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "ðñïôüêïëï ðåëÜôç/åîõðçñåôçôÞ"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "áðáó÷ïëçìÝíï êëåßäïìá óôï äéá÷åéñéóôÞ"
 
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "óõíáëëáãÞ SMTP"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "áíáæÞôçóç DNS"
 
-#: driver.c:1539
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "ìç ïñéóìÝíï óöÜëìá\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí áðïóôïëÞ óôï äéáêïìéóôÞ SMTP %s\n"
 
-#: driver.c:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%s óöÜëìá êáôÜ ôçí ëÞøç áðü ôï %s\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "ç åíôïëÞ ðñï-óýíäåóçò áðÝôõ÷å ìå êáôÜóôáóç %d\n"
 
-#: driver.c:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Ç õðïóôÞñéîç ãéá Kerberos V4 äåí Ý÷åé óõíäåèåß.\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Ç õðïóôÞñéîç ãéá Kerberos V5 äåí Ý÷åé óõíäåèåß.\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Ç åðéëïãÞ --flush äåí õðïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Ç åðéëïãÞ --all äåí õðïóôçñßæåôáé ìå ôï %s\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Ç åðéëïãÞ --limit äåí õðïóôçñßæåôáé ìå ôï %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -529,7 +520,7 @@ msgstr ""
 "ÄïêéìÜóôå \"env QMAILINJECT= %s ÔÁ ÏÑÉÓÌÁÔÁ ÓÁÓ ÅÄÙ\"\n"
 "%s: Áêýñùóç.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -546,17 +537,17 @@ msgstr ""
 "ÄïêéìÜóôå \"env NULLMAILER_FLAGS= %s ÔÁ ÏÑÉÓÌÁÔÁ ÓÁÓ ÅÄÙ\"\n"
 "%s: Áêýñùóç.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Äåí õðÜñ÷åôå.  Öýãåôå ìáêñéÜ.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: áäõíáìßá ðñïóäéïñéóìïý ôïõ óõóôÞìáôïò óáò!"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "ç gethostbyname áðÝôõ÷å ãéá ôï %s\n"
@@ -586,24 +577,20 @@ msgstr "Äåí ðåñéìÝíïõí ìçíýìáôá ãéá ôï %s\n"
 msgid "Pending messages for %s started\n"
 msgstr "Åêêßíçóç ôçò åéóáãùãÞò óå áíáìïíÞò ôùí ìçíõìÜôùí ãéá ôï %s\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Áäõíáìßá ôïðïèÝôçóçò óå óåéñÜ ôùí ìçíõìÜôùí ãéá ôï êüìâï %s\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Ï êüìâïò %s äåí åðéôñÝðåôáé: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "Óõíôáêôéêü ëÜèïò ETRN\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "Óõíôáêôéêü ëÜèïò ETRN óôéò ðáñáìÝôñïõò\n"
@@ -629,61 +616,61 @@ msgstr "Ç åðéëïãÞ --remote äåí õðïóôçñßæåôå ìå ôï ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Ç åðéëïãÞ --check äåí õðïóôçñßæåôå ìå ôï ETRN\n"
 
-#: fetchmail.c:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: êáëÝóôçêå ìå"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "áäõíáìßá ëÞøçò ôïõ ôñÝ÷ïíôïò öáêÝëïõ åñãáóßáò (cwd)\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Áõôü åßíáé ôï fetchmail Ýêäïóç %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "ËÞøç ðáñáìåôñùí áðü ôçí ãñáììÞ åíôïëþí%s%s\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:343
 msgid " and "
 msgstr " êáé "
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Äåí Ý÷ïõí ïñéóôåß äéá÷åéñéóôÝò áëëçëïãñáößáò -- ßóùò ôï %s íá ëåßðåé;\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: äåí Ý÷ïõí ïñéóôåß äéá÷åéñéóôÝò áëëçëïãñáößáò.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: äåí ôñÝ÷åé Üëëï fetchmail\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: óöÜëìá óôç èáíÜôùóç ôïõ %s fetchmail óôï %d; åãêáôÜëåéøç.\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "õðüâáèñï"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "ðñïóêÞíéï"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: ôï %s fetchmail óôï %d ôåñìáôßóôçêå.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -691,7 +678,7 @@ msgstr ""
 "fetchmail: áäõíáìßá åëÝã÷ïõ áëëçëïãñáößáò üôáí Ýíá Üëëï fetchmail ôñÝ÷åéóôï "
 "ßäéï óýóôçìá.\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -699,799 +686,799 @@ msgstr ""
 "fetchmail: áäõíáìßá åñþôçóçò ôùí ïñéóìÝíùí äéáêïìéóôþí åíþ ôñÝ÷åé Üëëï\n"
 "           fetchmail óôï %d.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: êÜðïéï Üëëï fetchmail ôñÝ÷åé óôï ðñïóêÞíéï óôï %d.\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:438
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: åíôïëÝò ìç äåêôÝò üôáí Ýíá fetchmail ôñÝ÷åé óôï ðáñáóêÞíéï.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: áöýðíéóç ðáñáóêçíéáêïý fetchmail óôï %d.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:456
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: çëéêéùìÝíïò åôåñïèáëåßò áäåñöüò ðÝèáíå ìõóôçñéïäþò óôï %d.\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:471
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: áäõíáìßá åýñåóç ëÝîçò êëåéäß ãéá ôï %s@%s.\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "ÐëçêôñïëïãÞóôå ôçí ëÝîç êëåéäß ãéá ôï %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "åêêßíçóç äáßìïíá fetchmail %s \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "áäõíáìßá áíïßãìáôïò ôïõ %s ãéá ðñüóèåóç êáôáãñáöþí óå áõôü \n"
 
-#: fetchmail.c:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "áäõíáìßá åëÝã÷ïõ-þñáò %s (óöÜëìá %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "åðáíåêêßíçóç fetchmail (%s Üëëáîå)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "ç ðñïóðÜèåéá ãéá åðáíåêê ßóùò áðïôý÷åé áöïý ï öÜêåëïò äåí Ý÷åé "
 "áðïêáôáóôáèåß\n"
 
-#: fetchmail.c:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "ç áðüðåéñá ãéá åðáíåêêßíçóç ôïõ fetchmail áðÝôõ÷å\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "ðáñÜâëåøç åñþôçóçò ôïõ %s (áðÝôõ÷å ç åîïõóéïäüôçóç Þ ðïëëÝò ëÞîåéò ÷ñüíïõ)\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ôï äßáëëåéìá äåí Ýöôáóå, äåí ãßíåôå åñþôçóç %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "ÊáôÜóôáóçò Åñþôçóçò=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "¼ëåò ïé óõíäÝóåéò Ý÷ïõí ìðëïêÜñåé. ÅãêáôÜëåéøç.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "áäñáíÝò óôï %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "áöõðíßóôçêå áðü ôï %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "áöõðíßóôçêå áðü óÞìá %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "áöõðíßóôçêå óôï %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "öõóéïëïãéêüò ôåñìáôéóìüò, êáôÜóôáóç %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 msgid "couldn't time-check the run-control file\n"
 msgstr "áäõíáìßá åëÝã÷ïõ-þñáò ôïõ áñ÷åßï run-control\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:983
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Ðñïåéäïðïßçóç: ðïëëáðëÝò áíáöïñÝò ôïõ äéáêïìéóôÞ %s óôï áñ÷åßï ñõèìßóåùí\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "ç õðïóôÞñéîç ãéá SSL äåí Ý÷åé ìðåé óôç ìåôÜöñáóç.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: ðñïåéäïðïßçóç: êáíÝíá äéáèÝóéìï DNS ãéá Ýëåã÷ï ëÞøåùí áðü %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr ""
 "ìç Ýãêõñåò ñõèìßóåéò %s, ï áñéèìüò èýñáò äåí ìðïñåß íá åßíáé áñíçôéêüò\n"
 
-#: fetchmail.c:1171
+#: fetchmail.c:1183
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr "ìç Ýãêõñåò ñõèìßóåéò %s, ôï RPOP áðáéôåß ðñïíïìéïý÷á èýñá\n"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1199
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "ìç Ýãêõñåò ñõèìßóåéò %s, ôï LMTP äåí êÜíåé ÷ñÞóç ôçò åî ïñéóìïý èýñáò SMTP\n"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1214
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Åßíáé ëÜèïò ôï fetchall êáé ìáæß ôï ðáñáìïíÞ óå êáôÜóôáóç äáßìïíá!\n"
 
-#: fetchmail.c:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "Ýëçîå ìå óÞìá %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s åñþôçóç %s (ðñùôüêïëëï %s) óôï %s: Üñ÷éóå ç åñþôçóç\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "Äåí Ý÷åé ñõèìéóôåß ç õðïóôÞñéîç POP2.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "Äåí Ý÷åé ñõèìéóôåß ç õðïóôÞñéîç POP3.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "Äåí Ý÷åé ñõèìéóôåß ç õðïóôÞñéîç IMAP.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "Äåí Ý÷åé ñõèìéóôåß ç õðïóôÞñéîç ETRN.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Áäõíáìßá õðïóôÞñéîçò ETRN ÷ùñßò gethostbyname(2).\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "Äåí Ý÷åé ñõèìéóôåß ç õðïóôÞñéîç ODMR.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Áäõíáìßá õðïóôÞñéîçò ODMR ÷ùñßò gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "åðéëÝ÷èçêå ìç õðïóôçñéæüìåíï ðñùôüêïëëï.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s åñþôçóç %s (ðñùôüêïëëï %s) óôï %s: ïëïêëçñþèçêå ç åñþôçóç\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "ÄéÜëëåéìá åñþôçóçò åßíáé %d äåõôåñüëåðôá\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Áñ÷åßï êáôá÷þñéóçò åßíáé ôï %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Áñ÷åßï Id åßíáé ôï %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Ôá ìçíýìáôá ðñïüäïõ èá êáôá÷ùñéèïýí ìÝóù ôïõ syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Ôï fetchmail èá áðïêñõöèåß êáé äå èá ðáñÜãåé Received\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1466
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Ôï fetchmail èá äåß÷íåé ôåëåßåò ðñïüäïõ êáé óôá áñ÷åßá êáôáãñáöÞò.\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1468
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Ôï fetchmail èá ðñïùèåß multidrop ìçíýìáôá ìå êáêÞ äéåýèõíóç óôï %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï postmaster.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Ôï fetchmail èá äñïìïëïãåß áëëçëïãñáößá óöáëìÜôùí óôï áðïóôïëÝá.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "ÅðéëïãÝò ãéá ëÞøç áðü %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Ç áëëçëïãñáößá èá ëçöèåß ìÝóù ôïõ %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1488
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr "  Åñþôçóç óå áõôü ôï äéá÷åéñéóôÞ èá óõìâåß êÜèå %d äéáëåßìáôá.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Ôï áëçèéíü üíïìá ôïõ äéá÷åéñéóôÞ åßíáé %s.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  Áõôüò ï äéáêïìéóôÞò %s èá åñùôçèåß üôáí äåí Ý÷åé ïñéóôåß êáíÝíáò.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr "'äåí èá"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr "èá"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  Ç ëÝîç êëåéäß èá åñùôÜôå.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ìõóôéêü APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ËÝîç êëåéäß = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Ôï ðñùôüêïëëï åßíáé KPOP ìå åîïõóéïäüôçóç Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Ôï ðñùôüêïëëï åßíáé %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (÷ñÞóç õðçñåóßáò %s)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (÷ñÞóç åðéëïãþí áóöÜëåéáò äéêôýïõ %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (÷ñçóéìïðïßçóç èýñáò %d)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (÷ñçóéìïðïßçóç èýñáò åî'ïñéóìïý)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (åîáíáãêáóìüò ÷ñÞóçò UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ¼ëåò ïé äéáèÝóéìåò ìÝèïäïé åîïõóéïäüôçóçò èá äïêéìáóôïýí.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç ìå ëÝîç êëåéäß.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç NTLM.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç OTP.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç CRAM-Md5.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç GSSAPI.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V4.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Èá åîáíáãêáóôåß ç åîïõóéïäüôçóç Kerberos V5.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ÊñõðôïãñÜöçóç Üêñç-ìå-Üêñç èåùñÞèçêå.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ÄéåõèõíôÞò õðçñåóßáò áëëçëïãñáößáò åßíáé: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Åíåñãïðïßçóç êñõðôïãñáöçìÝíùí SSL óõíåäñéþí.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Ðñùôüêïëëï SSL: %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Åíåñãïðïßçóç åëÝã÷ïõ ðéóôïðïéçôéêïý äéá÷åéñéóôÞ SSL.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ÖÜêåëïò åìðéóôåõìÝíïõ ðéóôïðïéçôéêïý SSL: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Áðïôýðùìá êëåéäéïý SSL (óå óýãêñéóç ìå ôï êëåéäß äéá÷åéñéóôÞ): %s\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ËÞîç ÷ñüíïõ ü÷é-áðÜíôçóçò áðü ôï äéá÷åéñéóôÞ åßíáé %d äåõôåñüëåðôá"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (åî'ïñéóìïý).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  Åî ïñéóìïý ãñáììáôïêéâþôéï åðéëÝ÷èçêå.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  ÅðéëåãìÝíá ãñáììáôïêéâþôéá åßíáé:"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s ìçíýìáôá èá ëçöèïýí (--all %s).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "¼ëá"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "Ìüíï ôá íÝá"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  ËçöèÝíôá ìçíýìáôá %s èá êñáôçèïýí óôï äéá÷åéñéóôÞ (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr ""
 "  ÐáëéÜ ìçíýìáôá %s èá äéáãñáöïýí ðñéí ôç ëÞøç ìçíõìÜôùí (--flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr ""
 "  ÅðáíåããñáöÞ ôùí ôïðéêþí-äéá÷åéñéóôÞ äéåõèýíóåùí %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  Áöáßñåóç ôïõ Carriage-return åßíáé %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  Åîáíáãêáóìüò ôïõ Carriage-return åßíáé %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  ÌåôÜöñáóç ôïõ Content-Transfer-Encoding åßíáé %s (pass8bits %s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  Áðïêùäéêïðïßçóç MIME åßíáé %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  Çñåìßá ìåôÜ ôçí åñþôçóç åßíáé %s (idle %s).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Ïé ãñáììÝò Nonempty Status èá %s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "áðïññéöèïýí"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "êñáôçèïýí"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Ïé ãñáììÝò Delivered-To èá %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ôï üñéï ìåãÝèïõí ìçíýìáôïò åßíáé %d octets (--limit %d).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ÊáíÝíá üñéï ìåãÝèïõò ìçíýìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Ðåñßïäïò ðñïåéäïðïßçóçò ìåãÝèïõò ìçíýìáôïò åßíáé %d äåýôåñá (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ÐñïåéäïðïéÞóåéò ìåãÝèïõò óå êÜèå åñþôçóç (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ¼ñéï ðáñáëçöèÝí-ìçíýìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  ÊáíÝíá üñéï ðáñáëçöèÝí-ìçíýìáôïò (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  ¼ñéï ðáñáëçöèÝí-ìçíýìáôïò åßíáé %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1660
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ÊáíÝíá üñéï ìåãÝèïõò ìçíýìáôïò (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ¼ñéï äÝóìçò ìçíýìáôïò SMTP åßíáé %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  ÊáíÝíá üñéï äÝóìçò ìçíýìáôïò SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Ðåñßïäïò äéáãñáöÞò ìåôáîý åîáëåßøåùí åîáíáãêÜóôçêå óå %d (--expunge %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ÊáììéÜ åîáíáãêáóìÝíç åîÜëåéøç (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Ðåñéï÷Ýò ãéá ôéò ïðïßåò áëëçëïãñáößá èá ëçöèåß åßíáé:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (åî'ïñéóìïý)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Ôá ìçíýìáôá èá ðñïóôåèïýí óå %s óáí BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Ôá ìçíýìáôá èá äéáíåìçèïýí ìå \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Ôá ìçíýìáôá èá ðñïùèçèïýí %cMTP óå:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Ôï ìÝñïò äéáêïìéóôÞ ôçò ãñáììÞò MAIL FROM èá åßíáé %s\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  ÁíáãíùñéóìÝíåò áðáíôÞóåéò ìðëïêáñßóìáôïò spam áêñïáôÞ åßíáé:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  Áðåíåñãïðïßçóç ìðëïêáñßóìáôïò-spam\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Ç óýíäåóç äéá÷åéñéóôÞ èá áñ÷éíÜ ìå \"%s\".\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëÞ ðñï-óýíäåóçò.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Ç óýíäåóç äéá÷åéñéóôÞ èá ôåñìáôßæåôáé ìå \"%s\".\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  ÊáììéÜ åíôïëÞ ìåôÜ-óýíäåóçò.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  ÊáíÝíá ôïðéêü üíïìá äåí ïñßóôçêå ãéá áõôü ôï äéáêïìéóôÞ.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  ÊáôÜóôáóç multi-drop: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  ÊáôÜóôáóç single-drop: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d ôïðéêü üíïìá(ôá) áíáãíùñßóôçêáí.\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  ÁíáæÞôçóç DNS ãéá ôéò äéåõèýíóåéò multidrop åßíáé %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  Ôá øåõäþíõìá äéá÷åéñéóôÞ èá óõãêñéèïýí ìå äéåõèýíóåéò multidrop ìå "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "äéåýèõíóç IP.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "üíïìá.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ÁðåíåñãïðïéÞèçêå ç äñïìïëüãçóç Åðéêåöáëßäá-öáêÝëïõ\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "Åðéêåöáëßäá öáêÝëïõ èåùñåßôå íá åßíáé: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "ÐáñáëÞöèçêå"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Áñéèìüò åðéêåöáëßäáò öáêÝëïõ ðïõ èá åðåîåñãáóôïýí: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1796
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Ôï ðñüèåìá %s èá áöáéñåèåß áðü ôï user id\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  ÊáììéÜ áöáßñåóç ðñïèÝìáôïò\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "ÐñïäçëùìÝíá øåõäþíõìá äéá÷åéñéóôÞ-áëëçëïãñáößáò:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  ÔïðéêÝò ðåñéï÷Ýò:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ç óýíäåóç ðñÝðåé íá åßíáé ìÝóù ôïõ interface %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  Äåí ïñßóôçêáí áðáéôÞóåéò interface.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Âñüã÷ïò åñþôçóçò èá ðáñáêïëïõèåß ôï %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  Äåí ïñßóôçêå interface ðáñáêïëïýèçóçò.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ÓõíäÝóåéò äéá÷åéñéóôÞ èá ãßíïõí ìÝóù ôïõ plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëÞ plugin.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  ÓõíäÝóåéò áêñïáôÞ èá ãßíïõí ìÝóù ôïõ plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  Äåí ïñßóôçêå åíôïëÞ plugout.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Äåí áðïèçêåýôçêáí UID áðü áõôü ôï äéáêïìéóôÞ.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID áðïèçêåýôçêáí.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Ðëçñïöïñßåò åíôïðéóìïý åñþôçóçò èá ðñïóôåèåß óôçí åðéêåöáëßäá Received.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1499,16 +1486,12 @@ msgstr ""
 "  ÊáììéÜ ðëçñïöïñßá åíôïðéóìïý åñþôçóçò äå èá ðñïóôåèåß óôçí åðéêåöáëßäá\n"
 "Received.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Éäéüôçôåò Pass-through \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca áðÝôõ÷å"
 
@@ -1581,152 +1564,151 @@ msgstr "ÓöÜëìá óôçí áðåëåõèÝñùóç äéáðéóôåõôçñßùí\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: áíáìïíÞ íçìÜôùóçò ãéá %d äåõô.\n"
 
-#: imap.c:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Ôáõôïðïßçóç ðñùôïêüëëïõ óáí IMAP2 Þ IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "èá çñåìÞóåé ìåôÜ ôçí åñþôçóç\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá OTP äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá NTLM äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Áðáéôïýìåíç éêáíüôçôá LOGIN äåí ìåôáãëùôôßóôçêå óôï fetchmail\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "åîÜëåéøç áðÝôõ÷å\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "åðáíåñþôçóç áðÝôõ÷å\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí áðáíåñþôçóç\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "ç åðéëïãÞ ãñáììáôïêéâùôßïõ áðÝôõ÷å\n"
 
-#: imap.c:685
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí ðñþôç åñþôçóç\n"
 
-#: imap.c:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "%d ìçíýìáôá áíáìÝíïõí ìåôÜ ôçí åîÜëåéøç\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "áíáæÞôçóç ãéá ìç éäùìÝíá ìçíýìáôá áðÝôõ÷å\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u äåí Ý÷åé åéäùèåß\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u åßíáé ôï ðñþôï ìç éäùìÝíï\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Áäõíáìßá áíïßãìáôïò ôïõ kvm interface. Âåâáéùèåßôå üôé ôï fetchmail\n"
 "åßíáé SGID kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Áäõíáìßá åðåîåñãáóßáò ôïõ ïíüìáôïò interface áðü ôï %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist estimate) áðÝôõ÷å"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc áðÝôõ÷å"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) áðÝôõ÷å"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "¸êäïóç ìçíýìáôïò äñïìïëüãçóçò %d äåí ãßíåôáé êáôáíïçôü."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Äå âñÝèçêå êáíÝíá interface ìå üíïìá %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "Äåí âñÝèçêáí äéåõèýíóåéò IP ãéá ôï %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "äåí õðÜñ÷åé äéåýèõíóç IP interface\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "ìç Ýãêõñç äéåýèõíóç IP interface\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "ìç Ýãêõñç IP interface mask\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s -óçìåéþèçêå- óáí %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "ðáñÜâëåøç åñþôçóçò ôïõ %s, ôï %s åßíáé êÜôù\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "ðáñÜâëåøç åñþôçóçò ôïõ %s, ç äéåýèõíóç IP %s áðïêëåßóôçêå\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s åëÝã÷èçêå óáí %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "ðáñÜâëåøç åñþôçóçò ôïõ %s, %s áíåíåñãüò\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "äñáóôçñéüôçôá óôï %s Þôáí %d, åßíáé %d\n"
@@ -1753,11 +1735,11 @@ msgstr "áäõíáìßá áðïêùäéêïðïßçóçò áðÜíôçóçò åôïéìüôçôáò BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "ü÷é ôáßñéáóìá ðñüêëçóçò\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: äéáãñáöÞ ðáëéïý áñ÷åßïõ êëåéäþìáôïò\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: áðïôõ÷ßá äçìéïõñãßáò êëåéäþìáôïò.\n"
 
@@ -1789,7 +1771,6 @@ msgstr "ÅðéóôñïöÞ ôþñá...\n"
 msgid "ATRN request refused.\n"
 msgstr "Ç áßôçóç ATRN áðïññßöèçêå.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "Áäõíáìßá åðåîåñãáóßáò áßôçóçò ATRN ôþñá\n"
@@ -1798,12 +1779,10 @@ msgstr "Áäõíáìßá åðåîåñãáóßáò áßôçóçò ATRN ôþñá\n"
 msgid "You have no mail.\n"
 msgstr "Äåí Ý÷åôå áëëçëïãñáößá.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Ç åíôïëÞ äåí Ý÷åé õëïðïéçèåß\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Áðáéôåßôå åîïõóéïäüôçóç.\n"
@@ -1837,7 +1816,7 @@ msgstr "äéá÷åéñéóôÞò Ýëáâå èáíÜóéìï\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Áäõíáìßá áðïêùäéêïðïßçóçò ðñüêëçóçò OTP\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "ÌõóôéêÞ öñÜóç êëåéäß: "
 
@@ -1970,192 +1949,203 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ðéóôïðïéçôéêü ðåëÜôç ssl\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     ðéóôïðïéçôéêü ðåëÜôç ssl\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    åîáíáãêáóìüò ðñùôïêüëëïõ ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      êáèïñéóìüò åîùôåñéêÞò åíôïëÞò ãéá Üíïéãìá óýíäåóçò\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     êáèïñéóìüò åîùôåñéêÞò åíôïëÞò ãéá Üíïéãìá smtp óýíäåóçò\n"
 
-#: options.c:691
+#: options.c:693
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    êáèïñéóìüò ðñùôïêüëëïõ áíÜêôçóçò (äåßôå óåëßäá man)\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        åîáíáãêáóìüò ÷ñÞóçò ôùí UIDL (pop3 ìüíï)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        èýñá õðçñåóßáò TCP/IP ãéá óýíäåóç óå áõôÞ\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ôýðïò åîïõóéïäüôçóçò (password/kerberos/ssh/otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ÷ñüíïò ëÞîçò ìç-áðÜíôçóçò äéáêïìéóôÞ\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ôýëéãìá åðéêåöáëßäáò äéåýèõíóçò\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    ðñüèåìá ãéá áöáßñåóç áðü ôï ôïðéêü user id\n"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   äéåõèõíôÞò õðçñåóßáò áëëçëïãñáößáò\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  ðñïóèÞêç ðëçñïöüñéáò åíôïðéóìïý-åñþôçóçò óôï Received\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ïñéóìüò ôïõ user login óôï äéá÷åéñéóôÞ\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ëÞøç ðáëéþí êáé íÝùí ìçíõìÜôùí\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      äéáãñáöÞ íÝùí ìçíõìÜôùí ìåôÜ ôçí ëÞøç\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        áðïèÞêåõóç íÝùí ìçíõìÜôùí ìåôÜ ôçí ëÞøç\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ðáëéþí ìçíõìÜôùí áðü ôï äéá÷åéñéóôÞ\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ü÷é åðáíåããñáöÞ ôçò åðéêåöáëßäáò äéåõèýíóåùí\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       ü÷é ëÞøç ìçíõìÜôùí ðÜíù áðü ôï äïóìÝíï ìÝãåèïò\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    ðåñßïäïò ìåôáîý åéäïðïéçôéêïý ìçíýìáôïò ðñïåéäïðïßçóçò\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      ïñéóìüò áßôçóçò áóöáëåßáò IP\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ïñéóìüò äéáêïìéóôÞ SMTP ãéá ðñïþèçóç\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ëÞøç áëëçëïãñáößáò áðü êáèïñéóìÝíåò ðåñéï÷Ýò\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress ïñéóìüò ðåñéï÷þí ðáñÜäïóçò SMTP ãéá ÷ñÞóç\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ïñéóìüò ðëÞñç ïíüìáôïòSMTP username@domain\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   ïñéóìüò ôéìþí áðáíôÞóåùí áíôé-spam\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  ïñéóìüò ïñßïõ äÝóìçò ãéá ôéò óõíäÝóåéò SMTP\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  ïñéóìüò ïñßïõ ëÞøçò ãéá ôéò óõíäÝóåéò äéá÷åéñéóôÞ\n"
 
-#: options.c:720
+#: options.c:722
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains ëÞøç áëëçëïãñáößáò áðü êáèïñéóìÝíåò ðåñéï÷Ýò\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ïñéóìüò ìÝãéóôùí äéáãñáöþí ìåôáîý åîáëåßøåùí\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ïñéóìüò MDA ãéá ÷ñÞóç óå ðñïþèçóç\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ïñéóìüò áñ÷åßïõ åîüäïõ BSMTP\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ïñéóìüò LMTP (RFC2033) ãéá ðáñÜäïóç\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      êáèïñéóìüò ïíüìáôïò áðïìáêñõóìÝíïõ öáêÝëïõ\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    åìöÜíéóç ôåëåßùí ðñïüäïõ êáé óôá áñ÷åßá êáôáãñáöÞò\n"
 
-#: pop3.c:538
+#: pop3.c:534
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Äå âñÝèçêå ç áðáéôïýìåíç ÷ñïíïëüãçóç óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Óõíôáêôéêü óöÜëìá ÷ñïíïëüãçóçò óôï ÷áéñåôéóìü\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ìç ïñéóìÝíç áßôçóç ðñùôïêüëëïõ óôï POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "áðáó÷ïëçìÝíï êëåßäùìá!  Åßíáé åíåñãÞ êÜðïéá Üëëç óõíåäñßá;\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:759
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Ôá ìçíýìáôá åéóÝñ÷ïíôáé óå ëßóôá óôï äéá÷åéñéóôÞ. Áäõíáìßá ÷åéñéóìïý áõôïý.\n"
 
-#: pop3.c:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "óöÜëìá ðñùôïêüëëïõ\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "óöÜëìá ðñùôïêüëëïõ êáôÜ ôç ëÞøç UIDL\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Ç åðéëïãÞ --remote äåí õðïóôçñßæåôáé ìå ôï POP3\n"
 
@@ -2214,162 +2204,142 @@ msgstr "Ôï áñ÷åßï %s äå ðñÝðåé íá Ý÷åé ðÜíù áðü -rwx--x--- (0710) Üäåéåò.\n"
 msgid "File %s must be owned by you.\n"
 msgstr "Ôï áñ÷åßï %s ðñÝðåé íá áíÞêåé óå åóÜò.\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (çìéôåëÝò ìÞíõìá êáôáãñáöÞò)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "ìåñéêü óöÜëìá êáôÜôìçóçò ìçíýìáôïò ëÜèïõò"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "Ðñüêåéôå íá åðáíåããñáöåß %s"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "ÎáíáãñáììÝíç Ýêäïóç åßíáé %s\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "Åðéôõ÷ßá"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr "ÐåñéïñéóìÝíïò ÷ñÞóôçò (êÜôé óõìâáßíåé ìå ôï ëïãáñéáóìü)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "Ìç Ýãêõñï userid Þ öñÜóç êëåéäß"
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr "ÓöÜëìá Èåüôçôáò"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA ôåêìÞñéï 2: óöÜëìá áðïêùäéêïðïßçóçò Base64\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Ç õðçñåóßá åðÝëåîå Ýêäïóç RPA %d.%d\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Ðñüêëçóç õðçñåóßáò (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "×ñïíïëüãçóç õðçñåóßáò %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "ÓöÜëìá ìÞêïõò RPA ôåêìçñßïõ 2\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Ëßóôá äéêáéïäïóßáò: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "ÓöÜëìá RPA óôç óõìâïëïóåéñÜ service@realm\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA ôåêìÞñéï 4: óöÜëìá áðïêùäéêïðïßçóçò Base64\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Åîïõóéïäüôçóç ÷ñÞóôç (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "ÊáôÜóôáóç RPA: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "ÓöÜëìá ìÞêïõò RPA ôåêìÞñéï 4\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "Ôï RPA óáò áðïññßðôåé: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "Ôï RPA óáò áðïññßðôåé, Üãíùóôç áéôßá\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "ÓöÜëìá ìÞêïõò Åîïõóéïäüôçóçò ×ñÞóôç RPA: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "ÓöÜëìá ìÞêïõò êëåéäéïý RPA Óõíåäñßáò: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth áðÝôõ÷å. Áðüêñõøç äéá÷åéñéóôÞ;\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "ÅãêáôáóôÜèçêå êëåéäß óõíåäñßáò:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Åîïõóéïäüôçóç RPA ïëïêëçñþèçêå\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "ËÞøç áðÜíôçóçò\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Ç ëÞøç áðÜíôçóçò åðÝóôñåøå %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Hdr ü÷é 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "ÓöÜëìá ìÞêïõò ôåêìçñßïõ\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Ôï ìÞêïò ôåêìçñßïõ %d äéáöùíåß ìå ôï rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "ÅóöáëìÝíïò ìç÷áíéóìüò ðåäßïõ\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "óöÜëìá dec64 óôï ÷áñáêôÞñá %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Åéóåñ÷üìåíá äõáäéêÜ äåäïìÝíá:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Åîåñ÷üìåíá äåäïìÝíá:\n"
 
@@ -2381,412 +2351,408 @@ msgstr "ÓõìâïëïóåéñÜ RPA õðåñâïëéêÜ ìåãÜëç\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "Ôï RPA ÁðÝôõ÷å íá áíïßîåé ôï /dev/urandom. Áõôü äå ðñÝðåé\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    íá óáò åìðïäßæåé íá ìðåßôå, áëëÜ óçìáßíåé üôé\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    äå ìðïñåßôå íá åßóôå óßãïõñïé üôé ìéëÜôå óôçí\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    õðçñåóßá ðïõ íïìßæåôå (åðéèÝóåéò åðáíÜëçøçò\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    áðü ìéá Üôéìç õðçñåóßá åßíáé ðéèáíÝò.)\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Ðñüêëçóç ÷ñÞóôç:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "Ôï MD5 åöáñìüæåôáé óôï ìðëüê äåäïìÝíï:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "ÁðïôÝëåóìá MD5: \n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "ðñïùèåßôáé óôï %s\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message óþìá)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "ç áëëçëïãñáößá áðü %s áíáðÞäçóå óôï %s\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Ôï áðïèçêåõìÝíï óöÜëìá åßíáé áêüìá %d\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP óöÜëìá: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "Áíïé÷ôü áñ÷åßï BSMTP Þ áðÝôõ÷å ç åéóáãùãéêÞ åããñáöÞ\n"
 
-#: sink.c:979
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Ï áêñïáôÞò %cMTP áðå÷èÜíåôáé ôç äéåýèõíóç ðáñáëÞðôç `%s'\n"
 
-#: sink.c:986
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Ï áêñïáôÞò %cMTP ðñáãìáôéêÜ áðå÷èÜíåôáé ôç äéåýèõíóç ðáñáëÞðôç `%s'\n"
 
-#: sink.c:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "êáíÝíá ôáßñéáóìá äéåýèõíóçò· äåí Ý÷åé ïñéóôåß postmaster.\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "áäõíáìßá áðïóôïëÞò áêüìá êáé óôï %s!\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "êáíÝíá ôáßñéáóìá äéåýèõíóçò· ðñïþèçóç óôï %s.\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "ðñüêåéôå íá äéáíåìçèïýí ìå: %s\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "¶íïéãìá MDA áðÝôõ÷å\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Óýíäåóç %cMTP óôï %s áðÝôõ÷å\n"
 
-#: sink.c:1280
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "áäõíáìßá áíýøùóçò áêñïáôÞ· ÷ñÞóç ôïõ %s"
 
-#: sink.c:1336
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "ôï MDA áðåâßùóå áðü óÞìá %d\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "Ôï MDA åðÝóôñåøå ìç-ìçäåíéêÞ êáôÜóôáóç %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr "ÐáñÜîåíï: ôï MDA pclose åðÝóôñåøå %d, áäõíáìßá ÷åéñéóìïý óôï %s:%d\n"
 
-#: sink.c:1363
+#: sink.c:1350
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Ôåñìáôéóìüò ìçíýìáôïò Þ êëåßóéìï ôïõ áñ÷åßïõ BSMTP áðÝôõ÷å\n"
 
-#: sink.c:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "Ï áêñïáôÞò SMTP áñíÞèçêå ôç äéáíïìÞ\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "ÓöÜëìá äéáíïìÞò LMTP óôï  EOM\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Ìç áíáìåíüìåíç áðÜíôçóç ü÷é-503 óôï LMTP EOM: %s\n"
 
-#: sink.c:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\tÏ Äáßìïíáò  Fetchmail\n"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Åîïõóéïäüôçóç ESMTP CRAM-MD5...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Ï äéá÷åéñéóôÞò áðÝññéøå ôçí åíôïëÞ AUTH.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "ÅóöáëìÝíç áðÜíôçóç BASE64 áðü ôï äéá÷åéñéóôÞ.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Áðïêùäéêïðïßçóç ðñüêëçóçò: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Åîïõóéïäüôçóç ESMTP PLAIN...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Åîïõóéïäüôçóç ESMTP LOGIN...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "óöÜëìá ðñùôïêüëëïõ áêñïáôÞ smtp\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: áðÝôõ÷å ôï malloc\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair áðÝôõ÷å\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: áðÝôõ÷å ôï fork\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "dup2 áðÝôõ÷å\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "åêôåëåßôå %s (äéáêïìéóôÞò %s õðçñåóßá %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) áðÝôõ÷å\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: ëÞøç ðáñÜíïìïõ ìÞêïõò äéåýèõíóçò ãéá ôï äéáêïìéóôÞ %s\n"
 
-#: socket.c:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Ïñãáíéóìüò Åêäüôç: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Ðñïåéäïðïßçóç: õðåñâïëéêÜ ìåãÜëï ¼íïìá Ïñãáíéóìïý Åêäüôç (ðéèáíÜ êïììÝíï).\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "¶ãíùóôïò Ïñãáíéóìüò\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Åêäüôç: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Ðñïåéäïðïßçóç: Êïéíü¼íïìá Åêäüôç åßíáé õðåñâïëéêÜ ìåãÜëï (ðéèáíÜ êïììÝíï).\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá Åêäüôç\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Êïéíü¼íïìá Äéá÷åéñéóôÞ: %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Êáêü ðéóôïðïéçôéêü: Subject Êïéíü¼íïìá õðåñâïëéêÜ ìåãÜëï!\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ìç ôáßñéáóìá ÊïéíïýÏíüìáôïò ÄéáêïìéóôÞ: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "Äåí Ý÷åé ïñéóôåß üíïìá äéá÷åéñéóôÞ, áäõíáìßá åðáëÞèåõóçò ðéóôïðïéçôéêïý!\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "¶ãíùóôï Êïéíü¼íïìá ÄéáêïìéóôÞ\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Äåí Ý÷åé ïñéóôåß üíïìá äéáêïìéóôÞ óôï ðéóôïðïéçôéêü!\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() áðÝôõ÷å!\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Óþèçêå ç ìíÞìç!\n"
 
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "Ç ðñïóùñéíÞ ìíÞìç êåéìÝíïõ ðåñßëçøçò åßíáé õðåñâïëéêÜ ìéêñÞ!\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s áðïôýðùìá êëåéäéïý: %s\n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s áðïôõðþìáôá ôáéñéÜæïõí.\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s áðïôõðþìáôá äåí ôáéñéÜæïõí!\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Ðñïåéäïðïßçóç: åðáëÞèåõóç ðéóôïðïéçôéêïý äéáêïìéóôÞ: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Üãíùóôïò åêäüôçò (ðñþôïé %d ÷áñáêôÞñåò): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Ï ðåñéãñáöÝáò áñ÷åßïõ åêôüò êëßìáêáò ãéá ôï SSL"
 
-#: socket.c:948
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Êáèïñßóôçêå Üêõñï ðñïôüêïëëï SSL '%s', ÷ñÞóç åî ïñéóìïý (SSLv23).\n"
 
-#: socket.c:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "ÅðáëÞèåõóç ðéóôïðïéçôéêïý/áðïôõðþìáôïò êÜðùò ðáñáëÞöèçêå!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "ÅðáíáðñïóðÜèåéá áíÜãíùóçò õðïäï÷Þò Cygwin\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "ÅðáíáðñïóðÜèåéá áíÜãíùóçò õðïäï÷Þò Cygwin áðÝôõ÷å!\n"
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "áíôéóôïß÷çóç ôïõ %s óôï ôïðéêü %s\n"
 
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "ðÝñáóå ìÝóá áðü %s ôáéñéÜæïíôáò ôï %s\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
 "%s"
 msgstr "áíÜëõóç ãñáììÞò Received:%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "äåêôÞ ãñáììÞ, ôï %s åßíáé øåõäüíçìï ôïõ äéá÷. áëëçëïãñáößáò\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "ìç äåêôÞ ãñáììÞ, ôï %s äåí åßíáé øåõäüíçìï ôïõ äéá÷. áëëçëïãñáößáò\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "äåí âñÝèçêáí äéåõèýíóåéò Received\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "âñÝèçêáí äéåõèýíóåéò Received `%s'\n"
 
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr "âñÝèçêå ïñéïèÝôçò ìçíýìáôïò êáôÜ ôçí óÜñùóç åðéêåöáëßäùí\n"
 
-#: transact.c:552
+#: transact.c:549
 msgid "incorrect header line found while scanning headers\n"
 msgstr "âñÝèçêå ëÜèïò ãñáììÞ åðéêåöáëßäáò êáôá ôïí Ýëåã÷ï åðéêåöáëßäùí\n"
 
-#: transact.c:554
+#: transact.c:551
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "ÓõãêÝíôñùóç áðü %s\n"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "äåí õðÜñ÷ïõí ôïðéêÜ üìïéá, ðñïþèçóç óôï %s\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "êáôáóôïëÞ ðñïþèçóçò êáé äéáãñáöÞò ëüãù óöáëìÜôùí ôïõ DNS\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "åããñáöÞ RFC822 msgblk.headers\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "êáììéÜ äéåýèõíóç ðáñáëÞðôç äå ôáéñéÜæåé ìå ôá ïñéóìÝíá ôïðéêÜ ïíüìáôá"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "äéåýèõíóç ðáñáëÞðôç %s äåí ôáéñéÜæåé ìå êáíÝíá ôïðéêü üíïìá"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "ôï ìÞíõìá ðåñéÝ÷åé åíèåôçìÝíá NULs"
 
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Ï áêñïáôÞò SMTP áðÝññéøå ôéò äéåõèýíóåéò ôïðéêþí ðáñáëçðôþí: "
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "åããñáöÞ êåéìÝíïõ ìçíýìáôïò\n"
 
@@ -2808,8 +2774,6 @@ msgstr " <Üäåéï>"
 msgid "Scratch list of UIDs:"
 msgstr "Ðñü÷åéñç ëßóôá ìå UID:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
@@ -2848,3 +2812,28 @@ msgstr "áðÝôõ÷å ôï malloc\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "áðÝôõ÷å ôï realloc\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "ìåñéêü óöÜëìá êáôÜôìçóçò ìçíýìáôïò ëÜèïõò"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "alloca áðÝôõ÷å"
+
+#~ msgid "messages"
+#~ msgstr "ìçíýìáôá"
+
+#~ 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 ee24f2cb..216379eb 100644
--- a/po/es.po
+++ b/po/es.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-10-20 15:21+0200\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2003-08-15 01:25-0300\n"
 "Last-Translator: Javier Kohen <jkohen@users.sourceforge.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -69,50 +69,50 @@ msgstr ""
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "  %d mensajes de %d octetos de largo omitidos por fetchmail."
 
-#: driver.c:503
+#: driver.c:498
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "saltando mensaje %s@%s:%d"
 
-#: driver.c:555
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "saltando mensaje %s@%s:%d (%d octetos)"
 
-#: driver.c:571
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (longitud -1)"
 
-#: driver.c:574
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (demasiado grande)"
 
-#: driver.c:589
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "no fue posible recibir los encabezados, mensaje %s@%s:%d (%d octetos)\n"
 
-#: driver.c:606
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "leyendo el mensaje %s@%s:%d de %d"
 
-#: driver.c:614
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %soctetos)"
 
-#: driver.c:615
+#: driver.c:610
 msgid "header "
 msgstr "encabezado "
 
-#: driver.c:687
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octetos en el cuerpo) "
 
-#: driver.c:745
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -120,62 +120,62 @@ msgstr ""
 "el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d "
 "esperada)\n"
 
-#: driver.c:776
+#: driver.c:771
 msgid " retained\n"
 msgstr " retenido\n"
 
-#: driver.c:785
+#: driver.c:780
 msgid " flushed\n"
 msgstr " eliminado\n"
 
-#: driver.c:802
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " no eliminado\n"
 
-#: driver.c:818
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 "límite de %d mensajes alcanzado; %d mensajes dejados en el servidor %s para "
 "la cuenta %s\n"
 
-#: driver.c:879
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "SIGPIPE lanzado desde un MDA o un error de socket de flujo\n"
 
-#: driver.c:886
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "tiempo agotado después de %d segundos de espera para conectarse con el "
 "servidor %s.\n"
 
-#: driver.c:890
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tiempo agotado después de %d segundos de espera por el servidor %s.\n"
 
-#: driver.c:894
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tiempo agotado después de %d segundos de espera por %s.\n"
 
-#: driver.c:899
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "tiempo agotado después de %d segundos de esperar respuesta del cliente.\n"
 
-#: driver.c:902
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tiempo agotado después de %d segundos.\n"
 
-#: driver.c:914
+#: driver.c:909
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ve repetidos excesos en el tiempo de espera"
 
-#: driver.c:917
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -184,7 +184,7 @@ msgstr ""
 "Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba "
 "obtener correo de %s@%s.\n"
 
-#: driver.c:921
+#: driver.c:916
 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 ""
 "para diagnosticar el problema.\n"
 "Fetchmail no inquirirá esta casilla hasta que lo reinicie.\n"
 
-#: driver.c:949
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "el comando preconexión falló con estado %d\n"
 
-#: driver.c:980
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "no fue posible encontrar casilla HESIOD para %s\n"
 
-#: driver.c:1002
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "El servidor líder no tiene nombre.\n"
 
-#: driver.c:1025
+#: driver.c:1020
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "no fue posible encontrar el nombre DNS canónico de %s (%s)\n"
 
-#: driver.c:1062
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "inconsistencia interna\n"
 
-#: driver.c:1072
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Fallo la conexión de %s a %s"
 
-#: driver.c:1078
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "máquina desconocida."
 
-#: driver.c:1081
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "el nombre es válido pero no tiene dirección IP."
 
-#: driver.c:1084
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "error irrecuperable en el servidor de nombres."
 
-#: driver.c:1086
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "error temporario en el servidor de nombres."
 
-#: driver.c:1097
+#: driver.c:1084
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "error desconocido en el DNS %d."
 
-#: driver.c:1115
+#: driver.c:1102
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: aviso de server fuera de alcance de fetchmail."
 
-#: driver.c:1117
+#: driver.c:1104
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail no pudo obtener correo de servidor %s:"
 
-#: driver.c:1144 imap.c:367 pop3.c:411
+#: driver.c:1131 imap.c:367 pop3.c:411
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
-#: driver.c:1197
+#: driver.c:1184
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Error `lock-busy' en %s@%s\n"
 
-#: driver.c:1201
+#: driver.c:1188
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Error: servidor ocupado en %s@%s\n"
 
-#: driver.c:1206
+#: driver.c:1193
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallo de autorización en %s@%s%s\n"
 
-#: driver.c:1209
+#: driver.c:1196
 msgid " (previously authorized)"
 msgstr " (previamente autorizado)"
 
-#: driver.c:1230
+#: driver.c:1217
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: la autenticación de fetchmail falló en %s@%s"
 
-#: driver.c:1234
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail no pudo obtener correo de %s@%s.\n"
 
-#: driver.c:1238
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -320,7 +320,7 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio sea restablecido."
 
-#: driver.c:1253
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -341,163 +341,163 @@ msgstr ""
 "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n"
 "servicio sea restablecido."
 
-#: driver.c:1268
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Reinquirir inmediatamente %s@%s\n"
 
-#: driver.c:1273
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Error de entrada o de autenticación desconocido en %s@%s\n"
 
-#: driver.c:1297
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorización exitosa en %s@%s\n"
 
-#: driver.c:1303
+#: driver.c:1290
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: la autenticación de fetchmail aprobada en %s@%s"
 
-#: driver.c:1307
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail pudo registrarse en %s@%s.\n"
 
-#: driver.c:1311
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "El servicio ha sido reestablecido.\n"
 
-#: driver.c:1342
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "seleccionando o re-inquiriendo la carpeta %s\n"
 
-#: driver.c:1344
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "seleccionando o re-inquiriendo la carpeta por defecto\n"
 
-#: driver.c:1360
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1368 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1373
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Inquiriendo %s\n"
 
-#: driver.c:1377
+#: driver.c:1355
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mensaje (%d %s) para %s"
 msgstr[1] "%d mensajes (%d %s) para %s"
 
-#: driver.c:1380
+#: driver.c:1358
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "visto"
 msgstr[1] "visto"
 
-#: driver.c:1383
+#: driver.c:1361
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mensaje para %s"
 msgstr[1] "%d mensajes para %s"
 
-#: driver.c:1390
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1396
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No hay correo para %s\n"
 
-#: driver.c:1429
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "¡cantidad de mensajes incorrecta!"
 
-#: driver.c:1530
+#: driver.c:1508
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1533
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "el encabezado RFC822 falta o está arruinado"
 
-#: driver.c:1536
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1539
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "sincronización cliente/servidor"
 
-#: driver.c:1542
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1545
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "bloqueo ocupado en el servidor"
 
-#: driver.c:1548
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "Transacción SMTP"
 
-#: driver.c:1551
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "búsqueda en DNS"
 
-#: driver.c:1554
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "error indefinido\n"
 
-#: driver.c:1565
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "error `%s' durante el envío al host SMTP %s\n"
 
-#: driver.c:1567
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "error `%s' recibiendo de %s\n"
 
-#: driver.c:1575
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "el comando posconexión falló con estado %d\n"
 
-#: driver.c:1596
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Soporte de Kerberos V4 no incluido.\n"
 
-#: driver.c:1604
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Soporte de Kerberos V5 no incluido.\n"
 
-#: driver.c:1615
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opción --flush no soportada con %s\n"
 
-#: driver.c:1621
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opción --all no soportada con %s\n"
 
-#: driver.c:1629
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opción --limit no soportada con %s\n"
@@ -613,60 +613,60 @@ 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:153
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invocado con"
 
-#: fetchmail.c:177
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "no fue posible obtener el directorio de trabajo actual\n"
 
-#: fetchmail.c:187
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Esta es la versión de fetchmail %s"
 
-#: fetchmail.c:331
+#: fetchmail.c:342
 #, 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:332
+#: fetchmail.c:343
 msgid " and "
 msgstr " y "
 
-#: fetchmail.c:337
+#: fetchmail.c:348
 #, 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:358
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no han sido especificados servidores de correo.\n"
 
-#: fetchmail.c:367 fetchmail.c:376
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ningún otro fetchmail está siendo ejecutando\n"
 
-#: fetchmail.c:382
+#: fetchmail.c:393
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n"
 
-#: fetchmail.c:383 fetchmail.c:389
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:383 fetchmail.c:389
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "primer plano"
 
-#: fetchmail.c:388
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminando.\n"
 
-#: fetchmail.c:404
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -674,7 +674,7 @@ msgstr ""
 "fetchmail: no es posible verificar el correo mientras otro fetchmail está en "
 "ejecución hacia la misma máquina\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -682,185 +682,185 @@ msgstr ""
 "fetchmail: no es posible inquirir las máquinas especificadas con otro "
 "fetchmail (%d) en ejecución.\n"
 
-#: fetchmail.c:417
+#: fetchmail.c:428
 #, 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:427
+#: fetchmail.c:438
 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:433
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n"
 
-#: fetchmail.c:445
+#: fetchmail.c:456
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: proceso hijo más antiguo (%d) murió misteriosamente.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:471
 #, 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:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Ingrese clave para %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s en segundo plano \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, 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:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "no se pudo temporizar %s (error %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s cambió)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 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:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "el intento de re-ejecutar fetchmail falló\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, 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:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo no alcanzado, no se interrogará %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado de la consulta=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado de la consulta=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado de la consulta=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado de la consulta=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado de la consulta=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado de la consulta=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado de la consulta=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado de la consulta=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado de la consulta=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado de la consulta=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado de la consulta=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado de la consulta=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado de la consulta=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado de la consulta=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado de la consulta=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas las conexiones están trabadas. Saliendo.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "durmiendo en %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "despertado por %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "despertado por señal %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "despertado en %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminación normal, estado %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 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:972
+#: fetchmail.c:983
 #, 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:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "El soporte de SSL no fue compilado.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -868,636 +868,636 @@ msgstr ""
 "fetchmail: cuidado: no hay DNS disponible para verificar recepciones "
 "`multidrop' de %s\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, 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:1171
+#: fetchmail.c:1183
 #, 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:1187
+#: fetchmail.c:1199
 #, 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:1202
+#: fetchmail.c:1214
 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:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con señal %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, 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:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "El soporte de POP2 no está configurado.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "El soporte de POP3 no está configurado.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "El soporte de IMAP no está configurado.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "El soporte de ETRN no está configurado.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "No se puede soportar ETRN sin gethostbyname(2).\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "El soporte de ODMR no está configurado.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "No se puede soportar ODMR sin gethostbyname(2).\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "fue seleccionado un protocolo no soportado.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, 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:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "El intervalo entre consultas es de %d segundos\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "El archivo de registro es %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "El archivo con identificaciones es %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Los mensajes de progreso serán registrados vía syslog\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascarará y no generará `Received'\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1466
 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:1456
+#: fetchmail.c:1468
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviará mensajes `multidrop' mal direccionados a %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail dirigirá el correo de error al `postmaster'.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail dirigirá el correo de error al remitente.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opciones para recibir de %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  El correo será recibido vía %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1488
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr "  La consulta de este servidor ocurrirá cada %d intervalos.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  El nombre verdadero del servidor es %s.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  Esta máquina %s interrogada cuando no haya otra especificada.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr "no será"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr "será"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  La clave será pedida.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secreto APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificación RPOP = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Clave = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  El protocolo es KPOP con autenticación Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  El protocolo es %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servicio %s)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (usando opciones de seguridad de red %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (usando puerto %d)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (usando puerto por defecto)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (forzando el uso de UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Se probarán todos los métodos de autenticación disponibles.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  Se forzará autenticación con clave.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Se forzará autenticación NTLM.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Se forzará autenticación OTP.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación CRAM-Md5.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Se forzará autenticación GSSAPI.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V4.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Se forzará autenticación Kerberos V5.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Se asume cifrado de un extremo a otro.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  El principal del servicio de correo es: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesiones encriptadas con SSL activadas.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo SSL: %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Comprobación de certificados SSL del servidor activada.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Directorio del certificado SSL de confianza: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  El tiempo de espera para respuestas del servidor es de %d segundos"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  La casilla por defecto está seleccionada.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  Las casillas seleccionadas son:"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s mensajes serán recibidos (--all %s).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "Todos los"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "Sólo los nuevos"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Los mensajes recibidos %sn dejados en el servidor (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr ""
 "  Los mensajes viejos %sn eliminados antes de la recepción de mensajes (--"
 "flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr ""
 "  La reescritura de las direcciones locales está %sa (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "enabled"
 msgstr "activado"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "disabled"
 msgstr "desactivado"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  La remoción de retornos de carro está %sa (stripcr %s).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  El fuerce de retornos de carro está %so (forcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr ""
 "  La interpretación de la Codificación de Transmisión de Contenido está %s "
 "(pass8bits %s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  La decodificación MIME está %sa (mimedecode %s).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  Ocio tras la consulta %s (idle %s).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Las líneas `Status' serán %s (dropstatus %s).\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "descartadas"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "guardadas"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Las líneas `Delivered-To' serán %s (dropdelivered %s).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, 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:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, 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:1637
+#: fetchmail.c:1649
 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:1640
+#: fetchmail.c:1652
 #, 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:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  La cantidad de mensajes recibidos está limitada a %d (--fetchsizelimit %"
 "d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1660
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  El límite de mensaje por lote SMTP es %d.\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, 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:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forzar eliminaciones (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Los dominios para los cuales se recibirá correo son:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, 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:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Los mensajes serán entregados con \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Los mensajes serán reenviados con %cMTP a:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, 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:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Las respuestas de servidor reconocidas como bloques de `spam' son:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  El bloqueo de `spam' está desactivado\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  No hay comando de pre-conexión.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, 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:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  No hay comando posconexión.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  No hay nombres locales declarados para esta máquina.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  Modo `multi-drop': "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  Modo `single-drop': "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d nombre(s) local(es) reconocidos.\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  Búsqueda en DNS de direcciones `multidrop' está %sa.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr ""
 "  Los alias del servidor serán comparados con las direcciones `multidrop' "
 "por "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "dirección IP.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "nombre.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, 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:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Recibido"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, 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:1784
+#: fetchmail.c:1796
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  El prefijo %s será removido del nombre de usuario\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  Ningún prefijo será removido\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias predeclarados del servidor de correo:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  Dominios locales:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, 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:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  No se especificó alguna interfaz requerida.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  El bucle de consulta monitoreará %s.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  No se especificó una interfaz de monitoreo.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, 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:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  No se especificó un comando para el `plugin'.\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, 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:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  No se especificó un comando para el `plugout'.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No hay UIDs guardadas de esta máquina.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs guardadas.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 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:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1505,12 +1505,12 @@ msgstr ""
 "  No se agregará información de trazado sobre la consulta al encabezado "
 "Recibido.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso \"%s\".\n"
 
-#: fetchmail.h:604 fetchmail.h:610
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca falló"
 
@@ -1611,123 +1611,123 @@ msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
 
-#: imap.c:650 imap.c:712
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:668 imap.c:697
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:676
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "Hay %d mensajes esperando tras el reintento de consulta\n"
 
-#: imap.c:686
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:690
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "Hay %d mensajes esperando tras la consulta inicial\n"
 
-#: imap.c:716
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "Hay %d mensajes esperando tras la eliminación\n"
 
-#: imap.c:739
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:769 pop3.c:659 pop3.c:671 pop3.c:888 pop3.c:895
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: imap.c:781 pop3.c:680
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "No es posible abrir la interfaz kvm. Asegúrese de que fetchmail este SGID "
 "kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Incapaz de interpretar el nombre de la interfaz a partir de %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (estimar lista de interfaces) falló"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc falló"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (lista de interfaces) falló"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "No se entendió el mensaje de ruteo versión %d."
 
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "No se encontró una interfaz con el nombre %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "No se encontró dirección IP para %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "falta la dirección IP de la interfaz\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "la dirección IP de la interfaz es inválida\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "la máscara IP de la interfaz es inválida\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "actividad en %s -vista- como %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "no se consulta %s, %s desactivada\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "no se consulta %s, la dirección IP de %s fue excluida\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "actividad en %s verificada como %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "no se consulta %s, %s inactiva\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "la actividad en %s era %d, es %d\n"
@@ -1754,11 +1754,11 @@ msgstr "no fue posible decodificar la respuesta BASE64 `ready'\n"
 msgid "challenge mismatch\n"
 msgstr "desafío no coincidente\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: removiendo archivo de bloqueo viejo\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: falló la creación del bloqueo.\n"
 
@@ -1971,164 +1971,175 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl del cliente\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     certificado ssl del cliente\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    forzar protocolo ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especificar el comando externo para abrir una conexión\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especificar el comando externo para abrir una conexión "
 "smtp\n"
 
-#: options.c:691
+#: options.c:693
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especificar el protocolo de recepción (ver página man)\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar el uso de UIDLs (sólo pop3)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        puerto TCP/IP al cual conectarse\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipo de autenticación (clave/kerberos/ssh/otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tiempo de espera por respuesta del servidor\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envolver encabezados de dirección\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefijo a remover de la identificación local del "
 "usuario\n"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   servicio de correo principal\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  añadir información sobre trazado de consultas al "
 "encabezado Recibido\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    especificar el `login' del usuario en el servidor\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         recibir mensajes viejos y nuevos\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borrar nuevos mensajes luego de recibidos\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        guardar nuevos mensajes luego de recibidos\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescribir las direcciones del encabezado\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recibir los mensajes más largos que lo especificado\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre las notificaciones de correo\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      configurar el pedido de seguridad IP\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configurar la máquina de reenvío de SMTP\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress configurar el dominio de entrega de SMTP a usar\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    usar nombreusuario@dominio como nombre completo para "
 "SMTP\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurar los valores de respuesta anti`spam'\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  configurar el límite de mensajes para las conexiones "
 "SMTP\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configurar el límite de mensajes para las conexiones al "
 "servidor\n"
 
-#: options.c:720
+#: options.c:722
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     configurar la cantidad de mensajes borrados entre "
 "eliminaciones\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         configurar el MDA para que reenvíe\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configurar archivo de salida de BSMTP\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para entrega\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especificar nombre de la carpeta remota\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
@@ -2150,25 +2161,25 @@ msgstr "Pedido de protocolo indefinido en POP3_auth\n"
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:650 pop3.c:879
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:752
+#: pop3.c:759
 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:838
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:853
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDLs\n"
 
-#: pop3.c:1210
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "La opción --remote no es soportada con POP3\n"
 
@@ -2236,10 +2247,6 @@ msgstr "Error de sistema desconocido"
 msgid "%s (log message incomplete)"
 msgstr "%s (mensaje de registro incompleto)"
 
-#: report.c:262 report.c:290 report.c:362 report.c:390
-msgid "partial error message buffer overflow"
-msgstr "error parcial en sobrecarga del buffer de mensaje"
-
 #: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
@@ -2415,107 +2422,107 @@ msgstr "El resultado de MD5 es: \n"
 msgid "forwarding to %s\n"
 msgstr "reenviando a %s\n"
 
-#: sink.c:349
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
 
-#: sink.c:352
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "correo de %s rebotado a %s\n"
 
-#: sink.c:484
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "El error guardado es aún %d\n"
 
-#: sink.c:547 sink.c:627
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Error de %cMTP: %s\n"
 
-#: sink.c:782
+#: sink.c:761
 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:1003
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Al servidor %cMTP no le gusta la dirección de recipiente `%s'\n"
 
-#: sink.c:1010
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "Al servidor %cMTP realmente no le gusta la dirección de recipiente `%s'\n"
 
-#: sink.c:1048
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
 
-#: sink.c:1060
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "¡ni siquiera es posible enviar a %s!\n"
 
-#: sink.c:1066
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
 
-#: sink.c:1219
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a punto de entregar con: %s\n"
 
-#: sink.c:1243
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "Fallo en la apertura de MDA\n"
 
-#: sink.c:1280
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Fallo en la conexión de %cMTP a %s\n"
 
-#: sink.c:1304
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "no se puede despertar al servidor; recurriendo a %s"
 
-#: sink.c:1360
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "El MDA murió por la señal %d\n"
 
-#: sink.c:1363
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "El MDA devolvió un estado distinto a cero %d\n"
 
-#: sink.c:1366
+#: sink.c:1329
 #, 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:1387
+#: sink.c:1350
 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:1408
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "El servidor SMTP rechazó la entrega\n"
 
-#: sink.c:1438
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "Error de entrega de LMTP en EOM\n"
 
-#: sink.c:1441
+#: sink.c:1404
 #, 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:1600
+#: sink.c:1555
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2523,32 +2530,32 @@ msgstr ""
 "-- \n"
 "El Daemon Fetchmail"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticación ESMTP CRAM-MD5...\n"
 
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "El servidor rechazó el comando AUTH.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "Mala respuesta base64 del server.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Desafío decodificado: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autenticación ESMTP PLAIN...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autenticación ESMTP LOGIN...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "error de protocolo en el servidor smtp\n"
 
@@ -2583,125 +2590,125 @@ msgstr "execvp(%s) falló\n"
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:424
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: largo de dirección ilegal recibido de la máquina %s\n"
 
-#: socket.c:781
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organización emisora: %s\n"
 
-#: socket.c:783
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Cuidado: el Nombre de la Organización emisora es muy largo (posiblemente "
 "truncado).\n"
 
-#: socket.c:785
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Organización Desconocida\n"
 
-#: socket.c:787
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "`CommonName' del emisor: %s\n"
 
-#: socket.c:789
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Cuidado: el `CommonName' del emisor es muy largo (posiblemente truncado).\n"
 
-#: socket.c:791
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "`CommonName' del emisor desconocido\n"
 
-#: socket.c:795
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "`CommonName' del servidor: %s\n"
 
-#: socket.c:799
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificado malo: el `CommonName' del sujeto es muy largo!\n"
 
-#: socket.c:815
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "`CommonName' del Servidor no coincide: %s != %s\n"
 
-#: socket.c:821
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nombre de servidor no fue configurado, ¡no fue posible verificar el "
 "certificado!\n"
 
-#: socket.c:826
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "`CommonName' del Servidor desconocido\n"
 
-#: socket.c:828
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "¡No se especifica el nombre del servidor en el certificado!\n"
 
-#: socket.c:838
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falló\n"
 
-#: socket.c:842
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "¡No hay memoria!\n"
 
-#: socket.c:854
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "¡El espacio para el resumen de texto es muy chico!\n"
 
-#: socket.c:860
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Huella digital de la llave %s: %s\n"
 
-#: socket.c:864
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Las huellas digitales de %s coinciden.\n"
 
-#: socket.c:867
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "¡Las huellas digitales de %s no coinciden!\n"
 
-#: socket.c:875
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Cuidado: la verificación del certificado del servidor: %s\n"
 
-#: socket.c:881
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:933
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:950
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "El protocolo SSL `%s' especificado es inválido, usando el defecto (SSLv23).\n"
 
-#: socket.c:1010
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "¡La verificación de certificado/huella digital fue de algún modo saltada!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del `socket' cygwin\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del `socket' cygwin\n"
 
@@ -2756,38 +2763,38 @@ msgstr "encabezado incorrecto encontrado durante la revisión de encabezados\n"
 msgid "line: %s"
 msgstr "línea: %s"
 
-#: transact.c:1071
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no hay coincidencias locales, reenviado a %s\n"
 
-#: transact.c:1086
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
 
-#: transact.c:1222
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribiendo encabezados RFC822\n"
 
-#: transact.c:1243
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "ninguna dirección de destino coincidió con los nombres locales declarados"
 
-#: transact.c:1254
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "la dirección de destino %s no coincide con algún nombre local"
 
-#: transact.c:1268
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "el mensaje contiene NULs"
 
-#: transact.c:1281
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
 
-#: transact.c:1406
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "escribiendo texto del mensaje\n"
 
@@ -2849,6 +2856,9 @@ msgstr "malloc falló\n"
 msgid "realloc failed\n"
 msgstr "realloc falló\n"
 
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "error parcial en sobrecarga del buffer de mensaje"
+
 #~ msgid "alloca failed\n"
 #~ msgstr "alloca falló\n"
 
diff --git a/po/fr.po b/po/fr.po
index 3ce11362..e127d5cf 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: 2004-11-10 01:32+0100\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2004-10-20 01:03+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -76,49 +76,49 @@ msgstr ""
 msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "  message %d de %d octets ignoré par fetchmail."
 
-#: driver.c:503
+#: driver.c:498
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "message %s@%s:%d ignoré"
 
-#: driver.c:555
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "message %s@%s:%d ignoré (%d octets)"
 
-#: driver.c:571
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (longueur -1)"
 
-#: driver.c:574
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (trop volumineux)"
 
-#: driver.c:589
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "impossible de récupérer l'en-tete du message %s@%s:%d (%d octets)\n"
 
-#: driver.c:606
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lecture du message %s@%s:%d parmi %d"
 
-#: driver.c:614
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:615
+#: driver.c:610
 msgid "header "
 msgstr "en-tête "
 
-#: driver.c:687
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d octets dans le corps) "
 
-#: driver.c:745
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -126,62 +126,62 @@ msgstr ""
 "le message %s@%s:%d n'est pas de la longueur attendue (%d actuelle != %d "
 "attendue)\n"
 
-#: driver.c:776
+#: driver.c:771
 msgid " retained\n"
 msgstr " conservé\n"
 
-#: driver.c:785
+#: driver.c:780
 msgid " flushed\n"
 msgstr " éliminé\n"
 
-#: driver.c:802
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " non éliminé\n"
 
-#: driver.c:818
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 "fetchlimit %d atteinte; %d messages demeurent sur le serveur %s (compte %s)\n"
 
-#: driver.c:879
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "«SIGPIPE» envoyé par un MDA ou une erreur de «stream socket»\n"
 
-#: driver.c:886
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "délai dépassé après %d secondes d'attente d'une connexion avec le serveur %"
 "s.\n"
 
-#: driver.c:890
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "délai dépassé après %d secondes d'attente du serveur %s.\n"
 
-#: driver.c:894
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "délai dépassé après %d secondes d'attente de %s.\n"
 
-#: driver.c:899
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "délai dépassé après %d secondes d'attente de la réponse du client.\n"
 
-#: driver.c:902
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "délai d'attente dépassé après %d secondes.\n"
 
-#: driver.c:914
+#: driver.c:909
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Subject: fetchmail a rencontré des dépassements de délais à plusieurs "
 "reprises"
 
-#: driver.c:917
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -190,7 +190,7 @@ msgstr ""
 "Fetchmail a rencontré plus de %d dépassements de délais en récupérant du "
 "courrier depuis %s@%s.\n"
 
-#: driver.c:921
+#: driver.c:916
 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"
@@ -208,98 +208,98 @@ msgstr ""
 "Fetchmail n'interrogera pas de nouveau cette boîte aux lettres\n"
 "tant que vous ne l'aurez pas redémarré.\n"
 
-#: driver.c:949
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "la commande de pré-connexion a échoué avec l'état %d\n"
 
-#: driver.c:980
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "impossible de trouver la boîte HESIOD pour %s\n"
 
-#: driver.c:1002
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Le serveur principal n'a pas de nom\n"
 
-#: driver.c:1025
+#: driver.c:1020
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "impossible de trouver le nom canonique DNS de %s (%s)\n"
 
-#: driver.c:1062
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "inconsistance interne\n"
 
-#: driver.c:1072
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "Échec de connexion %s avec %s"
 
-#: driver.c:1078
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "hôte inconnu."
 
-#: driver.c:1081
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "le nom est valide mais ne correspond à aucune adresse IP."
 
-#: driver.c:1084
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "erreur irrécupérable avec le serveur de noms."
 
-#: driver.c:1086
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "erreur temporaire avec le serveur de noms."
 
-#: driver.c:1097
+#: driver.c:1084
 #, c-format
 msgid "unknown DNS error %d."
 msgstr "erreur DNS inconnue %d."
 
-#: driver.c:1115
+#: driver.c:1102
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: avertissement de serveur non accessible par Fetchmail."
 
-#: driver.c:1117
+#: driver.c:1104
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s:"
 
-#: driver.c:1144 imap.c:367 pop3.c:411
+#: driver.c:1131 imap.c:367 pop3.c:411
 msgid "SSL connection failed.\n"
 msgstr "Échec de la connexion SSL\n"
 
-#: driver.c:1197
+#: driver.c:1184
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erreur «lock-busy» sur %s@%s\n"
 
-#: driver.c:1201
+#: driver.c:1188
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erreur «busy» sur %s@%s\n"
 
-#: driver.c:1206
+#: driver.c:1193
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Échec de l'autorisation sur %s@%s%s\n"
 
-#: driver.c:1209
+#: driver.c:1196
 msgid " (previously authorized)"
 msgstr " (précédemment autorisée)"
 
-#: driver.c:1230
+#: driver.c:1217
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: l'authentification de fetchmail a échoué sur %s@%s"
 
-#: driver.c:1234
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s@%s.\n"
 
-#: driver.c:1238
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -325,7 +325,7 @@ msgstr ""
 "a chaque réveil. Il n'y aura plus d'autre notifications jusqu'à ce que\n"
 "le service soit réactivé."
 
-#: driver.c:1253
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -346,163 +346,163 @@ msgstr ""
 "a chaque réveil. Il n'y aura plus d'autre notifications jusqu'à ce que\n"
 "le service soit réactivé."
 
-#: driver.c:1268
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Re-récupération immédiate sur %s@%s\n"
 
-#: driver.c:1273
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erreur de login ou d'identification inconnue pour %s@%s\n"
 
-#: driver.c:1297
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autorisation OK sur %s@%s\n"
 
-#: driver.c:1303
+#: driver.c:1290
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: l'authentification de fetchmail a réussie sur %s@%s"
 
-#: driver.c:1307
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail n'a pu enregistrer dans le journal (%s@%s).\n"
 
-#: driver.c:1311
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "Le service a été réactivé\n"
 
-#: driver.c:1342
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "sélection ou re-réception du dossier %s\n"
 
-#: driver.c:1344
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "sélection ou re-réception du dossier par défaut\n"
 
-#: driver.c:1360
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s dans %s (dossier %s)"
 
-#: driver.c:1368 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%s dans %s"
 
-#: driver.c:1373
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Réception de %s\n"
 
-#: driver.c:1377
+#: driver.c:1355
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d message (%d %s) pour %s"
 msgstr[1] "%d messages (%d %s) pour %s"
 
-#: driver.c:1380
+#: driver.c:1358
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "déjà vu"
 msgstr[1] "déjà vus"
 
-#: driver.c:1383
+#: driver.c:1361
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d message pour %s"
 msgstr[1] "%d messages pour %s"
 
-#: driver.c:1390
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1396
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Aucun message pour %s\n"
 
-#: driver.c:1429
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "nombre de messages erroné !"
 
-#: driver.c:1530
+#: driver.c:1508
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1533
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "l'en-tête RFC822 est manquant ou endommagé"
 
-#: driver.c:1536
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1539
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "synchronisation client/serveur"
 
-#: driver.c:1542
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "protocole client/serveur"
 
-#: driver.c:1545
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "verrou occupé sur le serveur"
 
-#: driver.c:1548
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "Transaction SMTP"
 
-#: driver.c:1551
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "requête au DNS"
 
-#: driver.c:1554
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "erreur non définie\n"
 
-#: driver.c:1565
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "erreur %s durant l'envoi vers le serveur SMTP %s\n"
 
-#: driver.c:1567
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "erreur %s durant la réception de %s\n"
 
-#: driver.c:1575
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "la commande de post-connexion a échoué avec l'état %d\n"
 
-#: driver.c:1596
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Support de Kerberos V4 non inclus.\n"
 
-#: driver.c:1604
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Support de Kerberos V5 non inclus.\n"
 
-#: driver.c:1615
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush non supportée avec %s\n"
 
-#: driver.c:1621
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all non supportée avec %s\n"
 
-#: driver.c:1629
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit non supportée avec %s\n"
@@ -1505,7 +1505,7 @@ msgstr ""
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriétés du passage \"%s\".\n"
 
-#: fetchmail.h:609 fetchmail.h:615
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "échec d'alloca"
 
@@ -1606,123 +1606,123 @@ msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
 
-#: imap.c:650 imap.c:712
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "échec de la purge\n"
 
-#: imap.c:668 imap.c:697
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "échec durant la re-réception\n"
 
-#: imap.c:676
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d messages en attente après le nouveau poll\n"
 
-#: imap.c:686
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "échec de la sélection de boîte aux lettres\n"
 
-#: imap.c:690
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "%d messages en attente après le premier poll\n"
 
-#: imap.c:716
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "%d messages en attente après la purge\n"
 
-#: imap.c:739
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:769 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: imap.c:781 pop3.c:687
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "Impossible d'ouvrir l'interface kvm.\n"
 "Assurez-vous que fetchmail est SGID kmem."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Impossible d'interpréter le nom de l'interface depuis %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: échec du sysctl (iflist estimate)"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: échec malloc"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: échec du sysctl (iflist)"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "La version %d du message de routage n'est pas compréhensible"
 
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Aucune interface n'a été trouvée avec le nom %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "Aucune adresse IP trouvée pour %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "l'adresse IP de l'interface est manquante\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "l'adresse IP de l'interface est invalide\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "le masque de l'interface est invalide\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activité sur %s -notée- comme étant %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "la réception depuis %s est ignorée, %s arrêtée\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "la réception depuis %s est ignorée, l'adresse IP de %s est exclue\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activité sur %s vérifiée comme étant %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "la réception depuis %s est ignorée, %s inactivée\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "l'activité sur %s était %d, est %d\n"
@@ -1749,11 +1749,11 @@ msgstr "impossible de décoder la réponse BASE64 «ready»\n"
 msgid "challenge mismatch\n"
 msgstr "non coïncidence du challenge\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: suppression de l'ancien fichier verrou\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: impossible de créer le verrou.\n"
 
@@ -2232,10 +2232,6 @@ msgstr "Erreur système inconnue"
 msgid "%s (log message incomplete)"
 msgstr "%s (message de trace incomplet)"
 
-#: report.c:262 report.c:290 report.c:362 report.c:390
-msgid "partial error message buffer overflow"
-msgstr "erreur partielle de surcharge du tampon de message"
-
 #: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
@@ -2412,106 +2408,106 @@ msgstr "Le résultat de MD5 est : \n"
 msgid "forwarding to %s\n"
 msgstr "réexpédition vers %s\n"
 
-#: sink.c:349
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (corps du message ayant rebondi)\n"
 
-#: sink.c:352
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "message depuis %s ayant rebondi sur %s\n"
 
-#: sink.c:484
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "L'erreur mémorisée est toujours %d\n"
 
-#: sink.c:547 sink.c:627
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erreur %cMTP: %s\n"
 
-#: sink.c:782
+#: sink.c:761
 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:1003
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse de destinataire `%s'\n"
 
-#: sink.c:1010
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Le serveur %cMTP n'apprécie pas l'adresse du destinataire `%s'\n"
 
-#: sink.c:1048
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "les adresses ne correspondent pas ; pas de postmaster\n"
 
-#: sink.c:1060
+#: sink.c:1023
 #, 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:1066
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "aucune correspondance dans les adresses ; réexpédition vers %s.\n"
 
-#: sink.c:1219
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "sur le point de délivrer le courrier à : %s\n"
 
-#: sink.c:1243
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "Échec d'ouverture MDA\n"
 
-#: sink.c:1280
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Échec de connexion %cMTP avec %s\n"
 
-#: sink.c:1304
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ne peut relever l'agent ; se replie sur %s"
 
-#: sink.c:1360
+#: sink.c:1323
 #, 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:1363
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA a retourné un état non nul (%d)\n"
 
-#: sink.c:1366
+#: sink.c:1329
 #, 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:1387
+#: sink.c:1350
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Échec à la terminaison du message ou à la fermeture de BSMTP\n"
 
-#: sink.c:1408
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "Le serveur SMTP a refusé de délivrer le courrier\n"
 
-#: sink.c:1438
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erreur de délivrance LMTP en EOM\n"
 
-#: sink.c:1441
+#: sink.c:1404
 #, 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:1600
+#: sink.c:1555
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2519,32 +2515,32 @@ msgstr ""
 "-- \n"
 "Le Démon Fetchmail"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Authentification ESMTP CRAM-Md5...\n"
 
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Le serveur a refusé la commande AUTH.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "Mauvaise réponse en base 64 du serveur.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Challenge décodé: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Autentification ESMTP PLAIN ...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Autentification ESMTP LOGIN ...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "erreur de protocole avec le serveur smtp\n"
 
@@ -2579,124 +2575,124 @@ msgstr "échec de execvp(%s)\n"
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:424
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: longueur d'adresse illégale reçue de l'hôte %s\n"
 
-#: socket.c:785
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organisation de l'expéditeur: %s\n"
 
-#: socket.c:787
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Avertissement: le nom de l'organisation de l'expéditeur est tros long (et "
 "peut etre tronqué).\n"
 
-#: socket.c:789
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Organisation inconnue\n"
 
-#: socket.c:791
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nom commun de l'émetteur : %s\n"
 
-#: socket.c:793
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Avertissement: le nom de l'expéditeur est tros long (et peut etre tronqué).\n"
 
-#: socket.c:795
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nom commun de l'expéditeur inconnu\n"
 
-#: socket.c:799
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Nom commun du serveur: %s\n"
 
-#: socket.c:803
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificat erroni: Sujet nom commun trop long!\n"
 
-#: socket.c:819
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Pas de concordance du nom commun du serveur: %s != %s\n"
 
-#: socket.c:825
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "Le nom du serveur n'est pas spécifié, impossible de vérifier le certificat!\n"
 
-#: socket.c:830
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Nom commun du serveur inconnu\n"
 
-#: socket.c:832
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Le nom du serveur n'est pas présent dans le certificat!\n"
 
-#: socket.c:842
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "échec de EVP_md5()\n"
 
-#: socket.c:846
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Plus de mémoire!\n"
 
-#: socket.c:858
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "Le tampon résumé est trop court!\n"
 
-#: socket.c:864
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "signature de la clé %s : %s\n"
 
-#: socket.c:868
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "La signature %s correspond.\n"
 
-#: socket.c:871
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "La signature %s ne correspond pas!\n"
 
-#: socket.c:880
+#: socket.c:867
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Avertissement: vérification du certificat du serveur: %s\n"
 
-#: socket.c:886
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "expéditeur inconnu (%d premiers caractères) : %s\n"
 
-#: socket.c:938
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Descripteur de fichier inaccessible pour SSL"
 
-#: socket.c:955
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Le protocole SSL «%s» spécifié est invalide, le protocole par défaut "
 "(SSLv23) est utilisé.\n"
 
-#: socket.c:1016
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La vérification du certificat ou de la signature n'a pas été faite!\n"
 
-#: socket.c:1088
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Nouvel essai de lecture sur la socket Cygwin\n"
 
-#: socket.c:1091
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Le nouvel essai de lecture sur la socket Cygwin a échoué!\n"
 
@@ -2751,37 +2747,37 @@ msgstr "ligne d'en-tête incorrecte trouvée lors du scan des en-têtes\n"
 msgid "line: %s"
 msgstr "ligne: %s"
 
-#: transact.c:1071
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "aucune correspondance locale, réexpédition vers %s\n"
 
-#: transact.c:1086
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "réexpédition et effacement supprimés suite à des erreurs de DNS\n"
 
-#: transact.c:1222
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "écriture d'en-têtes RFC822\n"
 
-#: transact.c:1243
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "aucune adresse de destination ne correspond aux noms locaux déclarés"
 
-#: transact.c:1254
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'adresse de destination %s ne correspond à aucun nom local"
 
-#: transact.c:1268
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "le message contient des caractères NULs"
 
-#: transact.c:1281
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Le serveur SMTP rejette les adresses locales de destination : "
 
-#: transact.c:1406
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "écriture du texte du message\n"
 
@@ -2841,5 +2837,8 @@ msgstr "échec malloc\n"
 msgid "realloc failed\n"
 msgstr "échec realloc\n"
 
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "erreur partielle de surcharge du tampon de message"
+
 #~ msgid "alloca failed\n"
 #~ msgstr "échec d'alloca\n"
diff --git a/po/ja.po b/po/ja.po
index cd974a9f..acf6aec9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.9.11\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2002-04-07 12:00+0900\n"
 "Last-Translator: Jumpei Baba <jbaba@wb3.so-net.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr "¤Ï¤¤¡¢¤³¤ì¤é¤ÎIP¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Þ¤·¤¿¡£\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "¤¤¤¤¤¨¡¢¤³¤ì¤é¤ÎIP¥¢¥É¥ì¥¹¤Ï°ìÃפ·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "¥Í¡¼¥à¥µ¡¼¥Ð¤¬`%s'¤ò¸¡º÷½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£(%s ¤ËÀܳ¤¹¤ëºÝ¤Ë)\n"
@@ -42,91 +42,82 @@ msgstr "BASE64 ÊÑ´¹¤µ¤ì¤¿ challenge ¤ò¥Ç¥³¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "decoded as %s\n"
 msgstr "%s ¤È¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos ¥¨¥é¡¼ : %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [¥µ¡¼¥Ð¤Î±þÅú  '%*s']\n"
 
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:340
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Subject: ·Ù¹ð : Fetchmail ÍÆÎÌĶ²á\n"
 "\n"
 "°Ê²¼¤Ë¼¨¤¹ÍÆÎ̤òĶ²á¤·¤¿¥á¥Ã¥»¡¼¥¸¤¬¥á¡¼¥ë¥µ¡¼¥Ð %s ¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹ :"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:358
+#, fuzzy, c-format
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr ""
 "\t%d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d bytes ¤ÎŤµ¤¬¤¢¤ê¤Þ¤¹)¤ÏÆɤßÈô¤Ð¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: driver.c:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ð¥¤¥È) ¤òÆɤßÈô¤Ð¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: driver.c:549
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸ (%d ¥Ð¥¤¥È) ¤òÆɤßÈô¤Ð¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (Ťµ -1)"
 
-#: driver.c:568
+#: driver.c:569
 #, fuzzy
 msgid " (oversized)"
 msgstr "  (ÍÆÎÌĶ²á, %d ¥Ð¥¤¥È)"
 
-#: driver.c:583
+#: driver.c:584
 #, fuzzy, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(%d ¥Ð¥¤¥È) ¤Î¥Ø¥Ã¥À¤òÆɤ߽Ф»¤Þ¤»¤ó¤Ç¤·"
 "¤¿¡£"
 
-#: driver.c:600
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸(Á´Éô¤Ç %d ÄÌ)¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹"
 
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d ¥Ð¥¤¥È%s)"
 
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr " (¥Ø¥Ã¥À) "
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d ¥Ð¥¤¥È (ËÜÂÎ) )"
 
-#: driver.c:736
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -134,60 +125,61 @@ msgstr ""
 "%s@%s °¸¤ËÆϤ¤¤¿ %d ÈÖÌܤΥá¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤¬¹ç¤¤¤Þ¤»¤ó (%d (¼ÂºÝ) != %d (ͽ"
 "ÁÛ)) \n"
 
-#: driver.c:767
+#: driver.c:771
 msgid " retained\n"
 msgstr " ¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ð¤Ë¤½¤Î¤Þ¤Þ¤Ë¤·¤Æ¤¢¤ê¤Þ¤¹¡£\n"
 
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr " ¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " ¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:809
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 "ºÇÂç¼è¤ê¹þ¤ß¿ô¤Ç¤¢¤ë %d Ä̤Ë㤷¤Þ¤·¤¿; ¥á¥Ã¥»¡¼¥¸¤¬ %d ÄÌ¡¢¥µ¡¼¥Ð %s ¤Ë¥¢¥«"
 "¥¦¥ó¥È %s °¸¤Ç»Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: driver.c:869
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr "MDA ¤è¤ê SIGPIPE ¤¬È¯¿®¤µ¤ì¤¿¤« stream socket ¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:876
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ð %s ¤ÎÀܳ±þÅú¤òÂÔ¤Á¤Þ¤·¤¿¤¬À©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:880
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "%d Éô֥µ¡¼¥Ð %s ¤Î±þÅú¤òÂÔ¤Á¤Þ¤·¤¿¤¬À©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:884
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "%d ÉÃ´Ö %s ¤Î±þÅú¤òÂÔ¤Á¤Þ¤·¤¿¤¬À©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:889
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "žÁ÷Àè¤Î¥×¥í¥°¥é¥à¤Î±þÅú¤ò %d ÉôÖÂÔ¤Á¤Þ¤·¤¿¤¬À©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d ÉôÖÂÔµ¡¤·¤Þ¤·¤¿¤¬À©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ¼Â¹ÔÃæ¤Ë·«¤êÊÖ¤·À©¸Â»þ´Ö¤ÎĶ²á¤¬È¯À¸¤·¤Þ¤·¤¿\n"
 
-#: driver.c:906
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -196,7 +188,7 @@ msgstr ""
 "Fetchmail ¼Â¹ÔÃæ¤Ë %d ²ó°Ê¾å¡¢%s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¼õ¿®¤ò»î¤ß¤Þ¤·¤¿¤¬¡¢¤½¤Î"
 "ÅÙ¤ËÀ©¸Â»þ´Ö¤òĶ²á¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:911
+#: driver.c:916
 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"
@@ -212,49 +204,49 @@ msgstr ""
 "ºÆµ¯Æ°¤·¤Ê¤¤¸Â¤ê fetchmail ¤Ï¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤è¤ê\n"
 "¥á¡¼¥ë¤ò¼è¤ê½Ð¤·¤Þ¤»¤ó¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: driver.c:940
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 "¥µ¡¼¥Ð¤Ø¤ÎÀܳ³«»ÏÁ°¤Ë¼Â¹Ô¤·¤¿¥³¥Þ¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Þ¤·"
 "¤¿¡£\n"
 
-#: driver.c:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s ¤Ë¤¢¤ë¤Ù¤­ HESIOD pobox ¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: driver.c:993
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr "Lead server ¤Î̾Á°¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1016
+#: driver.c:1020
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "%s ¤Î canonical DNS ̾¤ò¸¡º÷¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1053
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "ÆâÉô¤Ç¤ÎÉÔ°ìÃפ¬¤¢¤ê¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤¿ %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: driver.c:1069
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "ÉÔÌÀ¤Ê¥Û¥¹¥È¤Ç¤¹¡£"
 
-#: driver.c:1072
+#: driver.c:1076
 msgid "name is valid but has no IP address."
 msgstr "̾Á°¤ÏÍ­¸ú¤Ç¤¹¤¬ IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: driver.c:1075
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "¥Í¡¼¥à¥µ¡¼¥Ð¤Î²óÉüÉÔǽ¤Ê¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: driver.c:1077
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "°ì»þŪ¤Ê¥Í¡¼¥à¥µ¡¼¥Ð¤Î¥¨¥é¡¼¤Ç¤¹¡£"
 
@@ -264,17 +256,19 @@ msgid "unknown DNS error %d."
 msgstr "ÉÔÌÀ¤Ê DNS ¤Î¥¨¥é¡¼ %d ¤Ç¤¹¡£"
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetchmail ·Ù¹ð : ¥µ¡¼¥Ð¤È¸ò¿®ÉÔǽ\n"
 "\n"
 "Fetchmail ¼Â¹ÔÃæ¤Ë¥á¡¼¥ë¥µ¡¼¥Ð %s ¤È¸ò¿®½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, 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
 msgid "SSL connection failed.\n"
 msgstr "SSL ¤Ë¤è¤ëÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
@@ -298,16 +292,16 @@ msgid " (previously authorized)"
 msgstr "(°ÊÁ°¤Ïǧ¾Ú¤µ¤ì¤Þ¤·¤¿)"
 
 #: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail ¼Â¹ÔÃæ %s@%s ¤Îǧ¾Ú¤Ë¼ºÇÔ\n"
 
-#: driver.c:1220
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ¼Â¹ÔÃæ¤Ë %s@%s °¸¤ËÆϤ¤¤¿¥á¡¼¥ë¤ò¼è¤ê½Ð¤»¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: driver.c:1224
+#: driver.c:1225
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -337,7 +331,7 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ð¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Þ¤¹¡£\n"
 " "
 
-#: driver.c:1239
+#: driver.c:1240
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -358,175 +352,174 @@ msgstr ""
 "¥µ¡¼¥Ó¥¹¤¬Éüµì¤·¤Ê¤¤¸Â¤ê²¿¤âÄÌÃΤ¬½Ð¤µ¤ì¤Ê¤¤¤³¤È¤òλ¾µ´ê¤¤¤Þ¤¹¡£\n"
 "\n"
 
-#: driver.c:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1259
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëÉÔÌÀ¤Ê¥í¥°¥¤¥óËô¤Ïǧ¾Ú¤Î¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: driver.c:1283
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s ¤ËÂФ¹¤ëǧ¾Ú¤¬¹Ô¤ï¤ì¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1290
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail %s@%s ǧ¾Ú´°Î»\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 "%s@%s ¤Î¥í¥°¥¤¥ó¤¬´°Î»¤· fetchmail ¤Ë¤è¤ë¥¢¥¯¥»¥¹¤¬²Äǽ¤È¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1296
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "¥µ¡¼¥Ó¥¹¤¬Éüµ¢¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1327
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Õ¥©¥ë¥À %s ¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£\n"
 
-#: driver.c:1329
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 "ÁªÂò¤ò¤·¤Æ²¼¤µ¤¤¡£ÁªÂò¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ë¥À¤ËºÆÅÙ¥¢¥¯¥»¥¹¤·¤Þ"
 "¤¹¡£\n"
 
-#: driver.c:1345
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ð %s (¥Õ¥©¥ë¥À %s)"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "¥¢¥«¥¦¥ó¥È %s , ¥µ¡¼¥Ð %s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: driver.c:1362
+#: driver.c:1355
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s ( ¤½¤Î¤¦¤Á %d Ä̤ϴû¤ËÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹ ) ¤¬%s°¸¤ËÆϤ¤¤Æ¤¤¤Þ¤¹¡£"
+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:1363 driver.c:1370
-msgid "messages"
-msgstr "Ä̤Υá¥Ã¥»¡¼¥¸"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "Ä̤Υá¥Ã¥»¡¼¥¸"
-
-#: driver.c:1366
+#: driver.c:1358
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s¤¬%s °¸¤ËÆϤ¤¤Æ¤¤¤Þ¤¹¡£"
+#: driver.c:1361
+#, 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:1375
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d ¥Ð¥¤¥È)\n"
 
-#: driver.c:1381
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s °¸¤Ë¥á¥Ã¥»¡¼¥¸¤ÏÆϤ¤¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "µ¶Â¤¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¿ô!"
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ¥Ø¥Ã¥À¤Î·çÍ¸íɵ"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥ÐƱ´ü"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È/¥µ¡¼¥Ð¥×¥í¥È¥³¥ë"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "¥µ¡¼¥Ð¤Î lock busy"
 
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "SMTP ÄÌ¿®"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "DNS »²¾È"
 
-#: driver.c:1539
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "%s¥¨¥é¡¼¤¬ SMTP ¥µ¡¼¥Ð %s ¤Ø¤Î¥á¡¼¥ëÁ÷¿®Ãæ¤ËȯÀ¸¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%s¥¨¥é¡¼¤¬ %s ¤è¤ê¥á¡¼¥ë¤ò¼õ¿®¤·¤Æ¤¤¤ëºÇÃæ¤ËȯÀ¸¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Àܳ½ªÎ»¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Þ¤·¤¿¡£\n"
 
-#: driver.c:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 ¤Ë¤ÏÂбþ¤·¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 ¤Ë¤ÏÂбþ¤·¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --flush ¤È %s ¤ÏƱ»þ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --all ¤È %s ¤ÏƱ»þ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó --limit ¤È %s ¤ÏƱ»þ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -541,7 +534,7 @@ msgstr ""
 "\"env QMAILINJECT = %s (°ú¿ô)\" ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ²¼¤µ¤¤¡£\n"
 "%s: ½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -559,18 +552,18 @@ msgstr ""
 "¤¤¡£\n"
 "%s: ½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr ""
 "%s: µ®ÍͤΥ¢¥«¥¦¥ó¥È¤Ï¸ºß¤·¤Ê¤¤¡£¤µ¤Ã¤µ¤ÈΩ¤Áµî¤êÆóÅÙ¤ÈÌá¤Ã¤Æ¤¯¤ë¤Ê¡£\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: ¥Û¥¹¥È¤¬·èÄê¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "¥Û¥¹¥È %s ¤ò gethostbyname ¤Ç¸¡º÷¤»¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
@@ -600,24 +593,20 @@ msgstr "%s °¸¤Ë¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 msgid "Pending messages for %s started\n"
 msgstr "%s °¸¥á¥Ã¥»¡¼¥¸¤ò¸å²ó¤·¤Ë¤·¤Þ¤¹¡£\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "¥Î¡¼¥É %s °¸¤Î¥á¥Ã¥»¡¼¥¸¤Î°ì»þÊݴɤ¬½ÐÍè¤Þ¤»¤ó¡£\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "¥Î¡¼¥É %s ¤Ï %s ¤Î¤¿¤áµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "ETRN ¤Î¹½Ê¸¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "ETRN ¤Î¥Ñ¥é¥á¡¼¥¿¤¬¸í¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
@@ -643,60 +632,60 @@ msgstr "¥ª¥×¥·¥ç¥ó --remote ¤Ï ETRN ¤È¤ÏƱ»þ¤ËÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "¥ª¥×¥·¥ç¥ó --check ¤Ï ETRN ¤È¤ÏƱ»þ¤ËÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: ¼¡¤Îʪ¤ò±çÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail ¥ê¥ê¡¼¥¹ %s "
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó%s%s¤è¤ê¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹¡£\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:343
 msgid " and "
 msgstr "µÚ¤Ó"
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "¥á¡¼¥ë¥µ¡¼¥Ð¤Î½àÈ÷¤¬À°¤¤¤Þ¤»¤ó -- ¤ª¤½¤é¤¯ %s ¤¬Â¸ºß¤·¤Ê¤¤¤¿¤á¤Ç¤¹\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ¥á¡¼¥ë¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ¾¤Î fetchmail ¤¬¼Â¹ÔÃæ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: ¥¨¥é¡¼¤ÎȯÀ¸¤Ë¤è¤ê%s fetchmail (PID=%d)¤ò½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¤Î"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (PID=%d) ¤¬½ªÎ»¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -704,7 +693,7 @@ msgstr ""
 "fetchmail: Ʊ¤¸¥Û¥¹¥È¤ËÂФ·¤ÆÊ̤Πfetchmail ¤¬¸ò¿®¤·¤Æ¤¤¤ë¤¿¤á¥á¡¼¥ë¤Î³Îǧ¤¬"
 "½ÐÍè¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -712,182 +701,182 @@ msgstr ""
 "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¼Â¹ÔÃæ¤Î¤¿¤á»ØÄꤵ¤ì¤¿¥Û¥¹¥È¤ÈÀܳ¤Ç¤­¤Þ"
 "¤»¤ó¡£\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ¾¤Î fetchmail (PID=%d) ¤¬¥Õ¥©¥¢¥°¥é¥¦¥ó¥ÉÆ°ºîÃæ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:425
+#: fetchmail.c:438
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç fetchmail ¤¬Æ°ºîÃæ¤Î¤¿¤á¥ª¥×¥·¥ç¥ó¤¬¼õ¤±ÉÕ¤±¤é"
 "¤ì¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 "fetchmail: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î fetchmail (PID=%d) ¤¬Æ°ºî¤òºÆ³«¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:456
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: Ʊ»þ¤ËÆ°ºî¤·¤Æ¤¤¤¿ fetchmail (PID=%d) ¤¬ÆÍÁ³¾ÃÌǤ·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:471
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: %s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s ¤Ë¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤ : "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s ¥Ç¡¼¥â¥ó¤òÆ°ºî³«»Ï¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "¥í¥°¤òÄɲ乤뤿¤á¤Ë %s ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fetchmail.c:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "%s ¤ÎÊÔ½¸¤µ¤ì¤¿»þ´Ö¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£(¥¨¥é¡¼ %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "%s ¤¬ÊÔ½¸¤µ¤ì¤¿¤¿¤á fetchmail ¤òºÆµ¯Æ°¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail ¤ÎºÆµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "ǧ¾Ú¼ºÇÔ¤«À©¸Â»þ´ÖĶ²á¤¬ÉÑȯ¤·¤¿¤¿¤á %s ¤È¤Î¸ò¿®¤òÈô¤Ð¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "»þ´Ö´Ö³Ö¤Ë㤷¤Æ¤¤¤Ê¤¤¤Î¤Ç %s ¤Î°ì»þÊݴɤò¹Ô¤¤¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Á´¤Æ¤ÎÀܳ¤¬Æ°ºîÉÔÁ´¤Ë´Ù¤Ã¤Æ¤·¤Þ¤¤¤Þ¤·¤¿¡£½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "%s ¤ËµÙ̲¾õÂ֤Ȥʤê¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s ¿®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s ¤ËÆ°ºî¤òºÆ³«¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "Ä̾ï¤Î½ªÎ»¤Ç¤¹¡£status %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 msgid "couldn't time-check the run-control file\n"
 msgstr "Æ°ºîÀ©¸æ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸»þ´Ö¤ò³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:983
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "·Ù¹ð : ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¥Û¥¹¥È %s ¤òÊ£¿ô²óµ­½Ò¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: fetchmail.c:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL Âбþ¤¬¥³¥ó¥Ñ¥¤¥ë¤Î»þÅÀ¤ÇÍ­¸ú¤Ë¤µ¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -895,620 +884,620 @@ msgstr ""
 "fetchmail: ·Ù¹ð : %s ¤è¤ê multidrop fetch ¤ò³Îǧ¤¹¤ë¤¿¤á¤Î DNS ¤¬Í­¸ú¤Ç¤¢¤ê¤Þ"
 "¤»¤ó¡£\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr "¥µ¡¼¥Ð %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£¥Ý¡¼¥ÈÈÖ¹æ¤ÏÉé¤Î¿ô¤Ç¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1171
+#: fetchmail.c:1183
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "¥µ¡¼¥Ð %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£ RPOP ¤Ç¤Ï privileged port ¤òÍøÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ"
 "¤¹¡£\n"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1199
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "¥µ¡¼¥Ð %s ¤ÎÀßÄ̵꤬¸ú¤Ç¤¹¡£LMTP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î SMTP ¥Ý¡¼¥È¤òÍøÍѤǤ­¤Þ¤»"
 "¤ó¡£\n"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1214
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "fetchall ¤È keep ¥ª¥×¥·¥ç¥ó¤Ï¥Ç¡¼¥â¥ó¥â¡¼¥É¤ÇÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "¥·¥°¥Ê¥ë %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Þ¤¹¡£¸ò¿®¤¬³«»Ï¤µ¤ì¤Þ¤·"
 "¤¿¡£\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 ¤ËÂбþ¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 ¤ËÂбþ¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP ¤ËÂбþ¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN ¤ËÂбþ¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "gethostbyname(2) ̵¤·¤Ç ETRN ¤ËÂбþ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR ¤ËÂбþ¤·¤¿ÀßÄ꤬¹Ô¤ï¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "gethostbyname(2) ̵¤·¤Ç ODMR ¤ËÂбþ¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "Âбþ¤·¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s ¤Ï %s ¤È¥×¥í¥È¥³¥ë %s ¤òÍѤ¤¤Æ %s ¤Ë¸ò¿®¤·¤Æ¤¤¤Þ¤¹¡£¸ò¿®¤¬½ªÎ»¤·¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "¸ò¿®´Ö³Ö¤Ï %d ÉäǤ¹¡£\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "¥í¥°¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID ¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "¿Ê¹Ô¾õ¶·¤Î¥á¥Ã¥»¡¼¥¸¤Ï syslog ¤òÄ̤·¤Æµ­Ï¿¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail ¤Ï¥¢¥É¥ì¥¹¤ò½ñ¤­´¹¤¨¡¢Received ¤òÀ¸À®¤·¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1466
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail ¤Ï¥í¥°¥Õ¥¡¥¤¥ëÃæ¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1468
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail ¤Ï¸í¤Ã¤¿°¸Àè¤Î½ñ¤«¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò %s ¤ËžÁ÷¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ¤Ï postmaster °¸¤Ë¥¨¥é¡¼¥á¡¼¥ë¤òÁ÷¿®¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ¤ÏÁ÷¤ê¼ç¤Ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "¥¢¥«¥¦¥ó¥È %s@%s ¤Ç¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  ¥á¡¼¥ë¤Ï¥Û¥¹¥È %s ¤ò²ð¤·¤Æ¤ä¤ê¤È¤ê¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1488
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr "  ¤³¤Î¥µ¡¼¥Ð¤ËÂФ·¤Æ¤Î¥¢¥¯¥»¥¹¤Ï %d ¤Î´Ö³Ö¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  ¥µ¡¼¥Ð¤ÎËÜ̾¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤Ï¥Û¥¹¥È¤¬»Ø¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ë¥¢¥¯¥»¥¹%s\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr "¤µ¤ì¤Þ¤»¤ó¡£"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr "¤µ¤ì¤Þ¤¹¡£"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥ÉÆþÎϤ¬É¬ÍפǤ¹¡£\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É = \"%s\"\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Kerberos %s ǧ¾Ú¤Ë¤è¤ë KPOP ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Þ¤¹¡£"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Þ¤¹¡£"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s ¥µ¡¼¥Ó¥¹¤òÍøÍѤ·¤Þ¤¹)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (%s ¥Í¥Ã¥È¥ï¡¼¥¯¥»¥­¥å¥ê¥Æ¥£¥ª¥×¥·¥ç¥ó¤òÍøÍѤ·¤Þ¤¹)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (¥Ý¡¼¥È %d ¤òÍøÍѤ·¤Þ¤¹)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¡¼¥È¤òÍøÍѤ·¤Þ¤¹)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (UIDL ¤ÎÍøÍѤò¶¯À©¤·¤Þ¤¹)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ÍøÍѲÄǽ¤ÊÁ´¤Æ¤Îǧ¾ÚÊý¼°¤ò»î¤ß¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  ¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM ǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP ¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "   CRAM-MD5 Êý¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI Êý¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 Êý¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 Êý¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end °Å¹æ²½¤Ç¤¢¤ë¤È¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ¥á¡¼¥ë¥µ¡¼¥Ó¥¹¤Ï %s ¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ¤Ë¤è¤ë°Å¹æ²½ÄÌ¿®¤¬¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  %s ¥×¥í¥È¥³¥ë¤òÍøÍѤ·¤Þ¤¹¡£"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL ¥µ¡¼¥Ð¾ÚÌÀ½ñ¤Î³Îǧ¤¬ÀßÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL ¿®ÍѲÄǽ¾ÚÌÀ½ñ¤Ï %s ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ¥µ¡¼¥Ð¤Î±þÅúÀ©¸Â»þ´Ö¤Ï %d ÉäǤ¹¡£"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)¡£\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  ¥Ç¥Õ¥©¥ë¥È¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  ÁªÂò¤µ¤ì¤¿¥á¡¼¥ë¥Ü¥Ã¥¯¥¹:"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s¼èÆÀ¤·¤Þ¤¹¡£ (--all %s)\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "¿·µ¬¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  ¼èÆÀ¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥µ¡¼¥Ð¤ËÊÝ»ý%s (--keep %s)\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr "  ¸Å¤¤¥á¥Ã¥»¡¼¥¸¤Ï¼èÆÀ¤ÎÁ°¤Ë¾Ãµî%s (--flush %s)\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  server-local ¥¢¥É¥ì¥¹¤Ø¤Î½ñ¤­´¹¤¨%s (--norewrite %s)\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  ²þ¹Ôµ­¹æ¤Î½üµî%s (stripcr %s)\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  ²þ¹Ôµ­¹æ¤ÎÄɲÃ%s (forcecr %s)\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  Content-Transfer-Encoding ¤ÎÊÑ´¹%s (pass8bits %s)\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  MIME ¤Î¥Ç¥³¡¼¥É%s (mimedecode %s)\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  ¥µ¡¼¥Ð¥¢¥¯¥»¥¹¸å¤ÎÂÔµ¡%s (idle %s)\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  µ­½Ò¤Î¤¢¤ë Status ¹Ô¤Ï%s (dropstatus %s)\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "ºï½ü¤µ¤ì¤Þ¤¹¡£"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "ÊÝ»ý¤µ¤ì¤Þ¤¹¡£"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Delivered-To ¹Ô¤Ï%s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ÎºÇÂç %d ¥Ð¥¤¥È¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£ (--limit %d)\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÂФ¹¤ë·Ù¹ð¤Ï %d ÉÃËè¤Ë¹Ô¤ï¤ì¤Þ¤¹¡£ (--warnings %d)\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  ¥µ¡¼¥Ð¥¢¥¯¥»¥¹¤ÎÅ٤˥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤Î·Ù¹ð¤ò¹Ô¤¤¤Þ¤¹¡£ (--warnings 0)\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£ (--fetchlimit 0)\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤Ç¼èÆÀ¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£(--fetchlimit %d)\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1660
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤ÎÂ礭¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£ (--limit 0)\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Ï %d Ä̤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  °ì²ó¤ÎÀܳ¤ÇžÁ÷¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£ (--batchlimit 0)\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤Ï %d ÄÌËè¤Ëºï½ü¤µ¤ì¤Þ¤¹¡£ (--expunge %d)\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë´Ö³Ö¤ÏÀßÄꤵ¤ì¤Æ¤ª¤ê¤Þ¤»¤ó¡£ (--expunge 0)\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  ¥á¡¼¥ë¤ò¼èÆÀ¤¹¤ë¥É¥á¥¤¥ó¤Ï : "
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  ¥Õ¥¡¥¤¥ë %s ¤Ë BSMTP ·Á¼°¤Ç¥á¥Ã¥»¡¼¥¸¤¬Äɵ­¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó\"%s\"¤Ë¤è¤Ã¤Æ¥á¥Ã¥»¡¼¥¸¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  ¼õ¿®¤·¤¿¥á¥Ã¥»¡¼¥¸¤Ï %cMTP ¤Ë¤è¤Ã¤Æ¼¡¤Ë¼¨¤¹¥µ¡¼¥Ð¤ØžÁ÷¤µ¤ì¤Þ¤¹ :"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  ¥Û¥¹¥È¤Î MAIL FROM ¹Ô¤Î¥¢¥É¥ì¥¹¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Á÷¿®Àè¤Î¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤ËÂФ¹¤ë±þÅú¤Ï : "
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  ¥¹¥Ñ¥à¥Ö¥í¥Ã¥¯¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  ÀܳÁ°¤Ë¼Â¹Ô¤¹¤ëÌ¿Îá¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  ¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ï\"%s\"¤Ë¤è¤Ã¤ÆÀÚÃǤµ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  Àܳ½ªÎ»»þ¤Ë¹Ô¤¦Ì¿Îá¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤ËÂФ¹¤ë localname ¤ÏÀë¸À¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  `multi-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  `single-drop' ¥â¡¼¥É: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d ¸Ä¤Î localname ¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  multidrop ¥¢¥É¥ì¥¹¤ò¸¡º÷¤¹¤ë DNS ¤Ï %s ¤Ç¤¹¡£\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  ¥µ¡¼¥Ð¤ÎÊÌ̾¤Ï multidrop ¥¢¥É¥ì¥¹¤È¼¡¤Î¤â¤Î¤ÇÈæ³Ó¤µ¤ì¤Þ¤¹ : "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "IP ¥¢¥É¥ì¥¹ \n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "̾Á° \n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address ¤Ë¤è¤ë¥ë¡¼¥Æ¥£¥ó¥°¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header ¤Ï %s ¤È¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  %d ¸Ä¤Î Envelope header ¤¬²òÀϤµ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1796
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s ¤Ï¥æ¡¼¥¶ ID ¤«¤é½üµî¤µ¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  Prefix ¤Ï½üµî¤µ¤ì¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  ͽ¤áÀë¸À¤µ¤ì¤¿¥á¡¼¥ë¥µ¡¼¥Ð¤ÎÊÌ̾:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  ¥í¡¼¥«¥ë¥É¥á¥¤¥ó:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Àܳ¤Ï¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹ %s ¤òÄ̤·¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  Àܳ¤ËÍøÍѤ¹¤Ù¤­¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤Î»ØÄê¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Àܳ¤Ï %s ¤Î¾õÂÖ¤ò´Æ»ë¤·¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  ¾õÂÖ¤ò´Æ»ë¤·¤ÆÀܳ¤Ï¤ª¤³¤Ê¤¤¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¤¥ó \"%s\" ¤òÍøÍѤ·¤Þ¤¹¡£(--plugin %s)\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  ¥µ¡¼¥Ð¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¤¥ó¤Î»ØÄê¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤Ë¤Ï¥×¥é¥°¥¢¥¦¥È\"%s\"¤òÍøÍѤ·¤Þ¤¹¡£(--plugout %"
 "s)\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤ÎÀܳ¤ËÍøÍѤ¹¤ë¥×¥é¥°¥¢¥¦¥È¤Î»ØÄê¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¤³¤Î¥Û¥¹¥È¤«¤é¤Î UID ¤Ïµ­Ï¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d ¸Ä¤Î UID ¤¬µ­Ï¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Àܳ¾ðÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲ䵤ì¤Þ¤¹¡£\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1516,16 +1505,12 @@ msgstr ""
 "  Àܳ¾ðÊó¤Ï Received ¥Ø¥Ã¥À¤ËÄɲ䵤ì¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ¥×¥í¥Ñ¥Æ¥£ \"%s\" ¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca ¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
@@ -1598,153 +1583,152 @@ msgstr "¾ÚÌÀ½ñ¤Îȯ¹Ô¥¨¥é¡¼¤Ç¤¹¡£\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ¥¹¥ì¥Ã¥É¤Ï %d Éô֥¹¥ê¡¼¥×¤·¤Þ¤¹¡£\n"
 
-#: imap.c:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP4 rev 1 ¤Èǧ¼±¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP4 rev 0 ¤Èǧ¼±¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "¥×¥í¥È¥³¥ë¤Ï IMAP2 Ëô¤Ï IMAP2BIS ¤Èǧ¼±¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "Àܳ¤Î¸å¡¢µÙ»ß¤·¤Þ¤¹¡£\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 "OTP ¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¤¬¡¢fetchmail ¤¬ OTP Âбþ¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Í׵ᤵ¤ì¤¿ NTLM ½èÍýǽÎÏ¤Ï fetchmail ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Í׵ᤵ¤ì¤¿ LOGIN ½èÍýǽÎϤϥµ¡¼¥Ð¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "ºÆ¥¢¥¯¥»¥¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬ºÆ¥¢¥¯¥»¥¹¤Î¸å¤Ë¸ºß¤·¤Þ¤¹¡£\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: imap.c:685
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "ºÇ½é¤Î¥¢¥¯¥»¥¹¤«¤é %d Ä̤Υá¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: imap.c:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "ºï½ü¤Î¸å¡¢%d Ä̤Υá¥Ã¥»¡¼¥¸¤¬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ¤Ï̤ÆɤǤ¹¡£\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
 "kvm ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£fetchmail ¤¬ SGID kmem ¤Ç¤¢¤ë¤«³Îǧ¤·"
 "¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "%s ¤«¤é¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹Ì¾¤ò²òÀϤǤ­¤Þ¤»¤ó¡£"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist estimate) ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "¥ë¡¼¥Æ¥£¥ó¥°¥á¥Ã¥»¡¼¥¸ version %d ¤¬Íý²ò¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "%s ¤È¤¤¤¦Ì¾¤Î¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤Ï¸ºß¤·¤Þ¤»¤ó¡£"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "%s ¤Î IP ¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "̵¸ú¤Ê IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥¢¥É¥ì¥¹¤Ç¤¹\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "̵¸ú¤Ê IP ¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¥Þ¥¹¥¯¤Ç¤¹¡£\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "%s ¤ÎÆ°ºî¾õÂÖ¤Ï %d ¤È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "¥µ¡¼¥Ð %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ð¤·¤Þ¤¹¡£¥µ¡¼¥Ð %s ¤Ïµ¡Ç½¤·¤Æ¤ª¤ê¤Þ¤»¤ó¡£\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "¥µ¡¼¥Ð %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ð¤·¤Þ¤¹¡£%s \n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "%s ¤ÎÆ°ºî¾õÂÖ¤Ï %d ¤ÈȽÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "¥µ¡¼¥Ð %s ¤Ø¤Î¥¢¥¯¥»¥¹¤òÈô¤Ð¤·¤Þ¤¹¡£%s ¤ÏÆ°ºî²Äǽ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s ¤ÎÆ°ºî¤Ï %d ¤Ç¤·¤¿¤¬¡¢º£¤Ï %d ¤Ç¤¹¡£\n"
@@ -1772,11 +1756,11 @@ msgstr "BASE64 ¥ì¥Ç¥£±þÅú¤ò¥Ç¥³¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 msgid "challenge mismatch\n"
 msgstr "challenge ¤ÎÉÔ°ìÃפǤ¹¡£\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: ¸Å¤¤¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: ¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
@@ -1808,7 +1792,6 @@ msgstr "Turnaround now...\n"
 msgid "ATRN request refused.\n"
 msgstr "ATRN Í׵᤬µñÀ䤵¤ì¤Þ¤·¤¿¡£\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "¸½ºß¡¢ATRN Í×µá¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
@@ -1817,12 +1800,10 @@ msgstr "¸½ºß¡¢ATRN Í×µá¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
 msgid "You have no mail.\n"
 msgstr "¿·Ãå¥á¡¼¥ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "¥³¥Þ¥ó¥É¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "¥æ¡¼¥¶Ç§¾Ú¤¬É¬ÍפǤ¹¡£\n"
@@ -1856,7 +1837,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge ¤Î¥Ç¥³¡¼¥É¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -1986,200 +1967,211 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL ¤Î client certificate ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     SSL ¤Î client certificate ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 "      --sslproto    SSL ¤Î¥×¥í¥È¥³¥ë¤ò¶¯À©Åª¤Ë»ØÄꤷ¤Þ¤¹ (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      ÀܳÍѤγ°Éô¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     SMTP ¤Ë¤è¤ë¸ò¿®¤ò¹Ô¤¦¤¿¤á¤Î³°Éô¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:691
+#: options.c:693
 #, fuzzy
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    ÍøÍѤ¹¤ë¥×¥í¥È¥³¥ë¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 "                    (¾ÜºÙ¤Ï man page ¤ò»²¾È¤·¤Æ²¼¤µ¤¤)\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        UIDL ¤ò¶¯À©Åª¤ËÍøÍѤ·¤Þ¤¹ (POP3 ¤Î¤ßÍ­¸ú¤Ç¤¹)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        Àܳ¤ËÍøÍѤ¹¤ë TCP/IP ¥µ¡¼¥Ó¥¹¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:694
+#: options.c:696
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ǧ¾ÚÊý¼°¤ò»ØÄꤷ¤Þ¤¹ (password/kerberos/ssh)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ¥µ¡¼¥Ð¤Î±þÅúÂÔ¤ÁÀ©¸Â»þ´Ö¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ¥¢¥É¥ì¥¹¥Ø¥Ã¥À¤ò±£¤·¤Þ¤¹\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    local user id ¤«¤é prefix ¤òºï½ü¤·¤Þ¤¹\n"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ¥á¡¼¥ë¥µ¡¼¥Ó¥¹¤ÇÍøÍѤ¹¤ëÊý¼°¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received ¥Ø¥Ã¥À¤ËÀܳ¾ðÊó¤ò½ñ¤­²Ã¤¨¤Þ¤¹\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ¥µ¡¼¥Ð¤Ø¤Î¥í¥°¥¤¥ó̾¤ò¤·¤Æ¤¤¤·¤Þ¤¹\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ¿·ÃåµÚ¤Ó´ûÃå¤Î¥á¡¼¥ë¤òÁ´¤Æ¼è¤ê½Ð¤·¤Þ¤¹\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      ¼è¤ê½Ð¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ð¤«¤é¾Ãµî¤·¤Þ¤¹\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ¼è¤ê½Ð¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ð¤Ë»Ä¤·¤Æ¤ª¤­¤Þ¤¹\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ´û¤Ë¼è¤ê½Ð¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ð¤«¤é¾Ãµî¤·¤Þ¤¹\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ¥Ø¥Ã¥À¤Î¥¢¥É¥ì¥¹¤ò½ñ¤­´¹¤¨¤Þ¤»¤ó\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       »ØÄꤵ¤ì¤¿Â礭¤µ°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê½Ð¤·¤Þ¤»¤ó\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    ÍÆÎÌĶ²á¤Î¥á¡¼¥ë¤Ë¤Ä¤¤¤Æ·Ù¹ð¤òȯ¤¹¤ë´Ö³Ö¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      IP security request ¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    žÁ÷Àè¤Î SMTP ¥Û¥¹¥È¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "      --fetchdomains °ì²ó¤ÎÀܳ¤Ç¥á¡¼¥ë¤ò¼èÆÀ¤¹¤Ù¤­¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress SMTP ¤Ë¤è¤ëžÁ÷¤ÇÍøÍѤ¹¤ë¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    SMTP žÁ÷¤ÇÍøÍѤ¹¤ë¥Õ¥ë¥Í¡¼¥à username@domain ¤ò»ØÄꤷ¤Þ"
 "¤¹\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    ¥¹¥Ñ¥à¥á¡¼¥ëÂкö¤Î±þÅú¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  °ì²ó¤Î SMTP žÁ÷¤ÇÁ÷¿®¤µ¤ì¤ë¥á¡¼¥ë¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Þ¤¹\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  °ì²ó¤Î¥µ¡¼¥Ð¤È¤Î¸ò¿®¤Ç¼èÆÀ¤Ç¤­¤ë¥á¡¼¥ë¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Þ"
 "¤¹¡£\n"
 
-#: options.c:720
+#: options.c:722
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchdomains °ì²ó¤ÎÀܳ¤Ç¥á¡¼¥ë¤ò¼èÆÀ¤¹¤Ù¤­¥É¥á¥¤¥ó̾¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ¥á¥Ã¥»¡¼¥¸¤ò°ìÅ٤˾õ¤ëºÇÂç¿ô¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ¥á¡¼¥ëÁ÷¿®¥×¥í¥°¥é¥à¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 "      --bsmtp       ¼è¤ê¹þ¤ó¤À¥á¡¼¥ë¤ò½ñ¤­½Ð¤¹ BSMTP ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) ¤òÇÛ¿®¤ËÍøÍѤ·¤Þ¤¹\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      ¥µ¡¼¥Ð¤Î¥á¡¼¥ë¥Õ¥©¥ë¥À¤ò»ØÄꤷ¤Þ¤¹\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤â¿Ê¹Ô¾õ¶·¤ò¼¨¤¹ . ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: pop3.c:538
+#: pop3.c:534
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting Ãæ¤Ë APOP timestamp ¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: pop3.c:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting Ãæ¤Î timestamp ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth Ãæ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¥×¥í¥È¥³¥ë¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy ¾õÂ֤Ǥ¹¡£Ê̤θò¿®¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:759
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "¥µ¡¼¥Ð¥ê¥¹¥È¤Ë¥á¥Ã¥»¡¼¥¸¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼è¤ê°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: pop3.c:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL ¤ò¼è¤ê¹þ¤ßÃæ¤Ë¥×¥í¥È¥³¥ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "POP3 ¤Ç¤Ï --remote ¥ª¥×¥·¥ç¥ó¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
 
@@ -2238,162 +2230,142 @@ msgstr "%s ¤Ï -rwx--x--- (0710) °Ê³°¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
 msgid "File %s must be owned by you.\n"
 msgstr "%s ¤Î½êÍ­¼Ô¤Ïµ®Êý¼«¿È¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (¥í¥°¥á¥Ã¥»¡¼¥¸¤¬ÉÔ´°Á´¤Ç¤¹¡£)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "ÉôʬŪ¤Ê¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ÎÍÆÎÌĶ²á¤Ç¤¹¡£"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "%s ¤ÎºÆ½ñ¤­¹þ¤ß¤Ë¤Ä¤¤¤Æ"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "Rewritten ¥Ð¡¼¥¸¥ç¥ó¤Ï %s ¤Ç¤¹¡£\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "À®¸ù¤·¤Þ¤·¤¿¡£"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr "À©Ìó¤ò¼õ¤±¤Æ¤¤¤ë¥æ¡¼¥¶¤Ç¤¹¡£(²¿¤«¤³¤Î¥¢¥«¥¦¥ó¥È¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹¡£)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶ ID ¤«¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£"
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr "Deity ¥¨¥é¡¼"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 ¥Ç¥³¡¼¥É¥¨¥é¡¼\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "RPA ¥Ð¡¼¥¸¥ç¥ó %d.%d ¤òÁªÂò¤·¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service challenge (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service timestamp %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2 Ĺ¥¨¥é¡¼\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Realm ¥ê¥¹¥È: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "service@realm ¤Ë¤ª¤±¤ë RPA ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 ¥Ç¥³¡¼¥É¥¨¥é¡¼\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "¥æ¡¼¥¶Ç§¾Ú (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA status: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4 Ĺ¥¨¥é¡¼\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA ¤è¤êµñÀ䤵¤ì¤Þ¤·¤¿¡£:%s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "Íýͳ¤Ïʬ¤«¤ê¤Þ¤»¤ó¤¬ RPA ¤è¤êµñÀ䤵¤ì¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA User Anthentication Ĺ¥¨¥é¡¼: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Session key Ĺ¥¨¥é¡¼: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£µ¶Áõ¥µ¡¼¥Ð¤Ç¤·¤ç¤¦¤«¡©\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Session key ¤¬³ÎΩ¤·¤Þ¤·¤¿:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "RPA ǧ¾Ú¤¬½ªÎ»¤·¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "±þÅú¤òÆÀ¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "±þÅú %d ¤òÆÀ¤Þ¤·¤¿¡£ [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Hdr ¤¬ 60 ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "¥È¡¼¥¯¥óĹ¥¨¥é¡¼\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "¥È¡¼¥¯¥ó¤ÎŤµ %d ¤Ï rxlen ¤ÎŤµ %d ¤È°ìÃפ·¤Þ¤»¤ó¡£\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Mechanism field ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "ʸ»ú %d ¤Ë¤ª¤¤¤Æ dec64 ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£%x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "¼õ¿®¥Ç¡¼¥¿:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "žÁ÷Æü»þ:\n"
 
@@ -2405,350 +2377,346 @@ msgstr "RPA String ¤¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA ¤Ï /dev/urandom ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "¤³¤Î¤³¤È¤Ë¤è¤Ã¤Æ¥í¥°¥¤¥ó¤¬µñÈݤµ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "ËÜÅö¤ËÄÌ¿®¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤ëÁê¼ê¤È¸ò¿®¤·¤Æ¤¤¤ë¤«\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "³Î¾Ú¤ÏÆÀ¤é¤ì¤Þ¤»¤ó¡£\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "(¥µ¡¼¥Ó¥¹¤òÙÔ¤¤·¤¿·«¤êÊÖ¤·¹¶·â¤Î²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£)\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "User challenge:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 ¤ò¥Ç¡¼¥¿¥Ö¥í¥Ã¥¯¤ËŬÍѤ·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "MD5 ¤Î·ë²Ì :\n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s ¤ØžÁ÷¤·¤Þ¤¹¡£\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (žÁ÷¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎËÜÂÎ)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s ¤«¤é¤Î¥á¡¼¥ë¤ò %s ¤ËžÁ÷¤·¤Þ¤¹¡£\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "¥¨¥é¡¼¤Ï¤Þ¤À %d ¤Ç¤¹¡£\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP ¥¨¥é¡¼: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr ""
 "BSMTP ¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¡¢¤Þ¤¿¤Ï¡¢¥×¥ê¥¢¥ó¥Ö¥ë¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:979
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Þ¤»"
 "¤ó¡£\n"
 
-#: sink.c:986
+#: sink.c:973
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 "%cMTP Á÷¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ `%s' ¤È¤¤¤¦¼õ¤±¼ê¤Î¥¢¥É¥ì¥¹¤ò¼õ¤±ÉÕ¤±¤Þ¤»"
 "¤ó¡£\n"
 
-#: sink.c:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Þ¤»¤ó¡£postmaster ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "%s ¤ËÂФ·¤Æ¤µ¤¨Á÷¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Þ¤»¤ó¡£%s ¤ØžÁ÷¤·¤Þ¤¹¡£\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "%s ¤òÍøÍѤ·¤¿ÇÛ¿®¤Ë¤Ä¤¤¤Æ\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "MDA ¤Îµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP ¤Ë¤è¤ë %s ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1280
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¸ò¿®¤Ç¤­¤Þ¤»¤ó¡£%s ¤È¸ò¿®¤·¤Þ¤¹¡£"
 
-#: sink.c:1336
+#: sink.c:1323
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "%d È֤ο®¹æ¤ò¼õ¿®¤·¤¿¤¿¤áÆ°ºî¤òºÆ³«¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA ¤¬ 0 °Ê³°¤Î¥¹¥Æ¡¼¥¿¥¹ %d ¤òÊÖ¤·¤Æ½ªÎ»¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, c-format
 msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1363
+#: sink.c:1350
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»¡¢¤Þ¤¿¤Ï¡¢BSMTP ¥Õ¥¡¥¤¥ë¤Î½ªÎ»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP ÄÌ¿®Àè¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÇÛ¿®¤òµñ¤ß¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP ¤Î EOM ¤Ë¤ª¤±¤ëÇÛ¿®¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "LMTP EOM ¤ËÂФ·¤Æ 503 °Ê³°¤Îͽ´ü¤»¤Ì±þÅú %s ¤¬¤¢¤ê¤Þ¤·¤¿¡£\n"
 
-#: sink.c:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\t Fetchmail ¥Ç¡¼¥â¥ó \n"
 
-#: smtp.c:86
+#: smtp.c:87
 #, fuzzy
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "   CRAM-MD5 Êý¼°¤Ë¤è¤ëǧ¾Ú¤ò¶¯À©Åª¤Ë¹Ô¤¤¤Þ¤¹¡£\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "¥µ¡¼¥Ð¤¬ AUTH ¥³¥Þ¥ó¥É¤òµñÀ䤷¤Þ¤·¤¿¡£\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "¥µ¡¼¥Ð¤«¤é¸í¤Ã¤¿ base64 ¤ÎÊÖÅú¤òÆÀ¤Þ¤·¤¿¡£\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, fuzzy, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "%s ¤È¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP ¤Ç PLAIN ǧ¾Ú¤ò¤·¤Þ¤¹...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP ¤Ç LOGIN ǧ¾Ú¤ò¤·¤Þ¤¹...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "¥×¥í¥È¥³¥ë¥¨¥é¡¼¤Ç¤¹¡£\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "dup2 ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹¡£(¥Û¥¹¥È %s ¥µ¡¼¥Ó¥¹ %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: ¥Û¥¹¥È %s ¤Î¥¢¥É¥ì¥¹¤ÎŤµ¤¬ÉÔÀµ¤Ç¤¹¡£\n"
 
-#: socket.c:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "ȯ¹Ô¸µ¤ÎÁÈ¿¥: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "·Ù¹ð : ȯ¹Ô¸µ¤ÎÁÈ¿¥Ì¾¤¬Ä¹²á¤®¤Þ¤¹¡£(ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "ÉÔÌÀ¤ÊÁÈ¿¥¤Ç¤¹¡£\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "ȯ¹Ô¸µ¤Î CommonName: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "·Ù¹ð : ȯ¹Ô¸µ¤Î CommonName ¤¬Ä¹²á¤®¤Þ¤¹¡£ (ÙÔ¤¤µ¤ì¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¸µ¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "¥µ¡¼¥Ð¤Î CommonName: %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "ÉÔÀµ¾ÚÌÀ½ñ : Subject CommonName ¤¬Ä¹²á¤®¤Þ¤¹¡£\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "¥µ¡¼¥Ð¤Î CommonName ¤¬°ìÃפ·¤Þ¤»¤ó : %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "¥µ¡¼¥Ð̾¤¬ÀßÄꤵ¤ì¤Æ¤ª¤é¤º¡¢¾ÚÌÀ½ñ¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "ÉÔÌÀ¤Ê¥µ¡¼¥Ð¤Î CommonName ¤Ç¤¹¡£\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "¾ÚÌÀ½ñÃæ¤Ë¥µ¡¼¥Ð̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "¥á¥â¥êÉÔ­¤Ç¤¹¡£\n"
 
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "¥À¥¤¥¸¥§¥¹¥È¥Æ¥­¥¹¥È¥Ð¥Ã¥Õ¥¡¤¬¾¯¤Ê²á¤®¤Þ¤¹¡£\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ¤Î key fingerprint ¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£: %s \n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Þ¤·¤¿¡£\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ¤Î fingerprints ¤¬°ìÃפ·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "·Ù¹ð : ¥µ¡¼¥Ð¾ÚÌÀ½ñ¸¡¾Ú: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "ÉÔÌÀ¤Êȯ¹Ô¼Ô (¤Ï¤¸¤á¤Î %d ʸ»ú): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "¥Õ¥¡¥¤¥ë¼±Ê̻Ҥ¬ SSL ¤È¤·¤Æ¤ÏĹ²á¤®¤Þ¤¹¡£"
 
-#: socket.c:948
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "̵¸ú¤Ê SSL ¥×¥í¥È¥³¥ë `%s' ¤¬»ØÄꤵ¤ì¤¿¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È (SSLv23)¤òÍøÍѤ·¤Þ"
 "¤¹¡£\n"
 
-#: socket.c:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "¾ÚÌÀ½ñ/fingerprint ¸¡¾Ú¤¬´ö¤Ä¤«Èô¤Ð¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s ¤ò¥í¡¼¥«¥ë¤Î %s ¤ËÃÖ´¹¤·¤Þ¤·¤¿¡£\n"
 
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "%s ¤È %s ¤¬°ìÃפ·¤Þ¤·¤¿¡£\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2757,70 +2725,70 @@ msgstr ""
 "Receive ¹Ô¤ò²òÀÏÃæ¤Ç¤¹:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "¹Ô¤¬¼õÎΤµ¤ì¤Þ¤·¤¿¡£%s ¤Ï¥á¡¼¥ë¥µ¡¼¥Ð¤ÎÊÌ̾¤Ç¤¹¡£\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "¹Ô¤¬µñÀ䤵¤ì¤Þ¤·¤¿¡£%s ¤Ï¥á¡¼¥ë¥µ¡¼¥Ð¤ÎÊÌ̾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "Received ¤Î¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "Received ¤Î¥¢¥É¥ì¥¹¤Ï `%s' ¤Ç¤¹¡£\n"
 
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr "¥Ø¥Ã¥À¤ò²òÀÏÃæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬½ªÎ»¤·¤Æ¤·¤Þ¤¤¤Þ¤·¤¿\n"
 
-#: transact.c:552
+#: transact.c:549
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr "¥Ø¥Ã¥À¤ò²òÀÏÃæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬½ªÎ»¤·¤Æ¤·¤Þ¤¤¤Þ¤·¤¿\n"
 
-#: transact.c:554
+#: transact.c:551
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "%s ¤È¤¤¤¦Å¾Á÷Àè¤Ë³ºÅö¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "DNS ¤ÎÉÔÄ´¤ÇžÁ÷¤Èºï½ü¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers ¤ò½ñ¤­¹þ¤ó¤Ç¤¤¤Þ¤¹¡£\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "¤³¤Á¤é¤ÇÀë¸À¤µ¤ì¤¿¥¢¥É¥ì¥¹¤È¼õ¼è¼ê¤Î¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "¼õ¼è¼ê¤Î¥¢¥É¥ì¥¹ %s ¤Ë³ºÅö¤¹¤ëʪ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë NUL ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP ¼õ¿®¥×¥í¥°¥é¥à¤¬¼¡¤Î¥¢¥É¥ì¥¹¤Î¼õ¿®¤òµñÈݤ·¤Þ¤·¤¿ : "
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹þ¤ó¤Ç¤¤¤Þ¤¹\n"
 
@@ -2842,8 +2810,6 @@ msgstr " <¤¢¤ê¤Þ¤»¤ó>"
 msgid "Scratch list of UIDs:"
 msgstr "UID ¤Î¥¹¥¯¥é¥Ã¥Á¥ê¥¹¥È :"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
@@ -2882,3 +2848,28 @@ msgstr "malloc ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "ÉôʬŪ¤Ê¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ÎÍÆÎÌĶ²á¤Ç¤¹¡£"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "alloca ¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+
+#~ msgid "messages"
+#~ msgstr "Ä̤Υá¥Ã¥»¡¼¥¸"
+
+#~ 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 4a3faaab..a88d6d1e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-4.7.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 1999-02-09 17:46+01:00\n"
 "Last-Translator: Pawe³ Krawczyk <kravietz@ceti.com.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Tak, ich adresy IP s± takie same\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "Nie, ich adresy IP ró¿ni± siê\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "b³±d serwera nazw przy szukaniu `%s' podczas ³±czenia z %s.\n"
@@ -40,151 +40,143 @@ msgstr "rozkodowanie pocz±tkuj±cego wyzwania BASE64 by³o niemo¿liwe\n"
 msgid "decoded as %s\n"
 msgstr "rozkodowany jako %s\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "b³±d Kerberosa: %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [serwer odpowiedzia³ '%*s'] \n"
 
-#: driver.c:336
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:340
 #, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 
-#: driver.c:354
+#: driver.c:358
 #, fuzzy, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+msgid "  %d msg %d octets long skipped by fetchmail."
 msgstr "\tlist %d o d³ugo¶ci %d zosta³ pominiêty.\n"
 
-#: driver.c:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "pomijam list %d (%d bajtów)\n"
 
-#: driver.c:549
+#: driver.c:550
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "pomijam list %d (%d bajtów)\n"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:568
+#: driver.c:569
 #, fuzzy
 msgid " (oversized)"
 msgstr " (za du¿y, %d bajtów)\n"
 
-#: driver.c:583
+#: driver.c:584
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:600
+#: driver.c:601
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "pobieram %d list z %d"
 
 # budowanie komunikatu z pojedynczych slow - uwaga
 # na spacje i odmiane -PK
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d bajtów %s)"
 
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr "nag³ówka"
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (%d bajtów tre¶ci)"
 
-#: driver.c:736
+#: driver.c:740
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "d³ugo¶æ listu %d nie odpowiada d³ugo¶ci zg³oszonej przez serwer (%d != %d)\n"
 
-#: driver.c:767
+#: driver.c:771
 msgid " retained\n"
 msgstr " zachowany\n"
 
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr " skasowany\n"
 
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " nie zosta³ skasowany\n"
 
-#: driver.c:809
+#: driver.c:813
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr "limit pobranych listów zosta³ osi±gniêty: %d pozosta³o na serwerze\n"
 
-#: driver.c:869
+#: driver.c:874
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr ""
 
-#: driver.c:876
+#: driver.c:881
 #, 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"
 
-#: driver.c:880
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na serwer %s.\n"
 
-#: driver.c:884
+#: driver.c:889
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na %s.\n"
 
-#: driver.c:889
+#: driver.c:894
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "przekroczony czas oczekiwania na odpowied¼ po %d sekundach.\n"
 
-#: driver.c:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "przekroczony czas oczekiwania po %d sekundach.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Subject: fetchmail zg³asza wielokrotne przekroczenie czasu oczekiwania\n"
 
-#: driver.c:906
+#: driver.c:912
 #, fuzzy, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
 "s.\n"
 msgstr "Po %d timeoutach fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:916
 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,51 +192,51 @@ msgstr ""
 "\n"
 "Fetchmail nie bêdzie sprawdza³ tej skrzynki do czasu restartu.\n"
 
-#: driver.c:940
+#: driver.c:944
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "polecenie do uruchomienia przed po³±czeniem wysz³o z b³êdem %d\n"
 
-#: driver.c:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nie mogê znale¼æ skrzynki HESIOD dla %s\n"
 
-#: driver.c:993
+#: driver.c:997
 msgid "Lead server has no name.\n"
 msgstr ""
 
-#: driver.c:1016
+#: driver.c:1020
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s)\n"
 msgstr "nie mogê znale¼æ kanonicznej nazwy %s\n"
 
-#: driver.c:1053
+#: driver.c:1057
 #, fuzzy
 msgid "internal inconsistency\n"
 msgstr "fetchmail: niezgodno¶æ danych wewnêtrznych\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, fuzzy, c-format
 msgid "%s connection to %s failed"
 msgstr "po³±czenie %cMTP z %s nie powiod³o siê\n"
 
-#: driver.c:1069
+#: driver.c:1073
 #, fuzzy
 msgid "host is unknown."
 msgstr ": nieznany host\n"
 
-#: driver.c:1072
+#: driver.c:1076
 #, fuzzy
 msgid "name is valid but has no IP address."
 msgstr "nazwa istnieje, ale nie posiada adresu IP\n"
 
-#: driver.c:1075
+#: driver.c:1079
 #, fuzzy
 msgid "unrecoverable name server error."
 msgstr ": b³±d serwera DNS uniemo¿liwiajacy dalsz± pracê\n"
 
-#: driver.c:1077
+#: driver.c:1081
 #, fuzzy
 msgid "temporary name server error."
 msgstr "chwilowy problem z serwerem DNS\n"
@@ -255,14 +247,15 @@ msgid "unknown DNS error %d."
 msgstr ": nieznany b³±d %d serwera DNS\n"
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
+
+#: driver.c:1131 imap.c:367 pop3.c:411
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "po³±czenie SSL nie powiod³o siê."
@@ -288,15 +281,15 @@ msgstr ""
 
 #: driver.c:1217
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: b³±d autoryzacji fetchmaila\n"
 
-#: driver.c:1220
+#: driver.c:1221
 #, fuzzy, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
-#: driver.c:1224
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -325,7 +318,7 @@ msgstr ""
 "Demon fetchmaila bêdzie nadal próbowa³ siê po³±czyæ w ka¿dym cyklu.\n"
 "Dalsze powiadomienia do czasu odzyskania us³ugi nie bêd± wysy³ane."
 
-#: driver.c:1239
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -337,174 +330,171 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1259
+#: driver.c:1260
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1283
+#: driver.c:1284
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "B³±d autoryzacji dla %s@%s\n"
 
-#: driver.c:1289
+#: driver.c:1290
 #, fuzzy, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: b³±d autoryzacji fetchmaila\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail nie móg³ pobraæ poczty z %s@%s.\n"
 
-#: driver.c:1296
+#: driver.c:1298
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "Wersja RPA %d.%d\n"
 
-#: driver.c:1327
+#: driver.c:1329
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "ponowna próba po³±czenia z folderem %s\n"
 
-#: driver.c:1329
+#: driver.c:1331
 msgid "selecting or re-polling default folder\n"
 msgstr "ponowna próba po³±czenia z domy¶lnym folderem\n"
 
-#: driver.c:1345
+#: driver.c:1343
 #, fuzzy, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (folder %s)\n"
 
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s na %s\n"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "Próba po³±czenia z %s\n"
 
-#: driver.c:1362
+#: driver.c:1355
 #, fuzzy, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d przeczytanych) dla %s."
-
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "listów"
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "list"
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d przeczytanych) dla %s."
+msgstr[1] "%d %s (%d przeczytanych) dla %s."
 
-#: driver.c:1366
+#: driver.c:1358
 #, fuzzy
 msgid "seen"
-msgstr " "
+msgid_plural "seen"
+msgstr[0] " "
+msgstr[1] " "
 
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s dla %s."
+#: driver.c:1361
+#, fuzzy, c-format
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] "%d %s dla %s."
+msgstr[1] "%d %s dla %s."
 
-#: driver.c:1375
+#: driver.c:1368
 #, fuzzy, c-format
 msgid " (%d octets).\n"
 msgstr "(%d bajtów)."
 
-#: driver.c:1381
+#: driver.c:1374
 #, fuzzy, c-format
 msgid "No mail for %s\n"
 msgstr "Nie ma poczty dla %s"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "gniazda"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "w nag³ówkach RFC822 (brak lub b³êdne)"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "synchronizacji miêdzy serwerem i klientem"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "protoko³u miêdzy serwerem i klientem"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "plik zablokowany na serwerze"
 
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "transakcja SMTP"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "DNSu"
 
-#: driver.c:1539
+#: driver.c:1532
 #, fuzzy
 msgid "undefined error\n"
 msgstr "niezdefiniowany\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, fuzzy, c-format
 msgid "%s error while delivering to SMTP host %s\n"
 msgstr "b³±d %s podczas pobierania listów z %s\n"
 
-#: driver.c:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "b³±d %s podczas pobierania listów z %s\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "polecenie wykonane po pobraniu poczty zwróci³o b³±d %d\n"
 
-#: driver.c:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Obs³uga Kerberosa V4 nie zosta³a do³±czona do programu.\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Obs³uga Kerberosa V5 nie zosta³a do³±czona do programu.\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opcja --flush nie dzia³a z %s\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opcja --all nie dzia³a za %s\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opcja --limit nie dzia³a z %s\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -520,7 +510,7 @@ msgstr ""
 "Proszê spróbowaæ \"env QMAILINJECT= %s W£ASNE PARAMETRY\"\n"
 "%s: Przerwano.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -537,17 +527,17 @@ msgstr ""
 "Proszê spróbowaæ \"env NULLMAILER_FLAGS= %s W£ASNE PARAMETRY\"\n"
 "%s: Przerwano.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Nie istniejesz. Odejd¼.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: nie mogê znale¼æ nazwy twojego hosta!"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zwróci³o b³±d dla %s\n"
@@ -577,24 +567,20 @@ msgstr "Brak listów dla %s oczekuj±cych w kolejce\n"
 msgid "Pending messages for %s started\n"
 msgstr "Wysy³anie oczekuj±cych listów dla %s rozpoczête\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Kolejkowanie listów dla %s nie jest mo¿liwe\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Brak dostêpu dla hosta %s: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "B³±d sk³adniowy ETRN\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "B³±d sk³adniowy ETRN w parametrach\n"
@@ -620,60 +606,60 @@ 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:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: uruchomiony z"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "nie mo¿na uzyskaæ bie¿±cego katalogu\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Tu fetchmail, wersja %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Pobieram opcje z linii poleceñ%s%s\n"
 
-#: fetchmail.c:330
+#: fetchmail.c:343
 msgid " and "
 msgstr " i "
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, 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:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nie podano ¿adnych serwerów pocztowych.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nie dzia³a ¿aden inny proces fetchmaila\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: wyst±pi³ b³±d podczas próby ubicia %s fetchmaila, PID %d.\n"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "dzia³aj±cego w tle"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "dzia³aj±cego na konsoli"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail o numerze procesu %d zosta³ ubity.\n"
 
-#: fetchmail.c:402
+#: fetchmail.c:415
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -681,7 +667,7 @@ msgstr ""
 "fetchmail: nie mogê sprawdziæ poczty, bo dzia³a inny fetchmail do tego "
 "serwera\n"
 
-#: fetchmail.c:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -689,811 +675,811 @@ msgstr ""
 "fetchmail: nie mogê po³±czyæ siê z podanym hostem, bo dzia³a inny fetchmail "
 "(proces %d).\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, 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:425
+#: fetchmail.c:438
 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:431
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: chodz±cy w tle fetchmail (proces %d) zosta³ uaktywniony.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:456
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: starszy proces %d zgin±³ w niewyja¶nionych okoliczno¶ciach.\n"
 
-#: fetchmail.c:458
+#: fetchmail.c:471
 #, 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:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Podaj has³o dla %s@%s: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "startuje fetchmail %s w trybie demona\n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, 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:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nie mo¿na sprawdziæ czasu %s (b³±d %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restart fetchmaila (zmieniono %s)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 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"
 
-#: fetchmail.c:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "próba ponownego uruchomienia fetchmaila nie powiod³a siê\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, 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:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "fetchmail: nie nadszed³ jeszcze czas na po³±czenie z %s\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Wynik zapytania=0 (SUKCES)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Wynik zapytania=1 (BRAK POCZTY)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Wynik zapytania=2 (GNIAZDO)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Wynik zapytania=3 (B£¡D AUTORYZACJI)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Wynik zapytania=4 (PROTOKÓ£)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Wynik zapytania=5 (SK£ADNIA)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Wynik zapytania=6 (B£¡D IO)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Wynik zapytania=7 (B£¡D)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Wynik zapytania=8 (WY£¡CZENIE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Wynik zapytania=9 (BLOKADA)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Wynik zapytania=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Wynik zapytania=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Wynik zapytania=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Wynik zapytania=13 (MAKSIMUM POBRANO)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Wynik zapytania=%d\n"
 
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Nie mogê pobraæ poczty z ¿adnego serwera. Koñczê pracê.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "usypiam o godzinie %s\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "uaktywniony przez %s\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "uaktywniony przez sygna³ %d\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "uaktywniony o %s\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "praca zakoñczona poprawnie, kod wyj¶cia %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 msgid "couldn't time-check the run-control file\n"
 msgstr "nie mo¿na sprawdziæ czasu pliku kontroli uruchomienia\n"
 
-#: fetchmail.c:972
+#: fetchmail.c:983
 #, 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:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "obs³uga SSL nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 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:1164
+#: fetchmail.c:1176
 #, 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:1171
+#: fetchmail.c:1183
 #, 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"
 
-#: fetchmail.c:1187
+#: fetchmail.c:1199
 #, 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"
 
-#: fetchmail.c:1202
+#: fetchmail.c:1214
 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:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "przerwany sygna³em %d\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie rozpoczête\n"
 
-#: fetchmail.c:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "obs³uga protoko³u POP2 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "obs³uga protoko³u POP3 nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "obs³uga protoko³u IMAP nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "obs³uga polecenia ETRN nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "Obs³uga polecenia ETRN bez gethostbyname(2) jest niemo¿liwa.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "obs³uga protoko³u ODMR nie zosta³a wkompilowana.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "Obs³uga polecenia ODMR bez gethostbyname(2) jest niemo¿liwa.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "Wybrany protokó³ nie jest obs³ugiwany przez fetchmaila.\n"
 
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 "%s ³±czy siê z %s (protokó³ %s) o godzinie %s: odpytywanie zakoñczone\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Czas miêdzy sprawdzaniem skrzynek wynosi %d sekund\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Plik diagnostyczny to %s\n"
 
-#: fetchmail.c:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Plik identyfikacyjny to %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 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:1452
+#: fetchmail.c:1464
 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:1454
+#: fetchmail.c:1466
 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:1456
+#: fetchmail.c:1468
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail wy¶le ¼le zaadresowane listy do %s.\n"
 
-#: fetchmail.c:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do postmastera.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail przekieruje pocztê z b³êdami do nadawcy.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Poczta bêdzie pobierana przez %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1488
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr "Po³±czenie z tym serwerem odbêdzie siê co %d okresów.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Prawdziwa nazwa serwera to %s.\n"
 
 # budowanie zdania ze s³ów, uwaga -PK
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr ""
 "  Z tym serwerem%sbêdê siê ³±czy³ je¶li nie zostanie podany ¿aden inny "
 "serwer.\n"
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr " nie "
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr " "
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  Bêdê pyta³ o has³o.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Has³o APOP = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  U¿ytkownik RPOP = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Has³o = \"%s\".\n"
 
 # %s zawiera numer wersji protoko³u -PK
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  U¿ywam protoko³u KPOP z uwierzytelnieniem przez Kerberos %s"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  U¿ywam protoko³u %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (us³uga %s)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (opcje bezpieczeñstwa %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (po³±czenie na port %d)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (po³±czenie na domy¶lny port)"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (bêd± stosowane UIDL)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Bêd± próbowane wszystkie dostêpne metody uwierzytelnienia.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie przy pomocy has³a.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie NTLM.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie OTP.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie CRAM-Md5.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie GSSAPI.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V4.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Zostanie wymuszone uwierzytelnienie Kerberos V5.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Zak³adam szyfrowanie end-to-end.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Zarz±dc± us³ugi pocztowej jest: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesje kodowane SSL w³±czone.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokó³ SSL: %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Sprawdzanie certyfikatu SSL serwera w³±czone.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog zaufanego certyfikatu SSL: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Limit czasu na odpowied¼ serwera wynosi %d sekund"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (domy¶lne).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  Wybrana jest domy¶lna skrzynka odbiorcza.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  Wybrano nastêpuj±ce skrzynki:"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  Zostan± pobrane %s listy (%s --all).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "wszystkie"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "tylko nowe"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Pobrane listy%sbêd± pozostawione na serwerze (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr "  Stare listy%sbêd± kasowane przed pobraniem poczty (--flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  Przepisywanie adresów na postaæ lokaln± jest %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "enabled"
 msgstr "w³±czone"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1627 fetchmail.c:1630 fetchmail.c:1777
 msgid "disabled"
 msgstr "wy³±czone"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  Usuwanie znaków CR z koñców linii jest %s (stripcr %s).\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  Dodawanie znaków CR na koñcach linii jest %s (forcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr ""
 "  Interpretowanie nag³ówka Content-Transfer-Encoding jest %s (pass8bits %"
 "s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  Dekodowanie MIME jest %s (mimedecode %s).\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr "  Zw³oka po odpytaniu wynosi %s (idle %s).\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Niepuste nag³ówki Status bêd± %s (dropstatus %s).\n"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "kasowane"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "kept"
 msgstr "pozostawiane"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Linie Delivered-To bêd± %s (dropdelivered %s).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, 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:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Ostrze¿enia o wielko¶ci listu bêd± wy¶wietlane co %d sekund (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Ostrze¿enia o wielko¶ci bêd± wy¶wietlane przy ka¿dym ³±czeniu (--warnings "
 "0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, 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:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 "  Limit ilo¶ci otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit wielko¶ci listu wynosi %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1660
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Limit wielko¶ci listu nie jest ustawiony (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Binarne przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 1).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Binarne przeszukiwanie UID-ów przy %d z %d ¶ci±gañ (--fastuidl %d).\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "   Liniowe przeszukiwanie UID-ów przy ka¿dym ¶ci±ganiu (--fastuidl 0).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, 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:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 "  Limit ilo¶ci listów wysy³anych przez SMTP nie ustawiony (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, 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:1667
+#: fetchmail.c:1679
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Listy nie bêd± kasowane (--expunge 0).\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domeny dla których poczta bêdzie ¶ci±gana to:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (domy¶ny)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Listy bêd± dopisywane do %s jako BSMTP\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Listy bêd± lokalne dorêczane przy u¿yciu \"%s\".\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Listy bêd± przes³ane przy pomocy %cMTP do:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, 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:1707
+#: fetchmail.c:1719
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP bêdzie %s\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznawane odpowiedzi blokad antyspamowych to:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokowanie spamu wy³±czone\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, 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:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  Przed po³±czeniem nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, 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:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr ""
 "  Po zamkniêciu po³±czenia nie bêdzie wykonywane ¿adne dodatkowe polecenie.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  Brak nazw lokalnych ustawionych dla tego hosta.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  Tryb wielu skrzynek: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  Tryb jednej skrzynki: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d znanych nazw lokalnych.\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  DNS dla adresów wieloskrzynkowych to %s.\n"
 
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  Aliasy serwera bêd± porównywane z adresami skrzynek po "
 
-#: fetchmail.c:1770
+#: fetchmail.c:1782
 msgid "IP address.\n"
 msgstr "adresach IP.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "nazwie.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Obs³uga poczty wed³ug adresów w kopercie jest wy³±czone\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag³ówek koperty zosta³ ustawiony na: %s\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, 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:1784
+#: fetchmail.c:1796
 #, 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:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  ¯adne przedrostki nie bêd± usuwane\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Zadeklarowane aliasy serwera pocztowego:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  Domeny lokalne:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Po³±czenia bêd± nawi±zywane tylko przez interfejs %s.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  Nie jest okre¶lony ¿aden obowi±zkowy interfejs.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, 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:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  ¯aden interfejs nie bêdzie monitorowany.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Po³±czenia z serwerem bêd± nawi±zywane przez wtyczkê %s (--plugin %s).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie nawi±zuj±ce po³±czenie\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Po³±czenie z serwerem odbiorcy zostanie nawi±zane programem %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  Nie jest skonfigurowane ¿adne polecenie zamykaj±ce po³±czenie.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ¯adne UID-y nie zosta³y zachowane z sesji z tym hostem.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Zachowano %d UID-ów.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Informacje o ¶ledzeniu po³±czenia bêd± dodane do nag³ówka Received.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1502,16 +1488,12 @@ msgstr ""
 ".\n"
 
 # XXX -PK
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  W³asno¶ci przepuszczania \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "b³±d alloca"
 
@@ -1586,153 +1568,152 @@ 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:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 1\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokó³ rozpoznany jako IMAP4 rev 0\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokó³ rozpoznany jako IMAP2 lub IMAP2BIS\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod³o siê\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "ponowne po³±czenie nie powiod³o siê\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "%d listów oczekuj±cych po ponownym pobraniu\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
 
-#: imap.c:685
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "%d listów oczekuj±cych po pierwszym pobraniu\n"
 
-#: imap.c:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "%d listów oczekuj±cych po usuwaniu\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nie przeczytanych listów nie powiod³o siê\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nie przeczytany\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nie przeczytanym\n"
 
-#: interface.c:253
+#: 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."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "Nie mo¿na odczytaæ nazwy interfejsu z %s"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist estimate) nie powiód³ siê"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: b³±d malloc"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) nie powiód³ siê"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Wiadomo¶æ przekierowuj±ca w wersji %d nie zrozumiana."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Nie znaleziono interfejsu o nazwie %s"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "Nie znaleziono adresu IP dla %s"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "interfejs nie ma ustawionego adresu IP\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "interfejs ma ustawiony b³êdny adres IP\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "interfejs ma ustawion± b³êdn± maskê sieci\n"
 
 # XXX -PK
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "ruch na %s zauwa¿ony jako %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "pomijam po³±czenie z %s, %s nie jest podniesiony\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "pomijam po³±czenie z %s, adres IP %s nie jest na li¶cie\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "ruch na %s sprawdzany jako %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "pomijam po³±czenie z %s, %s nie jest aktywny\n"
 
 # XXX -PK
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "ruch na %s by³ %d, jest %d\n"
@@ -1759,11 +1740,11 @@ msgstr "odkodowanie odpowiedzi BASE64 jest niemo¿liwe\n"
 msgid "challenge mismatch\n"
 msgstr "niezgodno¶æ wyzwania\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: usuwam niewa¿ny plik blokady\n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: tworzenie blokady nie powiod³o siê.\n"
 
@@ -1795,7 +1776,6 @@ msgstr "Prze³±czanie...\n"
 msgid "ATRN request refused.\n"
 msgstr "¯±danie ATRN odrzucone.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "Nie mo¿na teraz obs³u¿yæ ¿±dania ATRN\n"
@@ -1804,12 +1784,10 @@ msgstr "Nie mo¿na teraz obs³u¿yæ ¿±dania ATRN\n"
 msgid "You have no mail.\n"
 msgstr "Nie ma poczty.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Polecenie nie zaimplementowane\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Wymagane uwierzytelnienie.\n"
@@ -1843,7 +1821,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:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "Tajne has³o: "
 
@@ -1973,203 +1951,214 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certyfikat klienta ssl\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     certyfikat klienta ssl\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    wymusza protokó³ ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: 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"
 
-#: options.c:689
+#: 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"
 
-#: options.c:691
+#: 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"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        wymusza u¿ywanie UIDL (tylko POP3)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        okre¶la port TCP/IP na który nale¿y siê ³±czyæ\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        okre¶la metodê uwierzytelnienia (has³o/Kerberos/ssh/"
 "otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     limit czasu oczekiwania na odpowied¼ serwera\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 "  -E, --envelope    okre¶la nazwê nag³ówka zawieraj±cego adres z koperty\n"
 
-#: options.c:697
+#: 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"
 
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   zarz±dca us³ugi pocztowej\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  dodaje informacje o ¶ledzeniu po³±czenia do Received\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    okre¶la login u¿ytkownika na serwerze\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         pobiera wszystkie listy, stare i nowe\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      kasuje nowe listy po pobraniu\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        po pobraniu pozostawia nowe listy na serwerze\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       kasuje stare listy z serwera\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   nie przepisuje adresów w nag³ówkach\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       nie pobiera listów wiêkszych ni¿ podany rozmiar\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    czas miêdzy powiadomieniami o poczcie\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      okre¶la funkcjê bezpieczeñstwa IP\n"
 
-#: options.c:713
+#: 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"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains pobiera pocztê dla podanych domen\n"
 
-#: options.c:715
+#: 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"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ustawia pe³n± nazwê SMTP username@domain\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    okre¶la odpowiedzi blokad antyspamowych\n"
 
-#: options.c:718
+#: 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"
 
-#: options.c:719
+#: 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"
 
-#: options.c:720
+#: options.c:722
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit ustawia limit wielko¶ci ¶ci±ganego listu\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    wykonuje binarne poszukiwanie UIDL-i\n"
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     liczba skasowanych listów miêdzy czyszczeniem skrzynki\n"
 
-#: options.c:723
+#: 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"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       okre¶la nazwê wynikowego pliku BSMTP\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        u¿ywa LMTP (RFC2033) do dorêczania poczty\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      okre¶la nazwê skrzynki na serwerze\n"
 
-#: options.c:727
+#: 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"
 
-#: pop3.c:538
+#: pop3.c:534
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
 
-#: pop3.c:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "B³±d sk³adni znacznika czasu w powitaniu\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pro¶ba o nieznany protokó³ w POP3_auth\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, 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:756
+#: pop3.c:759
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
 
-#: pop3.c:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "b³±d protoko³u\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b³±d protoko³u podczas pobierania UIDL\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "Opcja --remote nie dzia³a z POP3\n"
 
@@ -2228,162 +2217,142 @@ msgstr "Plik %s nie mo¿e mieæ uprawnieñ wiêkszych ni¿ -rwx--x--- (0710).\n"
 msgid "File %s must be owned by you.\n"
 msgstr "Plik %s musi byæ w³asno¶ci± u¿ytkownika.\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Nieznany b³±d systemu"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (tworzenie listy informacyjnego nie zosta³o zakoñczone)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "przepe³nienie bufora podczas tworzenia czê¶ci komunikatu o b³êdzie"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "Rozpoczêcie przepisywania %s"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "Przepisana wersja to %s\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "Sukces"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr "Zablokowany u¿ytkownik (co¶ nie w porz±dku z kontem)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "B³êdny identyfikator u¿ytkownika lub has³o"
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr "B³±d bosko¶ci"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "Token 2 RPA: b³±d dekodowania Base64\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Wersja RPA %d.%d\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Has³o do us³ugi (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Datownik us³ugi %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "Token 2 RPA b³±d d³ugo¶ci\n"
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Lista dziedzin: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "RPA: b³±d w napisie us³uga@dziedzina\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA symbol 4: b³±d podczas dekodowania Base64\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Uwierzytelnienie u¿ytkownika (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "Stan RPA: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "RPA: b³±d d³ugo¶ci symbolu 4\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA odrzuci³o u¿ytkownika: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA odrzuci³o u¿ytkownika bez podania przyczyny\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA: b³±d d³ugo¶ci uwierzytelnienia u¿ytkownika: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA: b³±d d³ugo¶ci klucza sesyjnego: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA: b³±d uwierzytelnienia _us³ugi_. Kto¶ podszywa siê pod serwer?\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Uzgodniony klucz sesyjny:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "Autoryzacja RPA zakoñczona\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Oczekiwanie na odpowied¼\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Oczekiwanie na odpowied¼ zakoñczone z wynikiem %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "D³ugo¶æ nag³ówka nie wynosi 60\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "B³±d d³ugo¶ci symbolu\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "D³ugo¶æ symbolu %d nie pasuje do rxlen %d\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "B³êdne pole mechanizmu\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "b³±d dec64 na znaku %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Przychodz±ce dane binarne:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Wychodz±ce dane binarne:\n"
 
@@ -2395,340 +2364,336 @@ msgstr "RPA: za d³ugi napis\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA: otwarcie /dev/urandom jest niemo¿liwe. Nie uniemo¿liwia\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    to zalogowania siê, ale oznacza ¿e nie mo¿esz\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    byæ pewien, ¿e po³±czy³e¶ siê z w³a¶ciw± us³ug±\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    (mo¿liwy jest atak przez odtwarzanie\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "     nieuczciwej us³ugi.)\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Wyzwanie u¿ytkownika:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 zastosowany do bloku danych:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "Wynik MD5: \n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "przesy³anie do %s\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (cia³o odbitego listu)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "poczta od %s odbita do %s\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Zachowany b³±d to nadal %d\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "b³±d %cMTP: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP: otwarcie pliku lub zapis nag³ówka nie powiód³ siê\n"
 
-#: sink.c:979
+#: sink.c:966
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "demon %cMTP nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:986
+#: sink.c:973
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "demon %cMTP naprawdê nie lubi adresu odbiorcy `%s'\n"
 
-#: sink.c:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "brak pasuj±cych adresów; postmaster nie ustawiony.\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "nie mogê wys³aæ poczty nawet do %s!\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "brak pasuj±cych lokalnych adresów, przesy³am do %s\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "list zostanie dorêczony przy pomocy: %s\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "b³±d podczas uruchamiania MDA (programu dorêczaj±cego pocztê)\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "po³±czenie %cMTP z %s nie powiod³o siê\n"
 
-#: sink.c:1280
+#: sink.c:1267
 #, 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:1336
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA zabity przez sygna³ %d\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA zwróci³ niezerowy kod b³êdu %d\n"
 
-#: sink.c:1342
+#: sink.c:1329
 #, 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:1363
+#: sink.c:1350
 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:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "serwer SMTP odmówi³ dostarczenia listu\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "B³±d podczas dorêczania LMTP w momencie wykonywania komendy EOM\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, 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:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\tDemon Fetchmaila\n"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP CRAM-MD5...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Serwer odrzuci³ polecenie AUTH.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "B³êdna odpowied¼ base64 z serwera.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Wywo³anie rozkodowane: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP PLAIN...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "Uwierzytelnienie ESMTP LOGIN...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "b³±d protoko³u serwera smtp\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: b³±d malloc\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: b³±d socketpair\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: b³±d fork\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "b³±d dup2\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "uruchamiam %s (host %s us³uga %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "b³±d execvp(%s)\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr "fetchmail: otrzyma³em b³êdn± d³ugo¶æ adresu dla hosta %s\n"
 
-#: socket.c:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizacja wystawcy: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uwaga: nazwa Organizacji wystawcy za d³uga (prawdopodobnie uciêta).\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Nieznana organizacja\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "CommonName wystawcy: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uwaga: CommonName wystawcy za d³ugie (prawdopodobnie uciête).\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nieznane CommonName wystawcy\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "CommonName serwera: %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "B³êdny certyfikat: za d³ugie CommonName podmiotu!\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Niezgodno¶æ CommonName serwera: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Nazwa serwera nie ustawiona, nie mo¿na sprawdziæ certyfikatu!\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Nieznane CommonName serwera\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Nazwa serwera nie podana w certyfikacie!\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "b³±d EVP_md5()!\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Brak pamiêci!\n"
 
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "Bufor skrótu tekstu za ma³y!\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Odcisk klucza %s: %s\n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s odcisków siê zgadza.\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s odcisków siê nie zgadza!\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Uwaga: weryfikacja certyfikatu serwera: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "nieznany wystawca (pierwsze %d znaków): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Deskryptor pliku poza zakresem dla SSL"
 
-#: socket.c:948
+#: socket.c:942
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Podano b³êdny protokó³ SSL `%s', u¿ywam domy¶lnego (SSLv23).\n"
 
-#: socket.c:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiego¶ powodu pominiêta!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Powtórzenie odczytu z gniazda cygwinowego\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Powtórzenie odczytu z gniazda cygwinowego nie powiod³o siê!\n"
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s zamieniony na lokalny %s\n"
 
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "przepuszczony przez %s pasuje do %s\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2737,69 +2702,69 @@ msgstr ""
 "analizujê nag³ówek Received:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "nag³ówek zosta³ przyjêty, %s jest aliasem serwera pocztowego\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "nag³ówek zosta³ odrzucony, %s nie jest aliasem serwera pocztowego\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "nie znalaz³em adresu Received\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "znalaz³em adres Received `%s'\n"
 
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr "podczas skanowania nag³ówków znaleziono separator listów\n"
 
-#: transact.c:552
+#: transact.c:549
 msgid "incorrect header line found while scanning headers\n"
 msgstr "podczas skanowania nag³ówków znaleziono b³êdn± liniê nag³ówka\n"
 
-#: transact.c:554
+#: transact.c:551
 #, c-format
 msgid "line: %s"
 msgstr "linia: %s"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "brak pasuj±cych lokalnych adresów, przesy³am do %s\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "listy nie zostan± przes³ane i skasowane z powodu b³êdów DNS-u\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "zapisujê RFC822 msgblk.headers\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr "¿aden z adresatów nie pasowa³ do nazw lokalnych u¿ytkowników"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresat %s nie pasowa³ do ¿adnej nazwy lokalnego u¿ytkownika"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "list zawiera³ znaki NULL"
 
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "demon SMTP odrzuci³ adresy lokalnych odbiorców: '"
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "zapisujê tre¶æ listu\n"
 
@@ -2821,8 +2786,6 @@ msgstr " <pusty>"
 msgid "Scratch list of UIDs:"
 msgstr "Pocz±tkowa lista UID-ów:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, c-format
 msgid "Merged UID list from %s:"
@@ -2860,3 +2823,28 @@ msgstr "b³±d malloc\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "b³±d realloc\n"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "przepe³nienie bufora podczas tworzenia czê¶ci komunikatu o b³êdzie"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "b³±d alloca"
+
+#~ msgid "messages"
+#~ msgstr "listów"
+
+#~ msgid "message"
+#~ msgstr "list"
+
+#~ msgid "Success"
+#~ msgstr "Sukces"
+
+#~ msgid "Restricted user (something wrong with account)"
+#~ msgstr "Zablokowany u¿ytkownik (co¶ nie w porz±dku z kontem)"
+
+#~ msgid "Invalid userid or passphrase"
+#~ msgstr "B³êdny identyfikator u¿ytkownika lub has³o"
+
+#~ msgid "Deity error"
+#~ msgstr "B³±d bosko¶ci"
diff --git a/po/tr.po b/po/tr.po
index 4859bd0b..67490bcd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-11-14 21:55+0100\n"
 "PO-Revision-Date: 2003-08-18 23:00+0100\n"
 "Last-Translator: Engin Gündüz <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -27,7 +27,7 @@ msgstr "Evet, IP adresleri birbirine uyuyor\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "Hayýr, IP adresleri birbirine uymuyor\n"
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -42,85 +42,76 @@ msgstr "BASE64 challenge'ýnýn kodunu çözemedim\n"
 msgid "decoded as %s\n"
 msgstr "%s olarak kodu çözüldü\n"
 
-#: driver.c:191
+#: driver.c:192
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos hatasý %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:251 driver.c:256
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [sunucu '%*s' diyor] \n"
 
-#: driver.c:336
-#, c-format
-msgid ""
-"Subject: Fetchmail oversized-messages warning.\n"
-"\n"
-"The following oversized messages remain on the mail server %s:"
+#: driver.c:337
+msgid "Subject: Fetchmail oversized-messages warning"
+msgstr ""
+
+#: driver.c:340
+#, fuzzy, c-format
+msgid "The following oversized messages remain on the mail server %s:"
 msgstr ""
 "Subject: Fetchmail çok büyük ileti uyarýsý.\n"
 "\n"
 "Aþaðýda yazýlý çok büyük iletiler sunucu %s üzerinde býrakýldý:"
 
-#: driver.c:354
-#, c-format
-msgid "\t%d msg %d octets long skipped by fetchmail.\n"
+#: driver.c:358
+#, 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:497
+#: driver.c:498
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlanýyor (%d sekizlik)"
 
-#: driver.c:549
+#: driver.c:550
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "ileti %s@%s:%d atlanýyor (%d sekizlik)"
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
-#: driver.c:565
+#: driver.c:566
 msgid " (length -1)"
 msgstr " (büyüklük -1)"
 
-#: driver.c:568
+#: driver.c:569
 msgid " (oversized)"
 msgstr " (çok büyük)"
 
-#: driver.c:583
+#: driver.c:584
 #, 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:600
+#: driver.c:601
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:605
+#: driver.c:609
 #, c-format
 msgid " (%d %soctets)"
 msgstr " (%d %ssekizlik)"
 
-#: driver.c:606
+#: driver.c:610
 msgid "header "
 msgstr "baþlýk "
 
-#: driver.c:678
+#: driver.c:682
 #, c-format
 msgid " (%d body octets) "
 msgstr " (ileti gövdesi %d sekizlik) "
 
-#: driver.c:736
+#: driver.c:740
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -128,59 +119,60 @@ msgstr ""
 "%s@%s:%d iletisinin uzunluðu beklendiði kadar deðil (gerçekte %d != beklenen "
 "%d)\n"
 
-#: driver.c:767
+#: driver.c:771
 msgid " retained\n"
 msgstr " býrakýldý\n"
 
-#: driver.c:776
+#: driver.c:780
 msgid " flushed\n"
 msgstr " boþaltýldý\n"
 
-#: driver.c:793
+#: driver.c:797
 msgid " not flushed\n"
 msgstr " boþaltýlmadý\n"
 
-#: driver.c:809
+#: driver.c:813
 #, c-format
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 "`fetchlimit' %d ulaþýldý; %d ileti %s sunucusunda %s hesabýnda býrakýldý\n"
 
-#: driver.c:869
+#: driver.c:874
 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:876
+#: driver.c:881
 #, 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:880
+#: driver.c:885
 #, 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:884
+#: driver.c:889
 #, 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:889
+#: driver.c:894
 #, 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:892
+#: driver.c:897
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamanaþýmý süresi doldu.\n"
 
-#: driver.c:904
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:909
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail çok sayýda zamanaþýmý ile karþýlaþýyor\n"
 
-#: driver.c:906
+#: driver.c:912
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -189,7 +181,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:911
+#: driver.c:916
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -206,50 +198,50 @@ msgstr ""
 "Fetchmail yeniden çalýþtýrýlana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:940
+#: driver.c:944
 #, 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:971
+#: driver.c:975
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s için HESIOD pobox bulunamadý\n"
 
-#: driver.c:993
+#: driver.c:997
 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:1016
+#: driver.c:1020
 #, 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:1053
+#: driver.c:1057
 msgid "internal inconsistency\n"
 msgstr "iç tutarsýzlýk\n"
 
-#: driver.c:1063
+#: driver.c:1067
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s baðlantýsý baþarýsýz oldu"
 
-#: driver.c:1069
+#: driver.c:1073
 msgid "host is unknown."
 msgstr "makina bilinmiyor."
 
-#: driver.c:1072
+#: driver.c:1076
 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:1075
+#: driver.c:1079
 msgid "unrecoverable name server error."
 msgstr "düzeltilemeyen ad sunucusu hatasý."
 
-#: driver.c:1077
+#: driver.c:1081
 msgid "temporary name server error."
 msgstr "geçici ad sunucusu hatasý."
 
@@ -259,17 +251,19 @@ msgid "unknown DNS error %d."
 msgstr "bilinmeyen DNS hatasý %d."
 
 #: driver.c:1102
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetcmail ulaþýlamayan sunucu uyarýsý.\n"
 "\n"
 "Fetchmail posta sunucusuna (%s) ulaþamadý:"
 
-#: driver.c:1131 imap.c:366 pop3.c:415
+#: driver.c:1104
+#, 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
 msgid "SSL connection failed.\n"
 msgstr "SSL baðlantýsý baþarýsýz oldu.\n"
 
@@ -293,16 +287,16 @@ msgid " (previously authorized)"
 msgstr " (önceden yetkilendirilmiþ)"
 
 #: driver.c:1217
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#, 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:1220
+#: driver.c:1221
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamadý.\n"
 
-#: driver.c:1224
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -332,7 +326,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:1239
+#: driver.c:1240
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -351,180 +345,175 @@ 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:1254
+#: driver.c:1255
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1259
+#: driver.c:1260
 #, 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:1283
+#: driver.c:1284
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1289
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1290
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1292
+#: driver.c:1294
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi baþardý.\n"
 
-#: driver.c:1296
+#: driver.c:1298
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden saðlanýyor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1327
+#: driver.c:1329
 #, 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:1329
+#: driver.c:1331
 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:1345
+#: driver.c:1343
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klasör %3$s)"
 
 # kaynak koduna bakýlacak
-#: driver.c:1353 rcfile_y.y:401
+#: driver.c:1346 rcfile_y.y:401
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#. only used for ETRN
-#: driver.c:1358
+#: driver.c:1351
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklanýyor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1362
-#, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%5$s için (%3$d adedi %4$s) %1$d %2$s"
-
-# bir önceki ve bir sonraki iletilerle ilgili.
-# Bunun Türkçede tekil çerilmesi gerek, çünkü hemen önünde bir sayý olacak.
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr "ileti"
-
-# önceki iki ileti ile ilgili.
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr "ileti"
+#: driver.c:1355
+#, 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:1366
+#: driver.c:1358
+#, fuzzy
 msgid "seen"
-msgstr "görülmüþ"
+msgid_plural "seen"
+msgstr[0] "görülmüþ"
+msgstr[1] "görülmüþ"
 
 # önceki iki ileti ile ilgili.
-#: driver.c:1369
-#, c-format
-msgid "%d %s for %s"
-msgstr "%3$s için %1$d %2$s"
+#: driver.c:1361
+#, 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:1375
+#: driver.c:1368
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1381
+#: driver.c:1374
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s için mektup yok\n"
 
-#: driver.c:1414
+#: driver.c:1407
 msgid "bogus message count!"
 msgstr "sahte ileti sayýsý!"
 
-#: driver.c:1515
+#: driver.c:1508
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1518
+#: driver.c:1511
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 baþlýðý ya hiç yok ya da formatý kötü"
 
-#: driver.c:1521
+#: driver.c:1514
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1524
+#: driver.c:1517
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1527
+#: driver.c:1520
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokolü"
 
-#: driver.c:1530
+#: driver.c:1523
 msgid "lock busy on server"
 msgstr "sunucuda kilit meþgul"
 
 # transaction'ý iþlem diye çevirdim. Doðru mu?
-#: driver.c:1533
+#: driver.c:1526
 msgid "SMTP transaction"
 msgstr "SMTP iþlemi"
 
-#: driver.c:1536
+#: driver.c:1529
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1539
+#: driver.c:1532
 msgid "undefined error\n"
 msgstr "tanýmlanmamýþ hata\n"
 
-#: driver.c:1550
+#: driver.c:1543
 #, 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:1552
+#: driver.c:1545
 #, c-format
 msgid "%s error while fetching from %s\n"
 msgstr "%2$s'den getirilirken %1$s hatasý\n"
 
-#: driver.c:1560
+#: driver.c:1553
 #, 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:1581
+#: driver.c:1574
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 desteði yok.\n"
 
-#: driver.c:1589
+#: driver.c:1582
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 desteði yok.\n"
 
-#: driver.c:1600
+#: driver.c:1593
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush seçeneði %s ile desteklenmiyor\n"
 
-#: driver.c:1606
+#: driver.c:1599
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all seçeneði %s ile desteklenmiyor\n"
 
-#: driver.c:1614
+#: driver.c:1607
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit seçeneði %s ile desteklenmiyor\n"
 
-#: env.c:58
+#: env.c:56
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -540,7 +529,7 @@ msgstr ""
 "Þunu deneyin: \"env QMAILINJECT= %s KULLANDIÐINIZ DÝÐER ARGÜMANLAR\"\n"
 "%s: Çýkýyorum.\n"
 
-#: env.c:70
+#: env.c:68
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -557,17 +546,17 @@ msgstr ""
 "Þunu deneyin: \"env QMAILINJECT= %s KULLANDIÐINIZ DÝÐER ARGÜMANLAR\"\n"
 "%s: Çýkýyorum.\n"
 
-#: env.c:82
+#: env.c:80
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Burada yoksunuz. Uzak durun.\n"
 
-#: env.c:144
+#: env.c:142
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: makinanýzý belirleyemiyorum!"
 
-#: env.c:160
+#: env.c:158
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "`gethostbyname' %s için baþarýsýz oldu\n"
@@ -597,24 +586,20 @@ msgstr "%s için bekleyen ileti yok\n"
 msgid "Pending messages for %s started\n"
 msgstr "%s için bekleyen iletiler baþladý\n"
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "%s düðümü için iletiler kuyruða konamýyor\n"
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Düðüm %s'in izni yok: %s\n"
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr "ETRN sözdizim hatasý\n"
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr "Parametrelerde ETRN sözdizim hatasý\n"
@@ -641,68 +626,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:154
+#: fetchmail.c:164
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: bunlarla baþlatýldý"
 
-#: fetchmail.c:178
+#: fetchmail.c:188
 msgid "could not get current working directory\n"
 msgstr "çalýþma dizini bulunamadý\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:198
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail sürüm %s"
 
-#: fetchmail.c:329
+#: fetchmail.c:342
 #, 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:330
+#: fetchmail.c:343
 msgid " and "
 msgstr " ve "
 
-#: fetchmail.c:335
+#: fetchmail.c:348
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Hiçbir posta sunucusu yok; belki %s eksik?\n"
 
-#: fetchmail.c:356
+#: fetchmail.c:369
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: hiçbir posta sunucusu belirtilmedi.\n"
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:378 fetchmail.c:387
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: baþka bir fetchmail çalýþmýyor\n"
 
-#: fetchmail.c:380
+#: fetchmail.c:393
 #, 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:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "background"
 msgstr "arkaplan"
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:394 fetchmail.c:400
 msgid "foreground"
 msgstr "önplan"
 
-#: fetchmail.c:386
+#: fetchmail.c:399
 #, 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:402
+#: fetchmail.c:415
 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:408
+#: fetchmail.c:421
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -710,68 +695,68 @@ msgstr ""
 "fetchmail: %d'de çalýþan baþka bir fetchmail ile belirtilen makinalarý "
 "yoklayamam.\n"
 
-#: fetchmail.c:415
+#: fetchmail.c:428
 #, 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:425
+#: fetchmail.c:438
 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:431
+#: fetchmail.c:444
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: %d'de arkaplanda çalýþan fetchmail uyandýrýldý.\n"
 
-#: fetchmail.c:443
+#: fetchmail.c:456
 #, 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:458
+#: fetchmail.c:471
 #, 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:464
+#: fetchmail.c:475
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s'in parolasýný yazýnýz: "
 
-#: fetchmail.c:495
+#: fetchmail.c:506
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s daemon baþlatýlýyor \n"
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:521 fetchmail.c:523
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "kayýt eklemek için %s açýlamadý \n"
 
-#: fetchmail.c:550
+#: fetchmail.c:561
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "dosya zamaný kontrol edilemedi %s (hata kodu %d)\n"
 
-#: fetchmail.c:555
+#: fetchmail.c:566
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail yeniden baþlatýlýyor (%s deðiþti)\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:571
 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:587
+#: fetchmail.c:598
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail'i yeniden baþlatma denemesi baþarýsýz oldu\n"
 
-#: fetchmail.c:615
+#: fetchmail.c:626
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
@@ -779,189 +764,189 @@ msgstr ""
 "zamamaþýmý)\n"
 
 # interval ne? time interval mi?? kaynak koduna bak
-#: fetchmail.c:627
+#: fetchmail.c:638
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "aralýk ulaþýlmadý, %s'i sorgulamýyorum\n"
 
-#: fetchmail.c:665
+#: fetchmail.c:676
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sorgulama durumu=0 (SUCCESS)\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:678
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sorgulama durumu=1 (NOMAIL)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:680
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sorgulama durumu=2 (SOCKET)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:682
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sorgulama durumu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:684
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sorgulama durumu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:686
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sorgulama durumu=5 (SYNTAX)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:688
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sorgulama durumu=6 (IOERR)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:690
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sorgulama durumu=7 (ERROR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:692
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sorgulama durumu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:694
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sorgulama durumu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:696
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sorgulama durumu=10 (SMTP)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:698
 msgid "Query status=11 (DNS)\n"
 msgstr "Sorgulama durumu=11 (DNS)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:700
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sorgulama durumu=12 (BSMTP)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:702
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sorgulama durumu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:704
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sorgulama durumu=%d\n"
 
 # wedge'yi sýkýþmak diye çevirdim. Uygun mu?
-#: fetchmail.c:739
+#: fetchmail.c:750
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tüm baðlantýlar sýkýþtý. Çýkýyorum.\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:757
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "fetchmail: %s'de uyuyorum\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:781
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s tarafýndan uyandýrýldým\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:784
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d sinyali ile tarafýndan uyandýrýldým\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:791
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s'de uyandýrýldým\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:797
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal bitiþ, durum kodu %d\n"
 
-#: fetchmail.c:939
+#: fetchmail.c:950
 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:972
+#: fetchmail.c:983
 #, 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:1114
+#: fetchmail.c:1128
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL desteði derlenirken eklenmemiþ.\n"
 
 # multidrop'u çeviremedim.
-#: fetchmail.c:1147
+#: fetchmail.c:1159
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: uyarý: %s'den multidrop iletileri kontrol etmek için DNS yok\n"
 
-#: fetchmail.c:1164
+#: fetchmail.c:1176
 #, 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:1171
+#: fetchmail.c:1183
 #, 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:1187
+#: fetchmail.c:1199
 #, 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:1202
+#: fetchmail.c:1214
 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:1252
+#: fetchmail.c:1264
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1337
+#: fetchmail.c:1349
 #, 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:1362
+#: fetchmail.c:1374
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 desteði yapýlandýrýlmamýþ.\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1386
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 desteði yapýlandýrýlmamýþ.\n"
 
-#: fetchmail.c:1384
+#: fetchmail.c:1396
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP desteði yapýlandýrýlmamýþ.\n"
 
-#: fetchmail.c:1390
+#: fetchmail.c:1402
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN desteði yapýlandýrýlmamýþ.\n"
 
-#: fetchmail.c:1396
+#: fetchmail.c:1408
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
 
-#: fetchmail.c:1403
+#: fetchmail.c:1415
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR desteði yapýlandýrýlmamýþ.\n"
 
-#: fetchmail.c:1409
+#: fetchmail.c:1421
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
 
-#: fetchmail.c:1415
+#: fetchmail.c:1427
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol seçilmiþ.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1425
+#: fetchmail.c:1437
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -969,295 +954,295 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1442
+#: fetchmail.c:1454
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nabýz yoklama aralýðý %d saniye\n"
 
 # logfile = kayýt dosyasý ?
-#: fetchmail.c:1444
+#: fetchmail.c:1456
 #, 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:1446
+#: fetchmail.c:1458
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyasý %s\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1461
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Ýlerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1464
 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:1454
+#: fetchmail.c:1466
 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:1456
+#: fetchmail.c:1468
 #, 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:1460
+#: fetchmail.c:1472
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1474
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini göndericiye iletecek.\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1481
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek için seçenekler:\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1485
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1476
+#: 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:1479
+#: fetchmail.c:1491
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun gerçek adý %s.\n"
 
 # Bu çeviriyi kontrol et.
-#: fetchmail.c:1481
+#: fetchmail.c:1493
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr "  Hiçbir makina belirtilmediðinde %s sorgulanacak.\n"
 
 # Harika. Nasýl çevrilecek bu?
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will not"
 msgstr ""
 
 # Harika! Nasýl çevrilecek þimdi bu?? :(
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1494 fetchmail.c:1609 fetchmail.c:1612
 msgid "will"
 msgstr ""
 
-#: fetchmail.c:1486
+#: fetchmail.c:1498
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1502
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1505
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullanýcý adý = \"%s\".\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1508
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1521
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullanýlýyor"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1524
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1527
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullanýyorum)"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1529
 #, c-format
 msgid " (using network security options %s)"
 msgstr " (þu að güvenliði seçeneklerini kullanýyorum: %s)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1532
 #, c-format
 msgid " (using port %d)"
 msgstr " (port %d kullanýlýyor)"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1535
 msgid " (using default port)"
 msgstr " (öntanýmlý port kullanýlýyor)"
 
 # 'to force' nasýl çevrilebilir?
-#: fetchmail.c:1525
+#: fetchmail.c:1537
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullanýmý istenecek)"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1543
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Tüm kimlik denetleme yöntemleri denenecek.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1546
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1549
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1552
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1555
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1558
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1561
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1564
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kanýtlamasý istenecek.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1567
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Uçtan uca þifreleme varsayýlýyor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1559
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1574
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile þifrelenmiþ oturumlar etkinleþtirildi.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1576
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokolü: %s.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1578
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikasý kontrolü etkinleþtirildi.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1580
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL güvenilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1583
 #, 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:1574
+#: fetchmail.c:1586
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamanaþýmý %d saniye"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1588
 msgid " (default).\n"
 msgstr " (öntanýmlý).\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1595
 msgid "  Default mailbox selected.\n"
 msgstr "  Öntanýmlý posta kutusu seçildi.\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1600
 msgid "  Selected mailboxes are:"
 msgstr "  Seçilen posta kutularý:"
 
 #  bu çeviriyi kontrol et
-#: fetchmail.c:1593
+#: fetchmail.c:1605
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "All"
 msgstr "Hepsi"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1606
 msgid "Only new"
 msgstr "Yalnýzca yeniler"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1608
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1599
+#: fetchmail.c:1611
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr "  Eski iletiler %s ileti alýmýndan önce boþaltýlacak (--flush %s).\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1614
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr "  server-local adreslerin yeniden yazýlmasý %s (--norewrite %s).\n"
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: 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:1605
+#: fetchmail.c:1617
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Baþkalarýna sor
-#: fetchmail.c:1608
+#: fetchmail.c:1620
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr "  Carriage-return'lerin zorunlu kullanýmý %s (orcecr %s).\n"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1623
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1626
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr "  MIME kod çözümü %s (mimedecode %s).\n"
 
 # idle = ?? Baþkalarýna sor
-#: fetchmail.c:1617
+#: fetchmail.c:1629
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\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:1620
+#: fetchmail.c:1632
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr "  Boþ olmayan Status satýrlarý %s (dropstatus %s)\n"
@@ -1271,172 +1256,172 @@ msgstr "  Boþ olmayan Status satýrlarý %s (dropstatus %s)\n"
 #
 # DIKKAT: 'discarded' ve 'kept'in durumlari özel; atýlacak ve tutulacak
 # olarak çevrilmeleri gerekiyor.
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1633 fetchmail.c:1636
 msgid "discarded"
 msgstr "atýlacak"
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: 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:1623
+#: fetchmail.c:1635
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr "  Delivered-To satýrlarý %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1641
 #, 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:1632
+#: fetchmail.c:1644
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ýleti boyut sýnýrý yok (--limit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1646
 #, 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:1637
+#: fetchmail.c:1649
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada büyüklük uyarýsý (--warnings 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1652
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Alýnan ileti sýnýrý %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1655
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Alýnan ileti sýnýrý yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1657
 #, 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:1648
+#: fetchmail.c:1660
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Ýleti boyut sýnýrý yok (--limit 0).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1664
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1666
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1669
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
 # batch = ?
-#: fetchmail.c:1659
+#: fetchmail.c:1671
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1661
+#: fetchmail.c:1673
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1677
 #, 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:1667
+#: fetchmail.c:1679
 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:1674
+#: fetchmail.c:1686
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Þu alanlar (domains) için posta getirilecek:"
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1691 fetchmail.c:1711
 msgid " (default)"
 msgstr " (öntanýmlý)"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Ýletiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1698
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Ýletiler \"%s\" ile ulaþtýrýlacak.\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1705
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Ýletiler %cMTP ile aþaðýdakilere iletilecek:"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1716
 #, 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:1707
+#: fetchmail.c:1719
 #, 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:1716
+#: fetchmail.c:1728
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yanýtlarý þöyle:"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1734
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin deðil\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1737
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu baðlantýsý \"%s\" ile açýlacak.\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1740
 msgid "  No pre-connection command.\n"
 msgstr "  Hiçbir baðlantý öncesi komutu yok.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1742
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu baðlantýsý \"%s\" ile kopatýlacak.\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1745
 msgid "  No post-connection command.\n"
 msgstr "  Hiçbir baðlantý öncesi komutu yok.\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1748
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina için hiçbir yerel ad tanýmlanmamýþ.\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1758
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1748
+#: fetchmail.c:1760
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1762
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr "%d yerel ad tanýndý.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1764
+#: fetchmail.c:1776
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr "  Multidrop adresler için DNS sorgulamasý %s.\n"
@@ -1445,111 +1430,111 @@ msgstr "  Multidrop adresler için DNS sorgulamasý %s.\n"
 # ve "name.". Dilbilgisi yapýsý Türkçeye tümüyle ters olduðundan
 # bunlarý aþaðýdaki iki iletide çevirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye böyle olduðunu anlamak için.
-#: fetchmail.c:1768
+#: fetchmail.c:1780
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr "  "
 
 # Niçin böyle çevrildiðini anlamak için yukarýdaki iletiye
 # bakýnýz.
-#: fetchmail.c:1770
+#: 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:1772
+#: fetchmail.c:1784
 msgid "name.\n"
 msgstr "Sunucu takma adlarý, adlarý kullanýlarak karþýlaþtýrýlacak.\n"
 
-#: fetchmail.c:1775
+#: fetchmail.c:1787
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin deðil\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1790
 #, 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:1779
+#: fetchmail.c:1791
 msgid "Received"
 msgstr "Received"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1793
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr "  Parse edilecek envelope baþlýðý sayýsý: %d\n"
 
-#: fetchmail.c:1784
+#: fetchmail.c:1796
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s öneki kullanýcý kimliðinden silinecek\n"
 
-#: fetchmail.c:1787
+#: fetchmail.c:1799
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1806
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Önceden tanýmlanmýþ posta sunucusu takma adlarý:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1815
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1825
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Baðlatý %s arayüzünden olmalý.\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1827
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir arayüzün kullanýlmasý zorunlu koþulmamýþ.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1829
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama döngüsü %s'i gözleyecek.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1831
 msgid "  No monitor interface specified.\n"
 msgstr "  Gözleme arayüzü belirtilmemiþ.\n"
 
 # plugin == ?
-#: fetchmail.c:1823
+#: fetchmail.c:1835
 #, 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:1825
+#: fetchmail.c:1837
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemiþ.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:1827
+#: fetchmail.c:1839
 #, 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:1829
+#: fetchmail.c:1841
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemiþ.\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1846
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hiçbir UID saklanmadý.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1855
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID saklandý.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1863
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received baþlýðýna yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1865
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1557,16 +1542,12 @@ msgstr ""
 "  Received baþlýðýna yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1868
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Özellikler geçiriliyor \"%s\".\n"
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:614 fetchmail.h:620
 msgid "alloca failed"
 msgstr "alloca baþarýsýz oldu"
 
@@ -1639,150 +1620,149 @@ msgstr "Credential'lar býrakýlýrken hata\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread %d saniye uyuyor.\n"
 
-#: imap.c:280
+#: imap.c:281
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol IMAP4 rev 1 olarak belirlendi\n"
 
-#: imap.c:286
+#: imap.c:287
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol IMAP rev 0 olarak belirlendi.\n"
 
-#: imap.c:293
+#: imap.c:294
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
 
-#: imap.c:308
+#: imap.c:309
 msgid "will idle after poll\n"
 msgstr "yoklamadan sonra idle kalýnacak\n"
 
-#: imap.c:460
+#: imap.c:462
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli OTP desteði ile derlenmemiþ\n"
 
-#: imap.c:482
+#: imap.c:484
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli NTLM desteði ile derlenmemiþ\n"
 
-#: imap.c:491
+#: imap.c:493
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yeteneðini desteklemiyor\n"
 
-#: imap.c:641 imap.c:707
+#: imap.c:644 imap.c:706
 msgid "expunge failed\n"
 msgstr "silme baþarýsýz oldu\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:662 imap.c:691
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama baþarýsýz oldu\n"
 
-#: imap.c:671
+#: imap.c:670
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr "yeniden yokladýktan sonra %d ileti bekliyor\n"
 
-#: imap.c:681
+#: imap.c:680
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu seçimi baþarýsýz oldu\n"
 
-#: imap.c:685
+#: imap.c:684
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr "ilk yoklamadan sonra %d ileti bekliyor\n"
 
-#: imap.c:711
+#: imap.c:710
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr "silinmeden sonra %d ileti bekliyor\n"
 
-#: imap.c:734
+#: imap.c:733
 msgid "search for unseen messages failed\n"
 msgstr "görülmemiþ iletileri arama iþlemi baþarýsýz oldu\n"
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:763 pop3.c:666 pop3.c:678 pop3.c:895 pop3.c:902
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u görülmemiþ\n"
 
-#: imap.c:776 pop3.c:684
+#: imap.c:775 pop3.c:687
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ilk görülmemiþ\n"
 
-#: interface.c:253
+#: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr "kvm arayüzü açýlamadý. fetchmail'in SGID kmem olduðundan emin olunuz."
 
-#: interface.c:398
+#: interface.c:396
 #, c-format
 msgid "Unable to parse interface name from %s"
 msgstr "%s'den arayüz adýný çýkaramadým"
 
-#: interface.c:420
+#: interface.c:418
 msgid "get_ifinfo: sysctl (iflist estimate) failed"
 msgstr "get_ifinfo: sysctl (iflist kestirme) baþarýsýz oldu"
 
-#: interface.c:426
+#: interface.c:424
 msgid "get_ifinfo: malloc failed"
 msgstr "get_ifinfo: malloc baþarýsýz oldu"
 
-#: interface.c:432
+#: interface.c:430
 msgid "get_ifinfo: sysctl (iflist) failed"
 msgstr "get_ifinfo: sysctl (iflist) baþarýsýz oldu"
 
-#: interface.c:450
+#: interface.c:448
 #, c-format
 msgid "Routing message version %d not understood."
 msgstr "Routing iletisi sürüm %d anlaþýlamadý."
 
-#. we did not find an interface with a matching name
-#: interface.c:482
+#: interface.c:480
 #, c-format
 msgid "No interface found with name %s"
 msgstr "Adý %s olan bir arayüz bulunamadý"
 
-#: interface.c:540
+#: interface.c:538
 #, c-format
 msgid "No IP address found for %s"
 msgstr "%s için bir IP adresi bulunamadý"
 
-#: interface.c:592
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "IP arayüzü adresi yok\n"
 
-#: interface.c:608
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "geçersiz IP arayüzü adresi\n"
 
-#: interface.c:614
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "geçersiz IP arayüzü maskesi\n"
 
-#: interface.c:653
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:668
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "%s'in yoklanmasýný atlýyorum, %s çalýþmýyor\n"
 
-#: interface.c:687
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "%s'in yoklamasý atlanýyor, %s IP adresi dýþarýda tutuluyor\n"
 
-#: interface.c:699
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:725
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "%s'in yoklamasý atlanýyor, %s etkin deðil\n"
 
-#: interface.c:732
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s'de etkinlik %d idi, þimdi %d\n"
@@ -1809,11 +1789,11 @@ msgstr "BASE64 hazýr yanýtýnýn kodu çözülemedi\n"
 msgid "challenge mismatch\n"
 msgstr "challenge'lar uymuyor\n"
 
-#: lock.c:81
+#: lock.c:83
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: eski kilit dosyasýný siliyorum \n"
 
-#: lock.c:122
+#: lock.c:124
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: kilit oluþturulamadý.\n"
 
@@ -1845,7 +1825,6 @@ msgstr "Roller deðiþiliyor...\n"
 msgid "ATRN request refused.\n"
 msgstr "ATRN isteði reddedildi.\n"
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr "ATRN isteðini þimdi iþleyemiyorum\n"
@@ -1854,12 +1833,10 @@ msgstr "ATRN isteðini þimdi iþleyemiyorum\n"
 msgid "You have no mail.\n"
 msgstr "Mektubunuz yok.\n"
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr "Bu komut gerçeklenmemiþ\n"
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr "Kimlik kanýtlamasý gerekiyor.\n"
@@ -1893,7 +1870,7 @@ msgstr "sunucu recv ölümcül\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'ýnýn kodu çözülemedi\n"
 
-#: opie.c:59 pop3.c:500
+#: opie.c:59 pop3.c:496
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
@@ -2024,155 +2001,166 @@ msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl istemci sertifikasý\n"
 
 #: options.c:686
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     ssl istemci sertifikasý\n"
+
+#: options.c:687
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:688
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    ssl protokolünü seç (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:690
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      baðlatýlarý açmak için dýþarýdan bir program belirle\n"
 
-#: options.c:689
+#: options.c:691
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     SMTP baðlantýlarýný yapmak için dýþarýdan bir program "
 "belirle\n"
 
-#: options.c:691
+#: options.c:693
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    belirtilen protokolü kullan (man sayfasýna bakýnýz)\n"
 
-#: options.c:692
+#: options.c:694
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        UIDL kullanýmýný zorunlu kýl (yalnýzca pop3 için)\n"
 
-#: options.c:693
+#: options.c:695
 msgid "  -P, --port        TCP/IP service port to connect to\n"
 msgstr "  -P, --port        baðlanýlacak TCP/IP portu\n"
 
-#: options.c:694
+#: options.c:696
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        kimlik kanýtama türü (parola/kerberos/ssh/otp)\n"
 
-#: options.c:695
+#: options.c:697
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     sunucu zamanaþýmý süresi\n"
 
-#: options.c:696
+#: options.c:698
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope   envelope adresi baþlýðý\n"
 
-#: options.c:697
+#: options.c:699
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    yerel kullanýcý kimliðinden silinecek önek\n"
 
 # 'principal' ne demek?
-#: options.c:698
+#: options.c:700
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   posta hizmeti pricipal'ý\n"
 
-#: options.c:699
+#: options.c:701
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  Received baþlýklarýna yoklama bilgisi ekle\n"
 
-#: options.c:701
+#: options.c:703
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    kullanýcýnýn sunucudaký kullanýcý adý\n"
 
-#: options.c:702
+#: options.c:704
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         eski ve yeni iletileri getir\n"
 
-#: options.c:703
+#: options.c:705
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      getirdikten sonra yeni iletileri sil\n"
 
-#: options.c:704
+#: options.c:706
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep       getirdikten sonra yeni iletileri sakla\n"
 
-#: options.c:705
+#: options.c:707
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:706
+#: options.c:708
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   baþlýk adreslerini yeniden yazma\n"
 
-#: options.c:707
+#: options.c:709
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -w, --limit       belirtilenden daha büyük iletileri getirme\n"
 
-#: options.c:708
+#: options.c:710
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    posta bildirimleri arasýndaki zaman aralýðý\n"
 
-#: options.c:711
+#: options.c:713
 msgid "  -T, --netsec      set IP security request\n"
 msgstr "  -T, --netsec      IP güvenliði iste\n"
 
-#: options.c:713
+#: options.c:715
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    bu SMTP sunucusunu kullan\n"
 
-#: options.c:714
+#: options.c:716
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "      --fetchdomains belirtilen alan adlarý için gelen postalarý getir\n"
 
-#: options.c:715
+#: options.c:717
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress kullanýlacak SMTP daðýtým alaný (domain) belirle\n"
 
-#: options.c:716
+#: options.c:718
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    bu SMTP kullanýcý@alanadý adresini kullan\n"
 
-#: options.c:717
+#: options.c:719
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam yanýt deðerlerini kullan\n"
 
-#: options.c:718
+#: options.c:720
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  SMTP baðlantýlarý için batch limiti belirle\n"
 
-#: options.c:719
+#: options.c:721
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  sunucu baðlantýlarý için getirme sýnýrý\n"
 
-#: options.c:720
+#: options.c:722
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchdomains belirtilen alan adlarý için gelen postalarý getir\n"
 
-#: options.c:721
+#: options.c:723
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:722
+#: options.c:724
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:723
+#: options.c:725
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         iletim için kullanýlacak MDA'yý belirle\n"
 
-#: options.c:724
+#: options.c:726
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP çýktýsýný bu dosyaya al\n"
 
-#: options.c:725
+#: options.c:727
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        daðýtým için LMTP (RFC2033) kullan\n"
 
-#: options.c:726
+#: options.c:728
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder    uzaktaki klasör adý olarak bunu kullan\n"
 
-#: options.c:727
+#: options.c:729
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ilerlemeyi gösteren noktalarý kayýt dosyalarýnda bile "
@@ -2180,40 +2168,40 @@ msgstr ""
 
 # timestamp = zaman damgasý (zaman belirteci daha doðal olurdu bence ama böyle kullanýlmýþ
 # baþka yerlerde)
-#: pop3.c:538
+#: pop3.c:534
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgasý selamlama içerisinde bulunamadý\n"
 
-#: pop3.c:547
+#: pop3.c:543
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama içindeki zaman damgasýnda sözdizim yanlýþý var\n"
 
-#: pop3.c:569
+#: pop3.c:565
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tanýmlanmamýþ protokol isteði\n"
 
-#: pop3.c:577
+#: pop3.c:573
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit meþgul!  Baþka bir oturum açýk olabilir\n"
 
-#: pop3.c:654 pop3.c:883
+#: pop3.c:657 pop3.c:886
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:756
+#: pop3.c:759
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmuþ. Bu durumu idare edemem.\n"
 
-#: pop3.c:842
+#: pop3.c:845
 msgid "protocol error\n"
 msgstr "protokol hatasý\n"
 
-#: pop3.c:857
+#: pop3.c:860
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatasý\n"
 
-#: pop3.c:1214
+#: pop3.c:1217
 msgid "Option --remote is not supported with POP3\n"
 msgstr "--remote seçeneði POP3 ile desteklenmiyor\n"
 
@@ -2273,165 +2261,143 @@ msgstr "Dosyanýn (%s) izinleri -rwx--x--- (0710)'den çok olmamalý.\n"
 msgid "File %s must be owned by you.\n"
 msgstr "Dosyanin (%s) sahibi siz olmalýsýnýz.\n"
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatasý"
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr "%s (kayýt iletisi tam deðil)"
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
-msgid "partial error message buffer overflow"
-msgstr "hata ileti tamponu taþmasý"
-
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "%s'i yeniden yazmak üzereyim"
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "Yeniden yazýlan %s\n"
 
-#: rpa.c:116
-msgid "Success"
-msgstr "Baþarýlý"
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr ""
-"Sýnýrlý kullanýcý (kullanýcý hesabý ile ilgili yanlýþ birþeyler olabilir)"
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr "Kullanýcý adý ya da parolasý geçersiz"
-
-# deity error???
-#: rpa.c:119
-msgid "Deity error"
-msgstr "`Deity' hatasý"
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 kod çözme hatasý\n"
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Hizmet RPA sürüm %d.%d'i seçti\n"
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Hizmet challenge'i (l=%d):\n"
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Hizmet zaman damgasý %s\n"
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2'de uzunluk hatasý var\n"
 
 # realm = alem
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Alem listesi: %s\n"
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr "hizmet@alem katarýnda RPA hatasý\n"
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 kod çözme hatasý\n"
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "Kullanýcý kimlik kanýtlama (l=%d):\n"
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA durumu: %02X\n"
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4: uzunluk hatasý\n"
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA sizi reddediyor: %s\n"
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA sizi reddediyor, nedeni bilinmiyor\n"
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA Kullanýcý Kimlik Kanýtlama uzunluk hatasý: %d\n"
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Oturumu anahtar uzunluðu hatasý: %d\n"
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _hizmet_ kimlik kanýtlamasý baþarýsýz oldu.\n"
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr "Oturum anahtarý kuruldu:\n"
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr "RPA yetkilendirme tamamlandý\n"
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr "Yanýt al\n"
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Yanýt alma %d döndü [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr "Baþlýk 60 deðil\n"
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr "Token uzunluk hatasý\n"
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Token uzunluðu %d rxlen (%d) ile uyuþmuyor\n"
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanizma alaný doðru deðil\n"
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "karakter %d'de dec64 hatasý: %x\n"
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr "Gelen ikilik veri:\n"
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr "Giden veri:\n"
 
@@ -2443,347 +2409,343 @@ msgstr "RPA katarý çok uzun\n"
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA /dev/urandom açýlamadý. Bu durum sisteme\n"
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr "    girmenize engel deðildir, ancak konuþtuðunuzu\n"
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    düþündüðünüz sistem ile konuþmuyor\n"
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr "    olabilirsiniz (kötü niyetli sistemler\n"
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    `replay' saldýrýsý yapabilir).\n"
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr "Kullanýcý challenge'ý:\n"
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr "Veri bloðuna MD5 uygulanýyor:\n"
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr "MD5 sonucu:\n"
 
-#: sink.c:246
+#: sink.c:247
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:348
+#: sink.c:332
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: ('bounce' iletisi gövdesi)\n"
 
-#. this will usually go to sylog...
-#: sink.c:351
+#: sink.c:335
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
 
-#: sink.c:461
+#: sink.c:467
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Kaydedilen hata hala %d\n"
 
-#: sink.c:524 sink.c:604
+#: sink.c:526 sink.c:606
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP hatasý: %s\n"
 
-#: sink.c:758
+#: sink.c:761
 msgid "BSMTP file open or preamble write failed\n"
 msgstr "BSMTP dosya açýlamadý ya da önsöz yazýlamadý\n"
 
-#: sink.c:979
+#: sink.c:966
 #, 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:986
+#: sink.c:973
 #, 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:1024
+#: sink.c:1011
 msgid "no address matches; no postmaster set.\n"
 msgstr "hiçbir adres uyuþmadý; postmaster yok.\n"
 
-#: sink.c:1036
+#: sink.c:1023
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile gönderilemedi!\n"
 "\n"
 
-#: sink.c:1042
+#: sink.c:1029
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hiçbir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1195
+#: sink.c:1182
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek üzereyim: %s\n"
 
-#: sink.c:1219
+#: sink.c:1206
 msgid "MDA open failed\n"
 msgstr "MDA açma baþarýsýz oldu\n"
 
-#: sink.c:1256
+#: sink.c:1243
 #, 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:1280
+#: sink.c:1267
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici çalýþtýrýlamadý; %s denenecek"
 
-#: sink.c:1336
+#: sink.c:1323
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile öldürüldü\n"
 
-#: sink.c:1339
+#: sink.c:1326
 #, 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:1342
+#: sink.c:1329
 #, 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:1363
+#: sink.c:1350
 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:1384
+#: sink.c:1371
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi daðýtýmý reddetti\n"
 
-#: sink.c:1414
+#: sink.c:1401
 msgid "LMTP delivery error on EOM\n"
 msgstr "Ýleti sonunda LMTP daðýtým hatasý\n"
 
-#: sink.c:1417
+#: sink.c:1404
 #, 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:1567
+#: sink.c:1555
+#, fuzzy
 msgid ""
-"--\n"
-"\t\t\t\tThe Fetchmail Daemon\n"
+"-- \n"
+"The Fetchmail Daemon"
 msgstr ""
 "--\n"
 "\t\t\t\tFetchmail Daemon'u\n"
 
-#: smtp.c:86
+#: smtp.c:87
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-Md5 Kimlik kanýtlamasý...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:94 smtp.c:145
 msgid "Server rejected the AUTH command.\n"
 msgstr "Sunucu AUTH komutunu reddetti.\n"
 
-#: smtp.c:101 smtp.c:160 smtp.c:170 smtp.c:176
+#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
 msgid "Bad base64 reply from server.\n"
 msgstr "Sunucudan geçersiz base64 yanýtý.\n"
 
-#: smtp.c:105
+#: smtp.c:106
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "'Challenge'ýn kodu çözüldü: %s\n"
 
-#: smtp.c:126
+#: smtp.c:123
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN Kimlik kanýtlamasý...\n"
 
-#: smtp.c:146
+#: smtp.c:138
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Kimlik kanýtlamasý...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:339 smtp.c:362
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatasý\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc baþarýsýz oldu\n"
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair baþarýsýz oldu\n"
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork baþarýsýz oldu\n"
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr "dup2 baþarýsýz oldu\n"
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s çalýþtýrýlýyor (makina %s hizmet %s)\n"
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) baþarýsýz oldu\n"
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:427
+#: socket.c:419
 #, 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:778
+#: socket.c:776
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Çýkaran Kurum: %s\n"
 
-#: socket.c:780
+#: socket.c:778
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uyarý: Çýkaran Kurum Adý çok uzun (sonundan kesilmiþ olabilir).\n"
 
-#: socket.c:782
+#: socket.c:780
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:784
+#: socket.c:782
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Çýkaran `CommonName'i: %s\n"
 
-#: socket.c:786
+#: socket.c:784
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uyarý: Çýkaran `CommonName'i çok uzun (sonundan kesilmiþ olabilir).\n"
 
-#: socket.c:788
+#: socket.c:786
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen Çýkaran `CommonName'i\n"
 
-#: socket.c:792
+#: socket.c:790
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Sunucu `CommonName'i: %s\n"
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:794
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Kötü sertifika: `Subject CommonName' çok uzun!\n"
 
-#: socket.c:812
+#: socket.c:810
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyuþmazlýðý: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:816
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu adý ayarlanmamýþ, sertifikayý doðrulayamýyorum!\n"
 
-#: socket.c:823
+#: socket.c:821
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:825
+#: socket.c:823
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu adý sertifikada belirtilmemiþ!\n"
 
-#: socket.c:835
+#: socket.c:833
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() baþarýsýz oldu!\n"
 
-#: socket.c:839
+#: socket.c:837
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:851
+#: socket.c:845
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu çok küçük!\n"
 
-#: socket.c:857
+#: socket.c:851
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtarý parmak izi: %s\n"
 
-#: socket.c:861
+#: socket.c:855
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyuþuyor.\n"
 
-#: socket.c:864
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s parmak izleri uyuþmuyor!\n"
 
-#: socket.c:872
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:867
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Uyarý: sunucu sertifikasý doðrulamasý: %s\n"
 
-#: socket.c:878
+#: socket.c:873
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "bilinmeyen çýkaran firma adý (ilk %d karakter): %s\n"
 
-#: socket.c:931
+#: socket.c:925
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL için sýnýrlar dýþýnda"
 
-#: socket.c:948
+#: socket.c:942
 #, 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:1008
+#: socket.c:1003
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi doðrulamasý bir biçimde atlandý!\n"
 
-#: socket.c:1080
+#: socket.c:1075
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1083
+#: socket.c:1078
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma baþarýsýz oldu!\n"
 
-#: transact.c:70
+#: transact.c:66
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s yerel %s'e eþlendi\n"
 
 # kaynak koduna bakýlacak
-#: transact.c:134
+#: transact.c:130
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "%2$s ile uyuþan %1$s geçirildi\n"
 
-#: transact.c:203
+#: transact.c:199
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2792,73 +2754,73 @@ msgstr ""
 "'Received' satýrý çözümleniyor:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:238
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "satýr kabul edildi, %s posta sunucusu için bir takma ad\n"
 
-#: transact.c:248
+#: transact.c:244
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "satýr kabul edilmedi, %s posta sunucusu için bir takma ad deðil\n"
 
-#: transact.c:322
+#: transact.c:318
 msgid "no Received address found\n"
 msgstr "hiçbir Received adresi bulunamadý\n"
 
-#: transact.c:331
+#: transact.c:327
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "`%s' Received adresi bulundu\n"
 
 # delimiter = sýnýr belirteci  (Sankur'un sözlüðünden)
-#: transact.c:531
+#: transact.c:528
 msgid "message delimiter found while scanning headers\n"
 msgstr "baþlýklar taranýrken ileti sýnýr belirteci bulundu\n"
 
 # delimiter = sýnýr belirteci  (Sankur'un sözlüðünden)
-#: transact.c:552
+#: transact.c:549
 msgid "incorrect header line found while scanning headers\n"
 msgstr "baþlýklar taranýrken geçersiz baþlýk satýrý bulundu\n"
 
-#: transact.c:554
+#: transact.c:551
 #, c-format
 msgid "line: %s"
 msgstr "satýr: %s"
 
-#: transact.c:1074
+#: transact.c:1069
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "yerelde uyan bulunamadý, %s'e iletiliyor\n"
 
-#: transact.c:1089
+#: transact.c:1084
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "iletme ve silme DNS hatalarý nedeniyle yapýlmýyor\n"
 
-#: transact.c:1225
+#: transact.c:1192
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers yazýlýyor\n"
 
-#: transact.c:1246
+#: transact.c:1213
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "alýcý adreslerinden hiçbiri bildirilen yerel adlardan hiçbirine uymuyor"
 
-#: transact.c:1257
+#: transact.c:1220
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "alýcý adresi %s yerel adlardan hiçbirine uymuyor"
 
-#: transact.c:1271
+#: transact.c:1229
 msgid "message has embedded NULs"
 msgstr "iletinin içinde NUL karakterleri var"
 
 # listener = dinleyici
-#: transact.c:1284
+#: transact.c:1237
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP dinleyicisi yerel alýcý adreslerini reddetti: "
 
-#: transact.c:1409
+#: transact.c:1362
 msgid "writing message text\n"
 msgstr "ileti metni yazýlýyor\n"
 
@@ -2881,8 +2843,6 @@ msgstr " <boþ>"
 msgid "Scratch list of UIDs:"
 msgstr "Müsvedde UID listesi:"
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
@@ -2922,6 +2882,36 @@ msgstr "malloc baþarýsýz oldu\n"
 msgid "realloc failed\n"
 msgstr "realloc baþarýsýz oldu\n"
 
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "hata ileti tamponu taþmasý"
+
+#, fuzzy
+#~ msgid "alloca failed\n"
+#~ msgstr "alloca baþarýsýz oldu"
+
+# bir önceki ve bir sonraki iletilerle ilgili.
+# Bunun Türkçede tekil çerilmesi gerek, çünkü hemen önünde bir sayý olacak.
+#~ msgid "messages"
+#~ msgstr "ileti"
+
+# önceki iki ileti ile ilgili.
+#~ 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"