Run 'make update-po' on po/.

svn path=/branches/BRANCH_6-3/; revision=5233

16 files changed, 10403 insertions, 7712 deletions

diff --git a/po/cs.po b/po/cs.po
index eb67a1da..5d02796c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-09-23 16:56+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -108,91 +108,101 @@ msgstr " (délka -1)"
 msgid " (oversized)"
 msgstr " (příliš velká)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nemohu stáhnout hlavičky, zpráva %s@%s:%d (%d oktetů)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "čtu zprávu %s@%s:%d z %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktetů)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetů v hlavičce)"
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktetů v těle)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "zpráva %s@%s:%d nemá očekávanou velikost (%d ve skutečnosti != %d očekáváno)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"zpráva %s@%s:%d nemá očekávanou velikost (%d ve skutečnosti != %d "
+"očekáváno)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " zachována\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " smazána\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " nesmazána\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "limit stahování %d dosažen; %d zpráva ponechána na serveru %s účet %s\n"
-msgstr[1] "limit stahování %d dosažen; %d zprávy ponechány na serveru %s účet %s\n"
-msgstr[2] "limit stahování %d dosažen; %d zpráv ponecháno na serveru %s účet %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"limit stahování %d dosažen; %d zpráva ponechána na serveru %s účet %s\n"
+msgstr[1] ""
+"limit stahování %d dosažen; %d zprávy ponechány na serveru %s účet %s\n"
+msgstr[2] ""
+"limit stahování %d dosažen; %d zpráv ponecháno na serveru %s účet %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "po %d sekundách vypršel čas při připojování k serveru %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "po %d sekundách vypršel čas při čekání na server %s.\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "po %d sekundách vypršel čas při čekání na %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "po %d sekundách vypršel čas při čekání odpověď posluchače.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "po %d sekundách vypršel čas.\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmailu opakovaně vypršel čas"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmailu vypršel čas více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmailu vypršel čas více než %d-krát při pokusu stáhnout poštu z %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 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,75 +217,75 @@ msgstr ""
 "\n"
 "Fetchmail již nebude vybírat z této schránky, dokud jej znovu nespustíte.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "příkaz před spojením selhal se stavem %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nemohu najít schránku HESIOD %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Vedoucí server nemá jméno.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nemohu nalézt kanonické doménové jméno pro %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "spojení %s k %s selhalo"
 
 # XXX: This is e-mail header as literal. Dont't touch "Subject: " header name.
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Varování fetchmailu o nedostupnosti serveru."
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "Spojení SSL selhalo.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Chyba \"zámek se používá\" na %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba \"server zaneprázdněn\" na %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autorizace na %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (dříve autorizován)"
 
 # XXX: This is e-mail header as literal. Dont't touch "Subject: " header name.
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: autentizace fetchmailu selhala na %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohl stáhnout poštu z %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -289,7 +299,7 @@ msgstr ""
 "fetchmail není schopen odlišit, protože server neposlal rozumnou chybovou\n"
 "hlášku."
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -308,7 +318,7 @@ msgstr ""
 "Démon fetchmail bude pokračovat v činnosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -327,60 +337,60 @@ msgstr ""
 "Démon fetchmail bude pokračovat v činnosti a při každém cyklu se pokusí\n"
 "připojit. Žádná další upozornění nebudou do obnovení služby zasílána."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okamžitě znovu kontroluji %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Neznámá chyba při přihlášení nebo autentizaci na %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Úspěšná autorizace na %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: Autentizace fetchmailu úspěšná na %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail se úspěšně přihlásil k %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Služba byla obnovena.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "vybírám nebo znovu kontroluji složku %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "vybírám nebo znovu kontroluji implicitní složku\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (složka %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Stahuji z %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -388,14 +398,14 @@ msgstr[0] "%d zpráva (%d %s) pro %s"
 msgstr[1] "%d zprávy (%d %s) pro %s"
 msgstr[2] "%d zpráv (%d %s) pro %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "přečtena"
 msgstr[1] "přečteny"
 msgstr[2] "přečteno"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -403,94 +413,94 @@ msgstr[0] "%d zpráva pro %s"
 msgstr[1] "%d zprávy pro %s"
 msgstr[2] "%d zpráv pro %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetů).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Žádná pošta pro %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "nesmyslný počet zpráv!"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "socketu"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "hlavičky RFC822"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "synchronizace mezi klientem a serverem"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "protokolu klient/server"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "zámku na serveru"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "transakce SMTP"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "hledání v DNS"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "nedefinovaná"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Chyba %s při stahování z %s@%s a doručování na SMTP stroj %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "neznámý"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Chyba %s při stahování z %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "příkaz po spojení selhal se stavem %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 není podporován.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 není podporován.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Přepínač --flush není s %s podporován\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Přepínač --all není s %s podporován\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Přepínač --limit nepodporuje argument %s\n"
@@ -516,7 +526,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -544,12 +555,15 @@ msgstr "gethostbyname pro %s selhalo\n"
 
 #: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Nemohu nalézt své vlastní jméno v databázi jmen strojů, abych jej mohl doplnit na celé jméno!\n"
+msgstr ""
+"Nemohu nalézt své vlastní jméno v databázi jmen strojů, abych jej mohl "
+"doplnit na celé jméno!\n"
 
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Zkusím pokračovat s nekvalifikovaným jménem stroje.\n"
@@ -621,14 +635,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Přepínač --check není s ETRN podporován.\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright © 2002, 2003 Eric S. Raymond\n"
-"Copyright © 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright © 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
 "Copyright © 2005–2006 Sunil Shetye\n"
 "Copyright © 2005–2007 Matthias Andree\n"
 
@@ -638,7 +655,8 @@ msgid ""
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 msgstr ""
-"Fetchmail nedává ABSOLUTNĚ ŽÁDNÉ ZÁRUKY. Toto je svobodné programové vybavení\n"
+"Fetchmail nedává ABSOLUTNĚ ŽÁDNÉ ZÁRUKY. Toto je svobodné programové "
+"vybavení\n"
 "a budeme rádi, když jej budete za jistých podmínek dále šířit. Podrobnosti\n"
 "naleznete v souboru COPYING v adresáři se zdrojovými kódy nebo dokumentací.\n"
 
@@ -700,13 +718,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail %s v %d byl zabit.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému počítači.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému "
+"počítači.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: nemohu stahovat ze zadaných serverů, když běží jiný fetchmail v %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: nemohu stahovat ze zadaných serverů, když běží jiný fetchmail v %"
+"d.\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -714,7 +739,8 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: v popředí běží jiný fetchmail v %d.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: neakceptuji přepínače, když na fetchmail běží na pozadí.\n"
 
 #: fetchmail.c:501
@@ -739,7 +765,9 @@ msgstr "Zadejte heslo pro %s@%s: "
 
 #: fetchmail.c:557 fetchmail.c:593
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Varování: syslog i soubor s protokolem jsou nastaveny. Záznamy hledejte v obou!\n"
+msgstr ""
+"fetchmail: Varování: syslog i soubor s protokolem jsou nastaveny. Záznamy "
+"hledejte v obou!\n"
 
 #: fetchmail.c:569
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
@@ -755,276 +783,295 @@ msgstr "spouštím démona fetchmail %s \n"
 msgid "could not open %s to append logs to \n"
 msgstr "nemohu otevřít %s, kam připojovat záznamy \n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nemohu zkontrolovat čas %s (chyba %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "znovu spouštím fetchmail (%s změněn)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus znovu se spustit může selhat, protože adresář nebyl obnoven\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus znovu spustit fetchmail selhal\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "stahování z %s přeskočeno (chyba autentizace nebo mnohokrát vypršel čas)\n"
+msgstr ""
+"stahování z %s přeskočeno (chyba autentizace nebo mnohokrát vypršel čas)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "ještě nenastal čas, neptám se %s\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav spojení=0 (SUCCESS)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav spojení=1 (NOMAIL)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav spojení=2 (SOCKET)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav spojení=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav spojení=4 (PROTOCOL)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav spojení=5 (SYNTAX)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav spojení=6 (IOERR)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav spojení=7 (ERROR)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav spojení=8 (EXCLUDE)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav spojení=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav spojení=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav spojení=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav spojení=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav spojení=13 (MAXFETCH)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav spojení=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Žádné ze spojení není aktivní. Končím.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "v %s spím na %d sekund\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "probuzen %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "probuzen signálem %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "probuzen v %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normální ukončení, stav %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "nemohu zkontrolovat čas konfiguračního souboru\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varování: počítač %s je v konfiguračním souboru zmíněn vícekrát\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: Chyba: záznam „defaults“ je v konfiguračním souboru zmíněn vícekrát.\n"
+msgstr ""
+"fetchmail: Chyba: záznam „defaults“ je v konfiguračním souboru zmíněn "
+"vícekrát.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL není podporováno.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Podpora pro KEBEROS v4 je nastavena, ale není zakompilována.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Podpora pro KEBEROS v5 je nastavena, ale není zakompilována.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Podpora pro GSSAPI je nastavena, ale není zakompilována.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: varování: není dostupné DNS pro kontrolu výběru společných schránek z %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: varování: není dostupné DNS pro kontrolu výběru společných "
+"schránek z %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "varování: společné schránky pro %s vyžadují přepínač envelope!\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
+msgstr ""
+"varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: chybná konfigurace %s, zadejte kladné číslo portu pro službu nebo port\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: chybná konfigurace %s, zadejte kladné číslo portu pro službu nebo "
+"port\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: Nastavení %s není platné, PROP vyžaduje privilegovaný port\n"
+msgstr ""
+"fetchmail: Nastavení %s není platné, PROP vyžaduje privilegovaný port\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMTP\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Jak fetchall, tak i keep jsou v démonu zapnuty nebo režim idle je chyba!\n"
+msgstr ""
+"Jak fetchall, tak i keep jsou v démonu zapnuty nebo režim idle je chyba!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukončen signálem %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování začato\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "Podpora POP2 není nastavena.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "Podpora POP3 není nastavena.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "Podpora IMAPu není nastavena.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "Podpora ETRN není nastavena.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "Podpora ODMR není nastavena.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "zvolen nepodporovaný protokol.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s se ptá %s (protokol %s) v %s: stahování dokončeno\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval stahování je %d sekund\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Soubor záznamů je %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Soubor ID je %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Zprávy o průběhu budou zaznamenávány pomocí syslogu\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail se bude skrývat a nebude generovat Received\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazovat tečky průběhu i v souborech záznamů.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail bude přeposílat špatně adresované zprávy ze společných schránek na %s.\n"
+msgstr ""
+"Fetchmail bude přeposílat špatně adresované zprávy ze společných schránek na "
+"%s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude chybové zprávy posílat postmasterovi.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude chybové zprávy posílat odesílateli.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Možnosti pro stahování z %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Pošta bude stahována z %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
@@ -1032,381 +1079,406 @@ msgstr[0] "  K stahování z tohoto serveru dojde každý %d interval.\n"
 msgstr[1] "  K stahování z tohoto serveru dojde každé %d intervaly.\n"
 msgstr[2] "  K stahování z tohoto serveru dojde každých %d intervalů.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skutečné jméno serveru je %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
-msgstr "  Pokud není zadán žádný počítač, nebude se stahovat z tohoto počítače.\n"
+msgstr ""
+"  Pokud není zadán žádný počítač, nebude se stahovat z tohoto počítače.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
-msgstr "  Pokud není zadán žádný počítač, bude se stahovat z tohoto počítače.\n"
+msgstr ""
+"  Pokud není zadán žádný počítač, bude se stahovat z tohoto počítače.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Bude požadováno heslo.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Tajemství APOP = \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\"\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " Protokol je KPOP s autentizací Kerberos %s"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr " Protokol je %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr "  (pomocí služby %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (pomocí implicitního portu)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr "  (vynuceně používám UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Budou vyzkoušeny všechny dostupné metody autentizace.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace heslem.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace MSN.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace NTLM.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace OTP.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace CRAM-Md5.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace GSSAPI.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V4.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Bude vynucena autentizace Kerberos V5.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Předpokládám šifrované spojení.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Principal poštovní služby je: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sezení šifrovaná s SSL povolena.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifikátu SSL povolena.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Adresář důvěryhodných certifikátů SSL: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Jméno serveru: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Otisk klíče SSL (porovnáván s klíčem serveru): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Čas čekání na odpověď serveru je %d sekund"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (implicitní).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Zvolena implicitní poštovní schránka.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Zvolené poštovní schránky jsou:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Budou staženy všechny zprávy (--all zapnuto).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Budou staženy jen nové zprávy (--all vypnuto).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stažené zprávy budou ponechány na serveru (--keep zapnuto).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stažené zprávy nebudou ponechány na serveru (--keep vypnuto).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Před začátkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
+msgstr ""
+"  Před začátkem stahování budou staré zprávy smazány (--flush zapnuto).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Před začátkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Před začátkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Před začátkem stahování budou příliš velké zprávy smazány (--limitflush zapnuto).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Před začátkem stahování budou příliš velké zprávy smazány (--limitflush "
+"zapnuto).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Před začátkem stahování nebudou příliš velké zprávy smazány (--limitflush vypnuto).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Před začátkem stahování nebudou příliš velké zprávy smazány (--limitflush "
+"vypnuto).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Přepisování adres místních naserveru je povoleno (--norewrite vypnuto).\n"
+msgstr ""
+"  Přepisování adres místních naserveru je povoleno (--norewrite vypnuto).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Přepisování adres místních naserveru je zakázáno (--norewrite zapnuto).\n"
+msgstr ""
+"  Přepisování adres místních naserveru je zakázáno (--norewrite zapnuto).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Mazání CR je povoleno (stripcr zapnuto).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Mazání CR je zakázáno (stripcr vypnuto).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vynucení CR je povoleno (forcecr zapnuto).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vynucení CR je zakázáno (forcecr vypnuto).\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dekódování MIME je povoleno (mimedecode zapnuto).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dekódování MIME je zakázáno (mimedecode vypnuto).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nečinnost po stahování je povolena (idle zapnuto).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nečinnost po stahování je zakázána (idle vypnuto).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit velikosti zprávy je %d oktetů (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Žádný limit velikosti zprávy (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Interval varování o velikosti zpráv je %d vteřin (--warnings %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varování o velikosti při každém stahování (--warnings 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit přijatých zpráv je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Žádný Limit přijatých (--fetchlimit 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit velikosti stahovaných zpráv je %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Hledat UID při každém stahování binárně (--fastuidl 1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "  Hledat UID při binárně při %d z %d stahování (--fastuidl %d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "  Hledat UID při každém stahování lineárně (--fastuidl 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit dávky zpráv SMTP je %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Žádný limit dávky zpráv SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Interval odstraňování mezi čištěním vynucen na %d (--expunge %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Žádná vynucená čištění (--expunge 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domény, pro které se bude stahovat pošta, jsou:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (implicitní)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Zprávy budou připojeny k %s jako BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Zprávy budou doručeny pomocí \"%s\".\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Zprávy budou přeposlány pomocí %cMTP na:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Název počítače v řádku MAIL FROM bude %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
+msgstr ""
+"  Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznávané odpovědi serveru blokující spam jsou:"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Blokování spamu zakázáno\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Připojení k serveru bude navázáno pomocí \"%s\"\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Žádný příkaz před spojením.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Připojení k serveru bude ukončeno pomocí \"%s\"\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Žádný příkaz po spojení.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nedeklarována žádná místní jména tohoto počítače.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Režim společných schránek: "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Režim soukromých schránek: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
@@ -1414,109 +1486,119 @@ msgstr[0] "Rozpoznáváno %d místní jméno.\n"
 msgstr[1] "Rozpoznávána %d místní jména.\n"
 msgstr[2] "Rozpoznáváno %d místních jmen.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy společných schránek je povoleno.s\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Vyhledávání DNS jmen pro adresy společných schránek je zakázáno.\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Přezdívky serveru budou porovnávány s adresami společných schránek podle IP adres.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Přezdívky serveru budou porovnávány s adresami společných schránek podle "
+"IP adres.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  Přezdívky serveru budou porovnávány s adresami společných schránek podle názvu.\n"
+msgstr ""
+"  Přezdívky serveru budou porovnávány s adresami společných schránek podle "
+"názvu.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Předpokládá se, že hlavička obálky je: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Počet hlaviček obálky, které budou přeskočeny: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Předpona %s bude odtržena od id uživatele\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Žádné odtrhávání předpony\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Deklarované přezdívky poštovního serveru:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Místní domény:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojení musí procházet přes %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Nezadán žádný požadavek na rozhraní.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Stahovací smyčka bude sledovat %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Nezadáno žádné sledované rozhraní.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
+msgstr ""
+"  Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Nezadán žádný příkaz zásuvného modulu.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Připojení k posluchači budou navazovány zásuvným modulem %s (--plugout %s).\n"
+msgstr ""
+"  Připojení k posluchači budou navazovány zásuvným modulem %s (--plugout %"
+"s).\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Nezadán žádný příkaz výstupního zásuvného modulu.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Z tohoto počítače neukládána žádná UID.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Ukládáno %d UID.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr "  Informace pro sledování stahování budou přidány do hlavičky Received.\n"
+msgstr ""
+"  Informace pro sledování stahování budou přidány do hlavičky Received.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-msgstr "  Informace pro sledování stahování nebudou přidány do hlavičky Received.\n"
+msgstr ""
+"  Informace pro sledování stahování nebudou přidány do hlavičky Received.\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Předávané vlastnosti \"%s\".\n"
@@ -1606,43 +1688,43 @@ msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "po stahování budu nečinný\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: přechod do TLS uspěl.\n"
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: přechod do TLS se nezdařil.\n"
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokračovat\n"
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:662
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mazání zpráv se neshoduje (%d ve skutečnosti != %d očekáváno)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1650,11 +1732,11 @@ msgstr[0] "%d zpráva čeká po opětovném stahování\n"
 msgstr[1] "%d zprávy čekají po opětovném stahování\n"
 msgstr[2] "%d zpráv čeká po opětovném stahování\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1662,11 +1744,11 @@ msgstr[0] "%d zpráva čeká po prvním stahování\n"
 msgstr[1] "%d zprávy čekají po prvním stahování\n"
 msgstr[2] "%d zpráv čeká po prvním stahování\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "čištění selhalo\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1674,23 +1756,25 @@ msgstr[0] "%d zpráva čeká po vyčištění\n"
 msgstr[1] "%d zprávy čekají po vyčištění\n"
 msgstr[2] "%d zpráv čeká po vyčištění\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepřečtených zpráv selhalo\n"
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu nebyla přečtena\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepřečtená\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1882,362 +1966,390 @@ msgstr "od serveru přijato fatální\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Nemohu dekódovat výzvu OTP\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Řetězec '%s' není platné číslo.\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota řetězce '%s' je %s než %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "menší"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "větší"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Zadán neplatný protokol `%s'.\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Zadána neplatná autentizace `%s'.\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "použití: fetchmail [přepínače] [server ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Přepínače jsou následující:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobrazit tuto nápovědu k přepínačům\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobrazit informace o verzi\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       zkontrolovat zprávy bez stahování\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracovat potichu\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracovat hlasitě (diagnostický výstup)\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spustit jako démona jednou za n sekund\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodpojovat proces démona\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabít proces démona\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     název souboru se záznamem\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      používat syslog(3) pro většinu zpráv při běhu jako démon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      používat syslog(3) pro většinu zpráv při běhu jako "
+"démon\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   nezapisovat Received a povolit podvržení počítače\n"
+msgstr ""
+"      --invisible   nezapisovat Received a povolit podvržení počítače\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc alternativní konfigurační soubor\n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      alternativní soubor UID\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     alternativní soubor PID (zámek)\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  nouzový příjemce pošty\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    přesměrovat vracené zprávy od uživatele postmasterovi.\n"
+msgstr ""
+"      --nobounce    přesměrovat vracené zprávy od uživatele postmasterovi.\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   vyžadované rozhraní\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     sledovat aktivitu rozhraní\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         povolit sezení šifrované ssl\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      soubor se soukromým klíčem ssl\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certifikát ssl klienta\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   přísně ověřovat certifikát serveru (doporučeno)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath cesta k certifikátům ssl\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint otisk, který musí odpovídat certifikátu serveru.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
 
-#: options.c:615
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint otisk, který musí odpovídat certifikátu serveru.\n"
+
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    vynutí protokol SSL (SSL2/SSL3/TLS1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      externí příkaz pro otevření spojení\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     externí příkaz pro otevření spojení smtp\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    protokol pro stahování (viz manuálovou stránku)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        vnutit používání UIDL (jen pop3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        TCP port, kam se připojovat (zastaralé, použijte --service)\n"
+msgstr ""
+"      --port        TCP port, kam se připojovat (zastaralé, použijte --"
+"service)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     TCP služba, kam se připojit (smí být číselný TCP port)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     TCP služba, kam se připojit (smí být číselný TCP port)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        typ autentizace (password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     čas čekání na odpověď serveru\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    hlavička adresy z obálky\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr "  -Q, --qvirtual    předpona, kterou odstranit z místního id uživatelů\n"
+msgstr ""
+"  -Q, --qvirtual    předpona, kterou odstranit z místního id uživatelů\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal poštovní služby\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  přidat informace pro sledování stahování do hlavičky Received\n"
+msgstr ""
+"      --tracepolls  přidat informace pro sledování stahování do hlavičky "
+"Received\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    jméno uživatele na serveru\n"
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  stáhnout staré i nové zprávy\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      odstranit nové zprávy po stažení\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ponechat nové zprávy po stažení\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       odstranit staré zprávy ze serveru\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  odstranit příliš velké zprávy\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   nepřepisovat adresy v hlavičkách\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       nestahovat zprávy překračující zadanou velikost\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval zasílání varovných zpráv\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    počítač pro přeposílání SMTP\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains stahovat poštu pro zadané domény\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpadress  používaná doména SMTP při doručování\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    nastavit plné jméno SMTP jméno@doména\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    nastavit hodnoty antispamových odpovědí\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  nastavit limit dávkování pro spojení SMTP\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  nastavit limit stahování pro připojení k serveru\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit nastavit limit velikosti stahovaných zpráv\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    hledat UIDL binárně\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     nastavit maximální počet odstraňování mezi čištěními\n"
+msgstr ""
+"  -e, --expunge     nastavit maximální počet odstraňování mezi čištěními\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         nastavit MDA, který používat pro přeposílání\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       nastavit výstupní soubor BSMTP\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        pro doručení používat LMTP (RFC2033)\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      název vzdálené složky\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    zobrazovat tečky průběhu i v souborech se záznamy\n"
+msgstr ""
+"      --showdots    zobrazovat tečky průběhu i v souborech se záznamy\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "VAROVÁNÍ: Nalezen „Maillennium POP3/PROXY server“, použiji příkaz RETR namísto TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"VAROVÁNÍ: Nalezen „Maillennium POP3/PROXY server“, použiji příkaz RETR "
+"namísto TOP.\n"
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "Pro tuto relaci je TLS povinné, ale server odmítl příkaz CAPA.\n"
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Avšak příkaz CAPA je pro TLS nutný.\n"
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokračovat.\n"
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr "Vyčerpali jsme všechny povolené autentikátory, a tak nemůžeme pokračovat.\n"
+msgstr ""
+"Vyčerpali jsme všechny povolené autentikátory, a tak nemůžeme pokračovat.\n"
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Požadovaný časový údaj APOP nebyl v pozdravu nalezen\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaktická chyba v časovém údaji z pozdravu\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "Neplatné časové razítko APOPu.\n"
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "zamčeno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Odpověď UIDL ze nadřazeného serveru nelze obsloužit.\n"
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server odpověděl s UID chybné zprávy.\n"
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla přečtena\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Přepínač --folder není s POP3 podporován\n"
 
@@ -2250,32 +2362,39 @@ msgid "SDPS not enabled."
 msgstr "SDPS není povoleno."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: přepínač interface je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: přepínač interface je podporován jen v Linuxu (bez IPv6) a "
+"FreeBSD\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: přepínač monitor je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: přepínač monitor je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL není povoleno"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "konec vstupu"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Soubor %s musí být obyčejný soubor.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Soubor %s nesmí mít oprávnění více než -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Musíte vlastnit soubor %s.\n"
@@ -2582,7 +2701,8 @@ msgstr "MDA vrátil nenulový stav %d\n"
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Záhada: MDA pclose vrátil %d a errno %d/%s, nezle zpracovat v %s:%d\n"
 
 #: sink.c:1377
@@ -2702,113 +2822,113 @@ msgstr "spojení k %s:%s [%s/%s] selhalo: %s.\n"
 msgid "connected.\n"
 msgstr "spojeno.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizace vydavatele: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Varování: Název organizace vydavatele příliš dlouhý (možná zkrácen).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Neznámá organizace\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Jméno vydavatele: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Varování: Jméno vydavatele příliš dlouhé (možná zkráceno).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Neznámé jméno vydavatele\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Jméno serveru: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Špatný certifikát: Jméno předmětu příliš dlouhé!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Jméno serveru neodpovídá: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Jméno serveru nenastaveno, nemohu ověřit certifikát!\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Neznámé jméno serveru\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Jméno serveru není v certifikátu zadáno!\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() selhalo!\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Nedostatek paměti!\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Vyrovnávací paměť textu digestu příliš malá!\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "otisk klíče %s: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "otisky %s odpovídají.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "otisky %s neodpovídají.\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Chyba ověřování certifikátu serveru: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "neznámý vydavatel (prvních %d znaků): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Deskriptor souboru mimo rozsah pro SSL"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Zadán neplatný protokol SSL `%s', používám implicitní (SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Ověření certifikátu/otisku bylo nějak přeskočeno!\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Další pokus čtení ze socketu Cygwin\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Další pokus čtení ze socketu Cygwin selhal!\n"
 
@@ -2937,30 +3057,31 @@ msgstr "neprohazuji seznamy UID, při tomto dotazu nebyla vidět žádná UID\n"
 msgid "discarding new UID list\n"
 msgstr "zahazuji nový seznam UID\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Odstraňuji soubor fetchids.\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Chyba při odstraňování %s. %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Zapisuji soubor fetchids.\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Chyba při zápisu do souboru fetchids %s, starý soubor ponechán na místě.\n"
+msgstr ""
+"Chyba při zápisu do souboru fetchids %s, starý soubor ponechán na místě.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Nemohu přejmenovat soubor fetchids %s na %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Nemohu otevřít soubor fetchids %s pro zápis: %s\n"
diff --git a/po/da.po b/po/da.po
index 1e220c54..27b40d7d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
-"POT-Creation-Date: 2003-08-13 04:24-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2003-09-02 20:21+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -13,20 +14,25 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Tjekker om %s virkelig er samme maskine som %s\n"
 
-#: checkalias.c:175
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "Ja, deres IP-adresser stemmer overens\n"
 
-#: checkalias.c:179
+#: checkalias.c:182
 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:198
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr "navneserverfejl ved opslag p� \"%s\" ved pr�vning af %s.\n"
+
+#: checkalias.c:223
 #, 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"
@@ -45,135 +51,148 @@ msgstr "afkodet som %s\n"
 msgid "kerberos error %s\n"
 msgstr "kerberosfejl %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:249 driver.c:254
 #, 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:335
+msgid "Subject: Fetchmail oversized-messages warning"
 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"
-msgstr "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+#: driver.c:339
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
+msgstr "afhentningsgr�nse %d n�et; %d breve tilbage p� server %s konto %s\n"
 
-#: driver.c:450
+#: driver.c:343
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
+msgstr "afhentningsgr�nse %d n�et; %d breve tilbage p� server %s konto %s\n"
+
+#: driver.c:362
+#, fuzzy, c-format
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+msgstr[1] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+
+#: driver.c:367
+#, fuzzy, c-format
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+msgstr[1] "\t%d. brev, %d oktetter lang, sprunget over af fetchmail.\n"
+
+#: driver.c:503
+#, fuzzy, c-format
+msgid "skipping message %s@%s:%d"
+msgstr "Springer brev %s@%s:%d over (%d oktetter)"
+
+#: driver.c:557
 #, 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:466
+#: driver.c:573
 msgid " (length -1)"
 msgstr " (l�ngde -1)"
 
-#: driver.c:469
+#: driver.c:576
 msgid " (oversized)"
 msgstr " (for langt)"
 
-#: driver.c:484
+#: driver.c:594
 #, 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:501
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "l�ser brev %s@%s:%d af %d"
 
-#: driver.c:506
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:616
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %soktetter)"
 
-#: driver.c:507
-msgid "header "
-msgstr "brevhoved-"
+#: driver.c:617
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:579
-#, c-format
-msgid " (%d body octets) "
+#: driver.c:685
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (%d oktetter i brevkrop)"
 
-#: driver.c:637
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+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:667
+#: driver.c:777
 msgid " retained\n"
 msgstr " bevaret\n"
 
-#: driver.c:676
+#: driver.c:787
 msgid " flushed\n"
 msgstr " slettet\n"
 
-#: driver.c:693
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " ikke slettet\n"
 
-#: driver.c:709
-#, 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:769
-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:822
+#, fuzzy, c-format
+msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "afhentningsgr�nse %d n�et; %d breve tilbage p� server %s konto %s\n"
+msgstr[1] "afhentningsgr�nse %d n�et; %d breve tilbage p� server %s konto %s\n"
 
-#: driver.c:776
+#: driver.c:879
 #, 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:780
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten p� server %s.\n"
 
-#: driver.c:784
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tidsafbrud efter %d sekunders venten p� %s.\n"
 
-#: driver.c:789
+#: driver.c:892
 #, 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:792
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tidsafbrud efter %d sekunder.\n"
 
-#: driver.c:804
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:907
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail har gentagne tidsafbrud\n"
 
-#: driver.c:806
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail fik mere end %d tidsafbrud ved forsoeg paa at hente post fra %s@%"
+"s.\n"
 
-#: driver.c:811
+#: driver.c:914
 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"
@@ -188,106 +207,101 @@ msgstr ""
 "\n"
 "Fetchmail vil ikke proeve den brevbakke igen foer du genstarter den.\n"
 
-#: driver.c:841
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "forbindelseskommando mislykkedes med status %d\n"
 
-#: driver.c:872
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kunne ikke finde HESIOD-postboks for %s\n"
 
-#: driver.c:894
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "F�rer-server har ikke noget navn.\n"
 
-#: driver.c:917
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#: driver.c:1008
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "kunne ikke finde kanonisk DNS-navn for %s (%s)\n"
 
-#: driver.c:954
-msgid "internal inconsistency\n"
-msgstr "intern uoverensstemmelse\n"
-
-#: driver.c:964
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-forbindelse til %s mislykkedes"
 
-#: driver.c:970
-msgid "host is unknown."
-msgstr "v�rten er ukendt."
-
-#: driver.c:973
-msgid "name is valid but has no IP address."
-msgstr "navnet er gyldigt, men har ingen IP-adresse."
-
-#: driver.c:976
-msgid "unrecoverable name server error."
-msgstr "uoprettelig navneserverfejl."
-
-#: driver.c:978
-msgid "temporary name server error."
-msgstr "midlertidig navneserverfejl."
-
-#: driver.c:985
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "ukendt DNS-fejl %d."
-
-#: driver.c:1003
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#: driver.c:1071
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetchmail-advarsel om utilgaengelig server.\n"
 "\n"
 "Fetchmail kunne ikke naa postserveren %s:"
 
-#: driver.c:1032 imap.c:365 pop3.c:410
+#: driver.c:1073
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
+
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL-forbindelse mislykkedes.\n"
 
-#: driver.c:1085
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "L�s optaget-fejl p� %s@%s\n"
 
-#: driver.c:1089
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server optaget-fejl p� %s@%s\n"
 
-#: driver.c:1094
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Godkendelsesfejl p� %s@%s%s\n"
 
-#: driver.c:1097
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (tidligere godkendt)"
 
-#: driver.c:1118
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#: driver.c:1187
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail - godkendelse mislykkedes paa %s@%s\n"
 
-#: driver.c:1121
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kunne ikke hente post fra %s@%s.\n"
 
-#: driver.c:1125
+#: driver.c:1195
+#, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+"Forsoeget paa at opnaa adgangstilladelse mislykkedes.\n"
+"Da der tidligere er opnaaet adgangstilladelelse for denne forbindelse,\n"
+"skyldes dette sandsynligvis en anden fejl (saasom optaget server) som\n"
+"fetchmail ikke kan se fordi serveren ikke sendte en ordentlig fejl-\n"
+"meddelelse.\n"
+"\n"
+"Hvis du imidlertid HAR aendret din kontoopsaetning efter at fetchmail-\n"
+"daemonen blev startet, er det noedvendigt at stoppe daemonen, aendre din\n"
+"opsaetning og s� genstarte daemonen.\n"
+"\n"
+"Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
+"Der vil ikke blive flere meddelelser foer servicen er genetableret."
+
+#: driver.c:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -310,7 +324,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:1140
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -329,171 +343,175 @@ msgstr ""
 "Fetchmail-daemonen vil fortsat koere og forsoege at lave forbindelse.\n"
 "Der vil ikke blive flere meddelelser foer servicen er genetableret."
 
-#: driver.c:1155
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Pr�ver straks igen %s@%s\n"
 
-#: driver.c:1160
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Ukendt indlognings- eller godkendelsesfejl p� %s@%s\n"
 
-#: driver.c:1184
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Godkendelse i orden p� %s@%s\n"
 
-#: driver.c:1190
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1262
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail - godkendelse i orden paa %s@%s\n"
 
-#: driver.c:1193
+#: driver.c:1266
 #, 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:1197
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Servicen er blevet reetableret.\n"
 
-#: driver.c:1228
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "v�lger eller pr�ver igen brevbakke %s\n"
 
-#: driver.c:1230
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "v�lger eller pr�ver igen indbakken\n"
 
-#: driver.c:1246
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ved %s (brevbakke %s)"
 
-#: driver.c:1254 rcfile_y.y:395
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#. only used for ETRN
-#: driver.c:1259
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Pr�ver %s\n"
 
-#: driver.c:1263
-#, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr "%d %s (%d %s) til %s"
-
-#: driver.c:1264 driver.c:1271
-msgid "messages"
-msgstr "breve"
-
-#: driver.c:1265 driver.c:1272
-msgid "message"
-msgstr "brev"
+#: driver.c:1328
+#, fuzzy, c-format
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] "%d %s (%d %s) til %s"
+msgstr[1] "%d %s (%d %s) til %s"
 
-#: driver.c:1267
+#: driver.c:1331
+#, fuzzy
 msgid "seen"
-msgstr "gamle"
+msgid_plural "seen"
+msgstr[0] "gamle"
+msgstr[1] "gamle"
 
-#: driver.c:1270
-#, c-format
-msgid "%d %s for %s"
-msgstr "%d %s til %s"
+#: driver.c:1334
+#, 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:1276
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetter).\n"
 
-#: driver.c:1282
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ingen post til %s\n"
 
-#: driver.c:1345
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "falsk brev-tal!"
 
-#: driver.c:1459
+#: driver.c:1522
 msgid "socket"
 msgstr "sokkel"
 
-#: driver.c:1462
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "manglende eller forkert RFC 822-brevhoved-"
 
-#: driver.c:1465
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA-"
 
-#: driver.c:1468
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "klient/server-synkroniserings"
 
-#: driver.c:1471
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "klient/server-protokol"
 
-#: driver.c:1474
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "server l�st-"
 
-#: driver.c:1477
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "SMTP-transaktions"
 
-#: driver.c:1480
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "DNS-opslags"
 
-#: driver.c:1483
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "udefineret fejl\n"
 
-#: driver.c:1494
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1552
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%sfejl ved levering til SMTP-v�rt fra %s\n"
 
-#: driver.c:1496
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1554
+#, fuzzy
+msgid "unknown"
+msgstr "v�rten er ukendt."
+
+#: driver.c:1556
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%sfejl ved hentning fra %s\n"
 
-#: driver.c:1504
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "afslutningskommando fejlede med kode %d\n"
 
-#: driver.c:1525
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "ikke oversat med Kerberos V4-st�tte.\n"
 
-#: driver.c:1533
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "ikke oversat med Kerberos V5-st�tte.\n"
 
-#: driver.c:1544
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Tilvalg --flush er ikke underst�ttet med %s\n"
 
-#: driver.c:1550
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Tilvalg --all er ikke underst�ttet med %s\n"
 
-#: driver.c:1558
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Tilvalg --limit er ikke underst�ttet med %s\n"
 
-#: env.c:60
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -508,12 +526,13 @@ msgstr ""
 "Pr�v \"env QMAILINJECT= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:72
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -524,7 +543,7 @@ msgstr ""
 "Pr�v \"env NULLMAILER_FLAGS= %s DINE ARGUMENTER HER\"\n"
 "%s: afbryder.\n"
 
-#: env.c:84
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Du findes ikke.  Fjern dig.\n"
@@ -534,59 +553,67 @@ msgstr "%s: Du findes ikke.  Fjern dig.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: kan ikke bestemme din v�rtsmaskine!"
 
-#: env.c:161
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname fejlede for %s\n"
 
-#: etrn.c:47 odmr.c:59
+#: env.c:170
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:174
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "%s's SMTP-modtager underst�tter ikke ESMTP\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "%s's SMTP-modtager underst�tter ikke ETRN\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "K� for %s startet\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "Ingen breve venter p� %s\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 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
+#: etrn.c:94
 #, 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
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Maskine %s ikke tilladt: %s\n"
 
-#. Syntax Error
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "ETRN-syntaksfejl\n"
 
-#. Syntax Error in Parameters
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "ETRN-syntaksfejl i parametre\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "Ukendt ETRN-fejl %d\n"
@@ -600,849 +627,991 @@ msgid "Option --flush is not supported with ETRN\n"
 msgstr "Tilvalg --flush er ikke underst�ttet med ETRN\n"
 
 #: etrn.c:162
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "Tilvalg --remote er ikke underst�ttet med ETRN\n"
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "Tilvalg --flush er ikke underst�ttet med ETRN\n"
 
 #: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Tilvalg --check er ikke underst�ttet med ETRN\n"
 
-#: fetchmail.c:156
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: kaldt med"
 
-#: fetchmail.c:180
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "kunne ikke f� det nuv�rende arbejdskatalog\n"
 
-#: fetchmail.c:190
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dette er fetchmail udgave %s"
 
-#: fetchmail.c:331
+#: fetchmail.c:395
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Bruger tilvalg fra kommandolinje%s%s\n"
 
-#: fetchmail.c:332
+#: fetchmail.c:396
 msgid " and "
 msgstr " og "
 
-#: fetchmail.c:337
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Ingen postservere sat op - m�ske mangler %s?\n"
 
-#: fetchmail.c:358
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ingen postservere er blevet specificeret.\n"
 
-#: fetchmail.c:367 fetchmail.c:376
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ingen anden fetchmail k�rer\n"
 
-#: fetchmail.c:382
+#: fetchmail.c:440
 #, 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:383 fetchmail.c:389
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "baggrunds"
 
-#: fetchmail.c:383 fetchmail.c:389
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "forgrunds"
 
-#: fetchmail.c:388
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %sfetchmail p� %d dr�bt.\n"
 
-#: fetchmail.c:404
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: kan ikke tjekke post mens en anden fetchmail til samme v�rt k�rer.\n"
+#: fetchmail.c:472
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: kan ikke tjekke post mens en anden fetchmail til samme v�rt "
+"k�rer.\n"
 
-#: fetchmail.c:410
+#: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: kan ikke pr�ve de specificerede v�rter mens en anden fetchmail k�rer p� %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: kan ikke pr�ve de specificerede v�rter mens en anden fetchmail "
+"k�rer p� %d.\n"
 
-#: fetchmail.c:417
+#: fetchmail.c:485
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: en anden forgrundsfetchmail k�rer p� %d.\n"
 
-#: fetchmail.c:427
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+#: fetchmail.c:495
+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:433
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: baggrunds fetchmail p� %d v�kket.\n"
 
-#: fetchmail.c:445
+#: fetchmail.c:513
 #, 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:460
+#: fetchmail.c:528
 #, 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:466
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Angiv kodeord for %s@%s: "
 
-#: fetchmail.c:497
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: advarsel: DNS er ikke tilg�ngelig til at tjekke flermodtager-"
+"afhentninger fra %s\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: ingen anden fetchmail k�rer\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starter fetchmail %s-d�mon\n"
 
-#: fetchmail.c:512 fetchmail.c:514
+#: fetchmail.c:589 fetchmail.c:591
 #, 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:552
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kunne ikke tidsf�ste %s (fejl %d)\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "genstarter fetchmail (%s �ndret)\n"
 
-#: fetchmail.c:562
+#: fetchmail.c:644
 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"
+msgstr ""
+"fors�g p� at genstarte kan mislykkes da kataloget ikke er genoprettet\n"
 
-#: fetchmail.c:589
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fors�g p� at genstarte fetchmail fejlede\n"
 
-#: fetchmail.c:617
+#: fetchmail.c:701
 #, 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"
+msgstr ""
+"pr�ve af %s droppet (mislykket godkendelse eller for mange tidsafbrud)\n"
 
-#: fetchmail.c:629
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval ikke n�et, sp�rger ikke %s\n"
 
-#: fetchmail.c:660
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sp�rgestatus=0 (succes)\n"
 
-#: fetchmail.c:662
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sp�rgestatus=1 (ingen post)\n"
 
-#: fetchmail.c:664
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sp�rgestatus=2 (sokkelfejl)\n"
 
-#: fetchmail.c:666
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sp�rgestatus=3 (godkendelsesfejl)\n"
 
-#: fetchmail.c:668
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sp�rgestatus=4 (protokolfejl)\n"
 
-#: fetchmail.c:670
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sp�rgestatus=5 (syntaksfejl)\n"
 
-#: fetchmail.c:672
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sp�rgestatus=6 (I/O-fejl)\n"
 
-#: fetchmail.c:674
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sp�rgestatus=7 (serverfejl)\n"
 
-#: fetchmail.c:676
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sp�rgestatus=8 (eksklusionsfejl)\n"
 
-#: fetchmail.c:678
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sp�rgestatus=9 (l�s optaget)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sp�rgestatus=10 (SMTP-fejl)\n"
 
-#: fetchmail.c:682
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Sp�rgestatus=11 (DNS-fejl)\n"
 
-#: fetchmail.c:684
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sp�rgestatus=12 (BSMTP-fejl)\n"
 
-#: fetchmail.c:686
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sp�rgestatus=13 (afhentningsgr�nse n�et)\n"
 
-#: fetchmail.c:688
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sp�rgestatus=%d\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle forbindelser er afbrudte.  Afbryder.\n"
 
-#: fetchmail.c:741
-#, c-format
-msgid "sleeping at %s\n"
+#: fetchmail.c:828
+#, fuzzy, c-format
+msgid "sleeping at %s for %d seconds\n"
 msgstr "sover %s\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "v�kket af %s\n"
 
-#: fetchmail.c:768
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "v�kket af signal %d\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "v�kket %s\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal afslutning, status %d\n"
 
-#: fetchmail.c:930
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "kunne ikke tidsf�ste k�rselskontrolfilen\n"
 
-#: fetchmail.c:963
+#: fetchmail.c:1054
 #, 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:1105
+#: fetchmail.c:1087
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr "Advarsel: flere forekomster af v�rt %s i konfigurationsfil\n"
+
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
 
-#: fetchmail.c:1136
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "ikke konfigureret med SSL-underst�ttelse.\n"
+
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: advarsel: DNS er ikke tilg�ngelig til at tjekke flermodtager-afhentninger fra %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: advarsel: DNS er ikke tilg�ngelig til at tjekke flermodtager-"
+"afhentninger fra %s\n"
 
-#: fetchmail.c:1153
+#: fetchmail.c:1269
 #, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1270
+msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
+msgstr ""
+
+#: fetchmail.c:1287
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "konfiguration af %s forkert, portnummer kan ikke v�re negativt\n"
 
-#: fetchmail.c:1160
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1294
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "konfiguration af %s forkert, RPOP kr�ver en privilegeret port\n"
 
-#: fetchmail.c:1176
+#: fetchmail.c:1312
 #, 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:1191
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Brug af b�de fetchall og keep som d�mon er en fejl!\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "afsluttet med signal %d\n"
 
-#: fetchmail.c:1326
+#: fetchmail.c:1424
 #, 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:1351
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "ikke konfigureret med POP2-underst�ttelse.\n"
 
-#: fetchmail.c:1363
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "ikke konfigureret med POP3-underst�ttelse.\n"
 
-#: fetchmail.c:1373
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "ikke konfigureret med IMAP-underst�ttelse.\n"
 
-#: fetchmail.c:1379
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "ikke konfigureret med ETRN-underst�ttelse.\n"
 
-#: fetchmail.c:1385
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "Kan ikke underst�tte ETRN uden gethostbyname(2).\n"
-
-#: fetchmail.c:1392
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "ikke konfigureret med ODMR-underst�ttelse.\n"
 
-#: fetchmail.c:1398
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "Kan ikke underst�tte ODMR uden gethostbyname(2).\n"
-
-#: fetchmail.c:1404
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "ikke-underst�ttet protokol valgt.\n"
 
-#: fetchmail.c:1414
+#: fetchmail.c:1502
 #, 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:1431
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Pr�vemellemrum er %d sekunder\n"
 
-#: fetchmail.c:1433
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfil er %s\n"
 
-#: fetchmail.c:1435
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Id-fil er %s\n"
 
-#: fetchmail.c:1438
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Forl�bsbeskeder vil blive logget vha. syslog\n"
 
-#: fetchmail.c:1441
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail vil forstille sig og ikke generere Received\n"
 
-#: fetchmail.c:1443
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail vil vise forl�bsprikker selv i logfiler.\n"
 
-#: fetchmail.c:1445
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
+msgstr ""
+"Fetchmail vil i flermodtager-tilstand levere fejladresserede breve til %s.\n"
 
-#: fetchmail.c:1449
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail vil rette fejlbreve til postmesteren.\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail vil rette fejlbreve til afsenderen.\n"
 
-#: fetchmail.c:1458
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tilvalg for modtagelse fra %s@%s:\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post vil blive modtaget via %s\n"
 
-#: fetchmail.c:1465
-#, 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:1553
+#, fuzzy, c-format
+msgid "  Poll of this server will occur every %d interval.\n"
+msgid_plural "  Poll of this server will occur every %d intervals.\n"
+msgstr[0] "  Pr�vning af denne server vil ske hvert %d. sekund.\n"
+msgstr[1] "  Pr�vning af denne server vil ske hvert %d. sekund.\n"
 
-#: fetchmail.c:1468
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Serverens sande navn er %s.\n"
 
-#: fetchmail.c:1470
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1560
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Denne v�rt %s blive forespurgt n�r ingen v�rt er specificeret.\n"
 
-#: fetchmail.c:1471 fetchmail.c:1586 fetchmail.c:1589
-msgid "will not"
-msgstr "vil ikke"
-
-#: fetchmail.c:1471 fetchmail.c:1586 fetchmail.c:1589
-msgid "will"
-msgstr "vil"
+#: fetchmail.c:1561
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Denne v�rt %s blive forespurgt n�r ingen v�rt er specificeret.\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Der vil blive spurgt efter kodeord.\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-hemmlighed = \"%s\".\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-id = \"%s\".\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Kodeord = \"%s\".\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol er KPOP med Kerberos %s-godkendelse"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol er %s"
 
-#: fetchmail.c:1504
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (bruger service %s)"
 
-#: fetchmail.c:1506
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (bruger netv�rkssikkerhedstilvalg %s)"
-
-#: fetchmail.c:1509
-#, c-format
-msgid " (using port %d)"
-msgstr " (bruger port %d)"
-
-#: fetchmail.c:1512
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (bruger standardport)"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (fremtvinger UIDL-brug)"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle tilg�ngelige godkendelsesmetoder vil blive fors�gt.\n"
 
-#: fetchmail.c:1523
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Kodeordsgodkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1526
+#: fetchmail.c:1605
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM-godkendelse er p�kr�vet.\n"
+
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1529
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1535
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-godkendelse er p�kr�vet.\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Antager brug af krypteret forbindelse.\n"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Fuldmagtsgiver for postservice er: %s\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Vil bruge SSL-kryptering.\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokol: %s\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-servercertifikat tjekkes.\n"
 
-#: fetchmail.c:1557
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Katalog for SSL-certifikater: %s\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Servers almennavn %s\n"
+
+#: fetchmail.c:1644
 #, 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:1563
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Venter p� svar fra server i h�jst %d sekunder"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (standard).\n"
 
-#: fetchmail.c:1572
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Indbakken valgt.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Udvalgte brevbakker er:"
 
-#: fetchmail.c:1582
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1667
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1583
-msgid "All"
-msgstr "Alle"
+#: fetchmail.c:1668
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s breve vil blive hentet (--all %s).\n"
 
-#: fetchmail.c:1583
-msgid "Only new"
-msgstr "Kun nye"
+#: fetchmail.c:1670
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Hentede breve %s blive gemt p� serveren (--keep %s).\n"
 
-#: fetchmail.c:1585
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1671
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Hentede breve %s blive gemt p� serveren (--keep %s).\n"
 
-#: fetchmail.c:1588
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1673
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
 
-#: fetchmail.c:1591
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1674
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
+
+#: fetchmail.c:1676
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
+
+#: fetchmail.c:1677
+#, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr "  Gamle breve %s blive slettede f�r afhentning (--flush %s).\n"
+
+#: fetchmail.c:1679
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1592 fetchmail.c:1595 fetchmail.c:1598 fetchmail.c:1601
-#: fetchmail.c:1604 fetchmail.c:1607 fetchmail.c:1740
-msgid "enabled"
-msgstr "sl�et til"
+#: fetchmail.c:1680
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  Omskrivning af serverlokale adresser er %s (--norewrite %s).\n"
 
-#: fetchmail.c:1592 fetchmail.c:1595 fetchmail.c:1598 fetchmail.c:1601
-#: fetchmail.c:1604 fetchmail.c:1607 fetchmail.c:1740
-msgid "disabled"
-msgstr "sl�et fra"
+#: fetchmail.c:1682
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1594
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1683
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Fjernelse af vognreturtegn er %s (stripcr %s).\n"
 
-#: fetchmail.c:1597
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1685
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Inds�ttelse af vognreturtegn er %s (forcecr %s).\n"
 
-#: fetchmail.c:1600
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+#: fetchmail.c:1686
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Inds�ttelse af vognreturtegn er %s (forcecr %s).\n"
+
+#: fetchmail.c:1688
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
 
-#: fetchmail.c:1603
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1689
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Fortolkning af Content-Transfer-Encoding er %s (pass8bit %s).\n"
+
+#: fetchmail.c:1691
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
 
-#: fetchmail.c:1606
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1692
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
+msgstr "  MIME-afkodning er %s (mimedecode %s).\n"
+
+#: fetchmail.c:1694
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Tomgang efter pr�vning er %s (idle %s).\n"
 
-#: fetchmail.c:1609
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1695
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
+msgstr "  Tomgang efter pr�vning er %s (idle %s).\n"
+
+#: fetchmail.c:1697
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1610 fetchmail.c:1613
-msgid "discarded"
-msgstr "slettet"
+#: fetchmail.c:1698
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Ikke-tomme statuslinjer vil blive %s (dropstatus %s)\n"
 
-#: fetchmail.c:1610 fetchmail.c:1613
-msgid "kept"
-msgstr "bevaret"
+#: fetchmail.c:1700
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1612
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1701
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  \"Delivered-To\"-linjer vil blive %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1705
 #, 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:1621
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ingen maksimal st�rrelse p� breve (--limit 0).\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1710
 #, 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:1626
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  St�rrelsesadvarsler ved hver pr�vning (--warnings 0).\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Maksimalt antal hentede breve er %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Intet maksimalt antal hentede breve (--fetchlimit 0).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1721
+#, 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:1724
+#, fuzzy
+msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
+msgstr "  Ingen maksimal st�rrelse p� breve (--limit 0).\n"
+
+#: fetchmail.c:1728
+msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
+msgstr ""
+
+#: fetchmail.c:1730
+#, c-format
+msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
+msgstr ""
+
+#: fetchmail.c:1733
+msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
+msgstr ""
+
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP-brevantalsgr�nse er %d.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Ingen SMTP-brevantalsgr�nse (--batchlimit 0).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1741
 #, 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:1642
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Ingen forcerede sletninger (--expunge 0).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Dom�ner som der vil blive hentet post til:"
 
-#: fetchmail.c:1654 fetchmail.c:1674
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (standard)"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Breve vil blive tilf�jet %s som BSMTP\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Breve vil blive leveret med \"%s\".\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Breve vil blive %cMTP-leveret til:"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1780
 #, 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:1682
+#: fetchmail.c:1783
 #, 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:1691
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Genkendte spamblokeringssvar fra modtager er:"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spamblokering er sl�et fra\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Serverforbindelsen vil blive etableret med \"%s\".\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Ingen etableringskommando.\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Serverforbindelse vil blive lukket med \"%s\".\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Ingen lukningskommando.\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Ingen lokale navne er angivet for denne v�rt.\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Flermodtager-tilstand: "
 
-#: fetchmail.c:1723
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Enkeltmodtager-tilstand: "
 
-#: fetchmail.c:1725
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d lokale navne genkendt\n"
+#: fetchmail.c:1826
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d lokale navne genkendt\n"
+msgstr[1] "%d lokale navne genkendt\n"
+
+#: fetchmail.c:1841
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
+msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1739
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1842
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-opslag for flermodtager-adresser er %s.\n"
 
-#: fetchmail.c:1743
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1846
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1745
-msgid "IP address.\n"
-msgstr "IP-adresse.\n"
-
-#: fetchmail.c:1747
-msgid "name.\n"
-msgstr "navn.\n"
+#: fetchmail.c:1848
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  Serveraliaser vil blive sammenholdt med flermodtager-adresser efter "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "Adressering efter konvolutadressen er sl�et fra\n"
 
-#: fetchmail.c:1753
+#: fetchmail.c:1854
 #, 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:1754
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1756
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1857
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Nr. konvolutadresse som vil blive analyseret: %d\n"
 
-#: fetchmail.c:1759
+#: fetchmail.c:1860
 #, 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:1762
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Ingen pr�fikssletning\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Foruderkl�rede postserveraliaser:"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Lokale dom�ner:"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Forbindelse skal ske gennem gr�nseflade %s.\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Ingen gr�nsefladekrav specificeret.\n"
 
-#: fetchmail.c:1792
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Pr�vel�kke vil overv�ge %s.\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Ingen overv�gning af gr�nseflade specificeret.\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1899
 #, 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"
+msgstr ""
+"  Serverforbindelser vil blive lavet vha. hj�lpeprogrammet %s (--plugin %"
+"s).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Intet hj�lpeprogram til kald af server specificeret.\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1903
 #, 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"
+msgstr ""
+"  Modtagerforbindelser vil blive lavet vha. hj�lpeprogrammet %s (--plugout %"
+"s).\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Intet hj�lpeprogram til kald af modtager specificeret.\n"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ingen IUD'er gemt fra denne v�rt.\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID'er gemt.\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Sporingsinformation vil blive tilf�jet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-msgstr "  Sporingsinformation vil ikke blive tilf�jet \"Received\"-brevhovedet.\n"
+msgstr ""
+"  Sporingsinformation vil ikke blive tilf�jet \"Received\"-brevhovedet.\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1932
 #, 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:575 fetchmail.h:581
-msgid "alloca failed"
-msgstr "alloca mislykkedes"
-
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "FEJL: ingen underst�ttelse til getpassword()-funktion\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1450,207 +1619,237 @@ msgstr ""
 "\n"
 "Fangede SIGINT... Jeg tr�kker mig.\n"
 
-#: gssapi.c:62
+#: gssapi.c:66
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Kunne ikke f� servicenavn for [%s]\n"
 
-#: gssapi.c:68
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Bruger servicenavn [%s]\n"
 
-#: gssapi.c:84
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Sender akkreditiver\n"
 
-#: gssapi.c:102
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Fejl ved udveksling af akkreditiver\n"
 
-#: gssapi.c:144
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
 
-#: gssapi.c:149
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Akkreditiver udvekslet\n"
 
-#: gssapi.c:153
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server kr�ver integritet og/eller hemmeligholdelse\n"
 
-#: gssapi.c:162
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
 
-#: gssapi.c:166
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maksimal GSS-symbolst�rrelse er %ld\n"
 
-#: gssapi.c:179
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
 
-#: gssapi.c:190
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Frigiver GSS-akkreditiver\n"
 
-#: gssapi.c:193
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Fejl ved frigivelse af akkreditiver\n"
 
-#: idle.c:62
+#: idle.c:61
 #, c-format
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: tr�d sover i %d sekunder.\n"
 
-#: imap.c:279
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identificeret som IMAP4 rev 1\n"
 
-#: imap.c:285
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identificeret som IMAP4 rev 0\n"
 
-#: imap.c:292
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
 
-#: imap.c:307
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "g�r i tomgang efter pr�vning\n"
 
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
 #: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med OTP-evne som p�kr�vet\n"
 
-#: imap.c:481
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail er ikke oversat med NTLM-evne som p�kr�vet\n"
 
-#: imap.c:490
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server underst�tter ikke den kr�vede indlogningsm�de\n"
 
-#: imap.c:640 imap.c:706
-msgid "expunge failed\n"
-msgstr "sletning (EXPUNGE) mislykkedes\n"
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr "brev %s@%s:%d havde ikke den forventede l�ngde (%d != %d forventet)\n"
 
-#: imap.c:662 imap.c:691
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "genpr�vning mislykkedes\n"
 
-#: imap.c:670
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "%d breve venter efter genpr�vning\n"
+#: imap.c:781 imap.c:837
+#, fuzzy, c-format
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "%d breve venter efter genpr�vning\n"
+msgstr[1] "%d breve venter efter genpr�vning\n"
 
-#: imap.c:680
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "valg af brevbakke mislykkedes\n"
 
-#: imap.c:684
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "%d breve venter efter f�rste pr�vning\n"
+#: imap.c:802
+#, fuzzy, c-format
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "%d breve venter efter f�rste pr�vning\n"
+msgstr[1] "%d breve venter efter f�rste pr�vning\n"
 
-#: imap.c:710
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "%d breve venter efter sletning\n"
+#: imap.c:816
+msgid "expunge failed\n"
+msgstr "sletning (EXPUNGE) mislykkedes\n"
 
-#: imap.c:732
+#: imap.c:820
+#, fuzzy, c-format
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "%d breve venter efter sletning\n"
+msgstr[1] "%d breve venter efter sletning\n"
+
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "s�gning efter usete breve mislykkedes\n"
 
-#: imap.c:762
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "%u er usete\n"
 
-#: imap.c:774
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u er f�rste usete\n"
 
-#: interface.c:253
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
+#: 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:589
 msgid "missing IP interface address\n"
 msgstr "manglende IP-gr�nsefladeadresse\n"
 
-#: interface.c:608
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "Ugyldig IP-gr�nsefladeadresse\n"
 
-#: interface.c:614
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "Ugyldig IP-gr�nseflademaske\n"
 
-#: interface.c:653
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "aktivitet p� %s opfattet som %d\n"
 
-#: interface.c:668
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "springer pr�vning af %s over, %s er nede\n"
 
-#: interface.c:687
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "springer pr�vning af %s over, %s's IP-adresse er fravalgt\n"
 
-#: interface.c:699
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "aktivitet p� %s tjekket som %d\n"
 
-#: interface.c:725
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "springer pr�vning af %s over, %s er inaktiv\n"
 
-#: interface.c:732
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "aktivitet p� %s var %d, er %d\n"
@@ -1677,931 +1876,1088 @@ msgstr "kunne ikke afkode BASE64 klar-svar\n"
 msgid "challenge mismatch\n"
 msgstr "uoverensstemmelse i anr�b\n"
 
-#: lock.c:81
+#: lock.c:86
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: fjerner efterladt l�sefil\n"
+
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: fjerner efterladt l�sefil\n"
 
-#: lock.c:122
+#: lock.c:121
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: fjerner efterladt l�sefil\n"
+
+#: lock.c:168
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: oprettelse af l�sefil mislykkedes\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "advarsel: fandt \"%s\" f�r noget v�rtsnavn"
-
-#: netrc.c:222
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: advarsel: fandt \"%s\" f�r noget v�rtsnavn\n"
 
-#: netrc.c:261
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: advarsel: ukendt symbol \"%s\"\n"
 
-#: odmr.c:65
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "%s's SMTP-modtager underst�tter ikke ATRN\n"
 
-#: odmr.c:103
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "Vender nu...\n"
 
-#: odmr.c:108
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "ATRN-anmodning afvist.\n"
 
-#. Unable to process ATRN request now
-#: odmr.c:112
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "Kan ikke behandle ATRN-anmodning nu.\n"
 
-#: odmr.c:117
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "Du har ingen post.\n"
 
-#. Command not implemented
-#: odmr.c:121
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Kommando ikke implementeret.\n"
 
-#. Authentication required
-#: odmr.c:125
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Godkendelse p�kr�vet.\n"
 
-#: odmr.c:129
+#: odmr.c:130
 #, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "Ukendt ODMR-fejl %d.\n"
 
-#: odmr.c:243
+#: odmr.c:189
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "skriver brevtekst\n"
+
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Tilvalg --keep er ikke underst�ttet med ODMR\n"
 
-#: odmr.c:247
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Tilvalg --flush er ikke underst�ttet med ODMR\n"
 
-#: odmr.c:251
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "Tilvalg --remote er ikke underst�ttet med ODMR\n"
+#: odmr.c:250
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "Tilvalg --flush er ikke underst�ttet med ODMR\n"
 
-#: odmr.c:255
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Tilvalg --check er ikke underst�ttet med ODMR\n"
 
-#: opie.c:37
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "fatal fejl ved l�sning fra server\n"
 
-#: opie.c:51
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Kunne ikke afkode OTP-anr�b\n"
 
-#: opie.c:59 pop3.c:495
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Hemmeligt l�sen: "
 
-#: options.c:197 options.c:241
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "strengen '%s' er ikke en gyldig talstreng.\n"
 
-#: options.c:206
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "V�rdien af strengen '%s' er %s end %d.\n"
 
-#: options.c:207
+#: options.c:178
 msgid "smaller"
 msgstr "mindre"
 
-#: options.c:207
+#: options.c:178
 msgid "larger"
 msgstr "st�rre"
 
-#: options.c:379
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ugyldig protokol '%s' specificeret.\n"
 
-#: options.c:425
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ugyldig godkendelse '%s' specificeret.\n"
 
-#: options.c:555
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: underst�ttelse af netv�rkssikkerhed er sl�et fra\n"
-
-#: options.c:648
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "brug: fetchmail [tilvalg] [server ...]\n"
 
-#: options.c:649
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Mulige tilvalg er:\n"
 
-#: options.c:650
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        vis denne hj�lp\n"
 
-#: options.c:651
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     vis versionsinformation\n"
 
-#: options.c:653
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tjek om der er breve uden at hente dem\n"
 
-#: options.c:654
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      v�r stille\n"
 
-#: options.c:655
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     v�r larmende (diagnostisk uddata)\n"
 
-#: options.c:656
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      k�r som d�mon en gang pr. n sekunder\n"
 
-#: options.c:657
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    s�t ikke ikke d�monprocessen i baggrunden\n"
 
-#: options.c:658
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        dr�b d�monproces\n"
 
-#: options.c:659
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     angiv navn p� logfil\n"
 
-#: options.c:660
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr "      --syslog      brug syslog(3) som d�mon til de fleste beskeder\n"
 
-#: options.c:661
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   skriv ikke Received-linjer & lav v�rtssl�ring\n"
 
-#: options.c:662
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specificer en alternativ k�rselskontrolfil\n"
 
-#: options.c:663
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
 
-#: options.c:664
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "  -i, --idfile      specificer en alternativ UID-fil\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specificer modtager som sidste udvej\n"
 
-#: options.c:665
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
+msgstr ""
+"      --nobounce    omdiriger afviste breve fra bruger til postmester.\n"
 
-#: options.c:667
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   specifikation af kr�vet gr�nseflade\n"
 
-#: options.c:668
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     overv�g gr�nseflade for aktivitet\n"
 
-#: options.c:671
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         brug ssl-kryptering\n"
 
-#: options.c:672
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      privat ssl-n�glefil\n"
 
-#: options.c:673
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl-klientcertifikat\n"
 
-#: options.c:674
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:618
+#, fuzzy
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr "      --sslcert     ssl-klientcertifikat\n"
+
+#: options.c:619
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     ssl-klientcertifikat\n"
+
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:622
+#, fuzzy
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      -ssl          brug bestemt af ssl-protokol (ssl2/ss3/tls1)\n"
 
-#: options.c:676
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specificer hj�lpeprogram til at �bne forbindelse\n"
 
-#: options.c:677
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     specificer hj�lpeprogram til at �bne smtp-forbindelse\n"
+msgstr ""
+"      --plugout     specificer hj�lpeprogram til at �bne smtp-forbindelse\n"
 
-#: options.c:679
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specificer posthentingsprotokol (se man-siden)\n"
 
-#: options.c:680
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        fremtving brug af UID'er (kun pop3)\n"
 
-#: options.c:681
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:629
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
 
-#: options.c:682
+#: options.c:630
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr "  -P, --port        TCP/IP-serviceport at bruge\n"
+
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        type godkendelse (password/kerberos/ssh/otp)\n"
 
-#: options.c:683
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tidsafbrud ved manglende serversvar\n"
 
-#: options.c:684
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    adressering efter konvolutadresse\n"
 
-#: options.c:685
+#: options.c:634
 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:686
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Fuldmagtsgiver for postservice\n"
 
-#: options.c:687
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  tilf�j sporingsinformation i \"Received\"-brevhovedet\n"
+msgstr ""
+"      --tracepolls  tilf�j sporingsinformation i \"Received\"-brevhovedet\n"
 
-#: options.c:689
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specificer brugernavn p� server\n"
 
-#: options.c:690
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+#, fuzzy
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         hent gamle og nye breve\n"
 
-#: options.c:691
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      slet nye breve efter hentning\n"
 
-#: options.c:692
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        gem nye breve efter hentning\n"
 
-#: options.c:693
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       slet gamle breve p� server\n"
 
-#: options.c:694
+#: options.c:643
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       slet gamle breve p� server\n"
+
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   omskriv ikke adresser i brevhovedet\n"
 
-#: options.c:695
+#: options.c:645
 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:696
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    periode mellem afsendelse af advarsler pr. post\n"
 
-#: options.c:699
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      anf�r IP-sikkerhedsanmodning\n"
-
-#: options.c:701
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    anf�r v�rt til SMTP-levering\n"
 
-#: options.c:702
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains hent post til anf�rte dom�ner\n"
 
-#: options.c:703
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress anf�r SMTP-afleveringsdom�ne at bruge\n"
 
-#: options.c:704
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    anf�r fuldt SMTP-navn - brugernavn@dom�ne\n"
 
-#: options.c:705
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   anf�r antispam-svarv�rdier\n"
 
-#: options.c:706
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  anf�r maks. antal afleveringer pr. SMTP-forbindelse\n"
+msgstr ""
+"  -b, --batchlimit  anf�r maks. antal afleveringer pr. SMTP-forbindelse\n"
 
-#: options.c:707
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  anf�r maks. antal hentninger pr. serverforbindelse\n"
+msgstr ""
+"  -B, --fetchlimit  anf�r maks. antal hentninger pr. serverforbindelse\n"
 
-#: options.c:708
+#: options.c:655
+#, fuzzy
+msgid "      --fetchsizelimit set fetch message size limit\n"
+msgstr "      --fetchdomains hent post til anf�rte dom�ner\n"
+
+#: options.c:656
+msgid "      --fastuidl    do a binary search for UIDLs\n"
+msgstr ""
+
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     anf�r maks. antal sletninger mellem effektueringer\n"
+msgstr ""
+"  -e, --expunge     anf�r maks. antal sletninger mellem effektueringer\n"
 
-#: options.c:709
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         anf�r MDA til brug for levering\n"
 
-#: options.c:710
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       anf�r BSMTP-uddatafil\n"
 
-#: options.c:711
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        brug LMTP (RFC 2033) til levering\n"
 
-#: options.c:712
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specificer navn p� brevbakke p� server\n"
 
-#: options.c:713
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    vis forl�bsprikker selv i logfiler\n"
 
-#: pop3.c:533
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "P�kr�vet APOP-tidsstempel ikke fundet i hilsen\n"
 
-#: pop3.c:542
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaksfejl i tidsstempel i hilsen\n"
 
-#: pop3.c:564
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Udefineret protokol�nske i POP3_auth\n"
 
-#: pop3.c:572
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "l�s optaget! Er et andet opkald aktivt?\n"
 
-#: pop3.c:680
+#: pop3.c:809
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:832
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:859 pop3.c:1105
+#, c-format
+msgid "id=%s (num=%d) was deleted, but is still present!\n"
+msgstr ""
+
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u er usete\n"
+
+#: pop3.c:965
 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:751
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "protokolfejl\n"
 
-#: pop3.c:764
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protokolfejl ved hentning af UID'er\n"
 
-#: pop3.c:1047
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1443
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "Tilvalg --remote er ikke underst�ttet med POP3\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "tilvalg vedr. server efter brugertilvalgene"
 
-#: rcfile_y.y:170
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "SDPS er ikke sl�et til."
 
-#: rcfile_y.y:218
-msgid "invalid security request"
-msgstr "Ugyldig sikkerhedsanmodning"
-
-#: rcfile_y.y:224
-msgid "network-security support disabled"
-msgstr "underst�ttelse af netv�rkssikkerhed er sl�et fra"
-
-#: rcfile_y.y:231
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: gr�nsefladetilvalg (interface) er kun underst�ttet under Linux (uden IPv6) og FreeBSD\n"
+#: rcfile_y.y:213
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: gr�nsefladetilvalg (interface) er kun underst�ttet under Linux "
+"(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:238
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: overv�gningstilvalg (monitor) er kun underst�ttet under Linux (uden IPv6) og FreeBSD\n"
+#: rcfile_y.y:220
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: overv�gningstilvalg (monitor) er kun underst�ttet under Linux "
+"(uden IPv6) og FreeBSD\n"
 
-#: rcfile_y.y:350
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL er ikke sl�et til"
 
-#: rcfile_y.y:396
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "slut p� inddata"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Filen %s skal v�re en regul�r fil.\n"
 
-#: rcfile_y.y:440
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Filen %s m� ikke flere tilladelser end -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:452
+#: rcfile_y.y:443
 #, c-format
 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:73
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr "Skal til at omskrive %s"
 
-#: rfc822.c:209
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr "Omskreven version er %s\n"
 
-#: rpa.c:116
+#: rpa.c:117
 msgid "Success"
 msgstr "Succes"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
 msgstr "Begr�nset bruger (noget er galt med kontoen)"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Ugyldigt brugernavn eller l�sen"
 
 # Hvad i alverden er deity error?
-#: rpa.c:119
+#: rpa.c:120
 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:371
 msgid "Get response\n"
 msgstr "F�r svar\n"
 
-#: rpa.c:400
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "F�r svar %d [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Hdr ikke 60\n"
 
-#: rpa.c:484
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Symboll�ngdefejl\n"
 
-#: rpa.c:489
+#: rpa.c:488
 #, 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:494
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanismefelt ukorrekt\n"
 
-#: rpa.c:532
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64-fejl ved tegn %d: %x\n"
 
-#: rpa.c:547
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Indg�ende bin�re data:\n"
 
-#: rpa.c:585
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Udg�ende data:\n"
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "RPA-streng for lang\n"
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:708
 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:709
 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:710
 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:711
 msgid "    service that you think you are (replay\n"
 msgstr "    service som du tror (gentagelses-\n"
 
-#: rpa.c:722
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    angreb af en u�rlig service er mulig).\n"
 
-#: rpa.c:733
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Brugeranr�b:\n"
 
-#: rpa.c:891
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 bliver anvendt p� datablok:\n"
 
-#: rpa.c:904
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr "MD5-resultatet er:\n"
 
-#: sink.c:217
+#: servport.c:53
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:80
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:81
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "leverer til %s\n"
 
-#: sink.c:319
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (tekst til afvisningsbrev)\n"
 
-#. this will usually go to sylog...
-#: sink.c:322
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "afvisning af brev fra %s sendt til %s\n"
 
-#: sink.c:429
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Gemt fejlkode er stadig %d\n"
 
-#: sink.c:492 sink.c:572
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP-fejl: %s\n"
 
-#: sink.c:726
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr "BSMTP-fil �ben eller skrivning af indledning mislykkedes\n"
+
+#: sink.c:758
+#, fuzzy
+msgid "BSMTP preamble write failed.\n"
 msgstr "BSMTP-fil �ben eller skrivning af indledning mislykkedes\n"
 
-#: sink.c:947
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
 
-#: sink.c:954
+#: sink.c:979
 #, 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:992
+#: sink.c:1025
 msgid "no address matches; no postmaster set.\n"
 msgstr "ingen adresser passer; postmester ikke sat.\n"
 
-#: sink.c:1004
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "kan ikke engang sende til %s!\n"
 
-#: sink.c:1010
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
 
-#: sink.c:1163
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "klar til at levere med: %s\n"
 
-#: sink.c:1187
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr "MDA-�bning mislykkedes\n"
 
-#: sink.c:1224
+#: sink.c:1260
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP-forbindelse til %s mislykkedes\n"
 
-#: sink.c:1248
+#: sink.c:1284
 #, 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:1304
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "leverer til %s\n"
+
+#: sink.c:1349
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA d�de af signal %d\n"
 
-#: sink.c:1307
+#: sink.c:1352
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returnerede en ikke-nul status %d\n"
 
-#: sink.c:1310
-#, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+#: sink.c:1355
+#, fuzzy, c-format
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Underligt: MDA pclose returnede %d, kan ikke h�ndtere det i %s:%d\n"
 
-#: sink.c:1331
+#: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
 
-#: sink.c:1352
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP-modtager afviste levering\n"
 
-#: sink.c:1382
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP-leveringsfejl p� EOM\n"
 
-#: sink.c:1385
+#: sink.c:1432
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
 
-#: sink.c:1535
+#: sink.c:1587
+#, 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:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5-godkendelse...\n"
 
-#. Server rejects AUTH
-#: smtp.c:93 smtp.c:153
+#: smtp.c:86 smtp.c:137
 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:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Fejl i base64-svar fra server.\n"
 
-#: smtp.c:105
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Anr�b afkodet: %s\n"
 
-#: smtp.c:126
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN-godkendelse...\n"
 
-#: smtp.c:146
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Authentication...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "protokolfejl hos SMTP-modtager\n"
 
-#: socket.c:107 socket.c:133
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc mislykkedes\n"
 
-#: socket.c:165
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair mislykkedes\n"
 
-#. error
-#: socket.c:171
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork mislykkedes\n"
 
-#: socket.c:179
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 mislykkedes\n"
 
-#: socket.c:185
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "udf�rer %s (server %s service %s)\n"
 
-#: socket.c:188
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) mislykkedes\n"
 
-#: socket.c:280
+#: socket.c:282
+#, c-format
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
+
+#: socket.c:285
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:296 socket.c:299
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "unknown (%s)"
+msgstr ""
 
-#: socket.c:427
+#: socket.c:302
 #, c-format
-msgid "fetchmail: illegal address length received for host %s\n"
-msgstr "fetchmail: ulovlig adressel�ngde modtaget for v�rt %s\n"
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, fuzzy, c-format
+msgid "cannot create socket: %s\n"
+msgstr "kan ikke engang sende til %s!\n"
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "SSL-forbindelse mislykkedes.\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "%s-forbindelse til %s mislykkedes"
 
-#: socket.c:777
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "SSL-forbindelse mislykkedes.\n"
+
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Udsteders organisation: %s\n"
 
-#: socket.c:779
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders organisationsnavn for langt (m�ske afsk�ret).\n"
 
-#: socket.c:781
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Ukendt organisation\n"
 
-#: socket.c:783
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Udsteders almennavn: %s\n"
 
-#: socket.c:785
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Advarsel: Udsteders almennavn for langt (m�ske afsk�ret).\n"
 
-#: socket.c:787
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Udsteders almennavn ukendt\n"
 
-#: socket.c:791
+#: socket.c:625
 #, 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:795
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "D�rligt certifikat: Almennavn for langt!\n"
 
-#: socket.c:811
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Uoverensstemmelse i servers almennavn: %s != %s\n"
 
-#: socket.c:817
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernavn ikke anf�rt, kunne ikke verificere certifikat!\n"
 
-#: socket.c:822
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Servers almennavn ukendt\n"
 
-#: socket.c:824
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernavn ikke specificeret i certifikat!\n"
 
-#: socket.c:834
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() mislykkedes!\n"
 
-#: socket.c:838
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Ingen hukommelse!\n"
 
-#: socket.c:850
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Oversigtstekstbuffer for lille!\n"
 
-#: socket.c:856
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s n�gle-fingeraftryk: %s\n"
 
-#: socket.c:860
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingeraftryk passer.\n"
 
-#: socket.c:863
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingeraftryk passer ikke!\n"
 
-#: socket.c:871
-#, c-format
-msgid "Warning: server certificate verification: %s\n"
+#: socket.c:733
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Advarsel: servercertifikat-verificering: %s\n"
 
-#: socket.c:877
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de f�rste %d tegn): %s\n"
 
-#: socket.c:909
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert v�rdi til SSL"
 
-#: socket.c:926
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:986
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
-msgstr "Certifikat/fingeraftryk-verifikation blev p� en eller anden m�de sprunget over!\n"
+msgstr ""
+"Certifikat/fingeraftryk-verifikation blev p� en eller anden m�de sprunget "
+"over!\n"
 
-#: socket.c:1058
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Fors�ger igen at l�se cygwin-sokkel\n"
 
-#: socket.c:1061
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Fors�g p� at l�se cygwin-sokkel mislykkedes!\n"
 
-#: transact.c:69
+#: transact.c:67
+#, fuzzy, c-format
+msgid "mapped address %s to local %s\n"
+msgstr "%s svarer til %s lokalt\n"
+
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s svarer til %s lokalt\n"
 
-#: transact.c:133
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "Unders�gt %s som passer med %s\n"
 
-#: transact.c:202
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2610,111 +2966,137 @@ msgstr ""
 "analyserer Received-linje:\n"
 "%s"
 
-#: transact.c:241
+#: transact.c:265
 #, 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:247
+#: transact.c:271
 #, 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:321
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "ingen \"Received\"-adresse fundet\n"
 
-#: transact.c:330
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "fandt \"Received\"-adresse `%s'\n"
 
-#: transact.c:514
+#: transact.c:551
 msgid "message delimiter found while scanning headers\n"
 msgstr "brev afsluttet under l�sningen af brevhovedet\n"
 
-#: transact.c:535
+#: transact.c:582
 msgid "incorrect header line found while scanning headers\n"
 msgstr "ukorrekt brevhovedlinje fundet under l�sningen af brevhovedet\n"
 
-#: transact.c:537
+#: transact.c:584
 #, c-format
 msgid "line: %s"
 msgstr "Linje: %s"
 
-#: transact.c:1057
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "ingen lokale overensstemmelser, leverer til %s\n"
 
-#: transact.c:1072
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "levering og sletning undladt pga. DNS-fejl\n"
 
-#: transact.c:1208
+#: transact.c:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "skriver RFC822 msgblk.headers\n"
 
-#: transact.c:1229
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "ingen modtageradresser passer med erkl�rede lokale navne"
 
-#: transact.c:1240
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "modtageradresse %s passede ikke med noget lokalt navn"
 
-#: transact.c:1254
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "brev indeholder NUL-tegn"
 
-#: transact.c:1267
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-modtager afviste lokal modtageradresse: "
 
-#: transact.c:1392
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "skriver brevtekst\n"
 
-#: uid.c:101
-#, c-format
-msgid "lstat: %s: %s\n"
-msgstr "lstat: %s: %s\n"
-
-#: uid.c:212
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "Gammel UID-liste fra %s:"
 
-#: uid.c:217 uid.c:228 uid.c:469
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <tom>"
 
-#: uid.c:224
+#: uid.c:262
 msgid "Scratch list of UIDs:"
 msgstr "Liste af �vrige UID'er:"
 
-#: uid.c:465
+#: uid.c:517 uid.c:569
+#, fuzzy, c-format
+msgid "Merged UID list from %s:"
+msgstr "Ny UID-liste fra %s:"
+
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Ny UID-liste fra %s:"
 
-#: uid.c:493
+#: uid.c:548
 msgid "swapping UID lists\n"
 msgstr "Ombytter UID-lister\n"
 
-#: uid.c:499
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "Ombytter ikke UID-lister, ingen UID'er set ved denne foresp�rgsel\n"
 
-#: uid.c:523
+#: uid.c:581
+#, fuzzy
+msgid "discarding new UID list\n"
+msgstr "Ombytter UID-lister\n"
+
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Sletter fetchids-fil\n"
 
-#: uid.c:529
+#: uid.c:620
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Fejl ved frigivelse af akkreditiver\n"
+
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Skriver fetchids-fil.\n"
 
+#: uid.c:645
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:649
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:653
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc mislykkedes\n"
@@ -2722,3 +3104,120 @@ msgstr "malloc mislykkedes\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc mislykkedes\n"
+
+#~ msgid ""
+#~ "Subject: Fetchmail oversized-messages warning.\n"
+#~ "\n"
+#~ "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:"
+
+#~ msgid "header "
+#~ msgstr "brevhoved-"
+
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "SIGPIPE kastet fra en MDA, eller en str�msokkelfejl\n"
+
+#~ msgid "internal inconsistency\n"
+#~ msgstr "intern uoverensstemmelse\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "navnet er gyldigt, men har ingen IP-adresse."
+
+#~ msgid "unrecoverable name server error."
+#~ msgstr "uoprettelig navneserverfejl."
+
+#~ msgid "temporary name server error."
+#~ msgstr "midlertidig navneserverfejl."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "ukendt DNS-fejl %d."
+
+#~ msgid "messages"
+#~ msgstr "breve"
+
+#~ msgid "message"
+#~ msgstr "brev"
+
+#~ msgid "Option --remote is not supported with ETRN\n"
+#~ msgstr "Tilvalg --remote er ikke underst�ttet med ETRN\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "Kan ikke underst�tte ETRN uden gethostbyname(2).\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "Kan ikke underst�tte ODMR uden gethostbyname(2).\n"
+
+#~ msgid "will not"
+#~ msgstr "vil ikke"
+
+#~ msgid "will"
+#~ msgstr "vil"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (bruger netv�rkssikkerhedstilvalg %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (bruger port %d)"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "Only new"
+#~ msgstr "Kun nye"
+
+#~ msgid "enabled"
+#~ msgstr "sl�et til"
+
+#~ msgid "disabled"
+#~ msgstr "sl�et fra"
+
+#~ msgid "discarded"
+#~ msgstr "slettet"
+
+#~ msgid "kept"
+#~ msgstr "bevaret"
+
+#~ msgid "IP address.\n"
+#~ msgstr "IP-adresse.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "navn.\n"
+
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca mislykkedes"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "advarsel: fandt \"%s\" f�r noget v�rtsnavn"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "Tilvalg --remote er ikke underst�ttet med ODMR\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: underst�ttelse af netv�rkssikkerhed er sl�et fra\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      anf�r IP-sikkerhedsanmodning\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "Ugyldig sikkerhedsanmodning"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "underst�ttelse af netv�rkssikkerhed er sl�et fra"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "overl�b i buffer til del af fejlbesked"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: ulovlig adressel�ngde modtaget for v�rt %s\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
diff --git a/po/de.po b/po/de.po
index c21486a0..ecad2019 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2137,7 +2137,8 @@ msgstr "      --sslcertpath Pfad zu den SSL-Zertifikaten\n"
 #: options.c:620
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr "     --sslcommonname  diesen CommonName des Servers erwarten (abgeraten)\n"
+msgstr ""
+"     --sslcommonname  diesen CommonName des Servers erwarten (abgeraten)\n"
 
 #: options.c:621
 msgid ""
diff --git a/po/el.po b/po/el.po
index 92a8b225..551daa10 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-17 09:23+0100\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,27 +14,27 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:172
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "������� ��� �� %s ����� �������� � ����� ������ �� ��� %s\n"
 
-#: checkalias.c:176
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "���, �� IP ����������� ���� ����������\n"
 
-#: checkalias.c:180
+#: checkalias.c:182
 msgid "No, their IP addresses don't match\n"
 msgstr "���, �� IP ����������� ���� ��� ����������\n"
 
-#: checkalias.c:196
+#: checkalias.c:198
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr ""
 "� ��������� ��� `%s' ������� (������ ����������� ��������), ���� ���\n"
 "����������� �������������  ��� �� %s.\n"
 
-#: checkalias.c:221
+#: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -50,90 +50,94 @@ msgstr "�������� ���������������� ��� BASE64 ���������\n"
 msgid "decoded as %s\n"
 msgstr "����������������� ��� %s\n"
 
-#: driver.c:193
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "������ kerberos %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:249 driver.c:254
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [� ������������ ���� '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:335
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:341
+#: driver.c:339
 #, fuzzy, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr ""
 "Subject: ������������� fetchmail ������������-���������.\n"
 "\n"
 "�� �������� ����������� �������� �������� ���������� ��� ����������� %s:"
 
-#: driver.c:345
+#: driver.c:343
 #, fuzzy, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr ""
 "Subject: ������������� fetchmail ������������-���������.\n"
 "\n"
 "�� �������� ����������� �������� �������� ���������� ��� ����������� %s:"
 
-#: driver.c:364
+#: driver.c:362
 #, fuzzy, c-format
-msgid "  %d msg %d octets long deleted by fetchmail."
-msgstr "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
+msgstr[1] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
 
-#: driver.c:368
+#: driver.c:367
 #, fuzzy, c-format
-msgid "  %d msg %d octets long skipped by fetchmail."
-msgstr "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
+msgstr[1] "\t%d ��� %d ������ octet ������������ ��� �� fetchmail.\n"
 
-#: driver.c:502
+#: driver.c:503
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "�������� ��������� %s@%s:%d (%d octets)"
 
-#: driver.c:556
+#: driver.c:557
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "�������� ��������� %s@%s:%d (%d octets)"
 
-#: driver.c:572
+#: driver.c:573
 msgid " (length -1)"
 msgstr " (����� -1)"
 
-#: driver.c:575
+#: driver.c:576
 msgid " (oversized)"
 msgstr " (���������� �������)"
 
-#: driver.c:590
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "�������� ����� ������������, ������ %s@%s:%d (%d octets)\n"
 
-#: driver.c:607
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "�������� ��������� %s@%s:%d ��� %d"
 
-#: driver.c:612
+#: driver.c:616
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soctets)"
 
-#: driver.c:613
+#: driver.c:617
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octets �������) "
 
 #: driver.c:685
-#, c-format
-msgid " (%d body octets) "
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (%d octets �������) "
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
@@ -141,19 +145,19 @@ msgstr ""
 "�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d "
 "�����������)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr "������������\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr "�����������\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr "��� �����������\n"
 
-#: driver.c:818
+#: driver.c:822
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -163,42 +167,38 @@ msgstr[0] ""
 msgstr[1] ""
 "�� ���� ����� %d; %d �������� ������� ���� ����������� %s ����������%s\n"
 
-#: driver.c:881
-msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-msgstr "��� SIGPIPE ��������� ��� ��� MDA � ��� ������ stream socket\n"
-
-#: driver.c:888
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ������� ���� %s.\n"
 
-#: driver.c:892
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� ��� ����������� %s.\n"
 
-#: driver.c:896
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "���� ������ ���� ��� %d ������� �������� ��� �� %s.\n"
 
-#: driver.c:901
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "���� ������ ���� ��� %d ������� �������� ��� ��� �������� ��� �������.\n"
 
-#: driver.c:904
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "���� ������ ���� ��� %d �������.\n"
 
-#: driver.c:916
+#: driver.c:907
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: �� fetchmail ������ ����������������� ������ ����� ������\n"
 
-#: driver.c:919
+#: driver.c:910
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -207,7 +207,7 @@ msgstr ""
 "�� fetchmail ���� ����������� ��� %d ������ ����� ������ ���� ��� ���������� "
 "��� �������� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:923
+#: driver.c:914
 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"
@@ -224,23 +224,23 @@ msgstr ""
 "�� fetchmail ��� �� ����������� ���� �� ��������������� ����� �� ��\n"
 "��������������.\n"
 
-#: driver.c:948
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:972
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "�������� ������� HESIOD ���. ������� ��� �� %s\n"
 
-#: driver.c:993
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "� ���������� ������������ ��� ���� �����.\n"
 
-#: driver.c:1017
+#: driver.c:1008
 #, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "�������� ������� ��������� �������� DNS ��� %s\n"
 
 #: driver.c:1055
@@ -261,46 +261,65 @@ msgstr ""
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "�������� ��� fetchmail ����� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "� ������� SSL �������.\n"
 
-#: driver.c:1152
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "������ lock-busy ���� %s@%s\n"
 
-#: driver.c:1156
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "������ busy ���������� ���� %s@%s\n"
 
-#: driver.c:1161
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "�������� �������������� ���� %s@%s%s\n"
 
-#: driver.c:1164
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (������������ ���������������)"
 
-#: driver.c:1185
+#: driver.c:1187
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail �������� �������������� ��� %s@%s\n"
 
-#: driver.c:1189
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "�������� ��� fetchmail ����� ������������� ��� �� %s@%s.\n"
 
-#: driver.c:1193
+#: driver.c:1195
+#, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+"������� � ���������� ����� ��������������.\n"
+"���� ��� ���� �������� ������ ������������� ��� ���� �� �������, ����\n"
+"�������� ��� ��� ����� ��������� ��������� (���� ������������� �����������)\n"
+"��� �� fetchmail �������� �� ��������� ������ � ������������ ��� �������\n"
+"��� ������� ������ ���������.\n"
+"\n"
+"����, ��� ����� ������� ��� ������������ ��� ����������� ��� ��� ���� ���\n"
+"���������� �� ������� fetchmail, ������ �� ��� �����������, �� �������� ���\n"
+"��������� ��� fetchmail, ��� �� �� ��������������.\n"
+"\n"
+"� �������� fetchmail �� ��������� �� ������ ��� �� ��������� �� ��������\n"
+"�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
+"������������� � ��������."
+
+#: driver.c:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -324,7 +343,7 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� �� \n"
 "������������� � ��������."
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -344,173 +363,174 @@ msgstr ""
 "�� ���� �����. �� �� �������� ����������� ������������ ����� ��\n"
 "������������� � ��������."
 
-#: driver.c:1223
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "����������� ������ ��� %s@%s\n"
 
-#: driver.c:1228
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "������� ������ ������� � �������������� ��� %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "������������� ������ ���� %s@%s\n"
 
-#: driver.c:1258
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: ������������� ��� fetchmail ������ ��� %s@%s\n"
 
-#: driver.c:1262
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "�������� ������� ��� fetchmail ��� %s@%s.\n"
 
-#: driver.c:1266
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "� �������� ��������������.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "������� � �����-����������� ������� %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "������� � �����-����������� ��'������� �������\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s ���  %s (������� %s)"
 
-#: driver.c:1314 rcfile_y.y:380
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s ���  %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "����������� ��� %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (���� %d) ��� �� %s"
 msgstr[1] "%d %s (���� %d) ��� �� %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1329
+#: driver.c:1334
 #, 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:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "��� ������� ������������ ��� �� %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "��������� ������� ���������!"
 
-#: driver.c:1485
+#: driver.c:1522
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1488
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "������ � ����� ����������� RFC822"
 
-#: driver.c:1491
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1494
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "������������ ������/�����������"
 
-#: driver.c:1497
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "��������� ������/�����������"
 
-#: driver.c:1500
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "������������ �������� ��� �����������"
 
-#: driver.c:1503
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "��������� SMTP"
 
-#: driver.c:1506
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "��������� DNS"
 
-#: driver.c:1509
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "�� �������� ������\n"
 
-#: driver.c:1515
+#: driver.c:1552
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s ������ ���� ��� �������� ��� ���������� SMTP %s\n"
 
-#: driver.c:1517
+#: driver.c:1554
 #, fuzzy
 msgid "unknown"
 msgstr "�������� �����������."
 
-#: driver.c:1519
+#: driver.c:1556
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s ������ ���� ��� ���� ��� �� %s\n"
 
-#: driver.c:1529
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "� ������ ���-�������� ������� �� ��������� %d\n"
 
-#: driver.c:1550
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V4 ��� ���� ��������.\n"
 
-#: driver.c:1558
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "� ���������� ��� Kerberos V5 ��� ���� ��������.\n"
 
-#: driver.c:1569
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "� ������� --flush ��� ������������� �� �� %s\n"
 
-#: driver.c:1575
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "� ������� --all ��� ������������� �� �� %s\n"
 
-#: driver.c:1584
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "� ������� --limit ��� ������������� �� �� %s\n"
 
-#: env.c:56
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -525,7 +545,7 @@ msgstr ""
 "��������� \"env QMAILINJECT= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:68
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -542,26 +562,26 @@ msgstr ""
 "��������� \"env NULLMAILER_FLAGS= %s �� �������� ��� ���\"\n"
 "%s: �������.\n"
 
-#: env.c:80
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: ��� ��������.  ������ ������.\n"
 
-#: env.c:142
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: �������� ������������� ��� ���������� ���!"
 
-#: env.c:163
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "� gethostbyname ������� ��� �� %s\n"
 
-#: env.c:165
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:169
+#: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -569,130 +589,146 @@ msgid ""
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
-#: etrn.c:47 odmr.c:58
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� ESMTP\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� ETRN\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "�������� ����������� ��� �� %s\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "��� ���������� �������� ��� �� %s\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "�������� ��� ��������� �� �������� ��� ��������� ��� �� %s\n"
 
-#: etrn.c:92
+#: etrn.c:94
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "�������� ����������� �� ����� ��� ��������� ��� �� ����� %s\n"
 
-#: etrn.c:96
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "� ������ %s ��� �����������: %s\n"
 
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "���������� ����� ETRN\n"
 
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "���������� ����� ETRN ���� �����������\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "������� ������ ETRN %d\n"
 
-#: etrn.c:151
+#: etrn.c:154
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "� ������� --keep ��� ������������ �� �� ETRN\n"
 
-#: etrn.c:155
+#: etrn.c:158
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "� ������� --flush ��� ������������ �� �� ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:162
 #, fuzzy
 msgid "Option --folder is not supported with ETRN\n"
 msgstr "� ������� --flush ��� ������������ �� �� ETRN\n"
 
-#: etrn.c:163
+#: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "� ������� --check ��� ������������ �� �� ETRN\n"
 
-#: fetchmail.c:159
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:171
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: ��������� ��"
 
-#: fetchmail.c:195
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "�������� ����� ��� ��������� ������� �������� (cwd)\n"
 
-#: fetchmail.c:257
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "���� ����� �� fetchmail ������ %s"
 
-#: fetchmail.c:354
+#: fetchmail.c:395
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "���� ���������� ��� ��� ������ �������%s%s\n"
 
-#: fetchmail.c:355
+#: fetchmail.c:396
 msgid " and "
 msgstr " ��� "
 
-#: fetchmail.c:360
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "��� ����� ������� ������������ ������������� -- ���� �� %s �� ������;\n"
 
-#: fetchmail.c:381
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: ��� ����� ������� ������������ �������������.\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ��� ������ ���� fetchmail\n"
 
-#: fetchmail.c:399
+#: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: ������ ��� �������� ��� %s fetchmail ��� %d; �����������.\n"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "��������"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "���������"
 
-#: fetchmail.c:408
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: �� %s fetchmail ��� %d ������������.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:472
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -700,7 +736,7 @@ msgstr ""
 "fetchmail: �������� ������� ������������� ���� ��� ���� fetchmail ��������� "
 "���� �������.\n"
 
-#: fetchmail.c:437
+#: fetchmail.c:478
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -708,206 +744,236 @@ msgstr ""
 "fetchmail: �������� �������� ��� ��������� ����������� ��� ������ ����\n"
 "           fetchmail ��� %d.\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:485
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ������ ���� fetchmail ������ ��� ��������� ��� %d.\n"
 
-#: fetchmail.c:454
+#: fetchmail.c:495
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: ������� �� ������ ���� ��� fetchmail ������ ��� ����������.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: �������� ������������� fetchmail ��� %d.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: ����������� ����������� ������� ������ ����������� ��� %d.\n"
 
-#: fetchmail.c:487
+#: fetchmail.c:528
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: �������� ������ ����� ������ ��� �� %s@%s.\n"
 
-#: fetchmail.c:491
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "�������������� ��� ���� ������ ��� �� %s@%s: "
 
-#: fetchmail.c:522
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: �������������: ������ ��������� DNS ��� ������ ������ ��� %s\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: ��� ������ ���� fetchmail\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "�������� ������� fetchmail %s \n"
 
-#: fetchmail.c:537 fetchmail.c:539
+#: fetchmail.c:589 fetchmail.c:591
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "�������� ���������� ��� %s ��� �������� ���������� �� ���� \n"
 
-#: fetchmail.c:575
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "�������� �������-���� %s (������ %d)\n"
 
-#: fetchmail.c:580
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "������������ fetchmail (%s ������)\n"
 
-#: fetchmail.c:585
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "� ���������� ��� ������� ���� �������� ���� � ������� ��� ���� "
 "�������������\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "� �������� ��� ������������ ��� fetchmail �������\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "��������� �������� ��� %s (������� � ������������� � ������ ������ ������)\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "�� ��������� ��� ������, ��� ������ ������� %s\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "���������� ��������=0 (SUCCESS)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "���������� ��������=1 (NOMAIL)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "���������� ��������=2 (SOCKET)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "���������� ��������=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "���������� ��������=4 (PROTOCOL)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "���������� ��������=5 (SYNTAX)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "���������� ��������=6 (IOERR)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "���������� ��������=7 (ERROR)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "���������� ��������=8 (EXCLUDE)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "���������� ��������=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:710
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "���������� ��������=10 (SMTP)\n"
 
-#: fetchmail.c:712
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "���������� ��������=11 (DNS)\n"
 
-#: fetchmail.c:714
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "���������� ��������=12 (BSMTP)\n"
 
-#: fetchmail.c:716
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "���������� ��������=13 (MAXFETCH)\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "���������� ��������=%d\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "���� �� ��������� ����� ���������. �����������.\n"
 
-#: fetchmail.c:771
-#, c-format
-msgid "sleeping at %s\n"
+#: fetchmail.c:828
+#, fuzzy, c-format
+msgid "sleeping at %s for %d seconds\n"
 msgstr "������� ��� %s\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "����������� ��� �� %s\n"
 
-#: fetchmail.c:798
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "����������� ��� ���� %d\n"
 
-#: fetchmail.c:805
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "����������� ��� %s\n"
 
-#: fetchmail.c:811
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "������������ �����������, ��������� %d\n"
 
-#: fetchmail.c:963
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "�������� �������-���� ��� ������ run-control\n"
 
-#: fetchmail.c:996
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
 
-#: fetchmail.c:1029
+#: fetchmail.c:1087
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "�������������: ��������� �������� ��� ���������� %s ��� ������ ���������\n"
 
-#: fetchmail.c:1149
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
 
-#: fetchmail.c:1180
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "� ���������� ��� SSL ��� ���� ���� ��� ���������.\n"
+
+#: fetchmail.c:1258
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: �������������: ������ ��������� DNS ��� ������ ������ ��� %s\n"
 
-#: fetchmail.c:1191
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1192
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1209
+#: fetchmail.c:1287
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -915,294 +981,300 @@ msgid ""
 msgstr ""
 "�� ������� ��������� %s, � ������� ����� ��� ������ �� ����� ���������\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1294
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "�� ������� ��������� %s, �� RPOP ������� ����������� ����\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "�� ������� ��������� %s, �� LMTP ��� ����� ����� ��� �� ������� ����� SMTP\n"
 
-#: fetchmail.c:1248
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "����� ����� �� fetchall ��� ���� �� �������� �� ��������� �������!\n"
 
-#: fetchmail.c:1298
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "����� �� ���� %d\n"
 
-#: fetchmail.c:1383
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������ � �������\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP2.\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� POP3.\n"
 
-#: fetchmail.c:1430
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� IMAP.\n"
 
-#: fetchmail.c:1436
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ETRN.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "��� ���� ��������� � ���������� ODMR.\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "���������� �� �������������� ����������.\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ������� %s (���������� %s) ��� %s: ������������ � �������\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "��������� �������� ����� %d ������������\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "������ ����������� ����� �� %s\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "������ Id ����� �� %s\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�� �������� ������� �� ������������ ���� ��� syslog\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "�� fetchmail �� ���������� ��� �� �� ������� Received\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "�� fetchmail �� ������� ������� ������� ��� ��� ������ ����������.\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "�� fetchmail �� ������� multidrop �������� �� ���� ��������� ��� %s.\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� postmaster.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "�� fetchmail �� ���������� ������������ ��������� ��� ���������.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "�������� ��� ���� ��� %s@%s:\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  � ������������ �� ������ ���� ��� %s\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1553
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
 msgstr[1] "  ������� �� ���� �� ����������� �� ������ ���� %d ����������.\n"
 
-#: fetchmail.c:1516
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  �� ������� ����� ��� ����������� ����� %s.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1560
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  ����� � ����������� %s �� �������� ���� ��� ���� ������� �������.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  � ���� ������ �� �������.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  ������� APOP = \"%s\".\n"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  ���� ������ = \"%s\".\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  �� ���������� ����� KPOP �� ������������� Kerberos %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  �� ���������� ����� %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (����� ��������� %s)"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (������������� ����� ��'�������)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (������������ ������ UIDL)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  ���� �� ���������� ������� �������������� �� �����������.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� �� ���� ������.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1605
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� NTLM.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� NTLM.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� OTP.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� CRAM-Md5.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� GSSAPI.\n"
 
-#: fetchmail.c:1579
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V4.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  �� ������������ � ������������� Kerberos V5.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  ������������� ����-��-���� ���������.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  ���������� ��������� ������������� �����: %s\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  ������������ ���������������� SSL ���������.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  ���������� SSL: %s.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  ������������ ������� �������������� ����������� SSL.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  ������� ������������� �������������� SSL: %s\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "���������� �����������: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  ��������� �������� SSL (�� �������� �� �� ������ �����������): %s\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  ���� ������ ���-��������� ��� �� ����������� ����� %d ������������"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (��'�������).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  �� ������� ��������������� ����������.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  ���������� ��������������� �����:"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1667
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s �������� �� ������� (--all %s).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1668
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s �������� �� ������� (--all %s).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1670
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  �������� �������� %s �� ��������� ��� ����������� (--keep %s).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1673
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1674
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1676
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1210,7 +1282,7 @@ msgid ""
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1677
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1218,344 +1290,344 @@ msgid ""
 msgstr ""
 "  ����� �������� %s �� ���������� ���� �� ���� ��������� (--flush %s).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1679
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1680
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  ����������� ��� �������-����������� ����������� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1682
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1683
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  �������� ��� Carriage-return ����� %s (stripcr %s).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1685
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1686
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  ������������ ��� Carriage-return ����� %s (forcecr %s).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1688
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1689
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  ��������� ��� Content-Transfer-Encoding ����� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1691
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1692
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  ��������������� MIME ����� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1695
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  ������ ���� ��� ������� ����� %s (idle %s).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1698
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  �� ������� Nonempty Status �� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1700
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1701
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  �� ������� Delivered-To �� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  �� ���� �������� ��������� ����� %d octets (--limit %d).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  �������� �������������� �������� ��������� ����� %d ������� (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  ��������������� �������� �� ���� ������� (--warnings 0).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  ������ ���� ����������-��������� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1721
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  ���� ����������-��������� ����� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  ������ ���� �������� ��������� (--limit 0).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1692
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  ���� ������ ��������� SMTP ����� %d.\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  ������ ���� ������ ��������� SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  �������� ��������� ������ ���������� ������������� �� %d (--expunge %d).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  ������ ������������� �������� (--expunge 0).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �������� ��� ��� ������ ������������ �� ������ �����:"
 
-#: fetchmail.c:1712 fetchmail.c:1732
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (��'�������)"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �� �������� �� ���������� �� %s ��� BSMTP\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �� �������� �� ����������� �� \"%s\".\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �� �������� �� ���������� %cMTP ��:"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  �� ����� ���������� ��� ������� MAIL FROM �� ����� %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1783
 #, 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:1749
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  �������������� ���������� �������������� spam ������� �����:"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  �������������� ��������������-spam\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������ �� \"%s\".\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  ������ ������ ���-��������.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  � ������� ����������� �� ������������ �� \"%s\".\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  ������ ������ ����-��������.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  ������ ������ ����� ��� �������� ��� ���� �� ����������.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  ��������� multi-drop: "
 
-#: fetchmail.c:1781
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  ��������� single-drop: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1826
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d ������ �����(��) ��������������.\n"
 msgstr[1] "%d ������ �����(��) ��������������.\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1841
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1842
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  ��������� DNS ��� ��� ����������� multidrop ����� %s.\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1846
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1848
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  �� ��������� ����������� �� ���������� �� ����������� multidrop �� "
 
-#: fetchmail.c:1808
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  ���������������� � ����������� �����������-�������\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "����������� ������� �������� �� �����: %s\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1857
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  ������� ������������ ������� ��� �� �������������: %d\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  �� ������� %s �� ��������� ��� �� user id\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  ������ �������� ����������\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "����������� ��������� �����������-�������������:"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  ������� ��������:"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  � ������� ������ �� ����� ���� ��� interface %s.\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  ��� ��������� ���������� interface.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  ������� �������� �� ������������ �� %s.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  ��� �������� interface ��������������.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  ��������� ����������� �� ������ ���� ��� plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  ��� �������� ������ plugin.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  ��������� ������� �� ������ ���� ��� plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  ��� �������� ������ plugout.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  ��� ������������� UID ��� ���� �� ����������.\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID �������������.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  ����������� ���������� �������� �� ��������� ���� ����������� Received.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1563,12 +1635,12 @@ msgstr ""
 "  ������ ���������� ���������� �������� �� �� ��������� ���� �����������\n"
 "Received.\n"
 
-#: fetchmail.c:1889
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  ��������� Pass-through \"%s\".\n"
 
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "������: ������ ���������� ��� �� ������� getpassword()\n"
 
@@ -1590,45 +1662,45 @@ msgstr "�������� ����� �������� ��������� ��� [%s]\n"
 msgid "Using service name [%s]\n"
 msgstr "����� �������� ��������� [%s]\n"
 
-#: gssapi.c:88
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "�������� ���������������\n"
 
-#: gssapi.c:106
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "������ ���� ��������� ���������������\n"
 
-#: gssapi.c:151
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "�������� ���������� ��������� �������� ���������\n"
 
-#: gssapi.c:156
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "������������ � ��������� ���������������\n"
 
-#: gssapi.c:160
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "� ������������ ������� ����������� ���/� �����������\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "�������������� ������� �������� ���������: %s%s%s\n"
 
-#: gssapi.c:173
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "������� ������� ��������� GSS ����� %ld\n"
 
-#: gssapi.c:186
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "������ ��� ���������� ������� �������� ���������\n"
 
-#: gssapi.c:197
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "������������ ��������������� GSS\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "������ ���� ������������ ���������������\n"
 
@@ -1637,81 +1709,108 @@ msgstr "������ ���� ������������ ���������������\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: ������� ��������� ��� %d ����.\n"
 
-#: imap.c:298
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "����������� ����������� ��� IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "����������� ����������� ��� IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "����������� ����������� ��� IMAP2 � IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "�� �������� ���� ��� �������\n"
 
-#: imap.c:482
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
+#: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "����������� ��������� OTP ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "����������� ��������� NTLM ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:513
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "����������� ��������� LOGIN ��� ��������������� ��� fetchmail\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr ""
+"�� ������ %s@%s:%d ��� ���� �� ����������� �����(%d ���������� !=%d "
+"�����������)\n"
+
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "����������� �������\n"
 
-#: imap.c:682
+#: imap.c:781 imap.c:837
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d �������� ��������� ���� ��� �����������\n"
 msgstr[1] "%d �������� ��������� ���� ��� �����������\n"
 
-#: imap.c:694
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "� ������� ���������������� �������\n"
 
-#: imap.c:698
+#: imap.c:802
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d �������� ��������� ���� ��� ����� �������\n"
 msgstr[1] "%d �������� ��������� ���� ��� ����� �������\n"
 
-#: imap.c:722
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "�������� �������\n"
 
-#: imap.c:726
+#: imap.c:820
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d �������� ��������� ���� ��� ��������\n"
 msgstr[1] "%d �������� ��������� ���� ��� ��������\n"
 
-#: imap.c:751
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "��������� ��� �� ������� �������� �������\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "%u ��� ���� �������\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ����� �� ����� �� �������\n"
 
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
@@ -1814,175 +1913,175 @@ msgstr "�������� ���������������� ��������� ����������� BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "��� ��������� ���������\n"
 
-#: lock.c:77
+#: lock.c:86
 #, fuzzy, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: �������� ������ ������� �����������\n"
 
-#: lock.c:89
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: �������� ������ ������� �����������\n"
 
-#: lock.c:96
+#: lock.c:121
 #, fuzzy, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: �������� ������ ������� �����������\n"
 
-#: lock.c:137
+#: lock.c:168
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: �������� ����������� �����������.\n"
 
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: �������������: ������� �� \"%s\" ���� ���� ����� ����������\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: �������������: ������� �������� \"%s\"\n"
 
-#: odmr.c:64
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "� SMTP �������� ��� %s ��� ����������� �TRN\n"
 
-#: odmr.c:102
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "��������� ����...\n"
 
-#: odmr.c:107
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "� ������ ATRN �����������.\n"
 
-#: odmr.c:111
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "�������� ������������ ������� ATRN ����\n"
 
-#: odmr.c:116
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "��� ����� ������������.\n"
 
-#: odmr.c:120
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "� ������ ��� ���� ����������\n"
 
-#: odmr.c:124
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "��������� �������������.\n"
 
-#: odmr.c:128
+#: odmr.c:130
 #, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "������� ������ ODMR %d\n"
 
-#: odmr.c:187
+#: odmr.c:189
 #, fuzzy
 msgid "receiving message data\n"
 msgstr "������� �������� ���������\n"
 
-#: odmr.c:240
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "� ������� --keep ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:244
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "� ������� --flush ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:248
+#: odmr.c:250
 #, fuzzy
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "� ������� --flush ��� ������������ �� �� ODMR\n"
 
-#: odmr.c:252
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "� ������� --check ��� ������������ �� �� ODMR\n"
 
-#: opie.c:36
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "������������ ����� ��������\n"
 
-#: opie.c:50
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "�������� ���������������� ��������� OTP\n"
 
-#: opie.c:58 pop3.c:515
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "������� ����� ������: "
 
-#: options.c:161 options.c:205
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "� ������������ '%s' ��� ����� ������ ������������ �������.\n"
 
-#: options.c:170
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "���� ��� ������������� '%s' ����� %s ���� %d.\n"
 
-#: options.c:171
+#: options.c:178
 msgid "smaller"
 msgstr "���������"
 
-#: options.c:171
+#: options.c:178
 msgid "larger"
 msgstr "����������"
 
-#: options.c:330
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "�������� �� ������ ���������� `%s'.\n"
 
-#: options.c:372
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "�������� �� ������ ������������� `%s'.\n"
 
-#: options.c:573
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "�����: fetchmail [��������] [������������ ...]\n"
 
-#: options.c:574
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  �� �������� ����� �� ���������:\n"
 
-#: options.c:575
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        ���������� ����� ��� ��������� ��������\n"
 
-#: options.c:576
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     ���������� ����������� ��������\n"
 
-#: options.c:578
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       ������� ��� �������� ����� ��������\n"
 
-#: options.c:579
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      ������� �������\n"
 
-#: options.c:580
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     ��������� ������� (����������� ������)\n"
 
-#: options.c:581
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      �������� ��� �������� ��� ���� ���� n �������\n"
 
-#: options.c:582
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    ������� ��������� ���������� ��� �������\n"
 
-#: options.c:583
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ����������� ���������� �������\n"
 
-#: options.c:584
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     ���������� �������� ������� ����������\n"
 
-#: options.c:585
+#: options.c:603
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1990,277 +2089,326 @@ msgstr ""
 "      --syslog      ������������� ��� syslog(3) ��� �� ����������� ��������\n"
 "                    ���� ��������� ��� ��������\n"
 
-#: options.c:586
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   �� ������� Received & ���������� ��� ��������� "
 "����������\n"
 
-#: options.c:587
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ������� ������������ ������� �����������\n"
 
-#: options.c:588
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
 
-#: options.c:589
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "  -i, --idfile      ������� ������������ ������� �� UIDs\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ������� ��������� ��� ��������� ����\n"
 
-#: options.c:590
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    �������������� ��� ����������� ��� ������ �� "
 "postmaster.\n"
 
-#: options.c:592
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   ������������ ������� interface\n"
 
-#: options.c:593
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ������������� interface ��� �������������\n"
 
-#: options.c:596
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ������������ ssl ���������������� ���������\n"
 
-#: options.c:597
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ��������� ������ �������� ssl\n"
 
-#: options.c:598
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
-#: options.c:599
+#: options.c:618
+#, fuzzy
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr "      --sslcert     ������������� ������ ssl\n"
+
+#: options.c:619
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     ������������� ������ ssl\n"
 
-#: options.c:600
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:601
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:622
+#, fuzzy
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    ������������ ����������� ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:603
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      ���������� ���������� ������� ��� ������� ��������\n"
 
-#: options.c:604
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     ���������� ���������� ������� ��� ������� smtp ��������\n"
 
-#: options.c:606
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    ���������� ����������� ��������� (����� ������ man)\n"
 
-#: options.c:607
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        ������������ ������ ��� UIDL (pop3 ����)\n"
 
-#: options.c:608
+#: options.c:629
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
 
-#: options.c:609
+#: options.c:630
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        ���� ��������� TCP/IP ��� ������� �� ����\n"
 
-#: options.c:610
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ����� �������������� (password/kerberos/ssh/otp)\n"
 
-#: options.c:611
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ������ ����� ��-��������� ����������\n"
 
-#: options.c:612
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ������� ������������ ����������\n"
 
-#: options.c:613
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    ������� ��� �������� ��� �� ������ user id\n"
 
-#: options.c:614
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ���������� ��������� �������������\n"
 
-#: options.c:615
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  �������� ����������� ����������-�������� ��� Received\n"
 
-#: options.c:617
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    ������� ��� user login ��� �����������\n"
 
-#: options.c:618
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+#, fuzzy
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         ���� ������ ��� ���� ���������\n"
 
-#: options.c:619
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      �������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:620
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ���������� ���� ��������� ���� ��� ����\n"
 
-#: options.c:621
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
 
-#: options.c:622
+#: options.c:643
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       ������ ��������� ��� �� �����������\n"
 
-#: options.c:623
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ��� ����������� ��� ������������ �����������\n"
 
-#: options.c:624
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       ��� ���� ��������� ���� ��� �� ������� �������\n"
 
-#: options.c:625
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    �������� ������ ������������� ��������� ��������������\n"
 
-#: options.c:627
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ������� ���������� SMTP ��� ��������\n"
 
-#: options.c:628
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
 
-#: options.c:629
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress ������� �������� ��������� SMTP ��� �����\n"
 
-#: options.c:630
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ������� ����� ��������SMTP username@domain\n"
 
-#: options.c:631
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   ������� ����� ���������� ����-spam\n"
 
-#: options.c:632
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  ������� ����� ������ ��� ��� ��������� SMTP\n"
 
-#: options.c:633
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  ������� ����� ����� ��� ��� ��������� �����������\n"
 
-#: options.c:634
+#: options.c:655
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchdomains ���� ������������� ��� ������������ ��������\n"
 
-#: options.c:635
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ������� �������� ��������� ������ ����������\n"
 
-#: options.c:637
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ������� MDA ��� ����� �� ��������\n"
 
-#: options.c:638
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ������� ������� ������ BSMTP\n"
 
-#: options.c:639
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ������� LMTP (RFC2033) ��� ��������\n"
 
-#: options.c:640
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      ���������� �������� �������������� �������\n"
 
-#: options.c:641
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    �������� ������� ������� ��� ��� ������ ����������\n"
 
-#: pop3.c:553
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "�� ������� � ����������� ����������� ��� ����������\n"
 
-#: pop3.c:562
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "���������� ������ ������������ ��� ����������\n"
 
-#: pop3.c:584
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�� �������� ������ ����������� ��� POP3_auth\n"
 
-#: pop3.c:592
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "������������ ��������!  ����� ������ ������ ���� ��������;\n"
 
-#: pop3.c:664
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:816
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u ��� ���� �������\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "�� �������� ����������� �� ����� ��� �����������. �������� ��������� �����.\n"
 
-#: pop3.c:902
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "������ �����������\n"
 
-#: pop3.c:917
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "������ ����������� ���� �� ���� UIDL\n"
 
-#: pop3.c:1276
+#: pop3.c:1443
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "� ������� --remote ��� ������������� �� �� POP3\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "������� ����������� ���� ��� �������� ������"
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "�� SDPS ��� ���� �������������."
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2268,7 +2416,7 @@ msgstr ""
 "fetchmail: � ������� interface ������������� ���� ��� Linux (����� IPv6) ��� "
 "�� FreeBSD\n"
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2276,25 +2424,25 @@ msgstr ""
 "fetchmail: � ������� monitor ������������� ���� ��� Linux (����� IPv6) ��� "
 "�� FreeBSD\n"
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "�� SSL ��� ���� �������������"
 
-#: rcfile_y.y:381
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "����� �������"
 
-#: rcfile_y.y:418
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "�� ������ %s ������ �� ����� �������� ������.\n"
 
-#: rcfile_y.y:428
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "�� ������ %s �� ������ �� ���� ���� ��� -rwx------ (0700) ������.\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "�� ������ %s ������ �� ������ �� ����.\n"
@@ -2415,203 +2563,215 @@ msgstr "������������� ������ ���������:\n"
 msgid "RPA authorisation complete\n"
 msgstr "������������� RPA ������������\n"
 
-#: rpa.c:373
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "���� ���������\n"
 
-#: rpa.c:403
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "� ���� ��������� ��������� %d [%s]\n"
 
-#: rpa.c:466
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Hdr ��� 60\n"
 
-#: rpa.c:487
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "������ ������ ���������\n"
 
-#: rpa.c:492
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "�� ����� ��������� %d �������� �� �� rxlen %d\n"
 
-#: rpa.c:498
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "���������� ���������� ������\n"
 
-#: rpa.c:535
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "������ dec64 ��� ��������� %d: %x\n"
 
-#: rpa.c:550
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "����������� ������� ��������:\n"
 
-#: rpa.c:588
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "���������� ��������:\n"
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "������������ RPA ���������� ������\n"
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:715
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "�� RPA ������� �� ������� �� /dev/urandom. ���� �� ������\n"
 
-#: rpa.c:716
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    �� ��� ��������� �� ������, ���� �������� ���\n"
 
-#: rpa.c:717
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    �� �������� �� ����� �������� ��� ������ ����\n"
 
-#: rpa.c:718
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    �������� ��� �������� (��������� ����������\n"
 
-#: rpa.c:719
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ��� ��� ����� �������� ����� �������.)\n"
 
-#: rpa.c:730
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "�������� ������:\n"
 
-#: rpa.c:883
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "�� MD5 ����������� ��� ����� ��������:\n"
 
-#: rpa.c:896
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr "���������� MD5: \n"
 
-#: servport.c:52
+#: servport.c:53
 #, c-format
 msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
 msgstr ""
 
-#: servport.c:78
+#: servport.c:80
 #, c-format
 msgid "Cannot resolve service %s to port number.\n"
 msgstr ""
 
-#: servport.c:79
+#: servport.c:81
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "���������� ��� %s\n"
 
-#: sink.c:312
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message ����)\n"
 
-#: sink.c:315
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "� ������������ ��� %s ��������� ��� %s\n"
 
-#: sink.c:447
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "�� ������������ ������ ����� ����� %d\n"
 
-#: sink.c:507 sink.c:591
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP ������: %s\n"
 
-#: sink.c:752
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
 msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
 
-#: sink.c:965
+#: sink.c:758
+#, fuzzy
+msgid "BSMTP preamble write failed.\n"
+msgstr "������� ������ BSMTP � ������� � ���������� �������\n"
+
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "� �������� %cMTP ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:972
+#: sink.c:979
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "� �������� %cMTP ���������� ����������� �� ��������� ��������� `%s'\n"
 
-#: sink.c:1013
+#: sink.c:1025
 msgid "no address matches; no postmaster set.\n"
 msgstr "������ ��������� ���������� ��� ���� ������� postmaster.\n"
 
-#: sink.c:1025
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "�������� ��������� ����� ��� ��� %s!\n"
 
-#: sink.c:1031
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "������ ��������� ���������� �������� ��� %s.\n"
 
-#: sink.c:1185
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "�������� �� ����������� ��: %s\n"
 
-#: sink.c:1209
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr "������� MDA �������\n"
 
-#: sink.c:1246
+#: sink.c:1260
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "������� %cMTP ��� %s �������\n"
 
-#: sink.c:1270
+#: sink.c:1284
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "�������� �������� ������޷ ����� ��� %s"
 
-#: sink.c:1326
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "������ ���� ������������ ���������������\n"
+
+#: sink.c:1349
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "�� MDA �������� ��� ���� %d\n"
 
-#: sink.c:1329
+#: sink.c:1352
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "�� MDA ��������� ��-�������� ��������� %d\n"
 
-#: sink.c:1332
-#, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+#: sink.c:1355
+#, fuzzy, c-format
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "��������: �� MDA pclose ��������� %d, �������� ��������� ��� %s:%d\n"
 
-#: sink.c:1353
+#: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "����������� ��������� � �������� ��� ������� BSMTP �������\n"
 
-#: sink.c:1374
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr "� �������� SMTP �������� �� �������\n"
 
-#: sink.c:1404
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr "������ �������� LMTP ���  EOM\n"
 
-#: sink.c:1407
+#: sink.c:1432
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "�� ����������� �������� ���-503 ��� LMTP EOM: %s\n"
 
-#: sink.c:1561
+#: sink.c:1587
 #, fuzzy
 msgid ""
 "-- \n"
@@ -2620,32 +2780,32 @@ msgstr ""
 "--\n"
 "\t\t\t\t� ��������  Fetchmail\n"
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "������������� ESMTP CRAM-MD5...\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "� ������������ �������� ��� ������ AUTH.\n"
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "��������� �������� BASE64 ��� �� �����������.\n"
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "��������������� ���������: %s\n"
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "������������� ESMTP PLAIN...\n"
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "������������� ESMTP LOGIN...\n"
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "������ ����������� ������� smtp\n"
 
@@ -2675,271 +2835,307 @@ msgstr "��������� %s (����������� %s �������� %s)\n"
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) �������\n"
 
-#: socket.c:281
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:284
+#: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:296 socket.c:299
+#, fuzzy, c-format
+msgid "unknown (%s)"
+msgstr "�������� �����������."
+
+#: socket.c:302
+#, c-format
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, fuzzy, c-format
+msgid "cannot create socket: %s\n"
+msgstr "�������� ��������� ����� ��� ��� %s!\n"
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "� ������� SSL �������.\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "%s ������� ��� %s �������"
+
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "� ������� SSL �������.\n"
+
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:628
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:630
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "�������� ����������\n"
 
-#: socket.c:632
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "���������� ������: %s\n"
 
-#: socket.c:634
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "�������������: ���������� ������ ����� ���������� ������ (������ �������).\n"
 
-#: socket.c:636
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "������� ���������� ������\n"
 
-#: socket.c:640
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "���������� �����������: %s\n"
 
-#: socket.c:644
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "���� �������������: Subject ���������� ���������� ������!\n"
 
-#: socket.c:690
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "�� ��������� �������������� ����������: %s != %s\n"
 
-#: socket.c:696
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "��� ���� ������� ����� �����������, �������� ����������� ��������������!\n"
 
-#: socket.c:701
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "������� ���������� ����������\n"
 
-#: socket.c:703
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "��� ���� ������� ����� ���������� ��� �������������!\n"
 
-#: socket.c:713
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() �������!\n"
 
-#: socket.c:717
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "������ � �����!\n"
 
-#: socket.c:725
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "� ��������� ����� �������� ��������� ����� ���������� �����!\n"
 
-#: socket.c:731
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s ��������� ��������: %s\n"
 
-#: socket.c:735
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s ����������� ����������.\n"
 
-#: socket.c:738
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s ����������� ��� ����������!\n"
 
-#: socket.c:747
+#: socket.c:733
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "�������������: ���������� �������������� ����������: %s\n"
 
-#: socket.c:753
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "�������� ������� (������ %d ����������): %s\n"
 
-#: socket.c:805
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "� ����������� ������� ����� �������� ��� �� SSL"
 
-#: socket.c:822
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "����������� ����� ���������� SSL '%s', ����� �� ������� (SSLv23).\n"
 
-#: socket.c:883
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "���������� ��������������/������������ ����� �����������!\n"
 
-#: socket.c:957
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "��������������� ��������� �������� Cygwin\n"
 
-#: socket.c:960
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������������� ��������� �������� Cygwin �������!\n"
 
-#: transact.c:74
+#: transact.c:67
+#, fuzzy, c-format
+msgid "mapped address %s to local %s\n"
+msgstr "������������ ��� %s ��� ������ %s\n"
+
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "������������ ��� %s ��� ������ %s\n"
 
-#: transact.c:138
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "������ ���� ��� %s ������������ �� %s\n"
 
-#: transact.c:207
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
 "%s"
 msgstr "������� ������� Received:%s"
 
-#: transact.c:246
+#: transact.c:265
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "����� ������, �� %s ����� ��������� ��� ����. �������������\n"
 
-#: transact.c:252
+#: transact.c:271
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "�� ����� ������, �� %s ��� ����� ��������� ��� ����. �������������\n"
 
-#: transact.c:326
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "��� �������� ����������� Received\n"
 
-#: transact.c:335
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "�������� ����������� Received `%s'\n"
 
-#: transact.c:538
+#: transact.c:551
 msgid "message delimiter found while scanning headers\n"
 msgstr "������� ��������� ��������� ���� ��� ������ ������������\n"
 
-#: transact.c:559
+#: transact.c:582
 msgid "incorrect header line found while scanning headers\n"
 msgstr "������� ����� ������ ������������ ���� ��� ������ ������������\n"
 
-#: transact.c:561
+#: transact.c:584
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "����������� ��� %s\n"
 
-#: transact.c:1082
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "��� �������� ������ �����, �������� ��� %s\n"
 
-#: transact.c:1097
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "��������� ��������� ��� ��������� ���� ��������� ��� DNS\n"
 
-#: transact.c:1209
+#: transact.c:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "������� RFC822 msgblk.headers\n"
 
-#: transact.c:1230
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "������ ��������� ��������� �� ��������� �� �� �������� ������ �������"
 
-#: transact.c:1237
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "��������� ��������� %s ��� ��������� �� ������ ������ �����"
 
-#: transact.c:1246
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "�� ������ �������� ���������� NULs"
 
-#: transact.c:1254
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "� �������� SMTP �������� ��� ����������� ������� ����������: "
 
-#: transact.c:1382
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "������� �������� ���������\n"
 
-#: uid.c:248
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "����� ����� UID ��� %s:"
 
-#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <�����>"
 
-#: uid.c:260
+#: uid.c:262
 msgid "Scratch list of UIDs:"
 msgstr "�������� ����� �� UID:"
 
-#: uid.c:514 uid.c:566
+#: uid.c:517 uid.c:569
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "����� ����� UID ��� %s:"
 
-#: uid.c:516
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr "��� ����� UID ��� %s:"
 
-#: uid.c:545
+#: uid.c:548
 msgid "swapping UID lists\n"
 msgstr "��������� ������ UID\n"
 
-#: uid.c:553
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "��� ��������� ������ UID, �� ������� ������ UID �� ���� ��� �������\n"
 
-#: uid.c:578
+#: uid.c:581
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "��������� ������ UID\n"
 
-#: uid.c:613
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "�������� ������� fetchids.\n"
 
-#: uid.c:615
+#: uid.c:620
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "������ ���� ������������ ���������������\n"
 
-#: uid.c:621
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "������� ������� fetchids\n"
 
-#: uid.c:640
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:644
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:648
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2952,6 +3148,9 @@ msgstr "������� �� malloc\n"
 msgid "realloc failed\n"
 msgstr "������� �� realloc\n"
 
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "��� SIGPIPE ��������� ��� ��� MDA � ��� ������ stream socket\n"
+
 #~ msgid "internal inconsistency\n"
 #~ msgstr "��������� ���������\n"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 10f2a2b5..de742a9f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2065,7 +2065,8 @@ msgstr "      --sslcertpath path to ssl certificates\n"
 #: options.c:620
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 
 #: options.c:621
 msgid ""
diff --git a/po/fi.po b/po/fi.po
index 6869139a..880eb110 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2007-11-06 01:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -65,12 +65,16 @@ msgstr "Subject: Fetchmailin varoitus liian suuresta viestistä"
 #: driver.c:339
 #, fuzzy, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
+msgstr ""
+"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
+"%2$d viestiä\n"
 
 #: driver.c:343
 #, fuzzy, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
+msgstr ""
+"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
+"%2$d viestiä\n"
 
 #: driver.c:362
 #, c-format
@@ -104,92 +108,105 @@ msgstr " (pituus -1)"
 msgid " (oversized)"
 msgstr " (ylisuuri)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr "otsakkeiden noutaminen ei onnistunut viestille %s@%s:%d (%d oktettia)\n"
+msgstr ""
+"otsakkeiden noutaminen ei onnistunut viestille %s@%s:%d (%d oktettia)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "luetaan viesti %s@%s:%d / %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktettia)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d otsakeoktettia) "
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d runko-oktettia) "
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " säilytettiin\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " poistettiin\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " ei poistettu\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viesti\n"
-msgstr[1] "noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle %2$d viestiä\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
+"%2$d viesti\n"
+msgstr[1] ""
+"noutoraja %1$d saavutettiin, %4$s-tunnukselle %3$s-palvelimella jäi jäljelle "
+"%2$d viestiä\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr "aikakatkaistu %d sekunnissa odotettaessa yhdistämistä palvelimelle %s.\n"
+msgstr ""
+"aikakatkaistu %d sekunnissa odotettaessa yhdistämistä palvelimelle %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa palvelinta %s.\n"
 
 # Odotettaessa mitä, häh?
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, fuzzy, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "aikakatkaistu %d sekunnissa odotettaessa kuuntelijan vastausta.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "aikakatkaistu %d sekunnissa.\n"
 
 # Subject: on todennäköisesti postin otsakekentän nimi, jota ei saa kääntää.
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail havaitsee toistuvia aikakatkaisuja"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail havaitsi yli %d aikakatkaisua yrittäessään noutaa postia tunnukselta %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail havaitsi yli %d aikakatkaisua yrittäessään noutaa postia "
+"tunnukselta %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 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,73 +216,74 @@ msgid ""
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr ""
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr ""
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr ""
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-yhteys kohteeseen %s epäonnistui"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
-msgstr "Subject: Fetchmailin varoitus tavoittamattomissa olevasta palvelimesta."
+msgstr ""
+"Subject: Fetchmailin varoitus tavoittamattomissa olevasta palvelimesta."
 
-#: driver.c:1070
+#: driver.c:1073
 #, fuzzy, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail ei pystynyt noutamaan postia paikasta %s@%s.\n"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr ""
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmailin todennus epäonnistui käyttäjälle %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail ei pystynyt noutamaan postia paikasta %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -274,7 +292,7 @@ msgid ""
 "error message."
 msgstr ""
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -286,7 +304,7 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -298,60 +316,60 @@ msgid ""
 "is restored."
 msgstr ""
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr ""
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr ""
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmailin todennus onnistui käyttäjälle %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr ""
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s palvelimella %s (kansio %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s palvelimella %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Noudetaan koneelta %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -359,109 +377,109 @@ msgstr[0] "%d viesti (%d %s) käyttäjälle %s"
 msgstr[1] "%d viestiä (%d %s) käyttäjälle %s"
 
 # Tämä on edellisen kohdan ensimmäinen %s.
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "nähty"
 msgstr[1] "nähtyä"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d viesti käyttäjälle %s"
 msgstr[1] "%d viestiä käyttäjälle %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktettia).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Ei postia käyttäjälle %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr ""
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "puuttuva tai virheellinen RFC822-otsake"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr ""
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr ""
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr ""
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr ""
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr ""
 
-#: driver.c:1541
+#: driver.c:1546
 #, fuzzy
 msgid "undefined"
 msgstr "määrittelemätön virhe\n"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 
-#: driver.c:1549
+#: driver.c:1554
 #, fuzzy
 msgid "unknown"
 msgstr "konenimi on tuntematon."
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr ""
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr ""
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 -tukea ei ole linkitetty.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr ""
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr ""
@@ -481,7 +499,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -508,7 +527,8 @@ msgstr ""
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
@@ -580,12 +600,14 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright © 2002, 2003 Eric S. Raymond\n"
-"Copyright © 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright © 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright © 2005-2006 Sunil Shetye\n"
 "Copyright © 2005-2007 Matthias Andree\n"
 
@@ -654,12 +676,15 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr ""
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
 msgstr ""
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 msgstr ""
 
 #: fetchmail.c:485
@@ -668,7 +693,8 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 
 #: fetchmail.c:501
@@ -709,780 +735,800 @@ msgstr ""
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr ""
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr ""
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr ""
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr ""
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr ""
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr ""
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr ""
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr ""
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr ""
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr ""
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr ""
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr ""
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr ""
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr ""
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr ""
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr ""
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr ""
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr ""
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr ""
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr ""
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "Noutoväli on %d sekuntia\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr ""
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr ""
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr ""
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr ""
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr ""
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Varoitus: kone %s mainitaan asetustiedostossa useampaan kertaan\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL-tukea ei ole käännetty mukaan.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr ""
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr ""
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr ""
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-tuen asetuksia ei ole tehty.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr ""
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Noutoväli on %d sekuntia\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Lokitiedosto on %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr ""
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Edistymisviestit tallennetaan lokiin syslogitse\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ohjaa virhepostit lähettäjälle.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr ""
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr ""
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Palvelimen todellinen nimi on %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tätä konetta %s, kun konenimeä ei ole annettu.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Salasanaa kysytään.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr ""
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr ""
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (käytetään palvelua %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (käytetään oletusporttia)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr ""
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Vaaditaan todennus.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr ""
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protokolla: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr ""
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (oletus).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Oletuspostilaatikko valittu.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Valitut postilaatikot ovat:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1674
 #, fuzzy
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1676
 #, fuzzy
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
 msgstr "  %s viestit noudetaan (--all %s).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr ""
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr ""
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr ""
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr ""
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr ""
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr ""
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Viestin kokoraja on %d oktettia (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Ei viestin kokorajaa (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr ""
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr ""
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (oletus)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr ""
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr ""
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr ""
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr ""
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d paikallista nimeä tunnistettu.\n"
 msgstr[1] "%d paikallista nimeä tunnistettu.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr ""
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr ""
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr ""
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr ""
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr ""
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr ""
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr ""
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr ""
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr ""
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr ""
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr ""
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID:tä tallennettu.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr ""
@@ -1570,87 +1616,89 @@ msgstr ""
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 
-#: imap.c:662
+#: imap.c:667
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr "viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
+msgstr ""
+"viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr ""
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d viesti odottamassa uudelleennoudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa uudelleennoudon jälkeen\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "postilaatikon valinta epäonnistui\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d viesti odottamassa ensimmäisen noudon jälkeen\n"
 msgstr[1] "%d viestiä odottamassa ensimmäisen noudon jälkeen\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr ""
 
-#: imap.c:815
+#: imap.c:820
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d viestiä odottamassa uudelleennoutoa\n"
 msgstr[1] "%d viestiä odottamassa uudelleennoutoa\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr ""
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr ""
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr ""
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
 #: interface.c:256
@@ -1844,367 +1892,379 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr ""
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr ""
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Merkkijonon \"%s\" arvo on %s kuin %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "pienempi"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "suurempi"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr ""
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr ""
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "käyttö:  fetchmail [valitsimet] [palvelin ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Valitsimet ovat seuraavat:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        näytä tämä ohje\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     näytä versiotiedot\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       tarkasta viestit hakematta niitä\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      toimi hiljaisesti\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     toimi äänekkäästi (tulostetaan lisätietoa)\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      aja palvelimena kerran n sekunnissa\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        tapa palvelinprosessi\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 
-#: options.c:601
+#: options.c:607
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -L, --logfile     anna lokitiedoston nimi\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ota käyttöön SSL-salattu istunto\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr ""
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        todennustapa (password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 #, fuzzy
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     "
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    määrittele käyttäjän tunnus palvelimella\n"
 
-#: options.c:632
+#: options.c:639
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         nouda sekä uudet että vanhat viestit\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      poista uudet viestit noudon jälkeen\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        säilytä uudet viestit noudon jälkeen\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:636
+#: options.c:643
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       poista vanhat viestit palvelimelta\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   älä uudelleenkirjoita otsakkeiden osoitteita\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       älä nouda annetun koon ylittäviä viestejä\n"
 
-#: options.c:639
+#: options.c:646
 #, fuzzy
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    "
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
 msgstr ""
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr ""
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "yhteyskäytäntövirhe\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr ""
 
@@ -2217,32 +2277,36 @@ msgid "SDPS not enabled."
 msgstr ""
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL ei ole käytössä"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "syötteen loppu"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Tiedoston %s on oltava tavallinen tiedosto.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Tiedostolla %s ei saa olla enempää kuin -rwx--x--- (0710) -oikeudet.\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2549,7 +2613,8 @@ msgstr ""
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
 #: sink.c:1377
@@ -2669,113 +2734,113 @@ msgstr "%s-yhteys kohteeseen %s epäonnistui"
 msgid "connected.\n"
 msgstr "SSL-yhteys epäonnistui.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -2903,30 +2968,30 @@ msgstr ""
 msgid "discarding new UID list\n"
 msgstr ""
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr ""
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr ""
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr ""
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index f43da152..ef8a3fba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.3.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-17 09:23+0100\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2000-04-10 01:26+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -21,25 +21,25 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:172
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Comprobando se %s � realmente o mesmo nodo que %s\n"
 
-#: checkalias.c:176
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "Si, os seus enderezos IP coinciden\n"
 
-#: checkalias.c:180
+#: checkalias.c:182
 msgid "No, their IP addresses don't match\n"
 msgstr "Non, os seus enderezos IP non coinciden\n"
 
-#: checkalias.c:196
+#: checkalias.c:198
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "fallo na resoluci�n do nome � buscar `%s' mentres se recib�a de %s.\n"
 
-#: checkalias.c:221
+#: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "fallo na resoluci�n do nome � buscar `%s' mentres se recib�a de %s.\n"
@@ -53,103 +53,107 @@ msgstr "non se puido decodificar o challenge BASE64\n"
 msgid "decoded as %s\n"
 msgstr "espertado en %s\n"
 
-#: driver.c:193
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "erro %s de kerberos\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:249 driver.c:254
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [o servidor di '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:335
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
-msgstr ""
+#: driver.c:339
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
+msgstr "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 
-#: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
-msgstr ""
+#: driver.c:343
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
+msgstr "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 
-#: driver.c:364
+#: driver.c:362
 #, fuzzy, c-format
-msgid "  %d msg %d octets long deleted by fetchmail."
-msgstr "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
+msgstr[1] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
 
-#: driver.c:368
+#: driver.c:367
 #, fuzzy, c-format
-msgid "  %d msg %d octets long skipped by fetchmail."
-msgstr "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
+msgstr[1] "\tmensaxe %d de %d octetos omitido polo fetchmail.\n"
 
-#: driver.c:502
+#: driver.c:503
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#: driver.c:556
+#: driver.c:557
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "omitindo mensaxe %d (%d octetos)"
 
-#: driver.c:572
+#: driver.c:573
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:575
+#: driver.c:576
 #, fuzzy
 msgid " (oversized)"
 msgstr " (exceso de tama�o, %d octetos)"
 
-#: driver.c:590
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:607
+#: driver.c:611
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensaxe %d de %d"
 
-#: driver.c:612
+#: driver.c:616
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d octetos%s)"
 
-#: driver.c:613
+#: driver.c:617
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos de corpo) "
 
 #: driver.c:685
-#, c-format
-msgid " (%d body octets) "
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (%d octetos de corpo) "
 
-#: driver.c:743
+#: driver.c:746
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "a mensaxe %d non ti�a o tama�o agardado (%d real != %d agardado)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " mantida\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " non eliminada\n"
 
-#: driver.c:818
+#: driver.c:822
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -157,42 +161,38 @@ msgid_plural ""
 msgstr[0] "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 msgstr[1] "atinxiuse o l�mite de %d mensaxes; %d deixadas no servidor\n"
 
-#: driver.c:881
-msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-msgstr "SIGPIPE enviado por un MDA ou erro da conexi�n stream\n"
-
-#: driver.c:888
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a conexi�n � servidor %s.\n"
 
-#: driver.c:892
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando � servidor %s.\n"
 
-#: driver.c:896
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado tras %d segundos agardando a %s.\n"
 
-#: driver.c:901
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "tempo esgotado tras %d segundos agardando a resposta do servidor receptor.\n"
 
-#: driver.c:904
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado tras %d segundos.\n"
 
-#: driver.c:916
+#: driver.c:907
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail atopa repetidas expiraci�ns do tempo de espera\n"
 
-#: driver.c:919
+#: driver.c:910
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -201,7 +201,7 @@ msgstr ""
 "Fetchmail atopou m�is de %d expiraci�ns do tempo de espera tentando colle-lo "
 "correo de %s@%s.\n"
 
-#: driver.c:923
+#: driver.c:914
 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"
@@ -217,23 +217,23 @@ msgstr ""
 "\n"
 "Fetchmail non recibir� de novo correo desta caixa ata que o reinicie.\n"
 
-#: driver.c:948
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "o programa de pre-conexi�n fallou con estado %d\n"
 
-#: driver.c:972
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "non se puido atopar a caixa postal HESIOD para %s\n"
 
-#: driver.c:993
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "O servidor principal non ten nome.\n"
 
-#: driver.c:1017
+#: driver.c:1008
 #, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "non se puido atopar o nome DNS can�nico de %s\n"
 
 #: driver.c:1055
@@ -250,47 +250,52 @@ msgstr ""
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1101
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: driver.c:1152
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1156
+#: driver.c:1158
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de bloqueo/actividade en %s@%s\n"
 
-#: driver.c:1161
+#: driver.c:1163
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Fallou a autorizaci�n en %s@%s\n"
 
-#: driver.c:1164
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1185
+#: driver.c:1187
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fallou a autenticaci�n do fetchmail\n"
 
-#: driver.c:1189
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1193
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+
+#: driver.c:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -300,8 +305,13 @@ msgid ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 msgstr ""
+"Fallou a tentativa de obter autorizaci�n.\n"
+"Probablemente isto quere dicir que a s�a contrasinal non � v�lida,\n"
+"pero os servidores POP3 poden fallar por outras causas, e o fetchmail\n"
+"non pode distinguilas porque non env�an mensaxes de erro �tiles cando\n"
+"hai un fallo de login.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -319,174 +329,175 @@ msgstr ""
 "non pode distinguilas porque non env�an mensaxes de erro �tiles cando\n"
 "hai un fallo de login.\n"
 
-#: driver.c:1223
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1228
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desco�ecido de login ou autenticaci�n en %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1256
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Fallou a autorizaci�n en %s@%s\n"
 
-#: driver.c:1258
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fallou a autenticaci�n do fetchmail\n"
 
-#: driver.c:1262
+#: driver.c:1266
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail non puido coller correo de %s@%s.\n"
 
-#: driver.c:1266
+#: driver.c:1270
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "O servicio escolleu a versi�n %d.%d do RPA\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "escollendo ou recibindo de novo mensaxes da carpeta por defecto\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1314 rcfile_y.y:380
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Recibindo de %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d lidas) para %s"
 msgstr[1] "%d %s (%d lidas) para %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1329
+#: driver.c:1334
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s para %s"
 msgstr[1] "%d %s para %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Non hai correo para %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1485
+#: driver.c:1522
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1488
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "a cabeceira RFC822 falta ou � err�nea"
 
-#: driver.c:1491
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1494
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "sincronizaci�n cliente/servidor"
 
-#: driver.c:1497
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1500
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "bloqueo activado no servidor"
 
-#: driver.c:1503
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "Transacci�n SMTP"
 
-#: driver.c:1506
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1509
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "erro indefinido\n"
 
-#: driver.c:1515
+#: driver.c:1552
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s � baixar correo de %s\n"
 
-#: driver.c:1517
+#: driver.c:1554
 #, fuzzy
 msgid "unknown"
 msgstr "a m�quina � desco�ecida."
 
-#: driver.c:1519
+#: driver.c:1556
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s � baixar correo de %s\n"
 
-#: driver.c:1529
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "o comando de pos-conexi�n fallou con estado %d\n"
 
-#: driver.c:1550
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Non est� enlazado con soporte Kerberos V4.\n"
 
-#: driver.c:1558
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Non est� enlazado con soporte Kerberos V5.\n"
 
-#: driver.c:1569
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "A opci�n --flush non est� soportada con %s\n"
 
-#: driver.c:1575
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "A opci�n --all non est� soportada con %s\n"
 
-#: driver.c:1584
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "A opci�n --limit non est� soportada con %s\n"
 
-#: env.c:56
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -496,7 +507,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:68
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -507,26 +518,26 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:80
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Vostede non existe.  Marche.\n"
 
-#: env.c:142
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: non se pode determina-la s�a m�quina"
 
-#: env.c:163
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "o gethostbyname fallou para %s\n"
 
-#: env.c:165
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:169
+#: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -534,132 +545,148 @@ msgid ""
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
-#: etrn.c:47 odmr.c:58
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "O servidor SMTP receptor de %s non soporta ESMTP\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "O servidor SMTP receptor de %s non soporta ETRN\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "Cola para %s iniciada\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "Non hai mensaxes agardando para %s\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "Mensaxes pendentes para %s iniciadas\n"
 
-#: etrn.c:92
+#: etrn.c:94
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Imposible po�er mensaxes na cola para o nodo %s\n"
 
-#: etrn.c:96
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Nodo %s non permitido: %s\n"
 
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "Erro de sintaxe de ETRN\n"
 
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "Erro de sintaxe de ETRN nos par�metros\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "Erro de ETRN %d desco�ecido\n"
 
-#: etrn.c:151
+#: etrn.c:154
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "A opci�n --keep non est� soportada con ETRN\n"
 
-#: etrn.c:155
+#: etrn.c:158
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "A opci�n --flush non est� soportada con ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:162
 #, fuzzy
 msgid "Option --folder is not supported with ETRN\n"
 msgstr "A opci�n --flush non est� soportada con ETRN\n"
 
-#: etrn.c:163
+#: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "A opci�n --check non est� soportada con ETRN\n"
 
-#: fetchmail.c:159
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:171
+#: fetchmail.c:188
 #, fuzzy
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: fallou o fork\n"
 
-#: fetchmail.c:195
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:257
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Isto � fetchmail versi�n %s"
 
-#: fetchmail.c:354
+#: fetchmail.c:395
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Collendo as opci�ns da li�a de comandos%s%s\n"
 
 # Estas d�as cadeas quedan "... da li�a de comandos e de .fetchmailrc"
-#: fetchmail.c:355
+#: fetchmail.c:396
 msgid " and "
 msgstr " e de "
 
-#: fetchmail.c:360
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Non hai ning�n servidor de correo configurado -- �quizais falta o %s?\n"
 
-#: fetchmail.c:381
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: non se indicou ning�n servidor de correo.\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: non hai outro fetchmail a se executar\n"
 
-#: fetchmail.c:399
+#: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erro matando fetchmail en %s co pid %d; sa�ndo.\n"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "primeiro plano"
 
-#: fetchmail.c:408
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail en %s co pid %d matado.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:472
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -667,7 +694,7 @@ msgstr ""
 "fetchmail: non se pode comproba-lo correo cando hai outro fetchmail na\n"
 "mesma m�quina a se executar.\n"
 
-#: fetchmail.c:437
+#: fetchmail.c:478
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -675,203 +702,234 @@ msgstr ""
 "fetchmail: non se pode recibir das m�quinas indicadas con outro fetchmail a "
 "se executar en %d.\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:485
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 "fetchmail: outro fetchmail en primeiro plano est� a se executar en %d.\n"
 
-#: fetchmail.c:454
+#: fetchmail.c:495
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: non se poden aceptar opci�ns cando hai un fetchmail en segundo "
 "plano a se executar.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail en segundo plano co pid %d espertado.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: proceso m�is antigo en %d morreu misteriosamente.\n"
 
-#: fetchmail.c:487
+#: fetchmail.c:528
 #, fuzzy, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: non se pode atopar unha contrasinal para %s@%s.\n"
 
-#: fetchmail.c:491
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Introduza a contrasinal para %s@%s: "
 
-#: fetchmail.c:522
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: aviso: ning�n DNS dispo�ible para comprobar recepci�ns con "
+"m�ltiples entregas de %s\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: non hai outro fetchmail a se executar\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando o demonio de fetchmail %s \n"
 
-#: fetchmail.c:537 fetchmail.c:539
+#: fetchmail.c:589 fetchmail.c:591
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:575
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "non se puido comproba-la data de %s (erro %d)\n"
 
-#: fetchmail.c:580
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "iniciando fetchmail (%s cambiou)\n"
 
-#: fetchmail.c:585
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:612
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fallou a tentativa de reexecutar o fetchmail\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "recepci�n de %s omitida (fallo de autenticaci�n ou demasiados excesos de "
 "espera)\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "non se atinxiu o intervalo, non se interrogar� %s\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:751
 #, fuzzy
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:753
 #, fuzzy
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:755
 #, fuzzy
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:757
 #, fuzzy
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:759
 #, fuzzy
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:761
 #, fuzzy
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:763
 #, fuzzy
 msgid "Query status=6 (IOERR)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:765
 #, fuzzy
 msgid "Query status=7 (ERROR)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:767
 #, fuzzy
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:769
 #, fuzzy
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:710
+#: fetchmail.c:771
 #, fuzzy
 msgid "Query status=10 (SMTP)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:712
+#: fetchmail.c:773
 #, fuzzy
 msgid "Query status=11 (DNS)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:714
+#: fetchmail.c:775
 #, fuzzy
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:716
+#: fetchmail.c:777
 #, fuzzy
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Estado da petici�n=%d\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "T�dalas las conexi�ns est�n trabadas.  Sa�ndo.\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:828
 #, fuzzy, c-format
-msgid "sleeping at %s\n"
+msgid "sleeping at %s for %d seconds\n"
 msgstr "fetchmail: durmindo en %s\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "espertado por %s\n"
 
-#: fetchmail.c:798
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: fetchmail.c:805
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "espertado en %s\n"
 
-#: fetchmail.c:811
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "finalizaci�n normal, estado %d\n"
 
-#: fetchmail.c:963
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "non se puido comprobar a data do ficheiro de control de execuci�n\n"
 
-#: fetchmail.c:996
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Aviso: m�ltiples menci�ns da m�quina %s no ficheiro de configuraci�n\n"
 
-#: fetchmail.c:1029
+#: fetchmail.c:1087
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Aviso: m�ltiples menci�ns da m�quina %s no ficheiro de configuraci�n\n"
 
-#: fetchmail.c:1149
+#: fetchmail.c:1209
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1180
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "non est� configurado o soporte POP2.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "non est� configurado o soporte POP2.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "non est� configurado o soporte POP2.\n"
+
+#: fetchmail.c:1258
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -879,16 +937,16 @@ msgstr ""
 "fetchmail: aviso: ning�n DNS dispo�ible para comprobar recepci�ns con "
 "m�ltiples entregas de %s\n"
 
-#: fetchmail.c:1191
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1192
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1209
+#: fetchmail.c:1287
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -896,294 +954,300 @@ msgid ""
 msgstr ""
 "configuraci�n de %s non v�lida, o n�mero de porto non pode ser negativo\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1294
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuraci�n de %s non v�lida, RPOP require un porto privilexiado\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuraci�n de %s non v�lida, LMTP non pode usar o porto por defecto SMTP\n"
 
-#: fetchmail.c:1248
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "�Baixar e manter t�dalas mensaxes en modo demonio � un erro!\n"
 
-#: fetchmail.c:1298
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminado con sinal %d\n"
 
-#: fetchmail.c:1383
+#: fetchmail.c:1424
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "non est� configurado o soporte POP3.\n"
 
-#: fetchmail.c:1430
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "non est� configurado o soporte IMAP.\n"
 
-#: fetchmail.c:1436
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "non est� configurado o soporte ETRN.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1485
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "non est� configurado o soporte POP2.\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "o protocolo escollido non est� soportado.\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1502
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interrogando %s (protocolo %s) en %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "O intervalo entre petici�ns � de %d segundos\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "O ficheiro de rexistro � %s\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "O ficheiro de identificaci�ns � %s\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "As mensaxes de progreso rexistraranse polo syslog\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail enmascararase e non xerar� unha li�a Received\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1492
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviar� mensaxes multidrop con enderezo incorrecto a %s.\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail enviar� as mensaxes de erro � postmaster.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail enviar� as mensaxes de erro � autor.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opci�ns para recibir de %s@%s:\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  O correo recibirase v�a %s\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1553
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Recibirase deste servidor cada %d intervalos.\n"
 msgstr[1] "  Recibirase deste servidor cada %d intervalos.\n"
 
-#: fetchmail.c:1516
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O nome real do servidor � %s.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1560
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina%sser� interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina%sser� interrogada cando non se indique ningunha outra.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Pedirase a contrasinal.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identificaci�n RPOP = \"%s\".\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Contrasinal = \"%s\".\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  O protocolo � KPOP con autenticaci�n Kerberos %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  O protocolo � %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando o servicio %s)"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (usando o porto por defecto)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (forzando o uso de UIDL)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1561
+#: fetchmail.c:1602
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1605
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Autenticaci�n NTLM soportada\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1608
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autenticaci�n NTLM soportada\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1611
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1614
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autenticaci�n CRAM-MD5 soportada\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1617
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: fetchmail.c:1579
+#: fetchmail.c:1620
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Activada a preautenticaci�n Kerberos V4.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1623
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Activada a preautenticaci�n Kerberos V5.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  As�mese encriptado dun punto � outro.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1592
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1594
+#: fetchmail.c:1635
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  O protocolo � %s"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1598
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1601
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Mostra da data do servicio %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1604
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  O tempo de espera de resposta do servidor � %d segundos"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (por defecto).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correo por defecto escollida.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correo escollidas son:"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1667
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1668
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Baixaranse %s mensaxes (--all %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1627
+#: fetchmail.c:1670
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  As mensaxes recibidas%sser�n mantidas no servidor (--keep %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1628
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As mensaxes recibidas%sser�n mantidas no servidor (--keep %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1630
+#: fetchmail.c:1673
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
@@ -1191,7 +1255,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1631
+#: fetchmail.c:1674
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
@@ -1200,7 +1264,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1633
+#: fetchmail.c:1676
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1210,7 +1274,7 @@ msgstr ""
 "flush %s).\n"
 
 # %s substit�ese por " non " ou " "
-#: fetchmail.c:1634
+#: fetchmail.c:1677
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1222,7 +1286,7 @@ msgstr ""
 # A traducci�n est� feita cos : porque � o �nico xeito de que as
 # palabras "activado" e "desactivado" sirvan para as sentencias
 # masculinas e femininas, sen que quede moi mal
-#: fetchmail.c:1636
+#: fetchmail.c:1679
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
@@ -1230,243 +1294,243 @@ msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 # A traducci�n est� feita cos : porque � o �nico xeito de que as
 # palabras "activado" e "desactivado" sirvan para as sentencias
 # masculinas e femininas, sen que quede moi mal
-#: fetchmail.c:1637
+#: fetchmail.c:1680
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rescritura dos enderezos locais: %s (--norewrite %s).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1682
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Eliminaci�n do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1683
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Eliminaci�n do retorno de carro: %s (stripcr %s).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1685
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1686
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Retorno de carro forzado: %s (forcecr %s).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1688
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpretaci�n de Content-Transfer-Encoding: %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1689
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpretaci�n de Content-Transfer-Encoding: %s (pass8bits %s).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1691
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Decodificaci�n MIME: %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1692
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Decodificaci�n MIME: %s (mimedecode %s).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inactividade despois da recepci�n: %s (idle %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1695
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Inactividade despois da recepci�n: %s (idle %s).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1698
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1700
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1701
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As li�as Status non baleiras ser�n %s (dropstatus %s)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O l�mite de tama�o de mensaxe � %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Sen l�mite de tama�o de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de avisos do tama�o das mensaxes � %d segundos (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tama�o de mensaxe en cada recepci�n (--warnings 0).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O l�mite de mensaxes recibidas � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Sen l�mite de mensaxes recibidas (--fetchlimit 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1721
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O l�mite de mensaxes recibidas � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Sen l�mite de tama�o de mensaxe (--limit 0).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1692
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O l�mite de lote de mensaxes SMTP � %d.\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Sen l�mite de lote de mensaxes SMTP (--bathlimit 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  O intervalo de borrado entre eliminaci�ns forzado a %d (--expunge %d).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Sen eliminaci�ns forzadas (--expunge 0).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1712 fetchmail.c:1732
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensaxes ser�n engadidas a %s como BSMTP\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensaxes ser�n entregadas con \"%s\".\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensaxes ser�n redirixiadas a trav�s de %cMTP a:"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da m�quina na li�a MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1749
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas de bloques spam reco�ecidas polo servidor receptor son:"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueo de spam desactivado\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conexi�n � servidor ser� iniciada con \"%s\".\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Ning�n comando de pre-conexi�n.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conexi�n � servidor ser� rematada con \"%s\".\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Ning�n comando de pos-conexi�n.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Non hai ning�n nome local declarado para esta m�quina.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Modo de entrega m�ltiple: "
 
-#: fetchmail.c:1781
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simple: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1826
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome(s) local(is) reco�ecidos.\n"
 msgstr[1] "%d nome(s) local(is) reco�ecidos.\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1841
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Busca no DNS por enderezos de m�ltiple entrega: %s.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1842
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Busca no DNS por enderezos de m�ltiple entrega: %s.\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1846
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1474,106 +1538,106 @@ msgstr ""
 "  Os aliases do servidor compararanse cos enderezos de m�ltiple entrega "
 "segundo "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1848
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Os aliases do servidor compararanse cos enderezos de m�ltiple entrega "
 "segundo "
 
-#: fetchmail.c:1808
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O encami�amento dos enderezos do sobre est� desactivado\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  As�mese que a cabeceira do sobre �: %s\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1857
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  N�mero da cabeceira do sobre a procesar: %d\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Eliminarase o prefixo %s do identificador de usuario\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Sen eliminaci�n de prefixo\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliases predeclarados do servidor de correo:"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Dominios locais:"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conexi�n ten que ser a trav�s da interfaz %s.\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Non se indicou ning�n requirimento de interfaz.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  O bucle de recibimento monitorizar� %s.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Non se indicou ningunha interfaz de monitorizaci�n.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conexi�ns � servidor faranse polo plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Non se indicou ning�n comando de plugin.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  �s conexi�ns � servidor receptor faranse polo plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Non se indicou ning�n comando de plugout.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Ning�n UID foi grabado desta m�quina.\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gravados.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1886
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1889
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propiedades de paso \"%s\".\n"
 
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERRO: non hai soporte para a rotina getpassword()\n"
 
@@ -1595,45 +1659,45 @@ msgstr "Non se puido obte-lo nome do servicio para [%s]\n"
 msgid "Using service name [%s]\n"
 msgstr "Usando o nome de servicio [%s]\n"
 
-#: gssapi.c:88
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Enviando credenciais\n"
 
-#: gssapi.c:106
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Erro no troco de credenciais\n"
 
-#: gssapi.c:151
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "Non foi posible desempaquetar os datos do nivel de seguridade\n"
 
-#: gssapi.c:156
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Troco de credenciais completo\n"
 
-#: gssapi.c:160
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "O servidor require integridade e/ou privacidade\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempaquetadas as marcas do nivel de seguridade: %s%s%s\n"
 
-#: gssapi.c:173
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "O tama�o m�ximo do s�mbolo GSS � %ld\n"
 
-#: gssapi.c:186
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Erro � crear a petici�n de nivel de seguridade\n"
 
-#: gssapi.c:197
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando as credenciais GSS\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Erro liberando as credenciais\n"
 
@@ -1642,84 +1706,109 @@ msgstr "Erro liberando as credenciais\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: durmindo en %s\n"
 
-#: imap.c:298
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificabo como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:482
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
+#: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:592 pop3.c:385
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:513
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr "a mensaxe %d non ti�a o tama�o agardado (%d real != %d agardado)\n"
+
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "fallou a nova tentativa de baixar mensaxes\n"
 
-#: imap.c:682
+#: imap.c:781 imap.c:837
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:694
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "fallou a selecci�n de caixa de correo\n"
 
-#: imap.c:698
+#: imap.c:802
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:722
+#: imap.c:816
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "fallou o execl(%s)\n"
 
-#: imap.c:726
+#: imap.c:820
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Non hai mensaxes agardando para %s\n"
 msgstr[1] "Non hai mensaxes agardando para %s\n"
 
-#: imap.c:751
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "fallou a busca de mensaxes non lidas\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "a %u a�nda foi lida\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:902 pop3.c:889
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "a %u a�nda foi lida\n"
 
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
@@ -1822,181 +1911,181 @@ msgstr "non se puido decodificar a resposta BASE64 de dispo�ibilidade\n"
 msgid "challenge mismatch\n"
 msgstr "o challenge non encaixa\n"
 
-#: lock.c:77
+#: lock.c:86
 #, fuzzy, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
 
-#: lock.c:89
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
 
-#: lock.c:96
+#: lock.c:121
 #, fuzzy, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: borrando ficheiro de bloqueo antigo\n"
 
-#: lock.c:137
+#: lock.c:168
 #, fuzzy
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: fallou o socketpair\n"
 
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: aviso: atopouse \"%s\" antes de calquera nome de m�quina\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: aviso: s�mbolo desco�ecido \"%s\"\n"
 
-#: odmr.c:64
+#: odmr.c:66
 #, fuzzy, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "O servidor SMTP receptor de %s non soporta ETRN\n"
 
-#: odmr.c:102
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr ""
 
-#: odmr.c:107
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr ""
 
-#: odmr.c:111
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr ""
 
-#: odmr.c:116
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr ""
 
-#: odmr.c:120
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr ""
 
-#: odmr.c:124
+#: odmr.c:126
 #, fuzzy
 msgid "Authentication required.\n"
 msgstr "Autenticaci�n OTP soportada\n"
 
-#: odmr.c:128
+#: odmr.c:130
 #, fuzzy, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "Erro de ETRN %d desco�ecido\n"
 
-#: odmr.c:187
+#: odmr.c:189
 #, fuzzy
 msgid "receiving message data\n"
 msgstr "escribindo o texto da mensaxe\n"
 
-#: odmr.c:240
+#: odmr.c:242
 #, fuzzy
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "A opci�n --keep non est� soportada con ETRN\n"
 
-#: odmr.c:244
+#: odmr.c:246
 #, fuzzy
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "A opci�n --flush non est� soportada con ETRN\n"
 
-#: odmr.c:248
+#: odmr.c:250
 #, fuzzy
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "A opci�n --flush non est� soportada con ETRN\n"
 
-#: odmr.c:252
+#: odmr.c:254
 #, fuzzy
 msgid "Option --check is not supported with ODMR\n"
 msgstr "A opci�n --check non est� soportada con ETRN\n"
 
-#: opie.c:36
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr ""
 
-#: opie.c:50
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Non se puido decodificar o challenge OTP\n"
 
-#: opie.c:58 pop3.c:515
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Contrasinal segreda: "
 
-#: options.c:161 options.c:205
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "A cadea '%s' non � unha cadea num�rica v�lida.\n"
 
-#: options.c:170
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "O valor da cadea '%s' � %s que %d.\n"
 
-#: options.c:171
+#: options.c:178
 msgid "smaller"
 msgstr "m�is pequeno"
 
-#: options.c:171
+#: options.c:178
 msgid "larger"
 msgstr "maior"
 
-#: options.c:330
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo indicado `%s' non v�lido.\n"
 
-#: options.c:372
+#: options.c:386
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Preautenticaci�n `%s' indicada non v�lida.\n"
 
-#: options.c:573
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opci�ns] [servidor ...]\n"
 
-#: options.c:574
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  As opci�ns son as seguintes:\n"
 
-#: options.c:575
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        amosar esta axuda das opci�ns\n"
 
-#: options.c:576
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     amosa-la informaci�n da versi�n\n"
 
-#: options.c:578
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       comprobar as mensaxes sen recollelas\n"
 
-#: options.c:579
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      traballar silenciosamente\n"
 
-#: options.c:580
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     traballar barullentamente (sa�da de diagn�stico)\n"
 
-#: options.c:581
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      executarse como un demonio unha vez cada n segundos\n"
 
-#: options.c:582
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    non quitar do primeiro plano o proceso demonio\n"
 
-#: options.c:583
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        mata-lo proceso demonio\n"
 
-#: options.c:584
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     indica-lo nome do ficheiro de rexistro\n"
 
-#: options.c:585
+#: options.c:603
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2004,316 +2093,364 @@ msgstr ""
 "      --syslog      usar syslog(3) para a maior parte das mensaxes � "
 "se                     executar como demonio\n"
 
-#: options.c:586
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   non escribir `Received' e activar finximento de m�quina\n"
 
-#: options.c:587
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc indicar un ficheiro de control de execuci�n diferente\n"
 
-#: options.c:588
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      indicar un ficheiro de UIDs alternativo\n"
 
-#: options.c:589
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "  -i, --idfile      indicar un ficheiro de UIDs alternativo\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  indicar o destinatario en �ltimo caso\n"
 
-#: options.c:590
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    redirixir as mensaxes erradas do usuario � postmaster.\n"
 
-#: options.c:592
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   indicaci�n de requirimento de interfaz\n"
 
-#: options.c:593
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorizar a actividade da interfaz\n"
 
-#: options.c:596
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesi�n encriptada con ssl\n"
 
-#: options.c:597
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ficheiro coa chave privada ssl\n"
 
-#: options.c:598
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:599
+#: options.c:618
+#, fuzzy
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr "      --sslcert     certificado de cliente ssl\n"
+
+#: options.c:619
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     certificado de cliente ssl\n"
 
-#: options.c:600
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:601
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:622
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:603
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      indicar comando externo para abri-la conexi�n\n"
 
-#: options.c:604
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     indicar comando externo para abri-la conexi�n smtp "
 "local\n"
 
-#: options.c:606
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    indicar o protocolo de recepci�n (mirar a p�xina man)\n"
 
-#: options.c:607
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar o uso de UIDLs (s� pop3)\n"
 
-#: options.c:608
+#: options.c:629
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        porto do servicio TCP/IP � que se conectar\n"
 
-#: options.c:609
+#: options.c:630
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        porto do servicio TCP/IP � que se conectar\n"
 
-#: options.c:610
+#: options.c:631
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --preauth     tipo de preautenticaci�n: password (contrasinal),\n"
 "                    kerberos, ou ssh\n"
 
-#: options.c:611
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tempo de espera da resposta do servidor\n"
 
-#: options.c:612
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabeceira co enderezo do sobre\n"
 
-#: options.c:613
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo a borrar da identificaci�n de usuario local\n"
 
-#: options.c:614
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    indicar o login do usuario no servidor\n"
 
-#: options.c:618
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+#, fuzzy
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         coller as mensaxes vellas e novas\n"
 
-#: options.c:619
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borra-las novas mensaxes despois de recollelas\n"
 
-#: options.c:620
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        mante-las novas mensaxes despois de recollelas\n"
 
-#: options.c:621
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
 
-#: options.c:622
+#: options.c:643
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       elimina-las mensaxes vellas do servidor\n"
 
-#: options.c:623
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   non rescribi-los enderezos das cabeceiras\n"
 
-#: options.c:624
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       non coller mensaxes meirandes que o tama�o dado\n"
 
-#: options.c:625
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    intervalo entre notificaci�ns de avisos de correo\n"
 
-#: options.c:627
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    establece-lo servidor SMTP para redirixir\n"
 
-#: options.c:628
+#: options.c:649
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:629
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress establece-lo dominio de entrega SMTP a usar\n"
 
-#: options.c:630
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   establece-los valores de resposta antispam\n"
 
-#: options.c:632
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  establece-lo l�mite de lote para conexi�ns SMTP\n"
 
-#: options.c:633
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:634
+#: options.c:655
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  establece-lo l�mite de mensaxes para as conexi�ns\n"
 "                    � servidor\n"
 
-#: options.c:635
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     establece-lo n�mero m�ximo de borrados entre "
 "eliminaci�ns\n"
 
-#: options.c:637
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         establece-lo MDA a usar para redirixir\n"
 
-#: options.c:638
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       establece-lo ficheiro BSMTP de sa�da\n"
 
-#: options.c:639
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para a entrega\n"
 
-#: options.c:640
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      indicar o nome da carpeta remota\n"
 
-#: options.c:641
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:553
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Mostra da data de APOP requirida non atopada no sa�do\n"
 
-#: pop3.c:562
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na mostra da data no sa�do\n"
 
-#: pop3.c:584
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petici�n de protocolo indefinida en POP3_auth\n"
 
-#: pop3.c:592
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "�bloqueo activado!  �Hai outra sesi�n activa?\n"
 
-#: pop3.c:664
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:816
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "a %u a�nda foi lida\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensaxes inseridas nunha lista no servidor. Non se pode manexar isto.\n"
 
-#: pop3.c:902
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:917
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo � obter os UIDLs\n"
 
-#: pop3.c:1276
+#: pop3.c:1443
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "A opci�n --remote non est� soportada con POP3\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:381
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:418
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:428
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:440
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2434,236 +2571,248 @@ msgstr "Chave de sesi�n establecida:\n"
 msgid "RPA authorisation complete\n"
 msgstr "Autorizaci�n RPA completa\n"
 
-#: rpa.c:373
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "Obtenci�n de resposta\n"
 
-#: rpa.c:403
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "A obtenci�n de resposta devolveu %d [%s]\n"
 
-#: rpa.c:466
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "A cabeceira non � 60\n"
 
-#: rpa.c:487
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Erro de lonxitude do s�mbolo\n"
 
-#: rpa.c:492
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "A lonxitude %d do compo�ente non est� de acordo coa rxlen %d\n"
 
-#: rpa.c:498
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "Campo de mecanismo incorrecto\n"
 
-#: rpa.c:535
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no car�cter %d: %x\n"
 
-#: rpa.c:550
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Datos binarios entrantes:\n"
 
-#: rpa.c:588
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Datos sa�ntes:\n"
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "Cadea RPA longa de m�is\n"
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:715
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA fallou na apertura de /dev/urandom. Isto non deber�a\n"
 
-#: rpa.c:716
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedilo de se conectar, pero significa que\n"
 
-#: rpa.c:717
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    non pode estar seguro de estar a falar co\n"
 
-#: rpa.c:718
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    servicio que vostede cre (son posibles\n"
 
-#: rpa.c:719
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    ataques de re-tentativa por un servicio deshonesto.)\n"
 
-#: rpa.c:730
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Challenge de usuario:\n"
 
-#: rpa.c:883
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 sendo aplicado � bloque de datos:\n"
 
-#: rpa.c:896
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr "O resultado MD5 �: \n"
 
-#: servport.c:52
+#: servport.c:53
 #, c-format
 msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
 msgstr ""
 
-#: servport.c:78
+#: servport.c:80
 #, c-format
 msgid "Cannot resolve service %s to port number.\n"
 msgstr ""
 
-#: servport.c:79
+#: servport.c:81
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "redirixindo a %s\n"
 
-#: sink.c:312
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:315
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:447
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:507 sink.c:591
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "erro de %cMTP: %s\n"
 
-#: sink.c:752
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do pre�mbulo\n"
+
+#: sink.c:758
+#, fuzzy
+msgid "BSMTP preamble write failed.\n"
 msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do pre�mbulo\n"
 
-#: sink.c:965
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:972
+#: sink.c:979
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
 
-#: sink.c:1013
+#: sink.c:1025
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1025
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "�non se pode nin sequera enviar a %s!\n"
 
-#: sink.c:1031
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
 
-#: sink.c:1185
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "a piques de entregar con: %s\n"
 
-#: sink.c:1209
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr "Fallou a apertura MDA\n"
 
-#: sink.c:1246
+#: sink.c:1260
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "fallou a conexi�n %cMTP a %s\n"
 
-#: sink.c:1270
+#: sink.c:1284
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1326
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "Erro liberando as credenciais\n"
+
+#: sink.c:1349
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "espertado por sinal %d\n"
 
-#: sink.c:1329
+#: sink.c:1352
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "O MDA saiu anormalmente ou devolveu estado non cero\n"
 
-#: sink.c:1332
+#: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1353
+#: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
 
-#: sink.c:1374
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr "O receptor SMTP rexeitou a entrega\n"
 
-#: sink.c:1404
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1407
+#: sink.c:1432
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta distinta de 503 non agardada � LMTP EOM: %s\n"
 
-#: sink.c:1561
+#: sink.c:1587
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:87
+#: smtp.c:79
 #, fuzzy
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autenticaci�n CRAM-MD5 soportada\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
@@ -2695,136 +2844,171 @@ msgstr "executando %s %s %s\n"
 msgid "execvp(%s) failed\n"
 msgstr "fallou o execl(%s)\n"
 
-#: socket.c:281
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:284
+#: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:296 socket.c:299
+#, fuzzy, c-format
+msgid "unknown (%s)"
+msgstr "a m�quina � desco�ecida."
+
+#: socket.c:302
+#, c-format
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, fuzzy, c-format
+msgid "cannot create socket: %s\n"
+msgstr "�non se pode nin sequera enviar a %s!\n"
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "fallou a conexi�n %cMTP a %s\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "fallou a conexi�n %cMTP a %s\n"
+
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "fallou a conexi�n %cMTP a %s\n"
+
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:630
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:634
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:636
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:640
+#: socket.c:625
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Mostra da data do servicio %s\n"
 
-#: socket.c:644
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:690
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:696
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:701
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:703
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:717
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:731
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:735
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:738
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:753
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:805
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:822
+#: socket.c:842
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo indicado `%s' non v�lido.\n"
 
-#: socket.c:883
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:957
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:960
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:74
+#: transact.c:67
+#, fuzzy, c-format
+msgid "mapped address %s to local %s\n"
+msgstr "%s asociado a %s local\n"
+
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s asociado a %s local\n"
 
-#: transact.c:138
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "pasou por %s coincidindo con %s\n"
 
-#: transact.c:207
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2833,134 +3017,135 @@ msgstr ""
 "analizando a li�a Received:\n"
 "%s"
 
-#: transact.c:246
+#: transact.c:265
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "li�a aceptada, %s � un alias do servidor de correo\n"
 
-#: transact.c:252
+#: transact.c:271
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "li�a rexeitada, %s non � un alias do servidor de correo\n"
 
-#: transact.c:326
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "non se atopou ning�n enderezo `Received'\n"
 
-#: transact.c:335
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "atopouse o enderezo `Received' `%s'\n"
 
-#: transact.c:538
+#: transact.c:551
 msgid "message delimiter found while scanning headers\n"
 msgstr "delimitador de mensaxes atopado � explora-las cabeceiras\n"
 
-#: transact.c:559
+#: transact.c:582
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr "delimitador de mensaxes atopado � explora-las cabeceiras\n"
 
-#: transact.c:561
+#: transact.c:584
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Recibindo de %s\n"
 
-#: transact.c:1082
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "non hai ningunha coincidencia local, reenviando a %s\n"
 
-#: transact.c:1097
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenv�o e borrado omitidos por causa de erros de DNS\n"
 
-#: transact.c:1209
+#: transact.c:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribindo cabeceiras de mensaxe RFC822\n"
 
-#: transact.c:1230
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "ning�n dos enderezos coincidiu cos nomes locais declarados"
 
-#: transact.c:1237
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "o enderezo de destinatario %s non coincidiu con ning�n nome local"
 
-#: transact.c:1246
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "a mensaxe cont�n caracteres nulos"
 
-#: transact.c:1254
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 "O servidor SMTP receptor rexeitou os enderezos de destinatario locais: "
 
-#: transact.c:1382
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "escribindo o texto da mensaxe\n"
 
-#: uid.c:248
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr ""
 
-#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr ""
 
-#: uid.c:260
+#: uid.c:262
 msgid "Scratch list of UIDs:"
 msgstr ""
 
-#: uid.c:514 uid.c:566
+#: uid.c:517 uid.c:569
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr ""
 
-#: uid.c:516
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr ""
 
-#: uid.c:545
+#: uid.c:548
 msgid "swapping UID lists\n"
 msgstr ""
 
-#: uid.c:553
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:578
+#: uid.c:581
 msgid "discarding new UID list\n"
 msgstr ""
 
-#: uid.c:613
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr ""
 
-#: uid.c:615
+#: uid.c:620
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Erro liberando as credenciais\n"
 
-#: uid.c:621
+#: uid.c:626
 #, fuzzy
 msgid "Writing fetchids file.\n"
 msgstr "iniciando o demonio de fetchmail %s \n"
 
-#: uid.c:640
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:644
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:648
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2973,6 +3158,9 @@ msgstr "fallou o malloc\n"
 msgid "realloc failed\n"
 msgstr "fallou o realloc\n"
 
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "SIGPIPE enviado por un MDA ou erro da conexi�n stream\n"
+
 #~ msgid "header "
 #~ msgstr " de cabeceira"
 
diff --git a/po/id.po b/po/id.po
index 5e1b1212..c307681c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-08-21 22:55+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -103,89 +103,96 @@ msgstr " (panjang -1)"
 msgid " (oversized)"
 msgstr " (terlalu besar)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "tak dapat mengambil tajuk, pesan %s@%s: %d (%d oktet)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "membaca pesan %s@%s:%d dari %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktet)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktet tajuk)"
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d oktet tubuh)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "pesan %s@%s:%d bukan panjang yang diharapkan (%d aktual != %d diharapkan)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"pesan %s@%s:%d bukan panjang yang diharapkan (%d aktual != %d diharapkan)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " tertahan\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " dihapus\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " tak dihapus\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "batas ambil %d tercapai; %d pesan tertinggal di server %s akun %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "waktu habis setelah %d detik menunggu tersambung ke server %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "waktu habis setelah %d detik menunggu server %s.\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "waktu habis setelah %d detik menunggu %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "waktu habis setelah %d detik menunggu hingga pendengar merespon.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "waktu habis setelah %d detik.\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjek: fetchmail melihat waktu habis yang berulang"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail melihat lebih dari %d waktu habis ketika coba mengambil surat dari%s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail melihat lebih dari %d waktu habis ketika coba mengambil surat dari%"
+"s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 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,73 +206,73 @@ msgstr ""
 "oleh galat server. Anda dapat menjalankan `fetchmail -v -v' untuk\n"
 "mendiagnosis masalah.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "perintah pra-koneksi gagal dengan status %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "tak dapat menemukan pobox HESIOD untuk %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Awalan server tak memiliki nama.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "tak dapat menemukan nama DNS kanonik dari %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "koneksi %s ke %s gagal"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subjek: peringatan tak dapat mencapai server Fetchmail."
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail tak dapat mencapai server surat %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "koneksi SSL gagal.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Galat kunci-sibuk di %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Galat server sibuk di %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Kegagalan otorisasi di %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (sebelumnya telah diotorisasi)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subjek: otorisasi fetchmail gagal di %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail tak dapat mengambil surat dari %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -279,7 +286,7 @@ msgstr ""
 "yang fetchmail tak dapat kenali karena server tidak mengirim pesan galat\n"
 "yang berguna."
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -299,7 +306,7 @@ msgstr ""
 "tiap siklus. Tak ada pemberitahuan di masa depan yang akan dikirimkan\n"
 "hingga layanan dipulihkan."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -320,164 +327,164 @@ msgstr ""
 "tiap siklus. Tak ada pemberitahuan di masa depan yang akan dikirimkan\n"
 "hingga layanan ini dipulihkan."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Penjajakan ulang secepatnya pada %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Log masuk tak dikenal atau galat otentikasi di %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Otorisasi OK pada %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subjek: otentikasi fetchmail OK pada %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail dapat log masuk ke %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Layanan telah dikembalikan.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "memilih atau polling ulang folder %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "memilih atau polling ulang folder standar\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s di %s (folder %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s di %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polling %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d pesan (%d %s) untuk %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "terlihat"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d pesan untuk %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktet).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Tak ada surat untuk %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "pesan palsu terhitung!"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "tajuk RFC822 hilang atau rusak"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "sinkronisasi klien/server"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "protokol klien/server"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "kunci sibuk di server"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "transaksi SMTP"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "pencarian DNS"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "tak dijelaskan"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "galat %s ketika mengambil dari %s@%s dan mengirim ke host SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "tak diketahui"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "galat %s ketika mengambil dari %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "perintah pasca-koneksi gagal dengan status %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Dukungan V4 kerberos tak ditautkan.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Dukungan V5 kerberos tak ditautkan.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opsi --flush tak didukung dengan %s\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opsi --all tak didukung dengan %s\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opsi --limit tak didukung dengan %s\n"
@@ -502,13 +509,15 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s: Variabel lingkungan NULLMAILER_FLAGS telah diatur.\n"
 "Ini berbahaya karena dapat membuat pemadat bungkus nullmailer-inject atau\n"
-"nullmailer sendmail dengan tajuk Dari:, ID-Pesan: atau Alamat-Balasan: anda.\n"
+"nullmailer sendmail dengan tajuk Dari:, ID-Pesan: atau Alamat-Balasan: "
+"anda.\n"
 "Coba \"env NULLMAILER_FLAGS=%s ARGUMEN ANDA DI SINI\"\n"
 "%s: Batalkan.\n"
 
@@ -529,12 +538,15 @@ msgstr "gethostbyname gagal untuk %s\n"
 
 #: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Tak dapat menemukan host saya sendiri di basis data host untuk mengkualifikasikannya!\n"
+msgstr ""
+"Tak dapat menemukan host saya sendiri di basis data host untuk "
+"mengkualifikasikannya!\n"
 
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Coba melanjutkan dengan nama host tak memenuhi syarat.\n"
@@ -606,14 +618,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Opsi --check tidak didukung dengan ETRN\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Hak cipta (C) 2002, 2003 Eric S. Raymond\n"
-"Hak cipta (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Hak cipta (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
 "Hak cipta (C) 2005-2006 Sunil Shetye\n"
 "Hak cipta (C) 2005-2007 Matthias Andree\n"
 
@@ -625,7 +640,8 @@ msgid ""
 msgstr ""
 "Fetchmail hadir dengan TANPA GARANSI APAPUN. Ini adalah perangkat lunak,\n"
 "dan anda dipersilakan untuk mendistribusikannya di bawah kondisi tertentu.\n"
-"Untuk detail, silakan lihat berkas COPYING di sumber atau direktori dokumentasi.\n"
+"Untuk detail, silakan lihat berkas COPYING di sumber atau direktori "
+"dokumentasi.\n"
 
 #: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
@@ -685,13 +701,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail di %d dimatikan.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: tak dapat memeriksa surat jika fetchmail lain ke host yang sama juga berjalan.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: tak dapat memeriksa surat jika fetchmail lain ke host yang sama "
+"juga berjalan.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: tak dapat menghitung host yang ditentukan dengan fetchmail lain yang berjalan di %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: tak dapat menghitung host yang ditentukan dengan fetchmail lain "
+"yang berjalan di %d.\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -699,8 +722,11 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: fetchmail latar depan lain berjalan di %d.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: tak dapat menerima opsi ketika fetchmail latar belakang berjalan.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: tak dapat menerima opsi ketika fetchmail latar belakang "
+"berjalan.\n"
 
 #: fetchmail.c:501
 #, c-format
@@ -724,7 +750,9 @@ msgstr "Masukkan sandi lewat untuk %s@%s:"
 
 #: fetchmail.c:557 fetchmail.c:593
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Peringatan: log sistem dan berkas log telah diatur. Silakan cek keduanya untuk log!\n"
+msgstr ""
+"fetchmail: Peringatan: log sistem dan berkas log telah diatur. Silakan cek "
+"keduanya untuk log!\n"
 
 #: fetchmail.c:569
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
@@ -740,765 +768,802 @@ msgstr "memulai jurik fetchmail %s \n"
 msgid "could not open %s to append logs to \n"
 msgstr "tak dapat membuka %s untuk ditambahkan data \n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "tak dapat memeriksa waktu %s (galat %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "memulai ulang fetchmail (%s diubah)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "percobaan untuk menjalankan ulang mungkin akan gagal karena direktori belum dikembalikan\n"
+msgstr ""
+"percobaan untuk menjalankan ulang mungkin akan gagal karena direktori belum "
+"dikembalikan\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "percobaan untuk menjalankan ulang fetchmail gagal\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "jajak pendapat %s dilewati (gagal otentikasi atau terlalu banyak waktu habis)\n"
+msgstr ""
+"jajak pendapat %s dilewati (gagal otentikasi atau terlalu banyak waktu "
+"habis)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval tak tercapai, tidak melemakan %s\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Status lema=0 (SUCCESS)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Status lema=1 (NOMAIL)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Status lema=2 (SOCKET)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Status lema=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Status lema=4 (PROTOCOL)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Status lema=5 (SYNTAX)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Status lema=6 (IOERR)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Status lema=7 (ERROR)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Status lema=8 (EXCLUDE)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Status lema=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Status lema=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Status lema=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Status lema=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Status lema=13 (MAXFETCH)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Status lema=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr ""
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "tertidur di %s selama %d detik\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "terbangun oleh %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "terbangun oleh sinyal %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "terbangun pada %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "penghentian normal, status %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "tak dapat memeriksa waktu di berkas kendali jalan\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Peringatan: banyak penyebutan host %s di berkas pengaturan\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Galat: banyak catatan \"standar\" di berkas pengaturan.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "dukungan SSL tidak dikompilasi.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v4 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "dukungan KERBEROS v5 dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "dukungan GSSAPI dikonfigurasi, tapi tak dikompilasi.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: peringatan: tak ada DNS tersedia untuk memeriksa pengambilan multitaruh dari %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: peringatan: tak ada DNS tersedia untuk memeriksa pengambilan "
+"multitaruh dari %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "peringatan: multitaruh untuk %s memerlukan opsi amplop!\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "peringatan: Jangan tanyakan dukungan jika semua surat melewati tuan pos!\n"
+msgstr ""
+"peringatan: Jangan tanyakan dukungan jika semua surat melewati tuan pos!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: konfigurasi %s tidak sah, tentukan nomor pangkalan positif untuk layanan atau pangkalan\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: konfigurasi %s tidak sah, tentukan nomor pangkalan positif untuk "
+"layanan atau pangkalan\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: konfigurasi %s tidak sah, RPOP memerlukan hak akses pangkalan\n"
+msgstr ""
+"fetchmail: konfigurasi %s tidak sah, RPOP memerlukan hak akses pangkalan\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "%s konfigurasi tidak sah, LMTP tak dapat menggunakan pangkalan SMTP standar\n"
+msgstr ""
+"%s konfigurasi tidak sah, LMTP tak dapat menggunakan pangkalan SMTP standar\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Baik fetchall dan tetap di jurik atau mode siaga adalah kesalahan!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "dihentikan dengan sinyal %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s kueri %s (protokol %s) di %s: jajak pendapat dimulai\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "Dukungan POP2 tidak diatur.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "Dukungan POP3 tidak diatur.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "Dukungan IMAP tidak diatur.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "Dukungan ETRN tidak diatur.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "Dukungan ODMR tidak diatur.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "protokol tak didukung terpilih.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s kueri %s (protokol %s) di %s: jajak pendapat selesai\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Interval jajak pendapat adalah %d detik\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Berkas catatan adalah %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile adalah %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Pesan proses akan dicatat via catatan sistem\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail akan menampilkan titik proses bahkan di berkas catatan.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail akan meneruskan pesan multi taruh salah alamat ke %s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke tuan pos.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail akan meneruskan surat galat ke pengirim.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opsi untuk menerima dari %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Surat akan diterima via %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Jajak pendapat server ini akan terjadi tiap %d interval.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Nama sebenarnya server adalah %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Host ini tidak akan dikueri bila tak ada host yang ditentukan.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Host ini akan dikueri bila tak ada host yang ditentukan.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Sandi lewat akan diberitahu.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Rahasia APOP = \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Sandi lewat = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol adalah KPOP dengan otentikasi %s Kerberos"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol adalah %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (menggunakan layanan %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (menggunakan pangkalan standar)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (memaksa penggunaan UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Semua metode otentikasi yang tersedia akan dicoba.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Otentikasi sandi lewat akan dipaksa.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Otentikasi MSN akan dipaksa.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Otentikasi NTLM akan dipaksa.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Otentikasi OTP akan dipaksa.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Otentikasi CRAM-Md5 akan dipaksa.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Otentikasi GSSAPI akan dipaksa.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V4 akan dipaksa.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Otentikasi Kerberos V5 akan dipaksa.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Enkripsi akhir-ke-akhir diasumsikan.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinsip layanan surat adalah: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Sesi terenkripsi SSL diaktifkan.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokol SSL: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Pemeriksaan sertifikat server SSL diaktifkan.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Direktori sertifikat terpercaya SSL: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "NamaUmum Server: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Sidik jari kunci SSL (diperiksa kontra kunci server): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Waktu jeda nonrespon server adalah %d detik"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (standar).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Kotak surat standar terpilih.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Kotak surat terpilih adalah:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Semua pesan akan diterima (--all hidup).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Hanya pesan baru yang akan diterima (--all mati).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Pesan diterima akan tetap disimpan di server (--keep hidup).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Pesan diterima tidak akan disimpan di server (--keep mati).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Pesan lama akan dihapus sebelum penerimaan pesan (--flush hidup).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Pesan lama tidak akan dihapus sebelum penerimaan pesan (--flush mati).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Pesan lama tidak akan dihapus sebelum penerimaan pesan (--flush mati).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Pesan terlalu besar akan dihapus sebelum penerimaan pesan (--limitflush hidup).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Pesan terlalu besar akan dihapus sebelum penerimaan pesan (--limitflush "
+"hidup).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Pesan terlalu besar tidak akan dihapus sebelum penerimaan pesan (--limitflush mati).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Pesan terlalu besar tidak akan dihapus sebelum penerimaan pesan (--"
+"limitflush mati).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Penulisan ulang alamat server lokal diaktifkan (--norewrite padam).\n"
+msgstr ""
+"  Penulisan ulang alamat server lokal diaktifkan (--norewrite padam).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Penulisan ulang alamat lokal dinonaktifkan (--norewrite hidup).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr ""
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr ""
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr ""
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr ""
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr ""
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr ""
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr ""
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr ""
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr ""
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr ""
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr ""
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr ""
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr ""
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr ""
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr ""
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr ""
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr ""
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr ""
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr ""
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr ""
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr ""
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr ""
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr ""
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr ""
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr ""
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr ""
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr ""
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr ""
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr ""
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr ""
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr ""
@@ -1586,87 +1651,88 @@ msgstr ""
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 
-#: imap.c:662
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr ""
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr ""
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr ""
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr ""
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr ""
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr ""
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
 #: interface.c:256
@@ -1859,362 +1925,374 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr ""
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr ""
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr ""
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr ""
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr ""
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr ""
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr ""
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr ""
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr ""
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr ""
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr ""
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr ""
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr ""
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr ""
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr ""
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr ""
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr ""
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr ""
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr ""
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr ""
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
 msgstr ""
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr ""
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr ""
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr ""
 
@@ -2227,32 +2305,36 @@ msgid "SDPS not enabled."
 msgstr ""
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:429
+#: rcfile_y.y:431
 #, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2559,7 +2641,8 @@ msgstr ""
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
 #: sink.c:1377
@@ -2679,113 +2762,117 @@ msgstr "koneksi ke %s:%s [%s/%s] gagal: %s.\n"
 msgid "connected.\n"
 msgstr "tersambung.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organisasi Penerbit: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr "Peringatan: Nama Organisasi Penerbit terlalu panjang (kemungkinan terpotong).\n"
+msgstr ""
+"Peringatan: Nama Organisasi Penerbit terlalu panjang (kemungkinan "
+"terpotong).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Organisasi Tak Diketahui\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "NamaUmum Penerbit: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "Peringatan: NamaUmum Penerbit terlalu panjang (kemungkinan terpotong).\n"
+msgstr ""
+"Peringatan: NamaUmum Penerbit terlalu panjang (kemungkinan terpotong).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "NamaUmum Penerbit Tak Diketahui\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "NamaUmum Server: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Sertifikat buruk: NamaUmum Subjek terlalu panjang!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "NamaUmum Server tidak cocok: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Nama server tak diatur, tak dapat memverifikasi sertifikat!\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "NamaUmum Server Tak Diketahui\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Nama server tak ditentukan di sertifikat!\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() gagal!\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Kehabisan memori!\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Penyangga teks digest terlalu kecil!\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s kunci sidik jari: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s sidik jari cocok.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s sidik jari tidak cocok!\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Galat verifikasi sertifikat server: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "penerbit tak diketahui (karakter %d pertama): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Penjelas berkas di luar jangkauan untuk SSL."
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Protokol SSL tidak sah '%s' ditentukan, menggunakan standar (SSLv23).\n"
+msgstr ""
+"Protokol SSL tidak sah '%s' ditentukan, menggunakan standar (SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikasi sertifikat/sidik jari entah bagaimana terlewatkan!\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Coba ulang baca soket Cygwin\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Coba ulang baca soket Cygwin gagal!\n"
 
@@ -2860,7 +2947,8 @@ msgstr "menulis RFC822 msgblk.headers\n"
 
 #: transact.c:1273
 msgid "no recipient addresses matched declared local names"
-msgstr "tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
+msgstr ""
+"tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
 
 #: transact.c:1280
 #, c-format
@@ -2914,30 +3002,31 @@ msgstr ""
 msgid "discarding new UID list\n"
 msgstr "mengabaikan senarai UID baru\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Menghapus berkas fetchids.\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Galat menghapus %s:%s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Menulis berkas fetchids.\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Galat menulis ke berkas fetchids %s, berkas lama tertinggal di tempat.\n"
+msgstr ""
+"Galat menulis ke berkas fetchids %s, berkas lama tertinggal di tempat.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Tak dapat menamai ulang berkas fetchids %s ke %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Tak dapat membuka berkas fetchids %s untuk penulisan: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 147405ed..25c3c377 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-05-16 00:27+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -67,7 +67,8 @@ msgstr "Subject: Fetchmail-waarschuwing -- te grote berichten"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "De volgende te grote berichten werden verwijderd van server %s, account %s:"
+msgstr ""
+"De volgende te grote berichten werden verwijderd van server %s, account %s:"
 
 #: driver.c:343
 #, c-format
@@ -106,90 +107,100 @@ msgstr " (lengte -1)"
 msgid " (oversized)"
 msgstr " (te groot)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "kan kopregels niet ophalen, bericht %s@%s:%d (%d bytes)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lezen van bericht %s@%s:%d van %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d bytes)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d bytes in kopregels) "
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d bytes in berichttekst) "
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "bericht %s@%s:%d had niet de verwachte lengte (feitelijk %d, verwachtte %d)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"bericht %s@%s:%d had niet de verwachte lengte (feitelijk %d, verwachtte %d)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " laten staan\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " verwijderd\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " niet verwijderd\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "ophaallimiet %d is bereikt; nog %d bericht op server %s, account %s\n"
-msgstr[1] "ophaallimiet %d is bereikt; nog %d berichten op server %s, account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"ophaallimiet %d is bereikt; nog %d bericht op server %s, account %s\n"
+msgstr[1] ""
+"ophaallimiet %d is bereikt; nog %d berichten op server %s, account %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "verbinden met server %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "wachten op server %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "wachten op %2$s duurde te lang -- gestopt na %1$d seconden\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr "wachten op reactie van luisteraar duurde te lang -- gestopt na %d seconden\n"
+msgstr ""
+"wachten op reactie van luisteraar duurde te lang -- gestopt na %d seconden\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "duurde te lang -- gestopt na %d seconden\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail ziet herhaaldelijk tijdslimietoverschrijdingen"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail zag meer dan %d tijdslimietoverschrijdingen tijdens pogingen om mail op te halen voor %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail zag meer dan %d tijdslimietoverschrijdingen tijdens pogingen om "
+"mail op te halen voor %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 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"
@@ -205,73 +216,73 @@ msgstr ""
 "\n"
 "Fetchmail blijft van deze mailbox af tot u het programma herstart.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-verbindingscommando is mislukt met aflsuitwaarde %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "kan geen HESIOD-pobox vinden voor %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Hoofdserver heeft geen naam.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "kan canonieke DNS-naam niet vinden van %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-verbinding met %s is mislukt"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail-waarschuwing -- onbereikbare server."
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail kon de mailserver %s niet bereiken:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL-connectie is mislukt.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Vergrendelingsfout op %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server is bezet op %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Aanmeldingsfout op %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (eerder al aangemeld)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail-aanmelding is mislukt voor %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail kon geen mail ophalen voor %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -283,7 +294,7 @@ msgstr ""
 "Aangezien dit eerder wel gelukt is, is de oorzaak waarschijnlijk een\n"
 "overbelaste server, maar deze gaf daar geen bruikbare foutmelding voor."
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -302,7 +313,7 @@ msgstr ""
 "Fetchmail blijft draaien en probeert de aanmelding elke ronde opnieuw.\n"
 "Er volgt pas weer bericht als het aanmelden lukt."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -321,167 +332,167 @@ msgstr ""
 "Fetchmail blijft draaien en probeert de aanmelding elke ronde opnieuw.\n"
 "Er volgt pas weer bericht als het aanmelden lukt."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Onmiddelijk opnieuw ophalen voor %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Onbekende gebruikersnaam of ongeldig wachtwoord voor %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Aanmelden is gelukt voor %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: Fetchmail-aanmelding is geslaagd voor %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail kon inloggen op %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "De dienstverlening is hersteld.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "map %s wordt geselecteerd of opnieuw opgehaald\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "standaardmap wordt geselecteerd of opnieuw opgehaald\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s op %s (map %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s op %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polsen van %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d bericht (%d %s) voor %s"
 msgstr[1] "%d berichten (%d %s) voor %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gelezen"
 msgstr[1] "gelezen"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d bericht voor %s"
 msgstr[1] "%d berichten voor %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d bytes).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Geen mail voor %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "onjuist berichtenaantal!"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "RFC822-kopregels zijn onjuist of ontbreken"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "client/server-synchronisatie"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "client/server-protocol"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "vergrendeling nog actief op server"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "SMTP-transactie"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "DNS-opzoekvraag"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "ongedefinieerde"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s fout tijdens ophalen van %s@%s en bezorgen op SMTP-host %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "onbekende"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s fout tijdens het ophalen van %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "na-verbindingscommando is mislukt met afsluitwaarde %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4-ondersteuning is niet ingebouwd.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5-ondersteuning is niet ingebouwd.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Optie '--flush' is niet mogelijk met %s\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Optie '--all' is niet mogelijk met %s\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Optie '--limit' is niet mogelijk met %s\n"
@@ -506,12 +517,14 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s:·De·NULLMAILER_FLAGS·shell-variable·is toegekend.\n"
-"Dit·is·gevaarlijk,·nullmailer-inject·of·de·sendmail-wrapper·van·nullmailer·zouden\n"
+"Dit·is·gevaarlijk,·nullmailer-inject·of·de·sendmail-"
+"wrapper·van·nullmailer·zouden\n"
 "je·From:·en/of·Message-ID:·headers·kunnen·verpesten.\n"
 "Probeer·\"env·NULLMAILER_FLAGS=·%s·JOUW·PARAMETERS·HIER\"\n"
 "%s:·Gestopt.\n"
@@ -538,7 +551,8 @@ msgstr ""
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
@@ -607,14 +621,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Optie '--check' is niet mogelijk met ETRN\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Sunil Shetye\n"
 "Copyright (C) 2005-2007 Matthias Andree\n"
 
@@ -686,15 +703,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail op %d geëlimineerd.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
 msgstr ""
 "fetchmail: kan mail niet controleren terwijl er een andere fetchmail\n"
 "naar dezelfde host actief is.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: kan opgegeven hosts niet contacteren terwijl een andere fetchmail draait op %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: kan opgegeven hosts niet contacteren terwijl een andere fetchmail "
+"draait op %d.\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -702,8 +724,11 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: een andere fetchmail draait op de voorgrond op %d.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: kan geen opties accepteren terwijl er een fetchmail op de achtergrond draait.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: kan geen opties accepteren terwijl er een fetchmail op de "
+"achtergrond draait.\n"
 
 #: fetchmail.c:501
 #, c-format
@@ -713,7 +738,8 @@ msgstr "fetchmail: fetchmail-service in de achtergrond op %d wakkergeschud.\n"
 #: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: ouder zusterproces op %d is om onbekende redenen afgebroken.\n"
+msgstr ""
+"fetchmail: ouder zusterproces op %d is om onbekende redenen afgebroken.\n"
 
 #: fetchmail.c:528
 #, c-format
@@ -727,7 +753,9 @@ msgstr "Geef wachtwoord voor %s@%s: "
 
 #: fetchmail.c:557 fetchmail.c:593
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Waarschuwing: syslog en logfile zijn ingesteld; controleer beide op informatie!\n"
+msgstr ""
+"fetchmail: Waarschuwing: syslog en logfile zijn ingesteld; controleer beide "
+"op informatie!\n"
 
 #: fetchmail.c:569
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
@@ -743,767 +771,832 @@ msgstr "starten van fetchmail %s-service \n"
 msgid "could not open %s to append logs to \n"
 msgstr "kan %s niet openen voor het toevoegen van loginformatie \n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "kan geen tijdcontrole op %s uitvoeren (fout %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail wordt herstart (%s is gewijzigd)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "poging tot herstarten kan mislukken omdat de map niet is hersteld\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "poging tot herstarten van fetchmail is mislukt\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "mail ophalen van %s wordt overgeslagen (aanmelden is mislukt of duurt te lang)\n"
+msgstr ""
+"mail ophalen van %s wordt overgeslagen (aanmelden is mislukt of duurt te "
+"lang)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval niet bereikt, %s wordt niet gecontroleerd\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Resultaatcode = 0 (GELUKT)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Resultaatcode=1 (GEEN MAIL)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Resultaatcode=2 (SOCKETFOUT)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Resultaatcode=3 (AANMELDEN MISLUKT)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Resultaatcode=4 (PROTOCOLFOUT)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Resultaatcode=5 (SYNTAXFOUT)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Resultaatcode=6 (I/O-fout)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Resultaatcode=7 (ALGEMENE FOUT)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Resultaatcode=8 (UITGESLOTEN)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Resultaatcode=9 (VERGRENDELING ACTIEF)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Resultaatcode=10 (SMTP-fout)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Resultaatcode=11 (DNS-fout)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Resultaatcode=12 (BSMTP-fout)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Resultaatcode=13 (OPHAALLIMIET BEREIKT)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Resultaatcode=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle verbindingen zijn vastgelopen.  Gestopt.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "slapen om %s gedurende %d seconden\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "gewekt door %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "gewekt door signaal %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "gewekt op %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normale afsluiting, afsluitwaarde %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "kan geen tijdcontrole uitvoeren op het run-control-bestand\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr "Waarschuwing: host %s is meerdere malen vermeld in configuratiebestand\n"
+msgstr ""
+"Waarschuwing: host %s is meerdere malen vermeld in configuratiebestand\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: Fout: meerder \"defaults\"-secties in configuratiebestand.\n"
+msgstr ""
+"fetchmail: Fout: meerder \"defaults\"-secties in configuratiebestand.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-ondersteuning is niet ingebouwd.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Kerberos V4-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Kerberos V5-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "GSSAPI-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: Waarschuwing: geen DNS beschikbaar voor multidrop van %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: configuratie van %s is ongeldig -- poortnummer kan niet negatief zijn\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: configuratie van %s is ongeldig -- poortnummer kan niet negatief "
+"zijn\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: configuratie voor %s is ongeldig -- RPOP vereist een speciale poort\n"
+msgstr ""
+"fetchmail: configuratie voor %s is ongeldig -- RPOP vereist een speciale "
+"poort\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "configuratie voor %s is ongeldig -- LMTP kan niet de standaard SMTP-poort gebruiken\n"
+msgstr ""
+"configuratie voor %s is ongeldig -- LMTP kan niet de standaard SMTP-poort "
+"gebruiken\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Zowel 'fetchall' als 'keep on' in service-stand is een vergissing!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beëindigd door signaal %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s ondervraagt %s (protocol %s) op %s: ophaalsessie gestart\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-ondersteuning is niet geconfigureerd.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "een niet-ondersteund protocol is geselecteerd.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s ondervraagt %s (protocol %s) op %s: ophaalsessie voltooid\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Ophaalinterval is %d seconden\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logbestand is %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-bestand is %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Voortgangsberichten worden via syslog opgeslagen\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail verstopt zich en maakt geen 'Received'-kopregels aan\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail toont voortgangspuntjes ook in logbestanden.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail zal onjuist geadresseerde multidrop-berichten doorsturen naar %s.\n"
+msgstr ""
+"Fetchmail zal onjuist geadresseerde multidrop-berichten doorsturen naar %s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail zal foutmeldingen naar de postmaster sturen.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail zal foutmeldingen naar de afzender sturen.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Opties voor het ophalen van %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail wordt opgehaald via %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Ondervragen van deze server vindt elk interval plaats.\n"
 msgstr[1] "  Ondervragen van deze server vindt elke %d intervallen plaats.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Werkelijke naam van server is %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Deze host wordt niet ondervraagd als er geen host is opgegeven.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Deze host wordt ondervraagd als er geen host is opgegeven.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Wachtwoord wordt aan gebruiker gevraagd.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-geheim = \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP-ID = \"%s\".\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Wachtwoord = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP met Kerberos %s-authenticatie"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (gebruikmakend van service %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (gebruikmakend van de standaard poort)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (gebruik van UIDL wordt afgedwongen)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle beschikbare authenticatiemethoden worden geprobeerd.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Wachtwoordauthenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-MD5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5-authenticatie wordt afgedwongen.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Versleuteling van-eindpunt-tot-eindpunt wordt aangenomen.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, fuzzy, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail-service principal is: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-versleutelde sessies zijn ingeschakeld.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-protocol: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Certificaat-controle voor SSL-server is ingeschakeld.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Map voor vertrouwde SSL-certificaten: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Gewone servernaam: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-sleutel-afdruk (geverifieerd tegenover server-sleutel): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server-timeout voor geen respons is %d seconden"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (standaard).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Standaard mailbox geselecteerd.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Geselecteerde mailboxen zijn:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle berichten zullen worden opgehaald ('--all on').\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Alleen nieuwe berichten zullen worden opgehaald ('--all off').\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
-msgstr "  Van opgehaalde berichten worden kopieën op de server bewaard ('--keep on').\n"
+msgstr ""
+"  Van opgehaalde berichten worden kopieën op de server bewaard ('--keep "
+"on').\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr "  Opgehaalde berichten worden van de server verwijderd ('--keep off').\n"
+msgstr ""
+"  Opgehaalde berichten worden van de server verwijderd ('--keep off').\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
+msgstr ""
+"  Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Oude berichten worden niet verwijderd voor het ophalen begint ('--flush off').\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Oude berichten worden niet verwijderd voor het ophalen begint ('--flush "
+"off').\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Te grote berichten worden verwijderd voor het ophalen begint ('--limitflush on').\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Te grote berichten worden verwijderd voor het ophalen begint ('--"
+"limitflush on').\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Te grote berichten worden niet verwijderd voor het ophalen begint ('--limitflush off').\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Te grote berichten worden niet verwijderd voor het ophalen begint ('--"
+"limitflush off').\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Herschrijven van lokale server-adressen is ingeschakeld ('--norewrite off').\n"
+msgstr ""
+"  Herschrijven van lokale server-adressen is ingeschakeld ('--norewrite "
+"off').\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Herschrijven van lokale server-adressen is uitgeschakeld ('--norewrite on').\n"
+msgstr ""
+"  Herschrijven van lokale server-adressen is uitgeschakeld ('--norewrite "
+"on').\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Verwijderen van CR-tekens is ingeschakeld ('stripcr on').\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Verwijderen van CR-tekens is uitgeschakeld ('stripcr off').\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Afdwingen van CR-tekens is ingeschakeld ('forcecr on').\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Afdwingen van CR-tekens is uitgeschakeld ('forcecr off').\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits on').\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits "
+"on').\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits off').\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits "
+"off').\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoderen is ingeschakeld ('mimedecode on').\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoderen is uitgeschakeld ('mimedecode off').\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nietsdoen na ophalen is ingeschakeld ('idle on').\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nietsdoen na ophalen is uitgeschakeld ('idle off').\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Niet-lege Status-regels worden weggegooid ('dropstatus on')\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Niet-lege Status-regels worden behouden ('dropstatus off')\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-regels worden weggegooid ('dropdelivered on')\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-regels worden behouden ('dropdelivered off')\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Berichtgrootte-limiet is %d tekens ('--limit %d').\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Berichtgrootte is onbegrensd ('--limit 0').\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Waarschuwingsinterval voor berichtgrootte is %d seconden ('--warnings %d').\n"
+msgstr ""
+"  Waarschuwingsinterval voor berichtgrootte is %d seconden ('--warnings %"
+"d').\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
-msgstr "  Waarschuwingen voor grootte tijdens elke ophaalronde ('--warnings 0').\n"
+msgstr ""
+"  Waarschuwingen voor grootte tijdens elke ophaalronde ('--warnings 0').\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Aantal berichten per keer is beperkt tot %d ('--fetchlimit %d').\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
-msgstr "  Het aantal per keer opgehaalde berichten is onbeperkt ('--fetchlimit 0').\n"
+msgstr ""
+"  Het aantal per keer opgehaalde berichten is onbeperkt ('--fetchlimit 0').\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Maximale berichtgrootte is %d ('--fetchsizelimit %d').\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Geen beperking op berichtgrootte ('--fetchsizelimit 0').\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Er wordt binair naar UID's gezocht tijdens het ophalen ('--fastuidl 1').\n"
+msgstr ""
+"  Er wordt binair naar UID's gezocht tijdens het ophalen ('--fastuidl 1').\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Er wordt binair naar UID's gezocht tijdens %d van de %d ophaalacties ('--fastuidl %d').\n"
+msgstr ""
+"  Er wordt binair naar UID's gezocht tijdens %d van de %d ophaalacties ('--"
+"fastuidl %d').\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "  Er wordt lineair naar UID's gezocht tijdens elke ophaalactie ('--fastuidl 0').\n"
+msgstr ""
+"  Er wordt lineair naar UID's gezocht tijdens elke ophaalactie ('--fastuidl "
+"0').\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, fuzzy, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP bericht-stapel limiet is %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 #, fuzzy
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Er is geen SMTP bericht-stapel limiet (--batchlimit 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Verwijderinterval tussen expunge-operaties geforceerd op %d (--expunge %d).\n"
+msgstr ""
+"  Verwijderinterval tussen expunge-operaties geforceerd op %d (--expunge %"
+"d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Geen geforceerde expunges (--expunge 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Er wordt mail opgehaald voor de volgende domeinen:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (standaard)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Berichten worden toegevoegd aan %s als BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Berichten worden bezorgd met \"%s\".\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Berichten worden %cMTP-geforward naar:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host-gedeelte van de MAIL FROM regel zal %szijn\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Het adres in de RCPT TO regels naar SMTP zal %s zijn\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Herkende foutcodes van spam-blokkades zijn:"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blokkades uitgeschakeld\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connectie wordt tot stand gebracht met \"%s\".\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Geen voor-verbindingscommando.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connectie wordt verbroken met \"%s\".\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Geen na-verbindingscommando.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Geen lokale namen gedeclareerd voor deze host.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokale naam herkend.\n"
 msgstr[1] "%d lokale namen herkend.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is ingeschakeld.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-zoekactie voor multidrop-adressen is uitgeschakeld.\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Server-aliassen worden vergeleken met multidrop-adressen via het IP-adres.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Server-aliassen worden vergeleken met multidrop-adressen via het IP-"
+"adres.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  Server-aliassen worden vergeleken met multidrop-adressen via de naam.\n"
+msgstr ""
+"  Server-aliassen worden vergeleken met multidrop-adressen via de naam.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelopadres-routering is uitgeschakeld\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelop-header is aangenomen als zijnde: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Aantal over te slaan envelop-headers: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s zal van de user-ID worden verwijderd\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Geen prefix-verwijdering\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Voorgedefinieerde mailserver-aliassen:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Lokale domeinen:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connectie moet door interface %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Geen interface-eisen opgegeven.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Ophaal-lus monitort %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Geen monitor-interface opgegeven.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Server-connecties worden gelegd via plugin %s ('--plugin %s').\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Geen plugin-commando opgegeven.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Luisterende connecties worden gelegd via plugout %s ('--plugout %s').\n"
+msgstr ""
+"  Luisterende connecties worden gelegd via plugout %s ('--plugout %s').\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Geen plugout-commando opgegeven.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Geen UID's opgeslagen voor deze host.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID's opgeslagen.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Poll trace informatie wordt toegevoegd aan de Received header.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-msgstr "  Er wordt geen poll trace informatie aan de Received header toegevoegd.\n"
+msgstr ""
+"  Er wordt geen poll trace informatie aan de Received header toegevoegd.\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Doorvoer-eigenschappen \"%s\".\n"
@@ -1593,87 +1686,89 @@ msgstr "Protocol herkend als IMAP2 of IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "zal nietsdoen na verzoek\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: opwaardering naar TLS is geslaagd.\n"
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: opwaardering naar TLS is mislukt.\n"
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benodigde OTP-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benodigde NTLM-ondersteuning is niet in fetchmail gecompileerd\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
 
-#: imap.c:662
+#: imap.c:667
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr "bericht %s@%s:%d was niet van de verwachte lengte (was %d != verwachtte %d)\n"
+msgstr ""
+"bericht %s@%s:%d was niet van de verwachte lengte (was %d != verwachtte %d)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "opnieuw polsen is mislukt\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d bericht in wachtrij na nieuwe aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na nieuwe aanvraag\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "mailbox-selectie is mislukt\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d bericht in wachtrij na eerste aanvraag\n"
 msgstr[1] "%d berichten in wachtrij na eerste aanvraag\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "expunge is mislukt\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d bericht in wachtrij na expunge\n"
 msgstr[1] "%d berichten in wachtrij na expunge\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "zoeken naar ongelezen berichten is mislukt\n"
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu is nog niet gelezen\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is als eerste nog niet gelezen\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
 #: interface.c:256
@@ -1866,362 +1961,388 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr "Kan OTP-challenge niet decoderen\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Geheime wachtwoordzin: "
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is geen geldige numerieke string.\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Waarde van string '%s' is %s dan %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "kleiner"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "groter"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ongeldig protocol '%s' opgegeven.\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ongeldige authenticatie '%s' opgegeven.\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Gebruik:  fetchmail [opties] [server ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Mogelijke opties zijn:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        deze hulptekst tonen\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     programmaversie tonen\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       op berichten controleren, maar deze niet ophalen\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      in stilte functioneren\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr "  -v, --verbose     gedetailleerde uitvoer produceren (diagnostische gegevens)\n"
+msgstr ""
+"  -v, --verbose     gedetailleerde uitvoer produceren (diagnostische "
+"gegevens)\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      als systeemservice elke N seconden draaien\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
-msgstr "  -N, --nodetach    wel systeemservice, maar terminal niet teruggeven\n"
+msgstr ""
+"  -N, --nodetach    wel systeemservice, maar terminal niet teruggeven\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        systeemserviceproces elimineren\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     te gebruiken logbestand\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      syslog(3) gebruiken voor berichtgeving als systeemservice\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      syslog(3) gebruiken voor berichtgeving als "
+"systeemservice\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   onzichtbaar; geen Received-headers aanmaken\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc   te gebruiken run-control-bestand \n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      te gebruiken bestand met UID's\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     te gebruiken PID-/vergrendelingsbestand\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  mail-ontvanger indien alles faalt\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    geen bounces naar gebruikers sturen, alles naar postmaster\n"
+msgstr ""
+"      --nobounce    geen bounces naar gebruikers sturen, alles naar "
+"postmaster\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   vereiste interface\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     deze interface op activiteit monitoren\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl        SSL-beveiligde sessies inschakelen\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "     --sslkey      bestand met SSL-privésleutels\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL-cliëntcertificaat\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
+msgstr ""
+"      --sslcertck   stricte controle van server-certificaat (aangeraden)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath   pad naar SSL-certificaten\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    SSL-protocol afdwingen (SSL2/SSL3/TLS1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      extern commando om verbinding te openen\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     extern commando om SMTP-verbinding te openen\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    ophaal-protocol (zie man-pagina)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        gebruik van UIDL's afdwingen (alleen POP3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        met deze TCP-poort verbinden (verouderd; gebruik --service)\n"
+msgstr ""
+"      --port        met deze TCP-poort verbinden (verouderd; gebruik --"
+"service)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --service     met deze TCP-poort verbinden (mag numeriek zijn)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        authenticatietype (password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server-timeout voor geen respons\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelop-adres-header\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix te verwijderen van lokaal user-ID\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal voor mail service\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  poll-tracing information toevoegen aan de Received-header\n"
+msgstr ""
+"      --tracepolls  poll-tracing information toevoegen aan de Received-"
+"header\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    loginnaam voor gebruiker op server\n"
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  zowel oude als nieuwe berichten ophalen\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      nieuwe berichten verwijderen na het ophalen\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr "  -k, --keep        kopie van nieuwe berichten achterlaten op de server\n"
+msgstr ""
+"  -k, --keep        kopie van nieuwe berichten achterlaten op de server\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       oude berichten van de server verwijderen\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  te grote berichten verwijderen\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   header-adressen niet herschrijven\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       berichten boven de genoemde grootte niet ophalen\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval tussen waarschuwingsmails\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    SMTP forwarding host\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains   mail voor deze domeinen ophalen\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress   te gebruiken SMTP-afleverdomein\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    SMTP volledige naam gebruikersnaam@domein\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam-responswaarden\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  stapel-limiet voor SMTP-connecties instellen\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  maximum aantal berichten per ophaalsessie\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit maximumgrootte van op te halen berichten\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL's binair zoeken\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     maximaal aantal verwijderingen tussen expunges\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         MDA voor forwarding\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP-uitvoerbestand\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) gebruiken voor bezorging\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      te gebruiken map op server\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    voortgangspuntjes ook in logbestanden tonen\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
 msgstr ""
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Vereiste APOP tijdstempel niet aangetroffen in begroeting\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tijdstempel syntaxfout in begroeting\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "Ongeldig APOP-tijdsstempel.\n"
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Ongedefinieerd protocol-verzoek in POP3_auth\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "Vergrendeling actief!  Draait er nog een sessie?\n"
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) is al verwijderd, maar bestaat nog steeds!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u is nog niet gelezen\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
+msgstr ""
+"Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "protocolfout\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocolfout tijdens het ophalen van UIDLs\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Optie '--folder' is niet mogelijk met POP3\n"
 
@@ -2234,36 +2355,44 @@ msgid "SDPS not enabled."
 msgstr "SPDS niet ingeschakeld."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
-"fetchmail: de interface-optie wordt alleen ondersteund onder Linux (zonder IPv6) \n"
+"fetchmail: de interface-optie wordt alleen ondersteund onder Linux (zonder "
+"IPv6) \n"
 "en FreeBSD\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr ""
-"fetchmail: de monitor-optie wordt alleen ondersteund onder Linux (zonder IPv6) \n"
+"fetchmail: de monitor-optie wordt alleen ondersteund onder Linux (zonder "
+"IPv6) \n"
 "en FreeBSD\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL is niet ingeschakeld"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "einde invoer"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Bestand %s moet een regulier bestand zijn.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
-msgstr "Bestandspermissies op %s mogen niet minder strak zijn dan -rwx--x--- (0710).\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+msgstr ""
+"Bestandspermissies op %s mogen niet minder strak zijn dan -rwx--x--- "
+"(0710).\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Je moet de eigenaar zijn van bestand %s.\n"
@@ -2570,7 +2699,8 @@ msgstr "afsluitwaarde van MDA is niet nul: %d\n"
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "VreemdRaar: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
 "kan dit niet verwerken, op %s:%d\n"
@@ -2692,113 +2822,118 @@ msgstr "verbinding met %s:%s [%s/%s] is mislukt: %s.\n"
 msgid "connected.\n"
 msgstr "verbonden.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Uitgevende organisatie: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr "Waarschuwing: naam van uitgevende organisatie is te lang (mogelijk afgebroken).\n"
+msgstr ""
+"Waarschuwing: naam van uitgevende organisatie is te lang (mogelijk "
+"afgebroken).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Onbekende organisatie\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Gewone uitgeversnaam: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Waarschuwing: gewone uitgeversnaam is te lang (mogelijk afgebroken).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Onbekende gewone uitgeversnaam\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Gewone servernaam: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Ongeldig certificaat: Subject CN is te lang!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Gewone naam (CN) van server klopt niet: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Servernaam is niet ingesteld; kan certificaat niet verifiëren!\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Onbekende gewone naam (CN) van server\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Servernaam is niet opgegeven in certificaat!\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() is mislukt!\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Onvoldoende geheugen beschikbaar!\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Tekstbuffer voor digest is te klein!\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s-sleutel-vingerafdruk: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s-vingerafdrukken komen overeen.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s-vingerafdrukken komen niet overeen!\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Fout bij verificatie van servercertificaat: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "onbekende uitgever (eerste %d tekens): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Bestandsdescriptor valt buiten bereik voor SSL"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Ongeldig SSL-protocol '%s' opgegeven; standaard (SSLv23) wordt gebruikt.\n"
+msgstr ""
+"Ongeldig SSL-protocol '%s' opgegeven; standaard (SSLv23) wordt gebruikt.\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
-msgstr "Verificatie van certificaat/vingerafdruk is op een of andere manier overslagen!\n"
+msgstr ""
+"Verificatie van certificaat/vingerafdruk is op een of andere manier "
+"overslagen!\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen is mislukt!\n"
 
@@ -2873,7 +3008,8 @@ msgstr "schrijven van RFC822 msgblk.headers\n"
 
 #: transact.c:1273
 msgid "no recipient addresses matched declared local names"
-msgstr "geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
+msgstr ""
+"geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
 
 #: transact.c:1280
 #, c-format
@@ -2927,30 +3063,31 @@ msgstr "UID-lijsten worden niet gewisseld; geen UID's in deze aanvraag\n"
 msgid "discarding new UID list\n"
 msgstr "nieuwe UID-lijst wordt weggegooid\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Verwijderen van fetchids-bestand.\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Fout bij verwijderen van %s: %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Schrijven van fetchids-bestand.\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Fout bij schrijven van fetchids-bestand %s; oude bestand is blijven staan.\n"
+msgstr ""
+"Fout bij schrijven van fetchids-bestand %s; oude bestand is blijven staan.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Kan fetchids-bestand %s niet naar %s hernoemen: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Kan fetchids-bestand %s niet openen om naar te schrijven: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7d8b090f..0f0624f0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-5.4.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-17 09:23+0100\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2000-07-28 09:40-03:00\n"
 "Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -16,26 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:172
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Checando se %s � realmente o mesmo n� que %s\n"
 
-#: checkalias.c:176
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "Sim, o endere�o IP deles bate\n"
 
-#: checkalias.c:180
+#: checkalias.c:182
 msgid "No, their IP addresses don't match\n"
 msgstr "N�o, o endere�o IP deles n�o bate\n"
 
-#: checkalias.c:196
+#: checkalias.c:198
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr ""
 "falha na resolu��o de nomes ao procurar por `%s' durante a consulta de %s.\n"
 
-#: checkalias.c:221
+#: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -50,103 +50,111 @@ msgstr "n�o foi poss�vel decodificar o desafio BASE64\n"
 msgid "decoded as %s\n"
 msgstr "acordado em %s\n"
 
-#: driver.c:193
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "erro kerberos %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:249 driver.c:254
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [servidor informa '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:335
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:341
-#, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+#: driver.c:339
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr ""
+"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
+"servidor\n"
 
-#: driver.c:345
-#, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+#: driver.c:343
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr ""
+"limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
+"servidor\n"
 
-#: driver.c:364
+#: driver.c:362
 #, fuzzy, c-format
-msgid "  %d msg %d octets long deleted by fetchmail."
-msgstr "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
+msgstr[1] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 
-#: driver.c:368
+#: driver.c:367
 #, fuzzy, c-format
-msgid "  %d msg %d octets long skipped by fetchmail."
-msgstr "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
+msgstr[1] "\t%d mensagem %d octetos de tamanho pulada pelo fetchmail.\n"
 
-#: driver.c:502
+#: driver.c:503
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:556
+#: driver.c:557
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "pulando a mensagem %d (%d octetos)"
 
-#: driver.c:572
+#: driver.c:573
 msgid " (length -1)"
 msgstr ""
 
-#: driver.c:575
+#: driver.c:576
 #, fuzzy
 msgid " (oversized)"
 msgstr " (muito grande, %d octetos)"
 
-#: driver.c:590
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr ""
 
-#: driver.c:607
+#: driver.c:611
 #, fuzzy, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "lendo mensagem %d de %d"
 
-#: driver.c:612
+#: driver.c:616
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %soctetos)"
 
-#: driver.c:613
+#: driver.c:617
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d octetos no corpo da mensagem) "
 
 #: driver.c:685
-#, c-format
-msgid " (%d body octets) "
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (%d octetos no corpo da mensagem) "
 
-#: driver.c:743
+#: driver.c:746
 #, fuzzy, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "mensagem %d n�o possui o tamanho esperado (%d atual != %d esperado)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " retida\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " eliminada\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " n�o eliminada\n"
 
-#: driver.c:818
+#: driver.c:822
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -158,44 +166,40 @@ msgstr[1] ""
 "limite de %d mensagens a recuperar atingido; %d mensagens mantidas no "
 "servidor\n"
 
-#: driver.c:881
-msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-msgstr "Um MDA enviou um SIGPIPE ou houve um erro de socket\n"
-
-#: driver.c:888
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "tempo esgotado ap�s %d segundos esperando para conectar ao servidor %s.\n"
 
-#: driver.c:892
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando pelo servidor %s.\n"
 
-#: driver.c:896
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando por %s.\n"
 
-#: driver.c:901
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "tempo esgotado ap�s %d segundos esperando pelo receptor responder.\n"
 
-#: driver.c:904
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "tempo esgotado ap�s %d segundos.\n"
 
-#: driver.c:916
+#: driver.c:907
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr ""
 "Assunto: o fetchmail tem notado repetidos vencimentos de temporiza��o\n"
 "\n"
 
-#: driver.c:919
+#: driver.c:910
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -204,7 +208,7 @@ msgstr ""
 "Fetchmail notou mais que %d vencimentos de temporiza��o enquanto tentava "
 "baixar mensagens de %s@%s.\n"
 
-#: driver.c:923
+#: driver.c:914
 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"
@@ -220,23 +224,23 @@ msgstr ""
 "\n"
 "Fetchmail n�o vai consultar mais esta caixa postal at� que seja reiniciado.\n"
 
-#: driver.c:948
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "comando de pr�-conex�o falhou com status %d\n"
 
-#: driver.c:972
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "n�o foi poss�vel encontrar caixa postal HESIOD para %s\n"
 
-#: driver.c:993
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Servidor l�der n�o possui nome.\n"
 
-#: driver.c:1017
+#: driver.c:1008
 #, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "n�o foi poss�vel encontrar o nome de DNS can�nico para %s\n"
 
 #: driver.c:1055
@@ -253,49 +257,54 @@ msgstr ""
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1101
 #, fuzzy
 msgid "SSL connection failed.\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: driver.c:1152
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1156
+#: driver.c:1158
 #, fuzzy, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Erro de travamento (lock-busy) para %s@%s\n"
 
-#: driver.c:1161
+#: driver.c:1163
 #, fuzzy, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Falha de autoriza��o para %s@%s\n"
 
-#: driver.c:1164
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr ""
 
-#: driver.c:1185
+#: driver.c:1187
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr ""
 "Assunto: falha de autentica��o do fetchmail\n"
 "\n"
 
-#: driver.c:1189
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1193
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+
+#: driver.c:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -305,8 +314,12 @@ msgid ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 msgstr ""
+"A tentativa de obter autoriza��o falhou.\n"
+"Isto provavelmente indica que sua senha � inv�lida, mas servidores POP3\n"
+"possuem outros tipos de falhas que fetchmail n�o consegue distinguir desta\n"
+"pois eles n�o enviam mensagens de erro �teis durante a falha no login.\n"
 
-#: driver.c:1208
+#: driver.c:1211
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -323,176 +336,177 @@ msgstr ""
 "possuem outros tipos de falhas que fetchmail n�o consegue distinguir desta\n"
 "pois eles n�o enviam mensagens de erro �teis durante a falha no login.\n"
 
-#: driver.c:1223
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr ""
 
-#: driver.c:1228
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Erro desconhecido de login ou autentica��o em %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1256
 #, fuzzy, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Falha de autoriza��o para %s@%s\n"
 
-#: driver.c:1258
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr ""
 "Assunto: falha de autentica��o do fetchmail\n"
 "\n"
 
-#: driver.c:1262
+#: driver.c:1266
 #, fuzzy, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "O fetchmail n�o p�de receber o correio eletr�nico de %s@%s.\n"
 
-#: driver.c:1266
+#: driver.c:1270
 #, fuzzy
 msgid "Service has been restored.\n"
 msgstr "Servi�o escolheu a vers�o %d.%d do RPA\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "selecionando ou tentando novamente baixar mensagens da pasta padr�o\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s em %s (pasta %s)"
 
-#: driver.c:1314 rcfile_y.y:380
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Baixando %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d visualizadas) para %s"
 msgstr[1] "%d %s (%d visualizadas) para %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1329
+#: driver.c:1334
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s para %s"
 msgstr[1] "%d %s para %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octetos).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nenhuma mensagem para %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr ""
 
-#: driver.c:1485
+#: driver.c:1522
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1488
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "cabe�alho RFC822 ruim ou faltando"
 
-#: driver.c:1491
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1494
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "sincroniza��o cliente/servidor"
 
-#: driver.c:1497
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "protocolo cliente/servidor"
 
-#: driver.c:1500
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "arquivo de lock existente no servidor"
 
-#: driver.c:1503
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "Transa��o SMTP"
 
-#: driver.c:1506
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "Busca no DNS"
 
-#: driver.c:1509
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "erro n�o definido\n"
 
-#: driver.c:1515
+#: driver.c:1552
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1517
+#: driver.c:1554
 #, fuzzy
 msgid "unknown"
 msgstr "a m�quina � desconhecida."
 
-#: driver.c:1519
+#: driver.c:1556
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erro %s enquanto baixando mensagens de %s\n"
 
-#: driver.c:1529
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "comando de p�s-conex�o falhou com status %d\n"
 
-#: driver.c:1550
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Suporte a Kerberos V4 n�o inclu�do (linkado).\n"
 
-#: driver.c:1558
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Suporte a Kerberos V5 n�o inclu�do (linkado).\n"
 
-#: driver.c:1569
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Op��o --flush n�o � suportada com %s\n"
 
-#: driver.c:1575
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Op��o --all n�o � suportada com %s\n"
 
-#: driver.c:1584
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Op��o --limit n�o � suportada com %s\n"
 
-#: env.c:56
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -502,7 +516,7 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:68
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -513,26 +527,26 @@ msgid ""
 "%s: Abort.\n"
 msgstr ""
 
-#: env.c:80
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Voc� n�o existe. V� embora.\n"
 
-#: env.c:142
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: n�o foi poss�vel determinar sua m�quina!"
 
-#: env.c:163
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname falhou para %s\n"
 
-#: env.c:165
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:169
+#: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -540,132 +554,148 @@ msgid ""
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
-#: etrn.c:47 odmr.c:58
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "Servidor SMTP de %s n�o suporta ESMTP\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "Servidor SMTP de %s n�o suporta ETRN\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "Armazenamento para %s iniciado\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "Nenhuma mensagem esperando para %s\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "Mensagens pendentes para %s iniciadas\n"
 
-#: etrn.c:92
+#: etrn.c:94
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Incapaz de armazenar mensagens para o n� %s\n"
 
-#: etrn.c:96
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "N� %s n�o permitido: %s\n"
 
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "Erro de sintaxe ETRN\n"
 
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "Erro de sintaxe nos par�metros ETRN\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "Erro ETRN desconhecido %d\n"
 
-#: etrn.c:151
+#: etrn.c:154
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Op��o --keep n�o � compat�vel com ETRN\n"
 
-#: etrn.c:155
+#: etrn.c:158
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Op��o --flush n�o � compat�vel com ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:162
 #, fuzzy
 msgid "Option --folder is not supported with ETRN\n"
 msgstr "Op��o --flush n�o � compat�vel com ETRN\n"
 
-#: etrn.c:163
+#: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Op��o --check n�o � compat�vel com ETRN\n"
 
-#: fetchmail.c:159
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:171
+#: fetchmail.c:188
 #, fuzzy
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: fork falhou\n"
 
-#: fetchmail.c:195
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: fetchmail.c:257
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Este � o fetchmail vers�o %s"
 
-#: fetchmail.c:354
+#: fetchmail.c:395
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Utilizando op��es da linha de comando%s%s\n"
 
-#: fetchmail.c:355
+#: fetchmail.c:396
 msgid " and "
 msgstr " e "
 
-#: fetchmail.c:360
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 "Nenhum servidor de correio eletr�nico configurado -- talvez %s esteja "
 "faltando?\n"
 
-#: fetchmail.c:381
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: nenhum servidor de correio eletr�nico foi especificado.\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nenhum outro fetchmail est� rodando\n"
 
-#: fetchmail.c:399
+#: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erro eliminando %s fetchmail em %d; desistindo.\n"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "segundo plano"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "primeiro plano"
 
-#: fetchmail.c:408
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail em %d terminado.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:472
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -673,7 +703,7 @@ msgstr ""
 "fetchmail: n�o � poss�vel checar por mensagens enquanto outro fetchmail est� "
 "rodando para a mesma m�quina.\n"
 
-#: fetchmail.c:437
+#: fetchmail.c:478
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -681,205 +711,236 @@ msgstr ""
 "fetchmail: n�o � poss�vel receber mensagens das m�quinas especificadas\n"
 "enquanto houver outro fetchmail rodando em %d.\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:485
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: outro fetchmail est� rodando em primeiro plano em %d.\n"
 
-#: fetchmail.c:454
+#: fetchmail.c:495
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: n�o � poss�vel aceitar op��es com outro fetchmail rodando em \n"
 "segundo plano.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail rodando em segundo plano em %d despertado.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 "fetchmail: processo mais antigo rodando em %d morreu misteriosamente.\n"
 
-#: fetchmail.c:487
+#: fetchmail.c:528
 #, fuzzy, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: n�o � poss�vel encontrar uma senha para %s@s.\n"
 
-#: fetchmail.c:491
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Digite a senha para %s@%s: "
 
-#: fetchmail.c:522
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: warning: nenhum DNS dispon�vel para checar buscas com m�ltiplas\n"
+"entregas de %s\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: nenhum outro fetchmail est� rodando\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
-#: fetchmail.c:537 fetchmail.c:539
+#: fetchmail.c:589 fetchmail.c:591
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:575
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "n�o foi poss�vel fazer checagem de hor�rio de %s (erro %d)\n"
 
-#: fetchmail.c:580
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "reiniciando fetchmail (%s mudou) \n"
 
-#: fetchmail.c:585
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:612
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "tentativa de re-executar fetchmail falhou.\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "consulta de %s pulada (falha de autentica��o ou muitos vencimentos de "
 "temporiza��o)\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalo n�o atingido, n�o consultando %s\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:751
 #, fuzzy
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:753
 #, fuzzy
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:755
 #, fuzzy
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:757
 #, fuzzy
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:759
 #, fuzzy
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:761
 #, fuzzy
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:763
 #, fuzzy
 msgid "Query status=6 (IOERR)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:765
 #, fuzzy
 msgid "Query status=7 (ERROR)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:767
 #, fuzzy
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:769
 #, fuzzy
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:710
+#: fetchmail.c:771
 #, fuzzy
 msgid "Query status=10 (SMTP)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:712
+#: fetchmail.c:773
 #, fuzzy
 msgid "Query status=11 (DNS)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:714
+#: fetchmail.c:775
 #, fuzzy
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:716
+#: fetchmail.c:777
 #, fuzzy
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Situa��o da consulta=%d\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Todas as conex�es est�o travadas. Encerrando.\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:828
 #, fuzzy, c-format
-msgid "sleeping at %s\n"
+msgid "sleeping at %s for %d seconds\n"
 msgstr "fetchmail: `dormindo' em %s\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "acordado por %s\n"
 
-#: fetchmail.c:798
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: fetchmail.c:805
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "acordado em %s\n"
 
-#: fetchmail.c:811
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "encerramento normal, status %d\n"
 
-#: fetchmail.c:963
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "n�o foi poss�vel checar o hor�rio do arquivo de controle de execu��o\n"
 
-#: fetchmail.c:996
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Aten��o: m�ltiplas entradas para a m�quina %s no arquivo de configura��o\n"
 
-#: fetchmail.c:1029
+#: fetchmail.c:1087
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "Aten��o: m�ltiplas entradas para a m�quina %s no arquivo de configura��o\n"
 
-#: fetchmail.c:1149
+#: fetchmail.c:1209
 #, fuzzy
 msgid "SSL support is not compiled in.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1180
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "O suporte a POP2 n�o est� configurado.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "O suporte a POP2 n�o est� configurado.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "O suporte a POP2 n�o est� configurado.\n"
+
+#: fetchmail.c:1258
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -887,316 +948,322 @@ msgstr ""
 "fetchmail: warning: nenhum DNS dispon�vel para checar buscas com m�ltiplas\n"
 "entregas de %s\n"
 
-#: fetchmail.c:1191
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1192
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1209
+#: fetchmail.c:1287
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "configura��o de %s inv�lida, n�mero da porta n�o pode ser negativo\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1294
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configura��o de %s inv�lida, o RPOP exige uma porta privilegiada\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "configura��o de %s inv�lida, LMTP n�o pode usar a porta SMTP padr�o\n"
 
-#: fetchmail.c:1248
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "fetchall e modo daemon juntos est� errado!\n"
 
-#: fetchmail.c:1298
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "encerrado com o sinal %d\n"
 
-#: fetchmail.c:1383
+#: fetchmail.c:1424
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "O suporte a POP3 n�o est� configurado.\n"
 
-#: fetchmail.c:1430
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "O suporte a IMAP n�o est� configurado.\n"
 
-#: fetchmail.c:1436
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "O suporte a ETRN n�o est� configurado.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1485
 #, fuzzy
 msgid "ODMR support is not configured.\n"
 msgstr "O suporte a POP2 n�o est� configurado.\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "protocolo n�o suportado escolhido.\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1502
 #, fuzzy, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s consultando %s (protocolo %s) em %s\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervalo de consulta � %d segundos\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Arquivo de registro � %s\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Arquivo de identifica��o � %s\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mensagens de progresso ser�o gravadas pelo syslog\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail far� mascaramento e n�o gerar� `Received'\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1492
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail reenviar� mensagens multidrop mal endere�adas para %s.\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail ir� enviar mensagens de correio de erro para o postmaster.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail ir� enviar mensagens de correio de erro para o remetente.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Op��es para consulta de %s@%s:\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mensagens ser�o recuperadas via %s\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1553
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Consulta deste servidor ir� ocorrer a cada %d intervalos.\n"
 msgstr[1] "  Consulta deste servidor ir� ocorrer a cada %d intervalos.\n"
 
-#: fetchmail.c:1516
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  O verdadeiro nome do servidor � %s.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1560
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina %s ser� consultada quando nenhuma m�quina for\n"
 "especificada.\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr ""
 "  Esta m�quina %s ser� consultada quando nenhuma m�quina for\n"
 "especificada.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  A senha ser� solicitada.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Segredo APOP = \"%s\".\n"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identifica��o RPOP = \"%s\".\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "   Senha = \"%s\".\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocolo � KPOP com autentica��o Kerberos %s"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocolo � %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (usando servi�o %s)"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (usando porta padr�o)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (for�ando o uso de UIDL)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1561
+#: fetchmail.c:1602
 #, fuzzy
 msgid "  Password authentication will be forced.\n"
 msgstr "Autentica��o OTP � suportada\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1605
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "Autentica��o NTLM � suportada\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1608
 #, fuzzy
 msgid "  NTLM authentication will be forced.\n"
 msgstr "Autentica��o NTLM � suportada\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1611
 #, fuzzy
 msgid "  OTP authentication will be forced.\n"
 msgstr "Autentica��o OTP � suportada\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1614
 #, fuzzy
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "Autentica��o CRAM-MD5 � suportada\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1617
 #, fuzzy
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "Autentica��o GSS � suportada\n"
 
-#: fetchmail.c:1579
+#: fetchmail.c:1620
 #, fuzzy
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Pr�-autentica��o Kerberos V4 ativada.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1623
 #, fuzzy
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Pr�-autentica��o Kerberos V5 ativada.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Criptografia end-to-end assumida.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1592
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1594
+#: fetchmail.c:1635
 #, fuzzy, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocolo � %s"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1598
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1601
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Data/hor�rio do servi�o %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1604
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 "  O tempo m�ximo para n�o obten��o de resposta do servidor � %d segundos"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (padr�o).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Caixa de correio padr�o selecionada.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  As caixas de correio selecionadas s�o:"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1667
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s mensagens ser�o recuperadas (--all %s).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1668
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s mensagens ser�o recuperadas (--all %s).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1670
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  As Mensagens baixadas %s ser�o mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  As Mensagens baixadas %s ser�o mantidas no servidor (--keep %s).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1673
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1674
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
@@ -1204,7 +1271,7 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1676
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1213,7 +1280,7 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1677
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1222,251 +1289,251 @@ msgstr ""
 "  Mensagens antigas %s ser�o eliminadas antes da recupera��o de mensagens \n"
 "(--flush %s).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1679
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr ""
 "  A reescrita de endere�os no servidor local est� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1680
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  A reescrita de endere�os no servidor local est� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1682
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  A elimina��o do retorno de carro (CR) est� %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1683
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  A elimina��o do retorno de carro (CR) est� %s (stripcr %s).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1685
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  For�ar retorno de carro (CR) est� %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1686
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  For�ar retorno de carro (CR) est� %s (forcecr %s).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1688
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  A interpreta��o de Content-Transfer-Encoding est� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1689
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  A interpreta��o de Content-Transfer-Encoding est� %s (pass8bits %s).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1691
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  A decodifica��o MIME est� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1692
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  A decodifica��o MIME est� %s (mimedecode %s).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Inatividade ap�s consulta � %s (inatividade %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1695
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Inatividade ap�s consulta � %s (inatividade %s).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1698
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1700
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1701
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  As linhas de status n�o vazias ser�o %s (dropstatus %s)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  O tamanho limite por mensagem � %d octetos (--limit %d).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  O intervalo de aviso de tamanho de mensagem � de %d segundos (--warnings \n"
 "%d).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Avisos de tamanho a cada recebimento (--warnings 0).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  O limite de mensagem recebida � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Nenhum limite para mensagem recebida (--fetchlimit 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1721
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  O limite de mensagem recebida � %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Nenhum limite para tamanho de mensagens (--limit 0).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1692
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  O limite de lote de mensagens SMTP � %d.\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Nenhum limite de lote de mensagens SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  O intervalo de dele��o entre elimina��es � %d (--expunge %d).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nenhuma elimina��o (--expunge 0).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1712 fetchmail.c:1732
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (padr�o)"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  As mensagens ser�o anexadas a %s como BSMTP\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  As mensagens ser�o entregues com \"%s\".\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  As mensagens ser�o re-enviadas via %cMTP para:"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  O nome da m�quina na linha MAIL FROM ser� %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1749
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  As respostas reconhecidas de blocos spam s�o:"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bloqueio de spam desabilitado\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  A conex�o do servidor ser� efetuada com \"%s\".\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Nenhum comando de pr�-conex�o.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  A conex�o com o servidor ser� derrubada com \"%s\".\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Nenhum comando de p�s-conex�o.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nenhum nome local declarado para esta m�quina.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Modo de m�ltipla entrega (multi-drop): "
 
-#: fetchmail.c:1781
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Modo de entrega simples (single-drop): "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1826
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nome(s) local(is) reconhecido(s).\n"
 msgstr[1] "%d nome(s) local(is) reconhecido(s).\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1841
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  A busca no DNS por endere�os de m�ltipla entrega est� %s.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1842
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  A busca no DNS por endere�os de m�ltipla entrega est� %s.\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1846
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
@@ -1474,106 +1541,106 @@ msgstr ""
 "  Os apelidos de servidores ser�o comparados com endere�os de m�ltipla\n"
 "entrega por "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1848
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Os apelidos de servidores ser�o comparados com endere�os de m�ltipla\n"
 "entrega por "
 
-#: fetchmail.c:1808
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  O roteamento de endere�os de envelope est� desabilitado\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Assume-se que o cabe�alho do envelope esteja: %s\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1857
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  N�mero de cabe�alhos de envelope  a serem processados: %d\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  O prefixo %s ser� removido da identifica��o do usu�rio\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Nenhuma remo��o de prefixo\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Apelidos pr�-declarados do servidor de correio eletr�nico:"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Dom�nios locais:"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  A conex�o precisa se dar pela interface %s.\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  N�o foi especificada nenhuma exig�ncia de interface.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Ciclo de consultas monitorar� %s.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Nenhuma interface de monitoramento foi especificada.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  As conex�es com o servidor se dar�o via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Nenhum comando \"plugin\" especificado.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  As conex�es com o cliente se dar�o via \"plugout\" %s (--plugout %s).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Nenhum comando \"plugout\" especificado.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Nenhuma identifica��o de usu�rio gravada a partir desta m�quina.\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d identifica��es de usu�rios gravadas.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1886
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1889
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriedades de passagem \"%s\".\n"
 
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "ERRO: n�o h� suporte � rotina getpassword()\n"
 
@@ -1595,45 +1662,45 @@ msgstr "N�o foi poss�vel obter nome do servi�o para [%s]\n"
 msgid "Using service name [%s]\n"
 msgstr "Usando nome do servi�o [%s]\n"
 
-#: gssapi.c:88
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Enviando credenciais\n"
 
-#: gssapi.c:106
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Erro na troca de credenciais\n"
 
-#: gssapi.c:151
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "N�o foi poss�vel desempacotar dados do n�vel de seguran�a\n"
 
-#: gssapi.c:156
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Troca de credenciais completa\n"
 
-#: gssapi.c:160
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Servidor requer integridade e/ou privacidade\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Desempacotadas marcas de n�vel de seguran�a: %s%s%s\n"
 
-#: gssapi.c:173
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Tamanho m�ximo do s�mbolo GSS � %ld\n"
 
-#: gssapi.c:186
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Erro criando solicita��o de n�vel de seguran�a\n"
 
-#: gssapi.c:197
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Liberando credenciais GSS\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Erro na libera��o de credenciais\n"
 
@@ -1644,84 +1711,109 @@ msgstr ""
 "fetchmail: tarefa aguardando por %d segundos.\n"
 "\n"
 
-#: imap.c:298
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocolo identificado como IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocolo identificado como IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocolo identificado como IMAP2 ou IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:482
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
+#: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 #, fuzzy
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida n�o � suportada pelo servidor\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:592 pop3.c:385
 #, fuzzy
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Capacidade de LOGIN exigida n�o � suportada pelo servidor\n"
 
-#: imap.c:513
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Capacidade de LOGIN exigida n�o � suportada pelo servidor\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr "mensagem %d n�o possui o tamanho esperado (%d atual != %d esperado)\n"
+
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "nova tentativa de baixar mensagens falhou\n"
 
-#: imap.c:682
+#: imap.c:781 imap.c:837
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:694
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "sele��o de caixa postal falhou\n"
 
-#: imap.c:698
+#: imap.c:802
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:722
+#: imap.c:816
 #, fuzzy
 msgid "expunge failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: imap.c:726
+#: imap.c:820
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Nenhuma mensagem esperando para %s\n"
 msgstr[1] "Nenhuma mensagem esperando para %s\n"
 
-#: imap.c:751
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "falha na busca por mensagens n�o vistas\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "%u � n�o vista\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:902 pop3.c:889
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u � n�o vista\n"
 
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
@@ -1825,182 +1917,182 @@ msgstr "n�o foi poss�vel decodificar resposta \"pronto\" de BASE64\n"
 msgid "challenge mismatch\n"
 msgstr "erro no desafio\n"
 
-#: lock.c:77
+#: lock.c:86
 #, fuzzy, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: removendo arquivos de trava antigos\n"
 
-#: lock.c:89
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: removendo arquivos de trava antigos\n"
 
-#: lock.c:96
+#: lock.c:121
 #, fuzzy, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: removendo arquivos de trava antigos\n"
 
-#: lock.c:137
+#: lock.c:168
 #, fuzzy
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: socketpair falhou\n"
 
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: aten��o: encontrado \"%s\" antes de qualquer nome de m�quina\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: warning: s�mbolo desconhecido \"%s\"\n"
 
-#: odmr.c:64
+#: odmr.c:66
 #, fuzzy, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "Servidor SMTP de %s n�o suporta ETRN\n"
 
-#: odmr.c:102
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr ""
 
-#: odmr.c:107
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr ""
 
-#: odmr.c:111
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr ""
 
-#: odmr.c:116
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr ""
 
-#: odmr.c:120
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr ""
 
-#: odmr.c:124
+#: odmr.c:126
 #, fuzzy
 msgid "Authentication required.\n"
 msgstr "Autentica��o OTP � suportada\n"
 
-#: odmr.c:128
+#: odmr.c:130
 #, fuzzy, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "Erro ETRN desconhecido %d\n"
 
-#: odmr.c:187
+#: odmr.c:189
 #, fuzzy
 msgid "receiving message data\n"
 msgstr "escrevendo o texto da mensagem\n"
 
-#: odmr.c:240
+#: odmr.c:242
 #, fuzzy
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Op��o --keep n�o � compat�vel com ETRN\n"
 
-#: odmr.c:244
+#: odmr.c:246
 #, fuzzy
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Op��o --flush n�o � compat�vel com ETRN\n"
 
-#: odmr.c:248
+#: odmr.c:250
 #, fuzzy
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "Op��o --flush n�o � compat�vel com ETRN\n"
 
-#: odmr.c:252
+#: odmr.c:254
 #, fuzzy
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Op��o --check n�o � compat�vel com ETRN\n"
 
-#: opie.c:36
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr ""
 
-#: opie.c:50
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "N�o foi poss�vel decodificar o desafio OTP\n"
 
-#: opie.c:58 pop3.c:515
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Frase-senha secreta: "
 
-#: options.c:161 options.c:205
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Cadeia '%s' n�o � uma cadeia de n�meros v�lidos.\n"
 
-#: options.c:170
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Valor da cadeia '%s' � %s que %d.\n"
 
-#: options.c:171
+#: options.c:178
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:171
+#: options.c:178
 msgid "larger"
 msgstr "maior"
 
-#: options.c:330
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Protocolo `%s' inv�lido foi especificado.\n"
 
-#: options.c:372
+#: options.c:386
 #, fuzzy, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Pr�-autentica��o `%s' inv�lida foi especificada.\n"
 
-#: options.c:573
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso: fetchmail [op��es] [servidor ...]\n"
 
-#: options.c:574
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  As op��es s�o:\n"
 
-#: options.c:575
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra esta tela de ajuda\n"
 
-#: options.c:576
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informa��es sobre a vers�o\n"
 
-#: options.c:578
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       checa por mensagens sem baix�-las\n"
 
-#: options.c:579
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabalha silenciosamente\n"
 
-#: options.c:580
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabalha barulhentamente (sa�das para diagn�stico)\n"
 
-#: options.c:581
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      roda como um servidor uma vez a cada n segundos\n"
 
-#: options.c:582
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr ""
 "  -N, --nodetach    n�o desconecta o processo servidor do seu terminal\n"
 
-#: options.c:583
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        elimina processo servidor\n"
 
-#: options.c:584
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica o nome do arquivo de log\n"
 
-#: options.c:585
+#: options.c:603
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2008,317 +2100,367 @@ msgstr ""
 "      --syslog      usa o syslog(3) para a maioria das mensagens quando\n"
 "                    estiver rodando como servidor\n"
 
-#: options.c:586
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   n�o escreve `Received' & ativa mascaramento da m�quina\n"
 
-#: options.c:587
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especifica arquivo de controle de execu��o alternativo\n"
 
-#: options.c:588
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr ""
 "  -i, --idfile      especifica arquivo de identidades de usu�rios \n"
 "                    alternativo\n"
 
-#: options.c:589
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr ""
+"  -i, --idfile      especifica arquivo de identidades de usu�rios \n"
+"                    alternativo\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica o destinat�rio usado em �ltimo caso\n"
 
-#: options.c:590
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redireciona mensagens erradas para o postmaster.\n"
 
-#: options.c:592
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especifica��o de interface exigida\n"
 
-#: options.c:593
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitora a atividade na interface\n"
 
-#: options.c:596
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         habilita sess�o ssl criptografada\n"
 
-#: options.c:597
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      arquivo contendo a chave ssl privada\n"
 
-#: options.c:598
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:599
+#: options.c:618
+#, fuzzy
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr "      --sslcert     certificado ssl do cliente\n"
+
+#: options.c:619
 #, fuzzy
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcert     certificado ssl do cliente\n"
 
-#: options.c:600
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:601
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:622
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:603
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica um comando externo para abrir uma conex�o\n"
 
-#: options.c:604
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especifica um comando externo para abrir uma conex�o "
 "smtp\n"
 
-#: options.c:606
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica o protocolo de retirada (ver p�gina de \n"
 "                    manual)\n"
 
-#: options.c:607
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        for�a o uso de UIDLs (somente para pop3)\n"
 
-#: options.c:608
+#: options.c:629
 #, fuzzy
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        Porta TCP para conex�o\n"
 
-#: options.c:609
+#: options.c:630
 #, fuzzy
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        Porta TCP para conex�o\n"
 
-#: options.c:610
+#: options.c:631
 #, fuzzy
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --preauth     tipo de pr�-autentica��o (senha/kerberos/ssh)\n"
 
-#: options.c:611
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 "  -t, --timeout     tempo limite para n�o obten��o de resposta do servidor\n"
 
-#: options.c:612
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cabe�alho do endere�o de envelope\n"
 
-#: options.c:613
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefixo para remover da identifica��o de um usu�rio "
 "local\n"
 
-#: options.c:614
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    especifica a identifica��o do usu�rio no servidor\n"
 
-#: options.c:618
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+#, fuzzy
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         recupera mensagens antigas e novas\n"
 
-#: options.c:619
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      apaga novas mensagens ap�s a recupera��o\n"
 
-#: options.c:620
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        n�o apaga novas mensagens ap�s recupera��o\n"
 
-#: options.c:621
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:622
+#: options.c:643
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       apaga mensagens antigas do servidor\n"
 
-#: options.c:623
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   n�o reescreve os cabe�alhos das mensagens\n"
 
-#: options.c:624
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       n�o recupera mensagens acima de um dado tamanho\n"
 
-#: options.c:625
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre avisos de notifica��o de e-mail\n"
 
-#: options.c:627
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configura a m�quina SMTP para reenvio\n"
 
-#: options.c:628
+#: options.c:649
 #, fuzzy
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:629
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress configura o dom�nio de entrega do SMTP a ser usado\n"
 
-#: options.c:630
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configura o valor das respostas anti-spam\n"
 
-#: options.c:632
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  configura o limite de lote para conex�es SMTP\n"
 
-#: options.c:633
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:634
+#: options.c:655
 #, fuzzy
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "  -B, --fetchlimit  configura o limite de recep��o para conex�es com o\n"
 "                    servidor\n"
 
-#: options.c:635
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     configura o m�ximo de dele��es entre elimina��es\n"
 
-#: options.c:637
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "      --mda         configura o MDA a ser usado para reenvio\n"
 
-#: options.c:638
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configura o arquivo de sa�da BSMTP\n"
 
-#: options.c:639
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) para entrega\n"
 
-#: options.c:640
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especifica o nome da pasta remota\n"
 
-#: options.c:641
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:553
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Data/hor�rio APOP exigidos n�o encontrados na sauda��o\n"
 
-#: pop3.c:562
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na data/hor�rio da sauda��o\n"
 
-#: pop3.c:584
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Solicita��o de protocolo n�o definida em POP3_auth\n"
 
-#: pop3.c:592
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "arquivo de travamento presente! H� outra sess�o ativa?\n"
 
-#: pop3.c:664
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:816
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u � n�o vista\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Mensagens inseridas numa lista no servidor. N�o posso tratar isso.\n"
 
-#: pop3.c:902
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "erro de protocolo\n"
 
-#: pop3.c:917
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erro de protocolo durante a obten��o de UIDLs\n"
 
-#: pop3.c:1276
+#: pop3.c:1443
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Op��o --remote n�o � compat�vel com POP3\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:381
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:418
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:428
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:440
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2439,238 +2581,250 @@ msgstr "Chave de sess�o estabelecida:\n"
 msgid "RPA authorisation complete\n"
 msgstr "Autoriza��o RPA completa\n"
 
-#: rpa.c:373
+#: rpa.c:371
 msgid "Get response\n"
 msgstr "Resposta recebida\n"
 
-#: rpa.c:403
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Recebido retorno de resposta %d [%s]\n"
 
-#: rpa.c:466
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Hdr n�o � 60\n"
 
-#: rpa.c:487
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Erro no comprimento do Token\n"
 
-#: rpa.c:492
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Comprimento do s�mbolo %d n�o combina com rxlen %d\n"
 
-#: rpa.c:498
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr "Campo mecanismo incorreto\n"
 
-#: rpa.c:535
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "erro dec64 no caractere %d: %x\n"
 
-#: rpa.c:550
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Entrada de dados bin�rios:\n"
 
-#: rpa.c:588
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Sa�da de dados:\n"
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "Cadeia RPA muito longa\n"
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:715
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA falhou na abertura de /dev/urandom. Isto n�o deveria\n"
 
-#: rpa.c:716
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    impedi-lo de se conectar, mas significa que\n"
 
-#: rpa.c:717
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    voc� n�o pode ter certeza de estar falando com\n"
 
-#: rpa.c:718
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr "    o servi�o que voc� pensa estar (ataques\n"
 
-#: rpa.c:719
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 "    de re-tentativa por parte de um servi�o desonesto s�o poss�veis.)\n"
 
-#: rpa.c:730
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Desafio de usu�rio:\n"
 
-#: rpa.c:883
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 est� sendo aplicado ao bloco de dados:\n"
 
-#: rpa.c:896
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr "O resultado MD5 �: \n"
 
-#: servport.c:52
+#: servport.c:53
 #, c-format
 msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
 msgstr ""
 
-#: servport.c:78
+#: servport.c:80
 #, c-format
 msgid "Cannot resolve service %s to port number.\n"
 msgstr ""
 
-#: servport.c:79
+#: servport.c:81
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "repassando para %s\n"
 
-#: sink.c:312
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:315
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:447
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:507 sink.c:591
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "Erro %cMTP: %s\n"
 
-#: sink.c:752
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr "Abertura de arquivo BSMTP ou escrita de pre�mbulo falhou\n"
+
+#: sink.c:758
+#, fuzzy
+msgid "BSMTP preamble write failed.\n"
 msgstr "Abertura de arquivo BSMTP ou escrita de pre�mbulo falhou\n"
 
-#: sink.c:965
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "Cliente %cMTP n�o gosta do endere�o do destinat�rio `%s'\n"
 
-#: sink.c:972
+#: sink.c:979
 #, fuzzy, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "Cliente %cMTP n�o gosta do endere�o do destinat�rio `%s'\n"
 
-#: sink.c:1013
+#: sink.c:1025
 #, fuzzy
 msgid "no address matches; no postmaster set.\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1025
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "n�o � poss�vel nem mandar para %s!\n"
 
-#: sink.c:1031
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: sink.c:1185
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "prestes a entregar para: %s\n"
 
-#: sink.c:1209
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr "Abertura MDA falhou\n"
 
-#: sink.c:1246
+#: sink.c:1260
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "Conex�o %cMTP com %s falhou\n"
 
-#: sink.c:1270
+#: sink.c:1284
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1326
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "Erro na libera��o de credenciais\n"
+
+#: sink.c:1349
 #, fuzzy, c-format
 msgid "MDA died of signal %d\n"
 msgstr "acordado pelo sinal %d\n"
 
-#: sink.c:1329
+#: sink.c:1352
 #, fuzzy, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 "O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
 
-#: sink.c:1332
+#: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1353
+#: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
 
-#: sink.c:1374
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr "Cliente SMTP recusou a entrega\n"
 
-#: sink.c:1404
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr "Erro na entrega LMTP no EOM\n"
 
-#: sink.c:1407
+#: sink.c:1432
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Resposta n�o-503 para o EOM LMTP: %s\n"
 
-#: sink.c:1561
+#: sink.c:1587
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:87
+#: smtp.c:79
 #, fuzzy
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "Autentica��o CRAM-MD5 � suportada\n"
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 #, fuzzy
 msgid "smtp listener protocol error\n"
 msgstr "erro de protocolo\n"
@@ -2702,136 +2856,171 @@ msgstr "rodando %s %s %s\n"
 msgid "execvp(%s) failed\n"
 msgstr "execl(%s) falhou\n"
 
-#: socket.c:281
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:284
+#: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:296 socket.c:299
+#, fuzzy, c-format
+msgid "unknown (%s)"
+msgstr "a m�quina � desconhecida."
+
+#: socket.c:302
+#, c-format
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, fuzzy, c-format
+msgid "cannot create socket: %s\n"
+msgstr "n�o � poss�vel nem mandar para %s!\n"
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "Conex�o %cMTP com %s falhou\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "Conex�o %cMTP com %s falhou\n"
+
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "Conex�o %cMTP com %s falhou\n"
+
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:630
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:634
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:636
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:640
+#: socket.c:625
 #, fuzzy, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Data/hor�rio do servi�o %s\n"
 
-#: socket.c:644
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:690
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:696
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:701
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:703
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:717
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:731
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:735
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:738
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr ""
 
-#: socket.c:753
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:805
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:822
+#: socket.c:842
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo `%s' inv�lido foi especificado.\n"
 
-#: socket.c:883
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:957
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:960
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:74
+#: transact.c:67
+#, fuzzy, c-format
+msgid "mapped address %s to local %s\n"
+msgstr "%s mapeado localmente para %s\n"
+
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "%s mapeado localmente para %s\n"
 
-#: transact.c:138
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "passou por %s combinando com %s\n"
 
-#: transact.c:207
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2840,137 +3029,138 @@ msgstr ""
 "analisando linha Received:\n"
 "%s"
 
-#: transact.c:246
+#: transact.c:265
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "linha aceita, %s � um apelido do servidor de email\n"
 
-#: transact.c:252
+#: transact.c:271
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "linha rejeitada, %s n�o � um apelido do servidor de email\n"
 
-#: transact.c:326
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "nenhum endere�o Received encontrado\n"
 
-#: transact.c:335
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "encontrado endere�o Received `%s'\n"
 
-#: transact.c:538
+#: transact.c:551
 msgid "message delimiter found while scanning headers\n"
 msgstr ""
 "encontrado o delimitador de mensagens durante varredura de cabe�alhos\n"
 
-#: transact.c:559
+#: transact.c:582
 #, fuzzy
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 "encontrado o delimitador de mensagens durante varredura de cabe�alhos\n"
 
-#: transact.c:561
+#: transact.c:584
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Baixando %s\n"
 
-#: transact.c:1082
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "n�o combina com nada localmente, repassando para %s\n"
 
-#: transact.c:1097
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvio e remo��o suprimidos devido a erro de DNS\n"
 
-#: transact.c:1209
+#: transact.c:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrevendo cabe�alhos RFC822\n"
 
-#: transact.c:1230
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "nenhum endere�o de destino combina com o valor local declarado"
 
-#: transact.c:1237
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "endere�o do destinat�rio %s n�o combina com nenhum nome local"
 
-#: transact.c:1246
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "a mensagem possui NULs inseridos"
 
-#: transact.c:1254
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Cliente SMTP rejeitou o endere�o do destinat�rio: "
 
-#: transact.c:1382
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "escrevendo o texto da mensagem\n"
 
-#: uid.c:248
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr ""
 
-#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr ""
 
-#: uid.c:260
+#: uid.c:262
 msgid "Scratch list of UIDs:"
 msgstr ""
 
-#: uid.c:514 uid.c:566
+#: uid.c:517 uid.c:569
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr ""
 
-#: uid.c:516
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr ""
 
-#: uid.c:545
+#: uid.c:548
 #, fuzzy
 msgid "swapping UID lists\n"
 msgstr "lista de UID gravada\n"
 
-#: uid.c:553
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr ""
 
-#: uid.c:578
+#: uid.c:581
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "lista de UID gravada\n"
 
-#: uid.c:613
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr ""
 
-#: uid.c:615
+#: uid.c:620
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Erro na libera��o de credenciais\n"
 
-#: uid.c:621
+#: uid.c:626
 #, fuzzy
 msgid "Writing fetchids file.\n"
 msgstr "iniciando fetchmail %s como daemon \n"
 
-#: uid.c:640
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:644
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:648
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2983,6 +3173,9 @@ msgstr "malloc falhou\n"
 msgid "realloc failed\n"
 msgstr "realloc falhou\n"
 
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "Um MDA enviou um SIGPIPE ou houve um erro de socket\n"
+
 #~ msgid "header "
 #~ msgstr "cabe�alho "
 
diff --git a/po/ru.po b/po/ru.po
index 36fe92da..feed90d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-01-18 00:37+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -31,7 +31,8 @@ msgstr "Нет, их IP-адреса не совпадают\n"
 #: checkalias.c:198
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "Выполняя поиск `%s', nameserver возвратил ошибку во время опроса %s: %s.\n"
+msgstr ""
+"Выполняя поиск `%s', nameserver возвратил ошибку во время опроса %s: %s.\n"
 
 #: checkalias.c:223
 #, c-format
@@ -64,12 +65,16 @@ msgstr "Тема: Предупреждение Fetchmail о превышении
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Следующие сообщения завышенного размера были удалены с почтового сервера %s, учётная запись %s:"
+msgstr ""
+"Следующие сообщения завышенного размера были удалены с почтового сервера %s, "
+"учётная запись %s:"
 
 #: driver.c:343
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
-msgstr "Следующие сообщения завышенного размера находятся на почтовом сервере %s, учётная запись %s:"
+msgstr ""
+"Следующие сообщения завышенного размера находятся на почтовом сервере %s, "
+"учётная запись %s:"
 
 #: driver.c:362
 #, c-format
@@ -103,90 +108,102 @@ msgstr " (длина -1)"
 msgid " (oversized)"
 msgstr " (завышенного размера)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "невозможно было извлечь заголовки, сообщение %s@%s:%d (%d октетов)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "считывается сообщение %s@%s:%d из %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d октетов)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d октетов в заголовке)"
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d октетов в теле)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "длина сообщения %s@%s:%d не совпала с ожидаемой (%d на самом деле != %d ожидалось)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"длина сообщения %s@%s:%d не совпала с ожидаемой (%d на самом деле != %d "
+"ожидалось)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " задержано\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " пропущено\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " не пропущено\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "Достигнут предел извлечения %d; осталось %d сообщение, сервер %s, учётная запись %s\n"
-msgstr[1] "Достигнут предел извлечения %d; осталось %d сообщений, сервер %s, учётная запись %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"Достигнут предел извлечения %d; осталось %d сообщение, сервер %s, учётная "
+"запись %s\n"
+msgstr[1] ""
+"Достигнут предел извлечения %d; осталось %d сообщений, сервер %s, учётная "
+"запись %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "таймаут после %d секунд ожидания подключения к серверу %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "таймаут после %d секунд ожидания сервера %s.\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "таймаут после %d секунд ожидания %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "таймаут после %d секунд ожидания ответа от слушателя.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "таймаут после %d секунд.\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Тема: fetchmail наблюдает повторяющиеся тайм-ауты"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail обнаружил более %d тайм-аутов при попытке получения почты из %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail обнаружил более %d тайм-аутов при попытке получения почты из %s@%"
+"s.\n"
 
-#: driver.c:911
+#: driver.c:914
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -204,73 +221,73 @@ msgstr ""
 "Fetchmail не будет опрашивать этот почтовый ящик до тех\n"
 "пор, пока вы его не перезапустите.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "сбой команды, выполняемой до соединения; статус: %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "невозможно было найти HESIOD pobox для %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Ведущий сервер без имени.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "невозможно было найти каноническое имя DNS %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "сбой %s-подключения к %s"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Тема: Предупреждение Fetchmail о недоступности сервера."
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail не смог установить связь с почтовым сервером %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "Сбой подключения через SSL.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Ошибка блокировки занятости для %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Ошибка занятости сервера для %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Ошибка авторизации для %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (ранее авторизовано)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Тема: Ошибка аутентификации fetchmail для %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail не смог получить почту из %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -284,7 +301,7 @@ msgstr ""
 "fetchmail не смог распознать из-за того, что сервер не отправил\n"
 "сообщение об ошибке."
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -304,7 +321,7 @@ msgstr ""
 "подключиться. В дальнейшем уведомления отправляться не будут до тех\n"
 "пор, пока служба не будет восстановлена."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -327,167 +344,167 @@ msgstr ""
 "отправляться не будут до тех пор, пока служба не будет\n"
 "восстановлена."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Немедленно повторить опрос для %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Неизвестный логин или ошибка аутентификации для %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Авторизация выполнена для %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Тема: Выполнена авторизация fetchmail для %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail вошел в систему %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Служба была восстановлена.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "выбирается или повторяется опрос каталога %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "выбирается или повторяется опрос каталога по умолчанию\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s на %s (каталог %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Опрашивается %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d сообщение (%d %s) для %s"
 msgstr[1] "%d сообщений (%d %s) для %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "просмотрено"
 msgstr[1] "просмотрено"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d сообщение для %s"
 msgstr[1] "%d сообщений для %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d октетов).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Для %s почты нет\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "фиктивное количество сообщений!"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "сокет"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "отсутствует или неверный заголовок RFC822"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "синхронизация клиент/сервер"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "протокол клиент/сервер"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "блокировка занятости на сервере"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "SMTP-транзакция"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "DNS-запрос"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "неопределённый"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Ошибка %s при выборке из %s@%s и доставке на хост SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "неизв."
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Ошибка %s при выборке из %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "сбой команды, выполняемой после соединения; статус: %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Поддержка Kerberos V4 не связана.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Поддержка Kerberos V5 не связана.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Опция --flush не поддерживается с %s\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Опция --all не поддерживается с %s\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Опция --limit не поддерживается с %s\n"
@@ -513,7 +530,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -541,16 +559,20 @@ msgstr "сбой gethostbyname для %s\n"
 
 #: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Невозможно найти свой собственный хост в базе данных хостов, чтобы определить его!\n"
+msgstr ""
+"Невозможно найти свой собственный хост в базе данных хостов, чтобы "
+"определить его!\n"
 
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Пытаемся продолжить с неопределённым именем хоста.\n"
-"НЕ СООБЩАЙТЕ о нарушенных заголовках Received:, строках HELO/EHLO или подобных проблемах!\n"
+"НЕ СООБЩАЙТЕ о нарушенных заголовках Received:, строках HELO/EHLO или "
+"подобных проблемах!\n"
 "Вместо этого ИСПРАВЬТЕ свой /etc/hosts, DNS, NIS или LDAP.\n"
 
 #: etrn.c:49 odmr.c:60
@@ -618,14 +640,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Опция --check не поддерживается с ETRN\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Sunil Shetye\n"
 "Copyright (C) 2005-2007 Matthias Andree\n"
 
@@ -682,7 +707,8 @@ msgstr "fetchmail: другие запущенные fetchmail отсутств�
 #: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: ошибка остановки %s fetchmail на %d; вынужденное завершение.\n"
+msgstr ""
+"fetchmail: ошибка остановки %s fetchmail на %d; вынужденное завершение.\n"
 
 #: fetchmail.c:441 fetchmail.c:450
 msgid "background"
@@ -698,13 +724,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail на %d остановлен.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: невозможно проверить почту, пока на том же хосте запущен другой fetchmail.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: невозможно проверить почту, пока на том же хосте запущен другой "
+"fetchmail.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: невозможно опросить указанные хосты из-за другого fetchmail, запущенного на %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: невозможно опросить указанные хосты из-за другого fetchmail, "
+"запущенного на %d.\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -712,8 +745,10 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: на %d запущен другой приоритетный fetchmail.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n"
 
 #: fetchmail.c:501
 #, c-format
@@ -723,7 +758,9 @@ msgstr "fetchmail: на %d из фонового режима вернулся
 #: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
-msgstr "fetchmail: на %d неожиданно завершился более старший процесс того же уровня.\n"
+msgstr ""
+"fetchmail: на %d неожиданно завершился более старший процесс того же "
+"уровня.\n"
 
 #: fetchmail.c:528
 #, c-format
@@ -737,7 +774,9 @@ msgstr "Введите пароль для %s@%s: "
 
 #: fetchmail.c:557 fetchmail.c:593
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Предупреждение: настроено использование syslog и logfile. Проверяйте оба журнала!\n"
+msgstr ""
+"fetchmail: Предупреждение: настроено использование syslog и logfile. "
+"Проверяйте оба журнала!\n"
 
 #: fetchmail.c:569
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
@@ -753,760 +792,817 @@ msgstr "запускается демон fetchmail %s\n"
 msgid "could not open %s to append logs to \n"
 msgstr "невозможно было открыть %s для добавления записей\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "невозможно было проверить время %s (ошибка %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail перезапускается (%s изменен)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "возможен сбой при перезапуске, т.к. каталог не был восстановлен\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "сбой перезапуска fetchmail\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "опрос %s пропущен (ошибка аутентификации или слишком много тайм-аутов)\n"
+msgstr ""
+"опрос %s пропущен (ошибка аутентификации или слишком много тайм-аутов)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "интервал не достигнут, %s не запрашивается\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Статус запроса=0 (SUCCESS)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Статус запроса=1 (NOMAIL)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Статус запроса=2 (SOCKET)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Статус запроса=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Статус запроса=4 (PROTOCOL)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Статус запроса=5 (SYNTAX)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Статус запроса=6 (IOERR)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Статус запроса=7 (ERROR)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Статус запроса=8 (EXCLUDE)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Статус запроса=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Статус запроса=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Статус запроса=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Статус запроса=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Статус запроса=13 (MAXFETCH)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Статус запроса=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Все соединения перегружены.  Завершение работы.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "в спящем режиме в %s на %d секунд\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "разбужен %s'ом\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "разбужен по сигналу %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "разбужен на %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "нормальное завершение, статус %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "невозможно было проверить время файла контроля запуска\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Предупреждение: многократные ссылки на хост %s в файле настройки\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n"
+msgstr ""
+"fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "Поддержка SSL не была включена при компиляции.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v4 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Поддержка KERBEROS v5 настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Поддержка GSSAPI настроена, но не была включена при компиляции.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: предупреждение: не доступен DNS для проверки многоканальной выборки из %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: предупреждение: не доступен DNS для проверки многоканальной "
+"выборки из %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "предупреждение: multidrop для %s требует опцию envelope!\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "предупреждение: Не просите технической поддержки, если все сообщения отправляются постмастеру!\n"
+msgstr ""
+"предупреждение: Не просите технической поддержки, если все сообщения "
+"отправляются постмастеру!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: конфигурация %s не верна, укажите положительный номер порта для службы\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: конфигурация %s не верна, укажите положительный номер порта для "
+"службы\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный порт\n"
+msgstr ""
+"fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный "
+"порт\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n"
+msgstr ""
+"конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Запускать fetchall, оставляя его при этом в режиме демона или простоя, нельзя!\n"
+msgstr ""
+"Запускать fetchall, оставляя его при этом в режиме демона или простоя, "
+"нельзя!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "завершен по сигналу %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос начат\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "Поддержка POP2 не настроена.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "Поддержка POP3 не настроена.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "Поддержка IMAP не настроена.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "Поддержка ETRN не настроена.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "Поддержка ODMR не настроена.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "выбран неподдерживаемый протокол.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s запрашивает %s (протокол %s) на %s: опрос завершен\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Интервал опроса - %d секунд\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Лог-файл - %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "ID-файл - %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Обработка сообщений будет регистрироваться через syslog\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail сымитирует и не создаст Received\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr "Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n"
+msgstr ""
+"Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail переадресует многоканальные сообщения без адреса на %s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail направит ошибочное письмо постмастеру.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail направит ошибочное письмо отправителю.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Параметры для получения из %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Почта будет получена через %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Опрос этого сервера будет выполняться с интервалом %d.\n"
 msgstr[1] "  Опрос этого сервера будет выполняться с интервалами %d.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Настоящее имя севера - %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, этот хост не будет запрошен.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Когда хост не указан, будет запрошен этот хост.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Будет затребован пароль.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Секрет APOP = \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Пароль = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Протокол - KPOP с аутентификацией Kerberos %s"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Протокол - %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (используется служба %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (используется порт по умолчанию)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (принудительно используется UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Будут испробованы все доступные способы аутентификации.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация с паролем.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация MSN.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация NTLM.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация OTP.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация CRAM-Md5.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация GSSAPI.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V4.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Будет использована принудительная аутентификация Kerberos V5.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Допускается оперативное шифрование.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Принципал почтовой службы: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Включены сессии, зашифрованные SSL.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Протокол SSL: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Включена проверка сертификата сервера SSL.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Каталог доверенных сертификатов SSL: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Общепринятое имя сервера: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Отпечаток ключа SSL (сверенный с ключом сервера): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Таймаут молчания сервера - %d секунд"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (по умолчанию).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Выбран почтовый ящик по умолчанию.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Выбранные почтовые ящики:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Будут получены все сообщения (--all on).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Будут получены только новые сообщения (--all off).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Выбранные сообщения будут оставлены на сервере (--keep on).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Выбранные сообщения будут удалены с сервера (--keep off).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Старые сообщения будут удалены перед получением сообщения (--flush on).\n"
+msgstr ""
+"  Старые сообщения будут удалены перед получением сообщения (--flush on).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Старые сообщения не будут удалены перед получением сообщения (--flush off).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Старые сообщения не будут удалены перед получением сообщения (--flush "
+"off).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Сообщения завышенного размера будут удалены перед получением сообщения (--limitflush on).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Сообщения завышенного размера будут удалены перед получением сообщения (--"
+"limitflush on).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Сообщения завышенного размера не будут удалены перед получением сообщения (--limitflush  off).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Сообщения завышенного размера не будут удалены перед получением сообщения "
+"(--limitflush  off).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Перезапись локальных адресов сервера включена (--norewrite off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Перезапись локальных адресов сервера выключена (--norewrite on).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Удаление возврата каретки включено (stripcr on).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Удаление возврата каретки выключено (stripcr off).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Принудительный возврат каретки включен (forcecr on).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Принудительный возврат каретки выключен (forcecr off).\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Интерпретация кодировки передаваемого контента включена (pass8bits off).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Интерпретация кодировки передаваемого контента включена (pass8bits off).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-декодирование включено (mimedecode on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-декодирование выключено (mimedecode off).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Простой после опроса включен (idle on).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Простой после опроса выключен (idle off).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Непустые строки состояния будут удалены (dropstatus on)\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Непустые строки состояния будут сохранены (dropstatus off)\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Строки Delivered-To будут удалены (dropdelivered on)\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Строки Delivered-To будут сохранены (dropdelivered off)\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Ограничение на размер сообщения - %d октетов (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Нет ограничения на размер сообщения (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Интервал между предупреждениями о размере сообщения - %d секунд (--warnings %d).\n"
+msgstr ""
+"  Интервал между предупреждениями о размере сообщения - %d секунд (--"
+"warnings %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Предупреждения о размере при каждом опросе (--warnings 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Ограничение на полученные сообщения - %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Нет ограничения на полученные сообщения (--fetchlimit 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr "  Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n"
+msgstr ""
+"  Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Нет ограничения на размер выборки сообщений (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n"
+msgstr ""
+"  Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl %d).\n"
+msgstr ""
+"  Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl %"
+"d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n"
+msgstr ""
+"   Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Ограничение на пакет SMTP-сообщений - %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Нет ограничения на пакет SMTP-сообщений (--batchlimit 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Интервал между удалениями принудительно установлен в %d (--expunge %d).\n"
+msgstr ""
+"  Интервал между удалениями принудительно установлен в %d (--expunge %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Нет принудительных удалений (--expunge 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Домены, для которых будет выполняться выборка почты:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (по умолчанию)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Сообщения будут прикреплены к %s как BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Сообщения будут доставлены с \"%s\".\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Сообщения будут переадресованы по %cMTP на:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Часть хоста из строки MAIL FROM будет %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n"
+msgstr ""
+"  Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Ответные действия на распознанные слушателем спам-блоки:"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Блокировка спама отключена\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Подключение к серверу будет установлено с \"%s\".\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Нет команды, выполняемой до соединения.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Подключение к серверу будет разорвано с \"%s\".\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Нет команды, выполняемой после соединения.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Нет локальных имен, объявленных для этого хоста.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Многоканальный режим:"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Одноканальный режим: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "распознано %d локальное имя.\n"
 msgstr[1] "распознано %d локальных имён.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов включен.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-запрос для многоканальных адресов выключен.\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Алисы сервера будут сравнены с многоканальными адресами по имени.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Маршрутизация охватывающего адреса отключена\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Охватывающий заголовок должен быть: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Количество пропускаемых охватывающих заголовков: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Префикс %s будет удален из id пользователя\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Нет разборки префикса\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Ранее объявленные алиасы почтового сервера:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Локальные домены:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Подключение должно быть через интерфейс %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Не указаны требования интерфейса.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Цикл опроса будет наблюдать за %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Не указан интерфейс монитора.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Подключения к серверу будут выполняться посредством плагина %s (--plugin %s).\n"
+msgstr ""
+"  Подключения к серверу будут выполняться посредством плагина %s (--plugin %"
+"s).\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Не указана команда плагина.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n"
+msgstr ""
+"  Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Не указана команда plugout'а.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  С этого хоста нет сохраненных UID'ов.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  Сохранено %d UID'ов.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
-msgstr "  Информация с трассировкой опроса будет добавлена в заголовок Received.\n"
+msgstr ""
+"  Информация с трассировкой опроса будет добавлена в заголовок Received.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1514,7 +1610,7 @@ msgstr ""
 "  Информация с трассировкой опроса не будет добавлена в заголовок Received.\n"
 ".\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Свойства ретрансляции \"%s\".\n"
@@ -1604,92 +1700,99 @@ msgstr "Протокол идентифицирован как IMAP2 или IMAP
 msgid "will idle after poll\n"
 msgstr "будет приостановлен после опроса\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: обновление до TLS выполнено успешно.\n"
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: сбой обновления до TLS.\n"
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить работу\n"
+msgstr ""
+"%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
+"работу\n"
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail скомпилирован без требуемой поддержки OTP\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail скомпилирован без требуемой поддержки NTLM\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Требуемая опция LOGIN не поддерживается сервером\n"
 
-#: imap.c:662
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "разногласие при удалении писем (%d на самом деле != %d ожидалось)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "не удалось повторить опрос\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "ожидается %d сообщение после повторного опроса\n"
 msgstr[1] "ожидается %d сообщений после повторного опроса\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "не удалось выбрать почтовый ящик\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "ожидается %d сообщение после первого опроса\n"
 msgstr[1] "ожидается %d сообщений после первого опроса\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "не удалось удалить\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "ожидается %d сообщение после удаления\n"
 msgstr[1] "ожидается %d сообщений после удаления\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "сбой поиска непросмотренных сообщений\n"
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu не просмотрено\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u первое не просмотренное\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Предупреждение: игнорируются некорректные данные о размерах сообщений, возвращённые сервером.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Предупреждение: игнорируются некорректные данные о размерах сообщений, "
+"возвращённые сервером.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "Невозможно открыть интерфейс kvm. Убедитесь, что fetchmail является SGID kmem."
+msgstr ""
+"Невозможно открыть интерфейс kvm. Убедитесь, что fetchmail является SGID "
+"kmem."
 
 #: interface.c:396
 #, c-format
@@ -1877,362 +1980,408 @@ msgstr "сервер прекратил получение\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Невозможно было декодировать запрос OTP\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Секретная идентификационная фраза:"
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Строка '%s' не является верной числовой строкой.\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Значение строки '%s' - %s, чем %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "меньше"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "больше"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Указан неверный протокол `%s'.\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Указана неверная аутентификация `%s'.\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "использование:  fetchmail [опции] [сервер ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Используемые опции:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        вывод этой справки\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     вывод информации о версии\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       проверка сообщений без выборки\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      работа без лишней информации\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr "  -v, --verbose     работа с подробным выводом диагностических данных\n"
+msgstr ""
+"  -v, --verbose     работа с подробным выводом диагностических данных\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      запуск в виде демона каждые n секунд\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    не отсоединять процесс демона\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        останов процесса демона\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     указание имени log-файла\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      использование syslog(3) для большинства сообщений, когда запущен как демон\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      использование syslog(3) для большинства сообщений, когда "
+"запущен как демон\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   не записывать Received и включить спуфинг хоста\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc указание другого файла контроля запуска\n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      указание других UID'ов файла\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     указание другого файла с PID'ом\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  указание получателя на крайний случай\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    перенаправление рикошетов пользователей к постмастеру.\n"
+msgstr ""
+"      --nobounce    перенаправление рикошетов пользователей к постмастеру.\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   требуемая для интерфейса спецификация\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     наблюдение за активностью интерфейса\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         включение сессии, зашифрованной ssl\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      файл секретного ключа ssl\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     сертификат клиента ssl\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   строгая проверка сертификата севера (рекомендуется)\n"
+msgstr ""
+"      --sslcertck   строгая проверка сертификата севера (рекомендуется)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath путь к сертификатам ssl\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint отпечаток, который должен соответствовать сертификату сервера.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
 
-#: options.c:615
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint отпечаток, который должен соответствовать сертификату "
+"сервера.\n"
+
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr "      --sslproto    принудительное использование протокола ssl (SSL2/SSL3/TLS1)\n"
+msgstr ""
+"      --sslproto    принудительное использование протокола ssl (SSL2/SSL3/"
+"TLS1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      указание внешней команды для установки соединения\n"
+msgstr ""
+"      --plugin      указание внешней команды для установки соединения\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     указание внешней команды для установки соединения smtp\n"
+msgstr ""
+"      --plugout     указание внешней команды для установки соединения smtp\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    указание протокола поиска (см. man page)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr "  -U, --uidl        принудительное использование UIDL'ов (только pop3)\n"
+msgstr ""
+"  -U, --uidl        принудительное использование UIDL'ов (только pop3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        TCP-порт для подключения (устарел, используйте --service)\n"
+msgstr ""
+"      --port        TCP-порт для подключения (устарел, используйте --"
+"service)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     служба TCP для подключения (может быть числовым TCP-портом)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     служба TCP для подключения (может быть числовым TCP-"
+"портом)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        тип аутентификации (password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     таймаут молчания сервера\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    заголовок охватывающего адреса\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    префикс, удаляемый из id локального пользователя\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   принципал почтовой службы\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  добавление информации трассировки опроса в заголовок Received\n"
+msgstr ""
+"      --tracepolls  добавление информации трассировки опроса в заголовок "
+"Received\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    указание логина пользователя на сервере\n"
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  получение старых и новых сообщений\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      удаление новых сообщений после получения\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        сохранение новых сообщений после получения\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       удаление старых сообщений с сервера\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  удаление сообщений завышенного размера\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   не перезаписывать адреса заголовка\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr "  -l, --limit       не делать выборку сообщений больше заданного размера\n"
+msgstr ""
+"  -l, --limit       не делать выборку сообщений больше заданного размера\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr "  -w, --warnings    промежутки между предупреждающими почтовыми уведомлениями\n"
+msgstr ""
+"  -w, --warnings    промежутки между предупреждающими почтовыми "
+"уведомлениями\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    установка хоста переадресации SMTP\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains выборка почты для указанных доменов\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress установка домена, используемого для доставки SMTP\n"
+msgstr ""
+"  -D, --smtpaddress установка домена, используемого для доставки SMTP\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr "      --smtpname    установка полного (пользователь@домен) имени SMTP\n"
+msgstr ""
+"      --smtpname    установка полного (пользователь@домен) имени SMTP\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr "  -Z, --antispam,   установка значений антиспамерских ответных действий\n"
+msgstr ""
+"  -Z, --antispam,   установка значений антиспамерских ответных действий\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr "  -b, --batchlimit  установка ограничения на пакет для SMTP-соединений\n"
+msgstr ""
+"  -b, --batchlimit  установка ограничения на пакет для SMTP-соединений\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  установка ограничения на выборку для соединений сервера\n"
+msgstr ""
+"  -B, --fetchlimit  установка ограничения на выборку для соединений сервера\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr "      --fetchsizelimit установка ограничения на размер выборки сообщений\n"
+msgstr ""
+"      --fetchsizelimit установка ограничения на размер выборки сообщений\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    выполнить двоичный поиск UIDL'ов\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     установка максимального количества удалений\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         установка MDA, используемого для переадресации\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       установка файла вывода BSMTP\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        использование для доставки LMTP (RFC2033)\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      указание имени удаленного каталога\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    отображение точечной строки прогресса даже в log-файлах\n"
+msgstr ""
+"      --showdots    отображение точечной строки прогресса даже в log-файлах\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP используется команда RETR.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP "
+"используется команда RETR.\n"
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr "Для этого сеанса требуется использовать TLS, однако сервер отклонил команду CAPA.\n"
+msgstr ""
+"Для этого сеанса требуется использовать TLS, однако сервер отклонил команду "
+"CAPA.\n"
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Команда CAPA необходима для TLS.\n"
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить работу.\n"
+msgstr ""
+"%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
+"работу.\n"
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Закончились допустимые аутентификаторы, продолжение невозможно.\n"
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В приветствии не найдена требуемая временная метка APOP\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "В приветствии ошибка синтаксиса временной метки\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "Недопустимая временная метка APOP.\n"
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Неопределённый запрос протокола в POP3_auth\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "блокировка занятости!  Может активен другой сеанс?\n"
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Невозможно обработать UIDL-ответ upstream-сервера.\n"
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Сервер возвратил ответ с UID для неверного сообщения.\n"
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u не просмотрено\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Сообщения добавлены в список на сервере. Обработка невозможна.\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "ошибка протокола\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "ошибка протокола при выборке UIDL'ов\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Опция --folder не поддерживается с POP3\n"
 
@@ -2245,32 +2394,39 @@ msgid "SDPS not enabled."
 msgstr "SDPS не включен."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: опция interface поддерживается только в Linux (без IPv6) и FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: опция interface поддерживается только в Linux (без IPv6) и "
+"FreeBSD\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: опция monitor поддерживается только в Linux (без IPv6) и FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: опция monitor поддерживается только в Linux (без IPv6) и FreeBSD\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL не включен"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "конец ввода"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Файл %s должен быть обычным файлом.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Файл %s должен иметь разрешения -rwx--x--- (0710), но не более того.\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Владельцем файла %s должны быть вы.\n"
@@ -2577,8 +2733,11 @@ msgstr "MDA возвратил ненулевой статус %d\n"
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно обработать в %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно "
+"обработать в %s:%d\n"
 
 #: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
@@ -2697,113 +2856,118 @@ msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n"
 msgid "connected.\n"
 msgstr "соединение установлено.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Запрашивающая организация: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr "Предупреждение: имя запрашивающей организации слишком длинное (возможно укорочено).\n"
+msgstr ""
+"Предупреждение: имя запрашивающей организации слишком длинное (возможно "
+"укорочено).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Неизвестная организация\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Общепринятое имя: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n"
+msgstr ""
+"Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Неизвестное общепринятое имя\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Общепринятое имя сервера: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Несовпадение общепринятого имени сервера: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Имя сервера не установлено, невозможно проверить сертификат!\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Неизвестное общепринятое имя сервера\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Имя сервера не указано в сертификате!\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "сбой EVP_md5()!\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Нехватка памяти!\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Буфер текстового журнала слишком мал!\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Отпечаток ключа %s: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Отпечатки %s совпадают.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Отпечатки %s не совпадают!\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Ошибка проверки сертификата сервера: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "неизвестная запрашивающая сторона (первые %d символов): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Дескриптор файла вне диапазона SSL"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Указан неверный протокол SSL '%s', используется протокол по умолчанию (SSLv23).\n"
+msgstr ""
+"Указан неверный протокол SSL '%s', используется протокол по умолчанию "
+"(SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Повторная попытка чтения сокета Cygwin\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Сбой повторного чтения сокета Cygwin!\n"
 
@@ -2932,30 +3096,30 @@ msgstr "списки UID не обмениваются, в этом запрос
 msgid "discarding new UID list\n"
 msgstr "отбрасывается новый список UID\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Удаляется файл fetchids.\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Ошибка удаления %s: %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Записывается файл fetchids.\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Ошибка записи в fetchids-файл %s, старый файл остался на месте.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Невозможно открыть fetchids-файл %s для записи: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 42b40a32..de1df4cd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-11-17 09:23+0100\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2003-06-12 15:02+00\n"
 "Last-Translator: Lubos Vitek <lubos_vitek@yahoo.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -15,25 +15,25 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:172
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Kontrolujem, �i %s je naozaj ten ist� uzol ako %s\n"
 
-#: checkalias.c:176
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "�no, ich IP adresy s�hlasia\n"
 
-#: checkalias.c:180
+#: checkalias.c:182
 msgid "No, their IP addresses don't match\n"
 msgstr "Nie, ich IP adresy nes�hlasia\n"
 
-#: checkalias.c:196
+#: checkalias.c:198
 #, fuzzy, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "Nameserver-zlyhanie pri h�adan� `%s' po�as komunik�cie s %s.\n"
 
-#: checkalias.c:221
+#: checkalias.c:223
 #, fuzzy, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "Nameserver-zlyhanie pri h�adan� `%s' po�as komunik�cie s %s.\n"
@@ -47,108 +47,112 @@ msgstr "nem��em dek�dova� BASE64 v�zvu\n"
 msgid "decoded as %s\n"
 msgstr "dek�dovan� ako %s\n"
 
-#: driver.c:193
+#: driver.c:191
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "Kerberos-chyba %s\n"
 
-#: driver.c:251 driver.c:256
+#: driver.c:249 driver.c:254
 #, c-format
 msgid "krb5_sendauth: %s [server says '%*s'] \n"
 msgstr "krb5_sendauth: %s [server odpovedal '%*s'] \n"
 
-#: driver.c:337
+#: driver.c:335
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr ""
 
-#: driver.c:341
+#: driver.c:339
 #, fuzzy, c-format
-msgid "The following oversized messages were deleted on the mail server %s:"
+msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr ""
 "Predmet: Fetchmail-varovanie: nadrozmern� spr�va.\n"
 "\n"
 "Nasleduj�ca nadrozmern� spr�va zost�va na po�tovom serveri %s:"
 
-#: driver.c:345
+#: driver.c:343
 #, fuzzy, c-format
-msgid "The following oversized messages remain on the mail server %s:"
+msgid "The following oversized messages remain on server %s account %s:"
 msgstr ""
 "Predmet: Fetchmail-varovanie: nadrozmern� spr�va.\n"
 "\n"
 "Nasleduj�ca nadrozmern� spr�va zost�va na po�tovom serveri %s:"
 
-#: driver.c:364
+#: driver.c:362
 #, fuzzy, c-format
-msgid "  %d msg %d octets long deleted by fetchmail."
-msgstr "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
+msgstr[1] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
 
-#: driver.c:368
+#: driver.c:367
 #, fuzzy, c-format
-msgid "  %d msg %d octets long skipped by fetchmail."
-msgstr "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
+msgstr[1] "\t%d msg %d oktetov dlh� vynechan� fetchmailom.\n"
 
-#: driver.c:502
+#: driver.c:503
 #, fuzzy, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "vynech�vam spr�vu %s@%s:%d (%d oktetov)"
 
-#: driver.c:556
+#: driver.c:557
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "vynech�vam spr�vu %s@%s:%d (%d oktetov)"
 
-#: driver.c:572
+#: driver.c:573
 msgid " (length -1)"
 msgstr "(d�ka -1)"
 
-#: driver.c:575
+#: driver.c:576
 msgid " (oversized)"
 msgstr "(nadrozmern�)"
 
-#: driver.c:590
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nem��em z�ska� z�hlavie, spr�va %s@%s:%d (%d oktetov)\n"
 
-#: driver.c:607
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "��tam spr�vu %s@%s:%d z %d"
 
-#: driver.c:612
+#: driver.c:616
 #, fuzzy, c-format
 msgid " (%d octets)"
 msgstr " (%d %s oktetov)"
 
-#: driver.c:613
+#: driver.c:617
 #, fuzzy, c-format
 msgid " (%d header octets)"
 msgstr " (%d oktetov v tele spr�vy)"
 
 #: driver.c:685
-#, c-format
-msgid " (%d body octets) "
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (%d oktetov v tele spr�vy)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "spr�va %s@%s:%d nemala o�ak�van� d�ku (%d aktu�lne != %d o�ak�van�)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " ponechan�\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " vypr�zdnen�\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " nevypr�zdnen�\n"
 
-#: driver.c:818
+#: driver.c:822
 #, fuzzy, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -158,47 +162,43 @@ msgstr[0] ""
 msgstr[1] ""
 "fetchlimit %d dosiahnut�; %d spr�v ponech�n�ch na serveri %s ��et %s\n"
 
-#: driver.c:881
-msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-msgstr "SIGPIPE obdr�an� z MDA alebo chyba v pr�de d�t zo socketu\n"
-
-#: driver.c:888
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na pripojenie na server "
 "%s.\n"
 
-#: driver.c:892
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na odpove� zo servera %"
 "s.\n"
 
-#: driver.c:896
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na %s.\n"
 
-#: driver.c:901
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 "vypr�anie �asov�ho limitu po %d sekund�ch pri �akan� na odpove� z "
 "prij�ma�a.\n"
 
-#: driver.c:904
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "vypr�anie �asov�ho limitu po %d sekund�ch.\n"
 
-#: driver.c:916
+#: driver.c:907
 #, fuzzy
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Predmet: fetchmail spozoroval opakovan� vypr�anie �asov�ch limitov\n"
 
-#: driver.c:919
+#: driver.c:910
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
@@ -207,7 +207,7 @@ msgstr ""
 "Fetchmail zistil viac ako %d vypr�an� �asov�ch limitov pri pokusoch\n"
 "z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:923
+#: driver.c:914
 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"
@@ -223,23 +223,23 @@ msgstr ""
 "\n"
 "Fetchmail nebude pracova� s t�mto prie�inkom, pokia� ho nespust�te znova.\n"
 
-#: driver.c:948
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pr�kaz sp���an� pred spojen�m nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:972
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nem��em n�js� HESIOD po�tov� schr�nku pre %s\n"
 
-#: driver.c:993
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Ved�ci server nem� meno.\n"
 
-#: driver.c:1017
+#: driver.c:1008
 #, fuzzy, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nem��em n�js� kanonick� DNS meno pre %s\n"
 
 #: driver.c:1055
@@ -260,46 +260,65 @@ msgstr ""
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohol z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:1099 imap.c:384 pop3.c:433
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL spojenie ne�spe�n�.\n"
 
-#: driver.c:1152
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Z�mka-chyba zanepr�zdnenia pri %s@%s\n"
 
-#: driver.c:1156
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Chyba zanepr�zdnenia servra pri %s@%s\n"
 
-#: driver.c:1161
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Chyba autoriz�cie pri %s@%s%s\n"
 
-#: driver.c:1164
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (predt�m autorizovan�)"
 
-#: driver.c:1185
+#: driver.c:1187
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Predmet: autentifik�cia fetchmailu ne�spe�n� pri %s@%s\n"
 
-#: driver.c:1189
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nemohol z�ska� po�tu z %s@%s.\n"
 
-#: driver.c:1193
+#: driver.c:1195
+#, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+"Pokus o autoriz�ciu bol ne�spe�n�.\n"
+"Preto�e predch�dzaj�ce pokusy o autoriz�ciu tohoto  spojenia boli �spe�n�,\n"
+"asi existuje in� pr��ina chyby spojenia (zanepr�zdnen� server a pod.)\n"
+"ktor� fetchmail nevie rozpozna�, preto�e server neposlal potrebn�\n"
+"chybov� hl�senie.\n"
+"\n"
+"Napriek tomu ak ste skuto�ne zmenili �daje o va�om konte po �tarte\n"
+"fetchmail d�mona, potrebujete tento d�mon zastavi�, zmeni� konfigur�ciu\n"
+"fetchmail-u a potom d�mon znovu spusti�.\n"
+"\n"
+"Fetchmail d�mon bude na�alej pokra�ova� v pr�ci a bude sa pok��a�\n"
+"o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
+"nebude obnoven�."
+
+#: driver.c:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -323,7 +342,7 @@ msgstr ""
 "o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
 "nebude obnoven�."
 
-#: driver.c:1208
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -343,173 +362,174 @@ msgstr ""
 "o spojenie. �al�ie upozornenia nebud� zasielan�, pokia� slu�ba\n"
 "nebude obnoven�."
 
-#: driver.c:1223
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Okam�it� stiahnutie z %s@%s\n"
 
-#: driver.c:1228
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Nezn�ma chyba pri prihl�sen� alebo autentifik�cii na %s@%s\n"
 
-#: driver.c:1252
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autentifik�cia OK na %s@%s\n"
 
-#: driver.c:1258
+#: driver.c:1262
 #, fuzzy, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Predmet: fetchmail autentifik�cia OK na %s@%s\n"
 
-#: driver.c:1262
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail bol �spe�n� pri prihl�sen� na %s@%s.\n"
 
-#: driver.c:1266
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Slu�ba bola obnoven�.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "v�ber alebo stiahnutie prie�inka %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "v�ber alebo stiahnutie �tandardn�ho prie�inka\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s pri %s (prie�inok %s)"
 
-#: driver.c:1314 rcfile_y.y:380
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s pri %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Obnovujem %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d %s (%d viden�) pre %s"
 msgstr[1] "%d %s (%d viden�) pre %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1329
+#: driver.c:1334
 #, fuzzy, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d %s pre %s"
 msgstr[1] "%d %s pre %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktetov).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "�iadna po�ta pre %s\n"
 
-#: driver.c:1375 imap.c:85
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "neplatn� po�et spr�v!"
 
-#: driver.c:1485
+#: driver.c:1522
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1488
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "ch�baj�ce alebo neplatn� z�hlavie RFC822"
 
-#: driver.c:1491
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1494
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "klient/server synchroniz�cia"
 
-#: driver.c:1497
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "klient/server protokol"
 
-#: driver.c:1500
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "z�mka na servri zanepr�zdnen�"
 
-#: driver.c:1503
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "SMTP transakcia"
 
-#: driver.c:1506
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "DNS vyh�ad�vanie"
 
-#: driver.c:1509
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "nezn�ma chyba\n"
 
-#: driver.c:1515
+#: driver.c:1552
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-chyba pri doru�ovan� na SMTP server %s\n"
 
-#: driver.c:1517
+#: driver.c:1554
 #, fuzzy
 msgid "unknown"
 msgstr "hostite� je nezn�my."
 
-#: driver.c:1519
+#: driver.c:1556
 #, fuzzy, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s-chyba pri s�ahovan� po�ty z %s\n"
 
-#: driver.c:1529
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "pr�kaz sp���an� po spojen� nebol �spe�n�, n�vratov� stav: %d\n"
 
-#: driver.c:1550
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Podpora Kerberos V4 nebola pripojen�.\n"
 
-#: driver.c:1558
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Podpora Kerberos V5 nebola pripojen�.\n"
 
-#: driver.c:1569
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Vo�ba --flush nie je podporovan� s %s\n"
 
-#: driver.c:1575
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Vo�ba --all nie je podporovan� s %s\n"
 
-#: driver.c:1584
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Vo�ba --limit nie je podporovan� s %s\n"
 
-#: env.c:56
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -524,7 +544,7 @@ msgstr ""
 "Sk�ste \"env QMAILINJECT= %s PARAMETRE\"\n"
 "%s: Ukon�en�.\n"
 
-#: env.c:68
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -540,26 +560,26 @@ msgstr ""
 "N�vratov�-cesta: z�hlav�. Sk�ste \"env NULLMAILER_FLAGS= %s PARAMETRE\"\n"
 "%s: Ukon�en�.\n"
 
-#: env.c:80
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Neexistujete. Cho�te pre�.\n"
 
-#: env.c:142
+#: env.c:145
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: nem��em rozozna� v�ho hostite�a!"
 
-#: env.c:163
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname zlyhalo pre %s\n"
 
-#: env.c:165
+#: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr ""
 
-#: env.c:169
+#: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -567,129 +587,145 @@ msgid ""
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 
-#: etrn.c:47 odmr.c:58
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "SMTP prij�ma� %s nepodporuje ESMTP\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "SMTP prij�ma� %s nepodporuje ETRN\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "Spracovanie fronty pre %s bolo spusten�\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "�iadna spr�va pre %s\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 msgid "Pending messages for %s started\n"
 msgstr "Spracovanie nedoru�en�ch spr�v pre %s bolo spusten�\n"
 
-#: etrn.c:92
+#: etrn.c:94
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr "Nem��em spracova� frontu spr�v pre uzol %s\n"
 
-#: etrn.c:96
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "Uzol %s nie je pr�pustn�: %s\n"
 
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "ETRN-syntaktick� chyba\n"
 
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "ETRN-syntaktick� chyba v parametroch\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "ETRN-nezn�ma syntaktick� chyba %d\n"
 
-#: etrn.c:151
+#: etrn.c:154
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "Vo�ba --keep nie je podporovan� s ETRN\n"
 
-#: etrn.c:155
+#: etrn.c:158
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "Vo�ba --flush nie je podporovan� s ETRN\n"
 
-#: etrn.c:159
+#: etrn.c:162
 #, fuzzy
 msgid "Option --folder is not supported with ETRN\n"
 msgstr "Vo�ba --flush nie je podporovan� s ETRN\n"
 
-#: etrn.c:163
+#: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Vo�ba --check nie je podporovan� s ETRN\n"
 
-#: fetchmail.c:159
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 
-#: fetchmail.c:171
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: vyvolan� s"
 
-#: fetchmail.c:195
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "nem��em n�js� aktu�lny pracovn� adres�r\n"
 
-#: fetchmail.c:257
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Toto je fetchmail verzia %s"
 
-#: fetchmail.c:354
+#: fetchmail.c:395
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Preber�m vo�by z pr�kazov�ho riadku%s%s\n"
 
-#: fetchmail.c:355
+#: fetchmail.c:396
 msgid " and "
 msgstr " a "
 
-#: fetchmail.c:360
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Nie s� nakongifurovan� po�tov� sevre -- mo�no ch�ba %s?\n"
 
-#: fetchmail.c:381
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: neboli �pecifikovan� po�tov� servre.\n"
 
-#: fetchmail.c:393
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: nie je spusten� �iadny �al�� fetchmail\n"
 
-#: fetchmail.c:399
+#: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: chyba pri stopovan� %s-fetchmailu pri %d; zastaven�.\n"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "pozadie"
 
-#: fetchmail.c:400 fetchmail.c:409
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "popredie"
 
-#: fetchmail.c:408
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s-fetchmail pri %d ukon�en�.\n"
 
-#: fetchmail.c:431
+#: fetchmail.c:472
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -697,7 +733,7 @@ msgstr ""
 "nem��em skontrolova� po�tu pokia� je spusten� in� fetchmail pre rovnak�ho "
 "hostite�a.\n"
 
-#: fetchmail.c:437
+#: fetchmail.c:478
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -705,185 +741,216 @@ msgstr ""
 "fetchmail: nem��em �aha� z uveden�ch hostite�ov pokia� be�� in� fetchmail na "
 "%d.\n"
 
-#: fetchmail.c:444
+#: fetchmail.c:485
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: je spusten� in� fetchmail v popred� na %d.\n"
 
-#: fetchmail.c:454
+#: fetchmail.c:495
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: nem��em akceptova� vo�by pokia� be�� in� fetchmail v pozad�.\n"
 
-#: fetchmail.c:460
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail be�iaci v pozad� na %d bol prebuden�.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: star�� s�rodenec na %d z�hadne zomrel.\n"
 
-#: fetchmail.c:487
+#: fetchmail.c:528
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: nem��em n�js� heslo pre %s@%s.\n"
 
-#: fetchmail.c:491
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Zadaj heslo pre %s@%s: "
 
-#: fetchmail.c:522
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: varovanie: nie je dostupn� DNS pre kontrolu Multidrop-spracovan� "
+"z %s\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: nie je spusten� �iadny �al�� fetchmail\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "�tartujem fetchmail %s d�mona \n"
 
-#: fetchmail.c:537 fetchmail.c:539
+#: fetchmail.c:589 fetchmail.c:591
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "nem��em otvori� %s pre pripojenie logov k \n"
 
-#: fetchmail.c:575
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "nem��em vykona� �asov� kontrolu %s (chyba %d)\n"
 
-#: fetchmail.c:580
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail re�tartovan� (%s zmenen�ch)\n"
 
-#: fetchmail.c:585
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "pokus o nov� spustenie m��e zlyha�, preto�e prie�inok nebol obnoven�\n"
 
-#: fetchmail.c:612
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "pokus o nov� spustenie fetchmail zlyhal\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "obnovenie %s vynechan� (zlyhala autentifik�cia alebo vypr�al �as spojenia)\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval nebol dosiahnut�, nebudem posiela� dotaz na %s\n"
 
-#: fetchmail.c:690
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Stav dotazu=0 (SUCCESS)\n"
 
-#: fetchmail.c:692
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Stav dotazu=1 (NOMAIL)\n"
 
-#: fetchmail.c:694
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Stav dotazu=2 (SOCKET)\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Stav dotazu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:698
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Stav dotazu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:700
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Stav dotazu=5 (SYNTAX)\n"
 
-#: fetchmail.c:702
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Stav dotazu=6 (IOERR)\n"
 
-#: fetchmail.c:704
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Stav dotazu=7 (ERROR)\n"
 
-#: fetchmail.c:706
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Stav dotazu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:708
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Stav dotazu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:710
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Stav dotazu=10 (SMTP)\n"
 
-#: fetchmail.c:712
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Stav dotazu=11 (DNS)\n"
 
-#: fetchmail.c:714
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Stav dotazu=12 (BSMTP)\n"
 
-#: fetchmail.c:716
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Stav dotazu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Stav dotazu=%d\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "�iadne spojenie nefunguje. Kon��m.\n"
 
-#: fetchmail.c:771
-#, c-format
-msgid "sleeping at %s\n"
+#: fetchmail.c:828
+#, fuzzy, c-format
+msgid "sleeping at %s for %d seconds\n"
 msgstr "sp�m o %s\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "zobuden� od %s\n"
 
-#: fetchmail.c:798
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "zobuden� sign�lom %d\n"
 
-#: fetchmail.c:805
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "zobuden� o %s\n"
 
-#: fetchmail.c:811
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "norm�lne ukon�enie, stav %d\n"
 
-#: fetchmail.c:963
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "nem��em vykona� �asov� kontrolu run-control s�boru\n"
 
-#: fetchmail.c:996
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Upozornenie: viacer� zmienky o hostiteli %s v konfigura�nom s�bore\n"
 
-#: fetchmail.c:1029
+#: fetchmail.c:1087
 #, fuzzy
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "Upozornenie: viacer� zmienky o hostiteli %s v konfigura�nom s�bore\n"
 
-#: fetchmail.c:1149
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL podpora nebola prelo�en�.\n"
 
-#: fetchmail.c:1180
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "SSL podpora nebola prelo�en�.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "SSL podpora nebola prelo�en�.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "SSL podpora nebola prelo�en�.\n"
+
+#: fetchmail.c:1258
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -891,309 +958,315 @@ msgstr ""
 "fetchmail: varovanie: nie je dostupn� DNS pre kontrolu Multidrop-spracovan� "
 "z %s\n"
 
-#: fetchmail.c:1191
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1192
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 
-#: fetchmail.c:1209
+#: fetchmail.c:1287
 #, fuzzy, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "nespr�vna konfigur�cia %s, ��slo portu nem��e by� z�porn�\n"
 
-#: fetchmail.c:1216
+#: fetchmail.c:1294
 #, fuzzy, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "nespr�vna konfigur�cia %s, RPOP vy�aduje privilegovan� port\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "nespr�vna konfigur�cia %s, LMTP nem��e pou�i� �tandardn� SMTP port\n"
 
-#: fetchmail.c:1248
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Pou�itie fetchall ako aj keep on v re�ime d�mona je chybn�!\n"
 
-#: fetchmail.c:1298
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "ukon�en� sign�lom %d\n"
 
-#: fetchmail.c:1383
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: �ahanie spusten�\n"
 
-#: fetchmail.c:1408
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1420
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1430
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1436
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1444
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR podpora nebola nakonfigurovan�.\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "vybran� nepodporovan� protokol.\n"
 
-#: fetchmail.c:1461
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s dotazuje %s (protokol %s) na %s: �ahanie dokon�en�\n"
 
-#: fetchmail.c:1478
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Dotazovac� interval je %d sek�nd\n"
 
-#: fetchmail.c:1480
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-s�bor je %s\n"
 
-#: fetchmail.c:1482
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile je %s\n"
 
-#: fetchmail.c:1485
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Protokol o spr�vach bude zaznamenan� syslog-om\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail sa bude maskova� a nebude generova� Received\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail bude zobrazova� priebeh pomocou bodiek aj v log-s�bore.\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail bude nespr�vne adresovan� spr�vy posiela� �alej na %s.\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail bude smerova� chybov� spr�vy spr�vcovi po�ty.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail bude smerova� chybov� spr�vy odosielate�ovi.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Vo�by pre pr�jem z %s@%s:\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Po�ta bude prijat� cez %s\n"
 
-#: fetchmail.c:1512
+#: fetchmail.c:1553
 #, fuzzy, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Dotazovanie tohoto servra bude vykonan� ka�d� %d intervaly.\n"
 msgstr[1] "  Dotazovanie tohoto servra bude vykonan� ka�d� %d intervaly.\n"
 
-#: fetchmail.c:1516
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Skuto�n� n�zov servera je %s.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1560
 #, fuzzy
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Tento hostite� %s dotazovan�, ke� nebude �pecifikovan� �iadny in�.\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1561
 #, fuzzy
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Tento hostite� %s dotazovan�, ke� nebude �pecifikovan� �iadny in�.\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Heslo bude po�adovan�.\n"
 
-#: fetchmail.c:1528
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP tajomstvo = \"%s\".\n"
 
-#: fetchmail.c:1531
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Heslo = \"%s\".\n"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokol je KPOP s Kerberos %s autentifik�ciou"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol je %s"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (pou��vam slu�bu %s)"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (pou��vam �tandardn� port)"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (povinn� pou�itie UIDL)"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr " V�etky dostupn� met�dy autentifik�cie bud� vysk��an�.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Autentifik�cia heslom bude povinn�.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1605
 #, fuzzy
 msgid "  MSN authentication will be forced.\n"
 msgstr "  NTLM autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1579
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 autentifik�cia bude povinn�.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Predpokladan� �ifrovanie na �rovni koncov�ho zariadenia.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Ved�ci po�tovej slu�by je: %s\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL �ifrovan� spojenia povolen�.\n"
 
-#: fetchmail.c:1594
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL Protokol je %s.\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Kontrola certifik�tu SSL servra povolen�.\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL prie�inok pre d�vern� certifik�ty: %s\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1642
+#, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr ""
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Odtla�ok SSL k���a (kontrolovan� proti k���u servra): %s\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  �asov� limit pre ne-odpovedanie servra je %d sek�nd"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (implicitn� hodnota).\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Vybran� �tandardn� po�tov� prie�inok.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Vybran� po�tov� prie�inky s�:"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1667
 #, fuzzy
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s spr�vy budu prijat� (--all %s).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1668
 #, fuzzy
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  %s spr�vy budu prijat� (--all %s).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1670
 #, fuzzy
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Stiahnut� spr�vy %s ponechan� na servri (--keep %s).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1671
 #, fuzzy
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Stiahnut� spr�vy %s ponechan� na servri (--keep %s).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1673
 #, fuzzy
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1674
 #, fuzzy
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1676
 #, fuzzy
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
@@ -1201,7 +1274,7 @@ msgid ""
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1677
 #, fuzzy
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
@@ -1209,342 +1282,342 @@ msgid ""
 msgstr ""
 "  Star� spr�vy %s bud� zmazan� pred pr�jmom nov�ch spr�v (--flush %s).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1679
 #, fuzzy
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Prepis lok�lnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1680
 #, fuzzy
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Prepis lok�lnej adresy servra je %s (--norewrite %s).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1682
 #, fuzzy
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Vynechanie znaku \"n�vrat voz�ka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1683
 #, fuzzy
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Vynechanie znaku \"n�vrat voz�ka\"-CR je %s (stripcr %s).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1685
 #, fuzzy
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Vyn�tenie znaku \"n�vrat voz�ka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1686
 #, fuzzy
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Vyn�tenie znaku \"n�vrat voz�ka\"-CR je %s (forcecr %s).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1688
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Interpret�cia �ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1689
 #, fuzzy
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  Interpret�cia �ifrovania obsahu pri prenose je %s (pass8bits %s).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1691
 #, fuzzy
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Dek�dovanie MIME je %s (mimedecode %s).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1692
 #, fuzzy
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Dek�dovanie MIME je %s (mimedecode %s).\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1694
 #, fuzzy
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Ne�innos� po stiahnut� je %s (idle %s).\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1695
 #, fuzzy
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Ne�innos� po stiahnut� je %s (idle %s).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1697
 #, fuzzy
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nepr�zdne stavov� riadky bud� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1698
 #, fuzzy
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nepr�zdne stavov� riadky bud� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1700
 #, fuzzy
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To riadky bud� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1701
 #, fuzzy
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To riadky bud� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Limit pre ve�kos� spr�vy je %d oktetov (--limit %d).\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Spr�vy nemaj� limitovan� ve�kos� (--limit 0).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Interval pre varovanie oh�adom ve�kosti spr�vy je %d sek�nd (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Varovanie o ve�kosti spr�v pri ka�dom s�ahovan� (--warnings 0).\n"
 
-#: fetchmail.c:1673
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit pre prijat� spr�vy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pr�jem spr�v nie je limitovan� (--fetchlimit 0).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1721
 #, fuzzy, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Limit pre prijat� spr�vy je %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1724
 #, fuzzy
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Spr�vy nemaj� limitovan� ve�kos� (--limit 0).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1687
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1690
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1692
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit d�vky SMTP spr�v je %d.\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  D�vka SMTP spr�v nie je limitovan� (--batchlimit 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Interval medzi skuto�n�mi vymazaniami nastaven� na %d (--expunge %d).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Nevyn�ten� vymazania (--expunge 0).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Dom�ny pre ktor� bude doru�en� po�ta s�:"
 
-#: fetchmail.c:1712 fetchmail.c:1732
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr "(implicitn� hodnota)"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Spr�vy bud� pripojen� k %s ako BSMTP\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Spr�vy bud� doru�en� s \"%s\".\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Spr�vy bud� %cMTP-dopraven� na:"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Hos�ov� �as� z MAIL FROM riadku bude %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Adresa, ktor� sa pou�ije v RCPT TO a bude doru�en� v SMTP bude %s\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Rozpoznan� SPAM-blokovan� odpovede prij�ma�a s�:"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  SPAM-blokovanie vypnut�\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Spojenie so servrom bude aktivovan� s \"%s\".\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Pr�kaz sp���an� pred spojen�m neexistuje.\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Spojenie so servrom bude ukon�en� s \"%s\".\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Pr�kaz sp���an� po spojen� neexistuje.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Nie s� definovan� �iadne lok�lne n�zvy pre tohto hostite�a.\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop m�d: "
 
-#: fetchmail.c:1781
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Single-drop m�d: "
 
-#: fetchmail.c:1783
+#: fetchmail.c:1826
 #, fuzzy, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d rozpoznan�ch lok�lnych n�zvov.\n"
 msgstr[1] "%d rozpoznan�ch lok�lnych n�zvov.\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1841
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS vyh�ad�vanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1842
 #, fuzzy
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS vyh�ad�vanie pre multi-drop adresy je %s.\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1846
 #, fuzzy
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  Prez�vky servra bud� porovn�van� s multi-drop adresami pomocou "
 
-#: fetchmail.c:1805
+#: fetchmail.c:1848
 #, fuzzy
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Prez�vky servra bud� porovn�van� s multi-drop adresami pomocou "
 
-#: fetchmail.c:1808
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Smerovanie adries ob�lok nie je aktivovan�\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Predpoklad� sa z�hlavie ob�lky: %s\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1857
 #, fuzzy, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Po�et z�hlav� ob�lok na anal�zu: %d\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s bude odstr�nen� z pou��vate�ovho id\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  �iadne odstr�nenie prefixu\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Preddeklarovan� prez�vky po�tov�ho servra:"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Lok�lne dom�ny:"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Spojenie mus� by� realizovan� pomocou rozhrania %s.\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Neboli �pecifikovan� �iadne po�iadavky na rozhranie.\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Dotazovac� cyklus s monitorom %s.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Nebolo �pecifikovan� �iadne monitorovacie rozhranie.\n"
 
-#: fetchmail.c:1856
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Spojenie so servrom bude realizovan� pomocou plugin-u %s (--plugin %s).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Nebol �pecifikovan� �iadny pr�kaz pre plugin.\n"
 
-#: fetchmail.c:1860
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  Spojenia s prij�ma�om bud� realizovan� pomocou plugout-u %s (--plugout %"
 "s).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Nebol �pecifikovan� �iadny pr�kaz pre plugout.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Neboli ulo�en� �iadne UID-y z tohoto hostite�a.\n"
 
-#: fetchmail.c:1876
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID-ov ulo�en�ch.\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Inform�cia o trase dotazu bude pridan� do z�hlavia Received.\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1552,12 +1625,12 @@ msgstr ""
 "  Do z�hlavia Received nebude pridan� �iadna inform�cia o trase s�ahovania.\n"
 ".\n"
 
-#: fetchmail.c:1889
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Vlastnosti prechodu \"%s\".\n"
 
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "CHYBA: �iadna podpora pre rutinu getpassword()\n"
 
@@ -1579,45 +1652,45 @@ msgstr "Nem��em z�ska� n�zov slu�by pre [%s]\n"
 msgid "Using service name [%s]\n"
 msgstr "Pou��vam n�zov slu�by [%s]\n"
 
-#: gssapi.c:88
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Posielam osobn� �daje\n"
 
-#: gssapi.c:106
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Chyba pri v�mene osobn�ch �dajov\n"
 
-#: gssapi.c:151
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "Nem��em rozbali� d�ta bezpe�nostnej �rovne\n"
 
-#: gssapi.c:156
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "V�mena osobn�ch �dajov kompletn�\n"
 
-#: gssapi.c:160
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server po�aduje integritu a/alebo s�kromie\n"
 
-#: gssapi.c:169
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Rozbalen� pr�znaky bezpe�nostnej �rovne: %s%s%s\n"
 
-#: gssapi.c:173
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maxim�lna ve�kos� GSS symbolu je %ld\n"
 
-#: gssapi.c:186
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "Chyba pri vytv�ran� �iadosti bezpe�nostnej �rovne\n"
 
-#: gssapi.c:197
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "Uvo��ujem osobn� �daje GSS\n"
 
-#: gssapi.c:200
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Chyba pri uvo��ovan� osobn�ch �dajov\n"
 
@@ -1626,81 +1699,106 @@ msgstr "Chyba pri uvo��ovan� osobn�ch �dajov\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: vl�kno uspat� na %d sek�nd.\n"
 
-#: imap.c:298
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol identifikovan� ako IMAP4 rev 1\n"
 
-#: imap.c:304
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol identifikovan� ako IMAP4 rev 0\n"
 
-#: imap.c:311
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol identifikovan� ako IMAP2 alebo IMAP2BIS\n"
 
-#: imap.c:326
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "bude ne�inn� po stiahnut�\n"
 
-#: imap.c:482
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
+#: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Po�adovan� funkcia OTP nebola prelo�en� do fetchmail-u\n"
 
-#: imap.c:504 pop3.c:341
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Po�adovan� funkcia NTLM nebola prelo�en� do fetchmail-u\n"
 
-#: imap.c:513
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Po�adovan� funkcia LOGIN nie je podporovan� servrom\n"
 
-#: imap.c:674 imap.c:707
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr "spr�va %s@%s:%d nemala o�ak�van� d�ku (%d aktu�lne != %d o�ak�van�)\n"
+
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "stiahnutie zlyhalo\n"
 
-#: imap.c:682
+#: imap.c:781 imap.c:837
 #, fuzzy, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d spr�v �ak� po stiahnut�\n"
 msgstr[1] "%d spr�v �ak� po stiahnut�\n"
 
-#: imap.c:694
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "v�ber po�tov�ho prie�inka zlyhal\n"
 
-#: imap.c:698
+#: imap.c:802
 #, fuzzy, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d spr�v �ak� po prvom stiahnut�\n"
 msgstr[1] "%d spr�v �ak� po prvom stiahnut�\n"
 
-#: imap.c:722
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "vymazanie zlyhalo\n"
 
-#: imap.c:726
+#: imap.c:820
 #, fuzzy, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d spr�v �ak� po prvom vymazan�\n"
 msgstr[1] "%d spr�v �ak� po prvom vymazan�\n"
 
-#: imap.c:751
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "vyh�ad�vanie nepre��tan�ch spr�v zlyhalo\n"
 
-#: imap.c:781 pop3.c:723 pop3.c:735 pop3.c:957 pop3.c:964
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "%u je nepre��tan�ch\n"
 
-#: imap.c:793 pop3.c:744
+#: imap.c:902 pop3.c:889
 #, fuzzy, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je prv� nepre��tan�\n"
 
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr ""
@@ -1803,469 +1901,515 @@ msgstr "nem��em dek�dova� BASE64 odpove� o pripravenosti\n"
 msgid "challenge mismatch\n"
 msgstr "nezhoda v�zvy\n"
 
-#: lock.c:77
+#: lock.c:86
 #, fuzzy, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: odstra�ujem star� zamykac� s�bor\n"
 
-#: lock.c:89
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: odstra�ujem star� zamykac� s�bor\n"
 
-#: lock.c:96
+#: lock.c:121
 #, fuzzy, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: odstra�ujem star� zamykac� s�bor\n"
 
-#: lock.c:137
+#: lock.c:168
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: vytvorenie z�mky zlyhalo.\n"
 
-#: netrc.c:220
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: varovanie: n�jden� \"%s\" pred niektor�mi n�zvami hostite�a\n"
 
-#: netrc.c:258
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: varovanie: nezn�my symbol \"%s\"\n"
 
-#: odmr.c:64
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "SMTP prij�ma� %s nepodporuje ATRN\n"
 
-#: odmr.c:102
+#: odmr.c:104
 #, fuzzy
 msgid "Turnaround now...\n"
 msgstr "Oto�en� teraz...\n"
 
-#: odmr.c:107
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "ATRN �iados� zamietnut�.\n"
 
-#: odmr.c:111
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "Nie je mo�n� teraz spracova� ATRN �iados�\n"
 
-#: odmr.c:116
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "Nem�te po�tu.\n"
 
-#: odmr.c:120
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Pr�kaz nie je implementovan�\n"
 
-#: odmr.c:124
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Autentifik�cia po�adovan�.\n"
 
-#: odmr.c:128
+#: odmr.c:130
 #, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "Nezn�ma ODMR chyba %d\n"
 
-#: odmr.c:187
+#: odmr.c:189
 #, fuzzy
 msgid "receiving message data\n"
 msgstr "z�pis textu spr�vy\n"
 
-#: odmr.c:240
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Vo�ba --keep nie je podporovan� s ODMR\n"
 
-#: odmr.c:244
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Vo�ba --flush nie je podporovan� s ODMR\n"
 
-#: odmr.c:248
+#: odmr.c:250
 #, fuzzy
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "Vo�ba --flush nie je podporovan� s ODMR\n"
 
-#: odmr.c:252
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Vo�ba --check nie je podporovan� s ODMR\n"
 
-#: opie.c:36
+#: opie.c:42
 #, fuzzy
 msgid "server recv fatal\n"
 msgstr "server recv fatal\n"
 
-#: opie.c:50
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "Nie je mo�n� dek�dova� OTP v�zvu\n"
 
-#: opie.c:58 pop3.c:515
+#: opie.c:64 pop3.c:610
 #, fuzzy
 msgid "Secret pass phrase: "
 msgstr "Heslo: "
 
-#: options.c:161 options.c:205
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Re�azec '%s' nie je platn� ��selny re�azec.\n"
 
-#: options.c:170
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota re�azca '%s' je %s ako %d.\n"
 
-#: options.c:171
+#: options.c:178
 msgid "smaller"
 msgstr "men�ia"
 
-#: options.c:171
+#: options.c:178
 msgid "larger"
 msgstr "v��ia"
 
-#: options.c:330
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "�pecifikovan� neplatn� protokol `%s'.\n"
 
-#: options.c:372
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "�pecifikovan� neplatn� autentifik�cia `%s'.\n"
 
-#: options.c:573
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "pou�itie:  fetchmail [prep�na�e] [server ...]\n"
 
-#: options.c:574
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Prep�na�e s� nasledovn�:\n"
 
-#: options.c:575
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobraz tohto pomocn�ka\n"
 
-#: options.c:576
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobraz inform�ciu o verzii\n"
 
-#: options.c:578
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       skontroluj spr�vy bez stiahnutia\n"
 
-#: options.c:579
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracuj potichu\n"
 
-#: options.c:580
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracuj hlu�ne (diagnostick� v�stup)\n"
 
-#: options.c:581
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spusti ako d�mon raz za n sek�nd\n"
 
-#: options.c:582
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodp�jaj proces d�mona\n"
 
-#: options.c:583
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabi proces d�mona\n"
 
-#: options.c:584
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     �pecifikuj n�zov log-s�boru\n"
 
-#: options.c:585
+#: options.c:603
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 "      --syslog      pou�i syslog(3) pre v��inu spr�v ke� be�� ako d�mon\n"
 
-#: options.c:586
+#: options.c:604
 #, fuzzy
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   nezapisuj Received & povo� podvrhnutie hostite�a\n"
 
-#: options.c:587
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc �pecifikuj n�hradn� sp���ac� riadiaci s�bor\n"
 
-#: options.c:588
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      �pecifikuj n�hradn� s�bor UID-ov\n"
 
-#: options.c:589
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "  -i, --idfile      �pecifikuj n�hradn� s�bor UID-ov\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 
-#: options.c:590
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 
-#: options.c:592
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr ""
 
-#: options.c:593
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 
-#: options.c:596
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr ""
 
-#: options.c:597
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr ""
 
-#: options.c:598
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr ""
 
-#: options.c:599
+#: options.c:618
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr ""
+
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr ""
 
-#: options.c:600
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 
-#: options.c:601
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:622
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr ""
 
-#: options.c:603
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 
-#: options.c:604
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 
-#: options.c:606
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 
-#: options.c:607
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 
-#: options.c:608
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 
-#: options.c:609
+#: options.c:630
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 
-#: options.c:610
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 
-#: options.c:611
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr ""
 
-#: options.c:612
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 
-#: options.c:613
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 
-#: options.c:614
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr ""
 
-#: options.c:615
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 
-#: options.c:617
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 
-#: options.c:618
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr ""
 
-#: options.c:619
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 
-#: options.c:620
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 
-#: options.c:621
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr ""
 
-#: options.c:622
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr ""
 
-#: options.c:623
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr ""
 
-#: options.c:624
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 
-#: options.c:625
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 
-#: options.c:627
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 
-#: options.c:628
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr ""
 
-#: options.c:629
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 
-#: options.c:630
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 
-#: options.c:631
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 
-#: options.c:632
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 
-#: options.c:633
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 
-#: options.c:634
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 
-#: options.c:635
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr ""
 
-#: options.c:636
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 
-#: options.c:637
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 
-#: options.c:638
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr ""
 
-#: options.c:639
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr ""
 
-#: options.c:640
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr ""
 
-#: options.c:641
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 
-#: pop3.c:553
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
+
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: pop3.c:562
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: pop3.c:584
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 
-#: pop3.c:592
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:664
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:687
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:714 pop3.c:948
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr ""
 
-#: pop3.c:816
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u je nepre��tan�ch\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 
-#: pop3.c:902
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr ""
 
-#: pop3.c:917
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr ""
 
-#: pop3.c:1276
+#: pop3.c:1443
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Vo�ba --flush nie je podporovan� s ODMR\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr ""
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr ""
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr ""
 
-#: rcfile_y.y:381
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr ""
 
-#: rcfile_y.y:418
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr ""
 
-#: rcfile_y.y:428
+#: rcfile_y.y:431
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr ""
 
-#: rcfile_y.y:440
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr ""
@@ -2386,234 +2530,245 @@ msgstr ""
 msgid "RPA authorisation complete\n"
 msgstr ""
 
-#: rpa.c:373
+#: rpa.c:371
 msgid "Get response\n"
 msgstr ""
 
-#: rpa.c:403
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr ""
 
-#: rpa.c:466
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr ""
 
-#: rpa.c:487
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr ""
 
-#: rpa.c:492
+#: rpa.c:488
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr ""
 
-#: rpa.c:498
+#: rpa.c:494
 msgid "Mechanism field incorrect\n"
 msgstr ""
 
-#: rpa.c:535
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr ""
 
-#: rpa.c:550
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:588
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr ""
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr ""
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr ""
 
-#: rpa.c:715
+#: rpa.c:708
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr ""
 
-#: rpa.c:716
+#: rpa.c:709
 msgid "    prevent you logging in, but means you\n"
 msgstr ""
 
-#: rpa.c:717
+#: rpa.c:710
 msgid "    cannot be sure you are talking to the\n"
 msgstr ""
 
-#: rpa.c:718
+#: rpa.c:711
 msgid "    service that you think you are (replay\n"
 msgstr ""
 
-#: rpa.c:719
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 
-#: rpa.c:730
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:883
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr ""
 
-#: rpa.c:896
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr ""
 
-#: servport.c:52
+#: servport.c:53
 #, c-format
 msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
 msgstr ""
 
-#: servport.c:78
+#: servport.c:80
 #, c-format
 msgid "Cannot resolve service %s to port number.\n"
 msgstr ""
 
-#: servport.c:79
+#: servport.c:81
 msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
-#: sink.c:223
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr ""
 
-#: sink.c:312
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#: sink.c:315
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr ""
 
-#: sink.c:447
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr ""
 
-#: sink.c:507 sink.c:591
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr ""
 
-#: sink.c:752
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr ""
+
+#: sink.c:758
+msgid "BSMTP preamble write failed.\n"
 msgstr ""
 
-#: sink.c:965
+#: sink.c:972
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:972
+#: sink.c:979
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr ""
 
-#: sink.c:1013
+#: sink.c:1025
 msgid "no address matches; no postmaster set.\n"
 msgstr ""
 
-#: sink.c:1025
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 
-#: sink.c:1031
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr ""
 
-#: sink.c:1185
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr ""
 
-#: sink.c:1209
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr ""
 
-#: sink.c:1246
+#: sink.c:1260
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr ""
 
-#: sink.c:1270
+#: sink.c:1284
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr ""
 
-#: sink.c:1326
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "Chyba pri uvo��ovan� osobn�ch �dajov\n"
+
+#: sink.c:1349
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr ""
 
-#: sink.c:1329
+#: sink.c:1352
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr ""
 
-#: sink.c:1332
+#: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 
-#: sink.c:1353
+#: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr ""
 
-#: sink.c:1374
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr ""
 
-#: sink.c:1404
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr ""
 
-#: sink.c:1407
+#: sink.c:1432
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr ""
 
-#: sink.c:1561
+#: sink.c:1587
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
 msgstr ""
 
-#: smtp.c:87
+#: smtp.c:79
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr ""
 
-#: smtp.c:94 smtp.c:145
+#: smtp.c:86 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
 
-#: smtp.c:102 smtp.c:152 smtp.c:162 smtp.c:168
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr ""
 
-#: smtp.c:106
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr ""
 
-#: smtp.c:123
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:138
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr ""
 
-#: smtp.c:339 smtp.c:362
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr ""
 
@@ -2643,136 +2798,171 @@ msgstr ""
 msgid "execvp(%s) failed\n"
 msgstr ""
 
-#: socket.c:281
+#: socket.c:282
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr ""
 
-#: socket.c:284
+#: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr ""
 
-#: socket.c:626
+#: socket.c:296 socket.c:299
+#, fuzzy, c-format
+msgid "unknown (%s)"
+msgstr "hostite� je nezn�my."
+
+#: socket.c:302
+#, c-format
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, c-format
+msgid "cannot create socket: %s\n"
+msgstr ""
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "SSL spojenie ne�spe�n�.\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "%s spojen� s %s bolo ne�spe�n�ch"
+
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "SSL spojenie ne�spe�n�.\n"
+
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:628
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:630
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:632
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:634
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:636
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:640
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#: socket.c:644
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:690
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:696
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:701
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:703
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:713
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:717
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:725
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:731
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:735
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:738
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:747
+#: socket.c:733
 #, fuzzy, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "  SSL prie�inok pre d�vern� certifik�ty: %s\n"
 
-#: socket.c:753
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:805
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:822
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:883
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:957
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:960
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
-#: transact.c:74
+#: transact.c:67
+#, c-format
+msgid "mapped address %s to local %s\n"
+msgstr ""
+
+#: transact.c:89
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr ""
 
-#: transact.c:138
+#: transact.c:156
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr ""
 
-#: transact.c:207
+#: transact.c:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2781,133 +2971,134 @@ msgstr ""
 "anal�za riadku Received:\n"
 "%s"
 
-#: transact.c:246
+#: transact.c:265
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "riadok akceptovan�, %s je alias po�tov�ho servra\n"
 
-#: transact.c:252
+#: transact.c:271
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "riadok zamietnut�, %s nie je alias po�tov�ho servra\n"
 
-#: transact.c:326
+#: transact.c:345
 msgid "no Received address found\n"
 msgstr "nen�jden� adresa Received\n"
 
-#: transact.c:335
+#: transact.c:354
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "n�jden� adresa Received `%s'\n"
 
-#: transact.c:538
+#: transact.c:551
 msgid "message delimiter found while scanning headers\n"
 msgstr "odde�ova� spr�vy n�jden� pri prezeran� z�hlav�\n"
 
-#: transact.c:559
+#: transact.c:582
 msgid "incorrect header line found while scanning headers\n"
 msgstr "nespr�vny riadok z�hlavia n�jden� pri prezeran� z�hlav�\n"
 
-#: transact.c:561
+#: transact.c:584
 #, fuzzy, c-format
 msgid "line: %s"
 msgstr "Obnovujem %s\n"
 
-#: transact.c:1082
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "�iadne lok�lne zhody, posielam na %s\n"
 
-#: transact.c:1097
+#: transact.c:1145
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "odoslanie a zmazanie odlo�en� kv�li DNS chyb�m\n"
 
-#: transact.c:1209
+#: transact.c:1255
 #, fuzzy
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "z�pis msgblk.hlavi�iek RFC822\n"
 
-#: transact.c:1230
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
 msgstr "�iadna adresa pr�jemcu nezodpoved� zadan�m lok�lnym men�m"
 
-#: transact.c:1237
+#: transact.c:1280
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa pr�jemcu %s nezodpoved� �iadnemu lok�lnemu menu"
 
-#: transact.c:1246
+#: transact.c:1289
 msgid "message has embedded NULs"
 msgstr "spr�va obsahuje NUL-y"
 
-#: transact.c:1254
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP prij�ma� zamietol lok�lne adresy pr�jemcu: "
 
-#: transact.c:1382
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "z�pis textu spr�vy\n"
 
-#: uid.c:248
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "Star� zoznam UID z %s:"
 
-#: uid.c:253 uid.c:264 uid.c:520 uid.c:570
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <pr�zdny>"
 
-#: uid.c:260
+#: uid.c:262
 msgid "Scratch list of UIDs:"
 msgstr "Do�asn� zoznam UID-ov:"
 
-#: uid.c:514 uid.c:566
+#: uid.c:517 uid.c:569
 #, fuzzy, c-format
 msgid "Merged UID list from %s:"
 msgstr "Star� zoznam UID z %s:"
 
-#: uid.c:516
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr "Nov� zoznam UID z %s:"
 
-#: uid.c:545
+#: uid.c:548
 msgid "swapping UID lists\n"
 msgstr "vymie�am zoznamy UID\n"
 
-#: uid.c:553
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "nevymie�am zoznamy UID, �iadne UID-y nevideli t�to po�iadavku\n"
 
-#: uid.c:578
+#: uid.c:581
 #, fuzzy
 msgid "discarding new UID list\n"
 msgstr "vymie�am zoznamy UID\n"
 
-#: uid.c:613
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Ma�em s�bor fetchids.\n"
 
-#: uid.c:615
+#: uid.c:620
 #, fuzzy, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Chyba pri uvo��ovan� osobn�ch �dajov\n"
 
-#: uid.c:621
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Zapisujem s�bor fetchids.\n"
 
-#: uid.c:640
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr ""
 
-#: uid.c:644
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr ""
 
-#: uid.c:648
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr ""
@@ -2920,6 +3111,9 @@ msgstr "malloc zlyhal\n"
 msgid "realloc failed\n"
 msgstr "realloc zlyhal\n"
 
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "SIGPIPE obdr�an� z MDA alebo chyba v pr�de d�t zo socketu\n"
+
 #~ msgid "header "
 #~ msgstr "z�hlavie "
 
diff --git a/po/sq.po b/po/sq.po
index 42fb0b58..16f1e042 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-02-29 00:24+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -31,7 +31,8 @@ msgstr "Jo, vendndodhjet e tyre IP nuk përputhen\n"
 #: checkalias.c:198
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "dështim emri shërbyesi ndërsa kërkoja për `%s' gjatë vjeljes së %s: %s\n"
+msgstr ""
+"dështim emri shërbyesi ndërsa kërkoja për `%s' gjatë vjeljes së %s: %s\n"
 
 #: checkalias.c:223
 #, c-format
@@ -64,7 +65,8 @@ msgstr "Subjekt: Sinjalizim nga Fetchmail rreth mesazhesh tej mase"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Mesazhet vijues tej mase u fshinë prej shërbyesit të postës %s llogaria %s:"
+msgstr ""
+"Mesazhet vijues tej mase u fshinë prej shërbyesit të postës %s llogaria %s:"
 
 #: driver.c:343
 #, c-format
@@ -103,90 +105,100 @@ msgstr " (gjatësi -1)"
 msgid " (oversized)"
 msgstr " (tej mase)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "nuk munda të sjell tituj, mesazh %s@%s:%d (%d tetëshe)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "po lexoj mesazh %s@%s:%d nga %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d oktete)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d tetëshe titulli) "
 
-#: driver.c:682
+#: driver.c:685
 #, fuzzy, c-format
 msgid " (%d body octets)"
 msgstr " (%d tetëshe trupi) "
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr "mbjatur\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " zbrazur\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " i pa zbrazur\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
-msgstr[0] "mbrritur në kufi prurjesh %d; %d mesazh lënë në shërbyesin %s llogaria %s\n"
-msgstr[1] "mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"mbrritur në kufi prurjesh %d; %d mesazh lënë në shërbyesin %s llogaria %s\n"
+msgstr[1] ""
+"mbrritur në kufi prurjesh %d; %d mesazhe lënë në shërbyesin %s llogaria %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr "mbarim kohe pas %d sekondash po pres për t'u lidhur me shërbyesin %s.\n"
+msgstr ""
+"mbarim kohe pas %d sekondash po pres për t'u lidhur me shërbyesin %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për shërbyesin %s.\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "mbarim kohe pas %d sekondash po pres për %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "mbarim kohe pas %d sekondash po pres të përgjigjet dëgjuesi.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "mbarim kohe pas %d sekondash.\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subjekt: fetchmail-i sheh mbarime të përsëritur kohe"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail-i vërejti më tepër se %d mbarime kohe ndërsa përpiqej të merrte postë prej %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail-i vërejti më tepër se %d mbarime kohe ndërsa përpiqej të merrte "
+"postë prej %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -195,80 +207,81 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Kjo mund të dëshmonte se shërbyesi juaj i postës ka ngecur, ose që shërbyesi juaj SMTP\n"
+"Kjo mund të dëshmonte se shërbyesi juaj i postës ka ngecur, ose që shërbyesi "
+"juaj SMTP\n"
 "ka ngecur, ose që kartela e kutisë suaj postare te shërbyesi është\n"
 "dëmtuar nga një gabim shërbyesi.  Mund të jepni `fetchmail -v -v' për të\n"
 "diagnostikuar problemin.\n"
 "\n"
 "Fetchmail-i nuk do të vjelë sërish prej kësaj kutie para se ta rinisni.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "urdhri para-lidhje dështoi me përfundim %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "nuk munda të gjej kuti postare HESIOD for %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Shërbyesi udhëheqës nuk ka emër.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, fuzzy, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nuk munda të gjej emër DNS kanonikal të %s (%s)\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "lidhja %s me %s dështoi"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subjekt: Sinjalizim Fetchmail për shërbyes të pakapshëm."
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail-i nuk mundi të lidhet me shërbyesin e postës %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gabim duket-i-zënë te %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gabim shërbyes i zënë te %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Dështim autorizimi te %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (autorizuar dikur)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subjekt: mirëfilltësimi fetchmail dështoi te %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail-i nuk mundi të marrë postë prej %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 #, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
@@ -283,7 +296,8 @@ msgstr ""
 "të cilën fetchmail-i nuk mund ta dallojë sepse shërbyesi nuk dërgoi\n"
 "një mesazh të dobishëm gabimi.\n"
 "\n"
-"Sidoqoftë, nëse KENI ndryshuar hollësitë për llogarinë tuaj pas prej nisjes së \n"
+"Sidoqoftë, nëse KENI ndryshuar hollësitë për llogarinë tuaj pas prej nisjes "
+"së \n"
 "demonit fetchmail, lipset të ndalni demonin, ndryshoni formësimin tuaj\n"
 "të fetchmail-it, e mandej rinisni demonin.\n"
 "\n"
@@ -291,7 +305,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1196
+#: driver.c:1201
 #, fuzzy
 msgid ""
 "\n"
@@ -309,7 +323,8 @@ msgstr ""
 "të cilën fetchmail-i nuk mund ta dallojë sepse shërbyesi nuk dërgoi\n"
 "një mesazh të dobishëm gabimi.\n"
 "\n"
-"Sidoqoftë, nëse KENI ndryshuar hollësitë për llogarinë tuaj pas prej nisjes së \n"
+"Sidoqoftë, nëse KENI ndryshuar hollësitë për llogarinë tuaj pas prej nisjes "
+"së \n"
 "demonit fetchmail, lipset të ndalni demonin, ndryshoni formësimin tuaj\n"
 "të fetchmail-it, e mandej rinisni demonin.\n"
 "\n"
@@ -317,7 +332,7 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -338,167 +353,168 @@ msgstr ""
 "në çdo cikël.  Nuk do të dërgohen njoftime në të ardhmen para se\n"
 " të rikthehet shërbimi."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Rivil menjëherë te %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Gabim mirëfilltësimi ose hyrje e panjohur te %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "OK autorizimi te %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subjekt: OK mirëfilltësimi fetchmail-i te %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail-i mundi të hyjë te %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Shërbimi është rivendosur.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "po përzgjedh ose vjel prej dosjes %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "po përzgjedh ose vjel prej dosjes parazgjedhje\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s te %s (dosja %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s te %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Po mbledh %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, fuzzy, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d mesazh për %s"
 msgstr[1] "%d mesazhe për %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] ""
 msgstr[1] ""
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d mesazh për %s"
 msgstr[1] "%d mesazhe për %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d oktete).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Pa postë për %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "numërim mesazhesh me gabime!"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "\"socket\""
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "titull RFC822 mungues ose i dëmtuar"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "njëkohësim klient/server"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "protokoll klient/server"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "kyçje e zënë te shërbyes"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "shkëmbim SMTP"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "kërkim DNS"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "e papërcaktuar"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr "gabim %s gjatë prurjes prej %s@%s-së dhe shpërndarjes te strehë SMTP %s\n"
+msgstr ""
+"gabim %s gjatë prurjes prej %s@%s-së dhe shpërndarjes te strehë SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "i/e panjohur"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "gabim %s gjatë sjelljes prej %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "urdhër pas-lidhjeje dështoi me gjendje %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr ""
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr ""
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Mundësia --zbrazje nuk mbulohet me %s\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Mundësia --all nuk mbulohet me %s\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Mundësi --limit nuk mbulohet me %s\n"
@@ -523,13 +539,16 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
 "%s: Ndryshorja e mjedisit NULLMAILER_FLAGS u rregullua.\n"
-"Çka është e rrezikshme ngaqë mund të bëjë nullmailerl-inject ose mbështjellësin\n"
-" sendmail të nullmailer-it të përziehet me titujt tuaj Prej:, ID Mesazhi:, ose Shteg-Kthimi.\n"
+"Çka është e rrezikshme ngaqë mund të bëjë nullmailerl-inject ose "
+"mbështjellësin\n"
+" sendmail të nullmailer-it të përziehet me titujt tuaj Prej:, ID Mesazhi:, "
+"ose Shteg-Kthimi.\n"
 "Provoni \"env NULLMAILER_FLAGS= %s ARGUMENTE TUAJT KËTU\"\n"
 "%s: Ndërprerje.\n"
 
@@ -555,11 +574,13 @@ msgstr "Nuk gjej dot strehën time te bazë të dhënash strehësh për ta shqua
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Po provoj të vazhdoj me strehëemër të pashquar.\n"
-"MOS raportoni tituj të dëmtuar Të Marrë: , rreshta HELO/EHLO apo probleme të ngjashëm!\n"
+"MOS raportoni tituj të dëmtuar Të Marrë: , rreshta HELO/EHLO apo probleme të "
+"ngjashëm!\n"
 "Rregulloni më mirë /etc/hosts, DNS, NIS apo LDAP tuajt.\n"
 
 #: etrn.c:49 odmr.c:60
@@ -630,12 +651,14 @@ msgstr "Mundësia --check nuk mbulohet me ETRN\n"
 #, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005 Matthias Andree, Sunil Shetye\n"
 "Copyright (C) 2006 Matthias Andree\n"
 
@@ -691,7 +714,9 @@ msgstr "fetchmail: nuk po xhiron tjetër fetchmail\n"
 #: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: gabim gjatë asgjësimit të %s fetchmail te %d; po qërohem që këtej.\n"
+msgstr ""
+"fetchmail: gabim gjatë asgjësimit të %s fetchmail te %d; po qërohem që "
+"këtej.\n"
 
 #: fetchmail.c:441 fetchmail.c:450
 msgid "background"
@@ -707,13 +732,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail te %d u asgjësua.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: nuk mund kontrolloj për postë kur një tjetër fetchmail xhiron te e njëjta strehë.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: nuk mund kontrolloj për postë kur një tjetër fetchmail xhiron te "
+"e njëjta strehë.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: nuk mund të vjel prej strehëve të treguara me një tjetër fetchmail në xhirim e sipër në to %d.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: nuk mund të vjel prej strehëve të treguara me një tjetër "
+"fetchmail në xhirim e sipër në to %d.\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -721,8 +753,11 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: një tjetër fetchmail xhiron në paraskenë te %d.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: nuk mund të pranoj mundësira kur një fetchmail xhiron në prapaskenë.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: nuk mund të pranoj mundësira kur një fetchmail xhiron në "
+"prapaskenë.\n"
 
 #: fetchmail.c:501
 #, c-format
@@ -747,7 +782,9 @@ msgstr "Jepni fjalëkalim për %s@%s: "
 #: fetchmail.c:557 fetchmail.c:593
 #, fuzzy
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje shpërndarjesh të shumëfishta %s\n"
+msgstr ""
+"fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje "
+"shpërndarjesh të shumëfishta %s\n"
 
 #: fetchmail.c:569
 #, fuzzy
@@ -764,764 +801,830 @@ msgstr "po nis demon fetchmail-i %s\n"
 msgid "could not open %s to append logs to \n"
 msgstr "nuk munda të hap %s ku të vargëzoj regjistrime \n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "s'munda të kontrolloj kohën e %s (gabim %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "po rinis fetchmail (%s ndryshoi)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr "përpjekja për rinisje mund të dështojë ngaqë drejtoria nuk është rikthyer\n"
+msgstr ""
+"përpjekja për rinisje mund të dështojë ngaqë drejtoria nuk është rikthyer\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "përpjekja për rinisje të fetchmail-it dështoi\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n"
+msgstr ""
+"vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval që nuk kapet, nuk po kërkoj %s\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Gjendje kërkimi=0 (SUKSES)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Gjendje kërkimi=1 (PAPOSTË)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Gjendje kërkimi=2 (\"SOCKET\")\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Gjendje kërkimi=3 (DËSHTMIR)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Gjendje kërkimi=4 (PROTOKOLL)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Gjendje kërkimi=5 (SYNTAKSË)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Gjendje kërkimi=6 (GABIO)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Gjendje kërkimi=7 (GABIM)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Gjendje kërkimi=8 (PËRJASHTO)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Gjendje kërkimi=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Gjendje kërkimi=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Gjendje kërkimi=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Gjendje kërkimi=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Gjendje kërkimi=13 (MAKSJELL)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Gjendje kërkimi=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Tërë lidhjet janë bllokur.  Po dal.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, fuzzy, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "gjumë më %s\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "përmendur prej %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "përmendur prej sinjali %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "përmendur më %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "përfundim normal, gjendje %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "s'munda të kontrolloj kohën për kartelën run-control\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr "Sinjalizim: përmendje e shumëfishtë e strehës %s në kartelën formësim\n"
+msgstr ""
+"Sinjalizim: përmendje e shumëfishtë e strehës %s në kartelën formësim\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Gabim: \"defaults\" të shumëfishtë në kartelën formësim.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Nuk është përpiluar mbulimi i SSL-së.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje shpërndarjesh të shumëfishta %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: sinjalizim: pa DNS të mundshëm nga i cili të kotrollohen prurje "
+"shpërndarjesh të shumëfishta %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "sinjalizim: Mos kërkoni ndihmë nëse tërë posta i shkon postmaster-it!\n"
+msgstr ""
+"sinjalizim: Mos kërkoni ndihmë nëse tërë posta i shkon postmaster-it!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për shërbimin ose portën\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për "
+"shërbimin ose portën\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: formësimi i %s i pavlefshëm, RPOP lyp një portë të privilegjuar\n"
+msgstr ""
+"fetchmail: formësimi i %s i pavlefshëm, RPOP lyp një portë të privilegjuar\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr "formësimi i %s i pavlefshëm, LMTP nuk mund të përdorë portën SMTP parazgjedhje\n"
+msgstr ""
+"formësimi i %s i pavlefshëm, LMTP nuk mund të përdorë portën SMTP "
+"parazgjedhje\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 #, fuzzy
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "\"fetchall\" e njëkohësisht \"keep on\" gjatë mënyrës demon përbën gabim!\n"
+msgstr ""
+"\"fetchall\" e njëkohësisht \"keep on\" gjatë mënyrës demon përbën gabim!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "përfunduar me sinjal %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja filloi\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP2.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për POP3.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për IMAP.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ETRN.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "Nuk është formësuar mbulim për ODMR.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "përzgjedhur protokoll i pambuluar.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja u plotësua\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Intervali i vjeljes është %d sekonda\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Jetëgjatësia e regjistrit është %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile është %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Mesazhe ecurie do të regjistrohen përmes syslog\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail do të kryejë maskim dhe nuk do të prodhojë Të Marrë\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail-i do të tregojë pika ecurie edhe në kartela regjistrimesh.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të shumëfishtë te %s.\n"
+msgstr ""
+"Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të "
+"shumëfishtë te %s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste drejt ustait të postës.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Mundësi për marrje prej %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Posta do të merret përmes %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Emri i vërtetë i shërbyesit është %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Kjo strehë nuk do pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Kjo strehë do të pyetet kur nuk ka strehë të treguar.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Do të kërkohet fjalëkalim.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Sekret APOP= \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Id RPOP = \"%s\".\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Fjalëkalim = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokolli është KPOP me mirëfilltësim Kerberos %s"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll është %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (po përdor shërbim %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (po përdor portë parazgjedhje)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (po detyroj përdorim UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Do të provohen tërë metodat e mundshme për mirëfilltësim.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim me fjalëkalim.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim MSN.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim NTLM.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim OTP.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim CRAM-Md5.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim GSSAPI.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V4.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Do të detyrohet mirëfilltësim Kerberos V5.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Nënkuptohet kodim cep-më-cep.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Parësori i shërbimit postar është: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Mundësuar sesione SSL të koduar.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protokoll SSL: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Mundësuar kontroll dëshmie shërbyesi SSL.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  drejtori dëshmish SSL të besueshme: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Emër i Zakonshëm Shërbyesi: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  shenjë gishtash kyçi SSL (kontrolluar kundrejt kyçi shërbyesi): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Afati i mospërgjigjes së shërbyesit është %d sekonda"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (parazgjedhje).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Kuti postare parazgjedhje e përzgjedhur.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Kutitë postare të përzgjedhura janë:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Do të merren tërë mesazhet (--all on).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Do të merren vetëm mesazhet e rinj (--all off).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Mesazhet e sjellë %s mbahen në shërbyes (--keep on).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Mesazhet e sjellë nuk do të mbahen në shërbyes (--keep off).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr "  Mesazhet e vjetër do të zbrazen para marrjes së mesazheve (--flush on).\n"
+msgstr ""
+"  Mesazhet e vjetër do të zbrazen para marrjes së mesazheve (--flush on).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Mesazhet e vjetër nuk do të zbrazen para marrjes së mesazheve (--flush off).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Mesazhet e vjetër nuk do të zbrazen para marrjes së mesazheve (--flush "
+"off).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Mesazhet tej masës do të zbrazen para marrjes së mesazheve (--limitflush on).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Mesazhet tej masës do të zbrazen para marrjes së mesazheve (--limitflush "
+"on).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Mesazhet tej masës nuk do të zbrazen para marrjes së mesazheve (--limitflush off).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Mesazhet tej masës nuk do të zbrazen para marrjes së mesazheve (--"
+"limitflush off).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Rishkrimi i vendndodhjeve vendore të shërbyesit është veprues (--norewrite off).\n"
+msgstr ""
+"  Rishkrimi i vendndodhjeve vendore të shërbyesit është veprues (--norewrite "
+"off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Rishkrimi i vendndodhjeve vendore të shërbyesit është joveprues (--norewrite on).\n"
+msgstr ""
+"  Rishkrimi i vendndodhjeve vendore të shërbyesit është joveprues (--"
+"norewrite on).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Heqja e \"carriage-return\"-it është vepruese (stripcr on).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Heqja e \"carriage-return\"-it është jovepruese (stripcr off).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është veprues (forcecr on).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "Detyrimi i \"carriage-return\"-it është joveprues (forcecr off).\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është joveprues (pass8bits on).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është joveprues "
+"(pass8bits on).\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është veprues (pass8bits off).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Interpretimi i Kodimit të Shpërnguljes së Përmbajtjes është veprues "
+"(pass8bits off).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Çkodimi MIME është veprues (mimedecode on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Çkodimi MIME është joveprues (mimedecode off).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "Plogështia pas vjeljes është vepruese (idle on).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "Plogështia pas vjeljes është jovepruese (idle off).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
-msgstr "  Nuk do të merren parasysh rreshta Gjendjeje Joboshe (dropstatus on)\n"
+msgstr ""
+"  Nuk do të merren parasysh rreshta Gjendjeje Joboshe (dropstatus on)\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr "  Do të merren parasysh rreshta Gjendjeje Joboshe do të jenë (dropstatus off)\n"
+msgstr ""
+"  Do të merren parasysh rreshta Gjendjeje Joboshe do të jenë (dropstatus "
+"off)\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Rreshtat Nisur Për nuk do të merren parasysh (dropdelivered on)\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Rreshtat Nisur Për do të merren parasysh (dropdelivered off)\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Kufiri i madhësisë së mesazheve është %d tetëshe (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr "  Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--warnings %d).\n"
+msgstr ""
+"  Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--"
+"warnings %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Sinjalizim madhësie në çdo vjelje (--warnings 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Kufiri për mesazhe të marrë është %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Pa kufi për mesazhe të marrë (--fetchlimit 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Kufi madhësie mesazhesh që sillen është %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Pa kufi madhësie mesazhesh që sillen (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n"
+msgstr ""
+"  Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Kryej kërkim linear të UID-ve gjatë çdo vjeljeje (--fastuidl 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Kufiri për tufë mesazhesh SMTP është %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Pa kufi për tufë mesazhe SMTP (--batchlimit 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Interval fshirjesh ndërmjet shuarjesh detyruar në %d (--expunge %d).\n"
+msgstr ""
+"  Interval fshirjesh ndërmjet shuarjesh detyruar në %d (--expunge %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Pa shuarje të detyruara (--expunge 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Përkatësitë për të cilat do të jepet postë janë:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (parazgjedhje)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Mesazhet do të vargëzohen te %s si BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Mesazhet do të shpërndahen me \"%s\".\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Mesazhet do të përcillen si %cMTP te:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr "  Vendndodhja që do vendoset tek rreshtat RCPT TO të dërguar te SMTP do të jetë %s\n"
+msgstr ""
+"  Vendndodhja që do vendoset tek rreshtat RCPT TO të dërguar te SMTP do të "
+"jetë %s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Përgjigje të pranuara blloqesh spam dëgjuesi janë:"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Bllokim spamesh i çaktivizuar\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të sillet me \"%s\".\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Pa urdhër para-lidhjeje.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Lidhja me shërbyesin do të lihet me \"%s\".\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Pa urdhër pas-lidhjeje.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Pa emra vendorë të deklaruar për këtë strehë.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Mënyrë shpërndarje e shumëfishtë: "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Mënyrë shpërndarje njëshe: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
-msgstr "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është veprues.\n"
+msgstr ""
+"  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është veprues.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
-msgstr "  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është joveprues.\n"
+msgstr ""
+"  Kërkimi DNS për vendndodhje shpërndarjesh të shumëfishta është joveprues.\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të shumëfishta nga prej vendndodhjes IP.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
+"shumëfishta nga prej vendndodhjes IP.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
-msgstr "  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të shumëfishta prej emrit.\n"
+msgstr ""
+"  Aliase shërbyesish do të krahasohen me vendndodhje shpërndarjesh të "
+"shumëfishta prej emrit.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Përcjellje vendndodhjesh zarf është çaktivizuar\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Titulli zarf nënkuptohet të jetë: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numër titujsh zarf për t'u anashkaluar: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Parashtesa %s do të hiqet prej id-je përdoruesi\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Pa heqje parashtese\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Aliase emrash shërbyesi të paradeklaruar:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Përkatësi vendore:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Lidhja duhet të jetë përmes ndërfaqes %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Pa kusht të përcaktuar rreth ndërfaqes.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Qerthulli i vjeljes do të mbikqyrë %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Pa ndërfaqe mbikqyrjeje të përcaktuar.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr "  Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n"
+msgstr ""
+"  Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Pa urdhër shtojce të përcaktuar.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr "  Lidhje dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n"
+msgstr ""
+"  Lidhje dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Pa urdhër shtojce daljeje të përcaktuar.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Pa UID të ruajtura prej kësaj strehe.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID të ruajtur.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Të dhëna gjurmimi vjeljeje do të shtohen te titulli Të Marrë.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1529,7 +1632,7 @@ msgstr ""
 "  Nuk do të shtohen të dhëna gjurmimi vjeljeje te titulli Të Marrë.\n"
 ".\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Veti kalimi-nëpër \"%s\".\n"
@@ -1619,92 +1722,95 @@ msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "do të rrijë bosh pas vjeljeje\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr ""
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr ""
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr ""
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme OTP e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
 
-#: imap.c:662
+#: imap.c:667
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr "mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
+msgstr ""
+"mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "rivjelja dështoi\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d mesazh në pritje pas rivjeljes\n"
 msgstr[1] "%d mesazhe në pritje pas rivjeljes\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "përzgjedhja e kutisë postare dështoi\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d mesazh në pritje pas vjeljes së parë\n"
 msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "shuarja dështoi\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d mesazh në pritje pas shuarjes\n"
 msgstr[1] "%d mesazhe në pritje pas shuarjes\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
 
-#: imap.c:885
+#: imap.c:890
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u është i pari i pavërejtur\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr "I pazoti të hap ndërfaqen kvm. Sigurohuni se fetchmail-i është SGID kmem."
+msgstr ""
+"I pazoti të hap ndërfaqen kvm. Sigurohuni se fetchmail-i është SGID kmem."
 
 #: interface.c:396
 #, c-format
@@ -1892,365 +1998,395 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Frazë pass sekrete: "
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Vargu '%s' nuk është një varg numerik i vlefshëm.\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Vlera e vargut '%s' është %s se %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "më e vogël"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "më e madhe"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Është treguar protokoll i pavlefshëm `%s'.\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Është treguar mirëfilltësim i pavlefshëm `%s'.\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "përdorimi:  fetchmail [mundësi] [shërbyes ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Mundësitë janë si vijon:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        shfaq ndihmën për këtë mundësi\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     shfaq të dhëna versioni\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       kontrollon për mesazhe por pa sjellë\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      puno në heshtje\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     puno me zhurmë (diagnostiko ecurinë)\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      xhiro si demon njëherë në n sekonda\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    mos shkëput proces demoni\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        asgjëso proces demoni\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     përcakto emër kartele regjistrimi\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      përdor syslog(3) për shumicën e mesazheve kur xhiron si demon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      përdor syslog(3) për shumicën e mesazheve kur xhiron si "
+"demon\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   mos shkruaj Të Marrë & dhe mundëso \"host spoofing\"\n"
+msgstr ""
+"      --invisible   mos shkruaj Të Marrë & dhe mundëso \"host spoofing\"\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc përcakto kartelë \"run control\" alternative\n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      përcakto tjetër kartelë UID-rash\n"
 
-#: options.c:601
+#: options.c:607
 #, fuzzy
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "  -i, --idfile      përcakto tjetër kartelë UID-rash\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  përcakto marrës të zonës së fundit\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
+msgstr ""
+"      --nobounce    ridrejto kapërcime prej përdoruesve te ustai i postës.\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   përcaktim i ndërfaqes së nevojshme\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     mbikqyr ndërfaqen për veprimtari\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         mundëso sesion të koduar me ssl\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      kartelë kyçi ssl vetiak\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     dëshmi ssl klienti\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath shteg për te dëshmi ssl\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
-msgstr "      --sslfingerprint shenjë gishtash që duhet të përputhet me atë të dëshmisë së shërbyesit.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+"      --sslfingerprint shenjë gishtash që duhet të përputhet me atë të "
+"dëshmisë së shërbyesit.\n"
 
-#: options.c:615
+#: options.c:622
 #, fuzzy
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    detyro protokoll ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      përcakto urdhër të jashtëm për hapje lidhjeje\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     përcakto urdhër të jashtëm për hapje lidhjeje smtp\n"
+msgstr ""
+"      --plugout     përcakto urdhër të jashtëm për hapje lidhjeje smtp\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    përcakto protokoll marrjeje (shih faqen man)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        detyro përdorimin e UIDL-rave (vetëm pop3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        portë TCP për lidhje (e vjetëruar, përdorni --service)\n"
+msgstr ""
+"      --port        portë TCP për lidhje (e vjetëruar, përdorni --service)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service        shërbim TCP për lidhje (mund të jetë portë numerike TCP)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service        shërbim TCP për lidhje (mund të jetë portë numerike "
+"TCP)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
-msgstr "      --auth        lloj mirëfilltësimi (fjalëkalim/kerberos/ssh/otp)\n"
+msgstr ""
+"      --auth        lloj mirëfilltësimi (fjalëkalim/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     afat mospërgjigjeje shërbyesi\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    titull vendndodhje si të qe zarf\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr "  -Q, --qvirtual    parashtesë për t'u hequr pre id-je përdoruesi vendor\n"
+msgstr ""
+"  -Q, --qvirtual    parashtesë për t'u hequr pre id-je përdoruesi vendor\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   parësori i shërbimit postar\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr "      --tracepolls  shton të dhëna gjurmimi vjeljeje te titull Të marrë\n"
+msgstr ""
+"      --tracepolls  shton të dhëna gjurmimi vjeljeje te titull Të marrë\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    përcakto futjen e përdoruesit te shërbyesi\n"
 
-#: options.c:632
+#: options.c:639
 #, fuzzy
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         merr mesazhe të rinj dhe të vjetër\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      fshi mesazhe të rinj pas marrjeje\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ruaj mesazhe të rinj pas marrjejel\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       fshi mesazhe të vjetër prej shërbyesit\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  fshij mesazhe tej mase\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   mos rishkruaj titull vendndodhjesh\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       mos sill mesazhe tej madhësisë së dhënë\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval midis njoftimesh sinjalizimi poste\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    cakto strehë SMTP përcjelljeje\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains sill postë për përkatësitë e caktuar\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr "  -D, --smtpaddress cakto përkatësi SMTP shpërndarje për t'u përdorur\n"
+msgstr ""
+"  -D, --smtpaddress cakto përkatësi SMTP shpërndarje për t'u përdorur\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr "      --smtpname    cakto emër të plotë SMTP emërpërdoruesi@përkatësi\n"
+msgstr ""
+"      --smtpname    cakto emër të plotë SMTP emërpërdoruesi@përkatësi\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   cakto vlera përgjigjesh antispam\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  cakto kufi tufe për lidhje SMTP\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  cakto kufi prurjeje për lidhje shërbyesish\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit cakto kufi madhësie mesazhesh që sillen\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    kryej një kërkim dyor për UIDL-ra\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     cakto maksimum fshirjesh ndërmjet shuarjesh\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         cakto MDA për t'u përdorur për përcjellje\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       cakto kartelë përfundimesh BSMTP\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        përdor LMTP (RFC2033) për shpërndarje\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      cakto emër dosjeje të largët\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika përparimi edhe në kartela regjistrimi\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "Kujdes: U gjet \"Maillennium POP3/PROXY server\", po përdor urdhrin RETR në vend të TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"Kujdes: U gjet \"Maillennium POP3/PROXY server\", po përdor urdhrin RETR në "
+"vend të TOP.\n"
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr ""
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr ""
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr ""
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr ""
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore në përshëndetje\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr ""
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n"
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u është i pavërejtur\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
+msgstr ""
+"Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
 
@@ -2263,32 +2399,40 @@ msgid "SDPS not enabled."
 msgstr "SDPS jo vepruese."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: mundësia e ndërfaqes mbulohet vetëm nën Linux (pa IPv6) dhe FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: mundësia e ndërfaqes mbulohet vetëm nën Linux (pa IPv6) dhe "
+"FreeBSD\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: mundësia e mbikqyrjes mbulohet vetëm nën Linux (pa IPv6) dhe FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: mundësia e mbikqyrjes mbulohet vetëm nën Linux (pa IPv6) dhe "
+"FreeBSD\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL nuk është vepruese"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "fund futjeje"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Kartela %s duhet të jetë një kartelë e rregullt.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Kartela %s duhet të ketë jo më shumë se lejet -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Kartela %s duhet të jetë prona juaj.\n"
@@ -2598,7 +2742,8 @@ msgstr "MDA riktheu gjendje jo zero %d\n"
 
 #: sink.c:1355
 #, fuzzy, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Çudi: MDA pclose riktheu %d, nuk mund të trajtojë %s:%d\n"
 
 #: sink.c:1377
@@ -2688,7 +2833,8 @@ msgstr "gabim getaddrinfo(\"%s\",\"%s\"): %s\n"
 
 #: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr "Provoni të shtoni mundësinë --service (shihni po ashtu FAQ, zëri R12).\n"
+msgstr ""
+"Provoni të shtoni mundësinë --service (shihni po ashtu FAQ, zëri R12).\n"
 
 #: socket.c:296 socket.c:299
 #, fuzzy, c-format
@@ -2720,113 +2866,116 @@ msgstr "lidhja %s me %s dështoi"
 msgid "connected.\n"
 msgstr "Lidhja SSL dështoi.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizëm Lëshues: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Sinjalizim: Emër Organizmi Lëshues shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Organizëm i Panjohur\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Emër i Zakonshëm Lëshuesi: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "Sinjalizim: Emër i Zakonshëm Lëshues shumë i gjatë (mundet u cungua).\n"
+msgstr ""
+"Sinjalizim: Emër i Zakonshëm Lëshues shumë i gjatë (mundet u cungua).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Emër i Zakonshëm Lëshuesi i Panjohur\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Emër i Zakonshëm Shërbyesi: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Dëshmi e gabuar: Emër i Zakonshëm Subjekti shumë i gjatë!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Ngatërrim Emri të Zakonshëm Shërbyesi: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar, nuk munda të verifikoj dëshminë!\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Emër i Zakonshëm Shërbyesi I panjohur\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Emër shërbyesi i pacaktuar në dëshmi!\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() dështoi!\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Kujtesë e pamjaftueshme!\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Shtytëz përmbledhjeje tekstesh shumë e vogël!\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "gjurmë gishtash kyçi %s: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s gjurmat e gishtave përputhen.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s gjurmat e gishtave nuk përputhen!\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Gabim verifikim dëshmie shërbyesi: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "lëshues i panjohur (%d gërmat e para): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Përshkrues kartele jashtë intervali për SSL"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Treguar protokoll SSL i pavlefshëm '%s', po përdor të parazgjedhurin (SSLv23).\n"
+msgstr ""
+"Treguar protokoll SSL i pavlefshëm '%s', po përdor të parazgjedhurin "
+"(SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikimi i dëshmisë/gjurmës së gishtave pak a shumë u anashkalua!\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Riprovë për lexim prej një \"socket\"-i Cygwin\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Leximi dhe shkrimi prej një \"socket\"-i Cygwin dështuan!\n"
 
@@ -2956,30 +3105,31 @@ msgstr "nuk po shkëmbejmë lista UID-sh, asnjë UID nuk e pa këtë kërkesë\n
 msgid "discarding new UID list\n"
 msgstr "po hedh tej listë të re UID-sh\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Po fshij kartelë \"fetchids\".\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Gabim në fshirjen e kartelës \"%s\": %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Po shkruaj kartelë \"fetchids\".\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Gabim gjatë shkrimit te kartela fetchids %s, u la në vend kartela e vjetër.\n"
+msgstr ""
+"Gabim gjatë shkrimit te kartela fetchids %s, u la në vend kartela e vjetër.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "S'riemërtoj dot kartelën fetchids %s si %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "S'hap dot kartelën fetchids %s për shkrim në të: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 75c35ab6..3217c83d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5\n"
-"POT-Creation-Date: 2003-10-15 15:23-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2003-10-17 17:27+0200\n"
 "Last-Translator: Engin G�nd�z <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -13,23 +14,30 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: checkalias.c:171
+#: checkalias.c:174
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "`%s' d���m�n�n ger�ekten `%s' ile ayn� olup olmad���na bak�l�yor\n"
 
-#: checkalias.c:175
+#: checkalias.c:178
 msgid "Yes, their IP addresses match\n"
 msgstr "Evet, IP adresleri birbirine uyuyor\n"
 
-#: checkalias.c:179
+#: checkalias.c:182
 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:198
+#, fuzzy, c-format
+msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
+msgstr ""
+"%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
+
+#: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr "%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
+msgstr ""
+"%2$s yoklan�rken `%1$s'in aranmas� s�ras�nda DNS sorgusu ba�ar�s�z oldu.\n"
 
 #: cram.c:95
 msgid "could not decode BASE64 challenge\n"
@@ -45,140 +53,155 @@ msgstr "%s olarak kodu ��z�ld�\n"
 msgid "kerberos error %s\n"
 msgstr "kerberos hatas� %s\n"
 
-#: driver.c:250 driver.c:255
+#: driver.c:249 driver.c:254
 #, 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:335
+msgid "Subject: Fetchmail oversized-messages warning"
 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"
-msgstr "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+#: driver.c:339
+#, fuzzy, c-format
+msgid "The following oversized messages were deleted on server %s account %s:"
+msgstr ""
+"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
 
-#: driver.c:494
+#: driver.c:343
+#, fuzzy, c-format
+msgid "The following oversized messages remain on server %s account %s:"
+msgstr ""
+"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
+
+#: driver.c:362
+#, fuzzy, c-format
+msgid "  %d message  %d octets long deleted by fetchmail."
+msgid_plural "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+msgstr[1] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+
+#: driver.c:367
+#, fuzzy, c-format
+msgid "  %d message  %d octets long skipped by fetchmail."
+msgid_plural "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+msgstr[1] "\tfetchmail %2$d sekizlik b�y�kl���ndeki %1$d. iletiyi atl�yor.\n"
+
+#: driver.c:503
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "ileti %s@%s:%d atlan�yor"
 
-#: driver.c:546
+#: driver.c:557
 #, 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:562
+#: driver.c:573
 msgid " (length -1)"
 msgstr " (b�y�kl�k -1)"
 
-#: driver.c:565
+#: driver.c:576
 msgid " (oversized)"
 msgstr " (�ok b�y�k)"
 
-#: driver.c:580
+#: driver.c:594
 #, 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:597
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "ileti %s@%s:%d okunuyor (%d taneden)"
 
-#: driver.c:602
-#, c-format
-msgid " (%d %soctets)"
+#: driver.c:616
+#, fuzzy, c-format
+msgid " (%d octets)"
 msgstr " (%d %ssekizlik)"
 
-#: driver.c:603
-msgid "header "
-msgstr "ba�l�k "
+#: driver.c:617
+#, fuzzy, c-format
+msgid " (%d header octets)"
+msgstr " (ileti g�vdesi %d sekizlik) "
 
-#: driver.c:675
-#, c-format
-msgid " (%d body octets) "
+#: driver.c:685
+#, fuzzy, c-format
+msgid " (%d body octets)"
 msgstr " (ileti g�vdesi %d sekizlik) "
 
-#: driver.c:733
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr "%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen %d)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr ""
+"%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen "
+"%d)\n"
 
-#: driver.c:764
+#: driver.c:777
 msgid " retained\n"
 msgstr " b�rak�ld�\n"
 
-#: driver.c:773
+#: driver.c:787
 msgid " flushed\n"
 msgstr " bo�alt�ld�\n"
 
-#: driver.c:790
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " bo�alt�lmad�\n"
 
-#: driver.c:806
-#, 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:866
-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:822
+#, fuzzy, c-format
+msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] ""
+"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
+msgstr[1] ""
+"`fetchlimit' %d ula��ld�; %d ileti %s sunucusunda %s hesab�nda b�rak�ld�\n"
 
-#: driver.c:873
+#: driver.c:879
 #, 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"
+msgstr ""
+"%d saniye %s sunucusuna ba�lanmak beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:877
+#: driver.c:883
 #, 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:881
+#: driver.c:887
 #, 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:886
+#: driver.c:892
 #, 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:889
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "%d saniye beklendi ve zamana��m� s�resi doldu.\n"
 
-#: driver.c:901
-msgid "Subject: fetchmail sees repeated timeouts\n"
+#: driver.c:907
+#, fuzzy
+msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail �ok say�da zamana��m� ile kar��la��yor\n"
 
-#: driver.c:903
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-msgstr "Fetchmail %2$s@%3$s'den posta almaya �al���rken %1$d'den �ok zamana��m� ile kar��la�t�.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
+msgstr ""
+"Fetchmail %2$s@%3$s'den posta almaya �al���rken %1$d'den �ok zamana��m� ile "
+"kar��la�t�.\n"
 
-#: driver.c:908
+#: driver.c:914
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -195,109 +218,103 @@ msgstr ""
 "Fetchmail yeniden �al��t�r�lana dek bir daha bu posta kutusuna\n"
 "bakmayacak.\n"
 
-#: driver.c:937
+#: driver.c:939
 #, 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:968
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "%s i�in HESIOD pobox bulunamad�\n"
 
-#: driver.c:990
+#: driver.c:984
 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:1013
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#: driver.c:1008
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "%s (%s)'in kanonik DNS ad�n� bulamad�m\n"
 
-#: driver.c:1050
-msgid "internal inconsistency\n"
-msgstr "i� tutars�zl�k\n"
-
-#: driver.c:1060
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
 
-#: driver.c:1066
-msgid "host is unknown."
-msgstr "makina bilinmiyor."
-
-#: driver.c:1069
-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:1072
-msgid "unrecoverable name server error."
-msgstr "d�zeltilemeyen ad sunucusu hatas�."
-
-#: driver.c:1074
-msgid "temporary name server error."
-msgstr "ge�ici ad sunucusu hatas�."
-
-#: driver.c:1081
-#, c-format
-msgid "unknown DNS error %d."
-msgstr "bilinmeyen DNS hatas� %d."
-
-#: driver.c:1099
-#, c-format
-msgid ""
-"Subject: Fetchmail unreachable-server warning.\n"
-"\n"
-"Fetchmail could not reach the mail server %s:"
+#: driver.c:1071
+#, fuzzy
+msgid "Subject: Fetchmail unreachable-server warning."
 msgstr ""
 "Subject: Fetcmail ula��lamayan sunucu uyar�s�.\n"
 "\n"
 "Fetchmail posta sunucusuna (%s) ula�amad�:"
 
-#: driver.c:1128 imap.c:366 pop3.c:410
+#: driver.c:1073
+#, fuzzy, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail %s@%s'den posta alamad�.\n"
+
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: driver.c:1181
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Me�gul kilit hatas� (%s@%s)\n"
 
-#: driver.c:1185
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Sunucu me�gul hatas� (%s@%s)\n"
 
-#: driver.c:1190
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s'te yetkilendirme hatas�\n"
 
-#: driver.c:1193
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (�nceden yetkilendirilmi�)"
 
-#: driver.c:1214
-#, c-format
-msgid "Subject: fetchmail authentication failed on %s@%s\n"
+#: driver.c:1187
+#, 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:1217
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail %s@%s'den posta alamad�.\n"
 
-#: driver.c:1221
+#: driver.c:1195
+#, fuzzy
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
-"error message.\n"
+"error message."
+msgstr ""
+"Yetki alma denemesi ba�ar�s�z oldu.\n"
+"Bu ba�lant� i�in daha �nce yetki alm�� oldu�umuza g�re, bu bir olas�l�kla\n"
+"ba�ka bir hata (�rne�in sunucunun me�gul olmas�) nedeniyle olabilir, fakat\n"
+"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu "
+"anlayamam��\n"
+"olabilir.\n"
+"\n"
+"Fakat e�er hesab�n�z�n bilgilerini fetchmail daemon'� ba�lat�ld���ndan\n"
+"beri de�i�tirilmi�se, �imdi daemon'� durdurup, fetchmail yap�land�rmas�n�\n"
+"de�i�tirip, daemon'� yeniden ba�latman�z gerekiyor.\n"
+"\n"
+"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:1201
+#, fuzzy
+msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
 "fetchmail daemon, you need to stop the daemon, change your configuration\n"
@@ -310,7 +327,8 @@ msgstr ""
 "Yetki alma denemesi ba�ar�s�z oldu.\n"
 "Bu ba�lant� i�in daha �nce yetki alm�� oldu�umuza g�re, bu bir olas�l�kla\n"
 "ba�ka bir hata (�rne�in sunucunun me�gul olmas�) nedeniyle olabilir, fakat\n"
-"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu anlayamam��\n"
+"fetchmail sunucudan i�e yarar bir hata iletisi almad���ndan bunu "
+"anlayamam��\n"
 "olabilir.\n"
 "\n"
 "Fakat e�er hesab�n�z�n bilgilerini fetchmail daemon'� ba�lat�ld���ndan\n"
@@ -320,7 +338,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:1236
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -339,180 +357,181 @@ 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:1251
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "%s@%s'de hemen yeniden kontrol\n"
 
-#: driver.c:1256
+#: driver.c:1232
 #, 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:1280
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s'te yetki denetleme tamam\n"
 
-#: driver.c:1286
-#, c-format
-msgid "Subject: fetchmail authentication OK on %s@%s\n"
+#: driver.c:1262
+#, fuzzy, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: %s@%s'te fetchmail kimlik denetleme tamam\n"
 
-#: driver.c:1289
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail %s@%s'e girmeyi ba�ard�.\n"
 
-#: driver.c:1293
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Hizmet yeniden sa�lan�yor.\n"
 
 # Bunu kaynak kodunda kontrol et.
-#: driver.c:1324
+#: driver.c:1302
 #, 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:1326
+#: driver.c:1304
 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:1342
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%2$s'de %1$s (klas�r %3$s)"
 
 # kaynak koduna bak�lacak
-#: driver.c:1350 rcfile_y.y:397
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%2$s'de %1$s"
 
-#. only used for ETRN
-#: driver.c:1355
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s yoklan�yor\n"
 
 # sonraki iki ileti ile ilgili
-#: driver.c:1359
-#, 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:1360 driver.c:1367
-msgid "messages"
-msgstr "ileti"
-
-# �nceki iki ileti ile ilgili.
-#: driver.c:1361 driver.c:1368
-msgid "message"
-msgstr "ileti"
-
-#: driver.c:1363
+#: driver.c:1328
+#, 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:1331
+#, 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:1366
-#, c-format
-msgid "%d %s for %s"
-msgstr "%3$s i�in %1$d %2$s"
+#: driver.c:1334
+#, 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:1372
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d sekizli).\n"
 
-#: driver.c:1378
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s i�in mektup yok\n"
 
-#: driver.c:1411
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "sahte ileti say�s�!"
 
-#: driver.c:1512
+#: driver.c:1522
 msgid "socket"
 msgstr "soket"
 
-#: driver.c:1515
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ba�l��� ya hi� yok ya da format� k�t�"
 
-#: driver.c:1518
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1521
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "istemci/sunucu senkronizasyonu"
 
-#: driver.c:1524
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "istemci/sunucu protokol�"
 
-#: driver.c:1527
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "sunucuda kilit me�gul"
 
 # transaction'� i�lem diye �evirdim. Do�ru mu?
-#: driver.c:1530
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "SMTP i�lemi"
 
-#: driver.c:1533
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "DNS sorgusu"
 
-#: driver.c:1536
-msgid "undefined error\n"
+#: driver.c:1546
+#, fuzzy
+msgid "undefined"
 msgstr "tan�mlanmam�� hata\n"
 
-#: driver.c:1547
-#, c-format
-msgid "%s error while delivering to SMTP host %s\n"
+#: driver.c:1552
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "SMTP makinas� %2$s'e da��t�l�rken %1$s hatas�\n"
 
-#: driver.c:1549
-#, c-format
-msgid "%s error while fetching from %s\n"
+#: driver.c:1554
+#, fuzzy
+msgid "unknown"
+msgstr "makina bilinmiyor."
+
+#: driver.c:1556
+#, fuzzy, c-format
+msgid "%s error while fetching from %s@%s\n"
 msgstr "%2$s'den getirilirken %1$s hatas�\n"
 
-#: driver.c:1557
+#: driver.c:1567
 #, 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:1578
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 deste�i yok.\n"
 
-#: driver.c:1586
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 deste�i yok.\n"
 
-#: driver.c:1597
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "--flush se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1603
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "--all se�ene�i %s ile desteklenmiyor\n"
 
-#: driver.c:1611
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "--limit se�ene�i %s ile desteklenmiyor\n"
 
-#: env.c:60
+#: env.c:59
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -528,12 +547,13 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:72
+#: env.c:71
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -544,7 +564,7 @@ msgstr ""
 "�unu deneyin: \"env QMAILINJECT= %s KULLANDI�INIZ D��ER ARG�MANLAR\"\n"
 "%s: ��k�yorum.\n"
 
-#: env.c:84
+#: env.c:83
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: Burada yoksunuz. Uzak durun.\n"
@@ -554,384 +574,471 @@ msgstr "%s: Burada yoksunuz. Uzak durun.\n"
 msgid "%s: can't determine your host!"
 msgstr "%s: makinan�z� belirleyemiyorum!"
 
-#: env.c:161
+#: env.c:168
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "`gethostbyname' %s i�in ba�ar�s�z oldu\n"
 
-#: etrn.c:47 odmr.c:59
+#: env.c:170
+msgid "Cannot find my own host in hosts database to qualify it!\n"
+msgstr ""
+
+#: env.c:174
+msgid ""
+"Trying to continue with unqualified hostname.\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
+"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
+msgstr ""
+
+#: etrn.c:49 odmr.c:60
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "%s'nin SMTP dinleyicisi ESMTP'yi desteklemiyor\n"
 
-#: etrn.c:53
+#: etrn.c:55
 #, c-format
 msgid "%s's SMTP listener does not support ETRN\n"
 msgstr "%s'nin SMTP dinleyicisi ETRN'yi desteklemiyor\n"
 
-#: etrn.c:77
+#: etrn.c:79
 #, c-format
 msgid "Queuing for %s started\n"
 msgstr "%s i�in kuyru�a koyma ba�lad�\n"
 
-#: etrn.c:82
+#: etrn.c:84
 #, c-format
 msgid "No messages waiting for %s\n"
 msgstr "%s i�in bekleyen ileti yok\n"
 
-#: etrn.c:88
+#: etrn.c:90
 #, c-format
 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
+#: etrn.c:94
 #, 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
+#: etrn.c:98
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr "D���m %s'in izni yok: %s\n"
 
-#. Syntax Error
-#: etrn.c:100
+#: etrn.c:102
 msgid "ETRN syntax error\n"
 msgstr "ETRN s�zdizim hatas�\n"
 
-#. Syntax Error in Parameters
-#: etrn.c:104
+#: etrn.c:106
 msgid "ETRN syntax error in parameters\n"
 msgstr "Parametrelerde ETRN s�zdizim hatas�\n"
 
-#: etrn.c:108
+#: etrn.c:110
 #, c-format
 msgid "Unknown ETRN error %d\n"
 msgstr "Bilinmeyen ETRN hatas� %d\n"
 
-#: etrn.c:155
+#: etrn.c:154
 msgid "Option --keep is not supported with ETRN\n"
 msgstr "--keep se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:159
+#: etrn.c:158
 msgid "Option --flush is not supported with ETRN\n"
 msgstr "--flush se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:163
-msgid "Option --remote is not supported with ETRN\n"
-msgstr "--remote se�ene�i ETRN ile desteklenmiyor\n"
+#: etrn.c:162
+#, fuzzy
+msgid "Option --folder is not supported with ETRN\n"
+msgstr "--flush se�ene�i ETRN ile desteklenmiyor\n"
 
-#: etrn.c:167
+#: etrn.c:166
 msgid "Option --check is not supported with ETRN\n"
 msgstr "--check se�ene�i ETRN ile desteklenmiyor\n"
 
+#: fetchmail.c:137
+msgid ""
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
+msgstr ""
+
+#: fetchmail.c:142
+msgid ""
+"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. For details,\n"
+"please see the file COPYING in the source or documentation directory.\n"
+msgstr ""
+
+#: fetchmail.c:176
+msgid "WARNING: Running as root is discouraged.\n"
+msgstr ""
+
 # bu T�rk�e'nin s�zdizimine uymuyor??? Ne bi�im 'i18n'!! :((
-#: fetchmail.c:156
+#: fetchmail.c:188
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: bunlarla ba�lat�ld�"
 
-#: fetchmail.c:180
+#: fetchmail.c:212
 msgid "could not get current working directory\n"
 msgstr "�al��ma dizini bulunamad�\n"
 
-#: fetchmail.c:190
+#: fetchmail.c:280
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "fetchmail s�r�m %s"
 
-#: fetchmail.c:331
+#: fetchmail.c:395
 #, 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:332
+#: fetchmail.c:396
 msgid " and "
 msgstr " ve "
 
-#: fetchmail.c:337
+#: fetchmail.c:401
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Hi�bir posta sunucusu yok; belki %s eksik?\n"
 
-#: fetchmail.c:358
+#: fetchmail.c:422
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: hi�bir posta sunucusu belirtilmedi.\n"
 
-#: fetchmail.c:367 fetchmail.c:376
+#: fetchmail.c:434
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: ba�ka bir fetchmail �al��m�yor\n"
 
-#: fetchmail.c:382
+#: fetchmail.c:440
 #, 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"
+msgstr ""
+"fetchmail: %2$d'de %1$sda �al��an fetchmail'i �ld�r�rken hata; ��k�yorum.\n"
 
-#: fetchmail.c:383 fetchmail.c:389
+#: fetchmail.c:441 fetchmail.c:450
 msgid "background"
 msgstr "arkaplan"
 
-#: fetchmail.c:383 fetchmail.c:389
+#: fetchmail.c:441 fetchmail.c:450
 msgid "foreground"
 msgstr "�nplan"
 
-#: fetchmail.c:388
+#: fetchmail.c:449
 #, 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:404
-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:472
+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:410
+#: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: %d'de �al��an ba�ka bir fetchmail ile belirtilen makinalar� yoklayamam.\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: %d'de �al��an ba�ka bir fetchmail ile belirtilen makinalar� "
+"yoklayamam.\n"
 
-#: fetchmail.c:417
+#: fetchmail.c:485
 #, 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:427
-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:495
+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:433
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: %d'de arkaplanda �al��an fetchmail uyand�r�ld�.\n"
 
-#: fetchmail.c:445
+#: fetchmail.c:513
 #, 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:460
+#: fetchmail.c:528
 #, 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:466
+#: fetchmail.c:532
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "%s@%s'in parolas�n� yaz�n�z: "
 
-#: fetchmail.c:497
+# multidrop'u �eviremedim.
+#: fetchmail.c:557 fetchmail.c:593
+#, fuzzy
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr ""
+"fetchmail: uyar�: %s'den multidrop iletileri kontrol etmek i�in DNS yok\n"
+
+#: fetchmail.c:569
+#, fuzzy
+msgid "fetchmail: Cannot detach into background. Aborting.\n"
+msgstr "fetchmail: ba�ka bir fetchmail �al��m�yor\n"
+
+#: fetchmail.c:573
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s daemon ba�lat�l�yor \n"
 
-#: fetchmail.c:512 fetchmail.c:514
+#: fetchmail.c:589 fetchmail.c:591
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "kay�t eklemek i�in %s a��lamad� \n"
 
-#: fetchmail.c:552
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "dosya zaman� kontrol edilemedi %s (hata kodu %d)\n"
 
-#: fetchmail.c:557
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "fetchmail yeniden ba�lat�l�yor (%s de�i�ti)\n"
 
-#: fetchmail.c:562
+#: fetchmail.c:644
 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"
+msgstr ""
+"yeniden ba�latma denemesi, dizin eski haline d�nd�r�lmedi�inden ba�ar�s�z "
+"olabilir\n"
 
-#: fetchmail.c:589
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "fetchmail'i yeniden ba�latma denemesi ba�ar�s�z oldu\n"
 
-#: fetchmail.c:617
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "%s'e bakmadan atl�yorum (ya kimlik denetlemesi ba�ar�s�z ya da �ok fazla zamama��m�)\n"
+msgstr ""
+"%s'e bakmadan atl�yorum (ya kimlik denetlemesi ba�ar�s�z ya da �ok fazla "
+"zamama��m�)\n"
 
 # interval ne? time interval mi?? kaynak koduna bak
-#: fetchmail.c:629
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "aral�k ula��lmad�, %s'i sorgulam�yorum\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Sorgulama durumu=0 (SUCCESS)\n"
 
-#: fetchmail.c:669
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Sorgulama durumu=1 (NOMAIL)\n"
 
-#: fetchmail.c:671
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Sorgulama durumu=2 (SOCKET)\n"
 
-#: fetchmail.c:673
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Sorgulama durumu=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:675
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Sorgulama durumu=4 (PROTOCOL)\n"
 
-#: fetchmail.c:677
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Sorgulama durumu=5 (SYNTAX)\n"
 
-#: fetchmail.c:679
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Sorgulama durumu=6 (IOERR)\n"
 
-#: fetchmail.c:681
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Sorgulama durumu=7 (ERROR)\n"
 
-#: fetchmail.c:683
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Sorgulama durumu=8 (EXCLUDE)\n"
 
-#: fetchmail.c:685
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Sorgulama durumu=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:687
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Sorgulama durumu=10 (SMTP)\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Sorgulama durumu=11 (DNS)\n"
 
-#: fetchmail.c:691
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Sorgulama durumu=12 (BSMTP)\n"
 
-#: fetchmail.c:693
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Sorgulama durumu=13 (MAXFETCH)\n"
 
-#: fetchmail.c:695
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Sorgulama durumu=%d\n"
 
 # wedge'yi s�k��mak diye �evirdim. Uygun mu?
-#: fetchmail.c:741
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "T�m ba�lant�lar s�k��t�. ��k�yorum.\n"
 
-#: fetchmail.c:748
-#, c-format
-msgid "sleeping at %s\n"
+#: fetchmail.c:828
+#, fuzzy, c-format
+msgid "sleeping at %s for %d seconds\n"
 msgstr "fetchmail: %s'de uyuyorum\n"
 
-#: fetchmail.c:772
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "%s taraf�ndan uyand�r�ld�m\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "%d sinyali ile taraf�ndan uyand�r�ld�m\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "%s'de uyand�r�ld�m\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal biti�, durum kodu %d\n"
 
-#: fetchmail.c:941
+#: fetchmail.c:1021
 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:974
+#: fetchmail.c:1054
 #, 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"
+msgstr ""
+"Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
 
-#: fetchmail.c:1116
+#: fetchmail.c:1087
+#, fuzzy
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
+msgstr ""
+"Uyar�: yap�land�rma dosyas�nda %s makinas�n�n ad� birden �ok kez ge�iyor\n"
+
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL deste�i derlenirken eklenmemi�.\n"
 
+#: fetchmail.c:1216
+#, fuzzy
+msgid "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "SSL deste�i derlenirken eklenmemi�.\n"
+
+#: fetchmail.c:1222
+#, fuzzy
+msgid "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "SSL deste�i derlenirken eklenmemi�.\n"
+
+#: fetchmail.c:1228
+#, fuzzy
+msgid "GSSAPI support is configured, but not compiled in.\n"
+msgstr "SSL deste�i derlenirken eklenmemi�.\n"
+
 # multidrop'u �eviremedim.
-#: fetchmail.c:1149
+#: fetchmail.c:1258
 #, 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"
+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:1166
+#: fetchmail.c:1269
 #, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+msgid "warning: multidrop for %s requires envelope option!\n"
+msgstr ""
+
+#: fetchmail.c:1270
+msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
+msgstr ""
+
+#: fetchmail.c:1287
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "%s yap�land�rma ge�ersiz, port s�f�rdan k���k bir say� olamaz\n"
 
 # priviledged port = ayr�cal�kl� port???
-#: fetchmail.c:1173
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#: fetchmail.c:1294
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "%s yap�land�rma ge�ersiz, RPOP ayr�cal�kl� bir port gerektirir\n"
 
-#: fetchmail.c:1189
+#: fetchmail.c:1312
 #, 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"
+msgstr ""
+"%s yap�land�rma ge�ersiz, LMTP, SMTP'nin �ntan�ml� portunu kullanamaz\n"
 
-#: fetchmail.c:1204
-msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
+#: fetchmail.c:1326
+#, fuzzy
+msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "`fetchall' ve daemon kipinde �al��ma birlikte olmaz!\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "%d sinyali ile sona erdirildi\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1424
 #, 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:1364
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1376
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1386
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1392
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1398
-msgid "Cannot support ETRN without gethostbyname(2).\n"
-msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
-
-#: fetchmail.c:1405
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR deste�i yap�land�r�lmam��.\n"
 
-#: fetchmail.c:1411
-msgid "Cannot support ODMR without gethostbyname(2).\n"
-msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
-
-#: fetchmail.c:1417
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "desteklenmeyen protokol se�ilmi�.\n"
 
 # bunu kontrol et kaynak kodunda.
-#: fetchmail.c:1427
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
@@ -939,582 +1046,634 @@ msgstr ""
 "\n"
 
 # poll = yoklama
-#: fetchmail.c:1444
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Nab�z yoklama aral��� %d saniye\n"
 
 # logfile = kay�t dosyas� ?
-#: fetchmail.c:1446
+#: fetchmail.c:1521
 #, 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:1448
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Kimlik dosyas� %s\n"
 
-#: fetchmail.c:1451
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "�lerleme durumu iletileri syslog ile kaydedilecek.\n"
 
-#: fetchmail.c:1454
+#: fetchmail.c:1529
 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:1456
+#: fetchmail.c:1531
 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"
+msgstr ""
+"Fetchmail ilerleme durumunu g�steren noktalar� kay�t dosyalar�nda bile "
+"g�sterecek.\n"
 
 # multidrop message ne demek?
-#: fetchmail.c:1458
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-msgstr "Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
+msgstr ""
+"Fetchmail yanl�� adrese g�nderilmi� multidrop iletileri %s'e iletecek.\n"
 
 # postmaster = postmaster ??
-#: fetchmail.c:1462
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail hata iletisini postmaster'a iletecek.\n"
 
-#: fetchmail.c:1464
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail hata iletisini g�ndericiye iletecek.\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "%s@%s'den getirmek i�in se�enekler:\n"
 
-#: fetchmail.c:1475
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mektuplar %s yoluyla getirilecek\n"
 
 # poll = yoklama
-#: fetchmail.c:1478
-#, 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:1553
+#, fuzzy, c-format
+msgid "  Poll of this server will occur every %d interval.\n"
+msgid_plural "  Poll of this server will occur every %d intervals.\n"
+msgstr[0] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
+msgstr[1] "  Bu sunucunun yoklamas� her %d zaman aral���nda yap�lacak.\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Sunucunun ger�ek ad� %s.\n"
 
 # Bu �eviriyi kontrol et.
-#: fetchmail.c:1483
-#, c-format
-msgid "  This host %s be queried when no host is specified.\n"
+#: fetchmail.c:1560
+#, fuzzy
+msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
 
-# Harika. Nas�l �evrilecek bu?
-#: fetchmail.c:1484 fetchmail.c:1599 fetchmail.c:1602
-msgid "will not"
-msgstr ""
-
-# Harika! Nas�l �evrilecek �imdi bu?? :(
-#: fetchmail.c:1484 fetchmail.c:1599 fetchmail.c:1602
-msgid "will"
-msgstr ""
+# Bu �eviriyi kontrol et.
+#: fetchmail.c:1561
+#, fuzzy
+msgid "  This host will be queried when no host is specified.\n"
+msgstr "  Hi�bir makina belirtilmedi�inde %s sorgulanacak.\n"
 
-#: fetchmail.c:1488
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Parola sorulacak.\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret'i = \"%s\".\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP kullan�c� ad� = \"%s\".\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Parola = \"%s\".\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "Protokol olarak Kerberos %s kimlik denetlemesi ile KPOP kullan�l�yor"
 
-#: fetchmail.c:1514
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokol %s"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (%s hizmetini kullan�yorum)"
 
-#: fetchmail.c:1519
-#, c-format
-msgid " (using network security options %s)"
-msgstr " (�u a� g�venli�i se�eneklerini kullan�yorum: %s)"
-
-#: fetchmail.c:1522
-#, c-format
-msgid " (using port %d)"
-msgstr " (port %d kullan�l�yor)"
-
-#: fetchmail.c:1525
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (�ntan�ml� port kullan�l�yor)"
 
 # 'to force' nas�l �evrilebilir?
-#: fetchmail.c:1527
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (UIDL kullan�m� istenecek)"
 
-#: fetchmail.c:1533
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  T�m kimlik denetleme y�ntemleri denenecek.\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Parola ile kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1605
+#, fuzzy
+msgid "  MSN authentication will be forced.\n"
+msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
+
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 kimlik kan�tlamas� istenecek.\n"
 
-#: fetchmail.c:1557
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  U�tan uca �ifreleme varsay�l�yor.\n"
 
 # mail service principal ne demek?
-#: fetchmail.c:1561
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Posta hizmeti 'pricipal'i: %s\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL ile �ifrelenmi� oturumlar etkinle�tirildi.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protokol�: %s.\n"
 
-#: fetchmail.c:1568
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL sunucu sertifikas� kontrol� etkinle�tirildi.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL g�venilir sertifika dizini: %s\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Sunucu `CommonName'i: %s\n"
+
+#: fetchmail.c:1644
 #, 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:1576
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Sunucu zamana��m� %d saniye"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (�ntan�ml�).\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  �ntan�ml� posta kutusu se�ildi.\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Se�ilen posta kutular�:"
 
 #  bu �eviriyi kontrol et
-#: fetchmail.c:1595
-#, c-format
-msgid "  %s messages will be retrieved (--all %s).\n"
+#: fetchmail.c:1667
+#, fuzzy
+msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1596
-msgid "All"
-msgstr "Hepsi"
+#  bu �eviriyi kontrol et
+#: fetchmail.c:1668
+#, fuzzy
+msgid "  Only new messages will be retrieved (--all off).\n"
+msgstr "  %s ileti getirilecek (--all %s).\n"
 
-#: fetchmail.c:1596
-msgid "Only new"
-msgstr "Yaln�zca yeniler"
+#: fetchmail.c:1670
+#, fuzzy
+msgid "  Fetched messages will be kept on the server (--keep on).\n"
+msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1598
-#, c-format
-msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
+#: fetchmail.c:1671
+#, fuzzy
+msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Getirilen iletiler %s sunucuda tutulacak (--keep %s).\n"
 
-#: fetchmail.c:1601
-#, c-format
-msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
+#: fetchmail.c:1673
+#, fuzzy
+msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
 
-#: fetchmail.c:1604
-#, c-format
-msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
+#: fetchmail.c:1674
+#, fuzzy
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
+
+#: fetchmail.c:1676
+#, fuzzy
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
+
+#: fetchmail.c:1677
+#, fuzzy
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr "  Eski iletiler %s ileti al�m�ndan �nce bo�alt�lacak (--flush %s).\n"
+
+#: fetchmail.c:1679
+#, fuzzy
+msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1605 fetchmail.c:1608 fetchmail.c:1611 fetchmail.c:1614
-#: fetchmail.c:1617 fetchmail.c:1620 fetchmail.c:1767
-msgid "enabled"
-msgstr "etkin"
+#: fetchmail.c:1680
+#, fuzzy
+msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
+msgstr "  server-local adreslerin yeniden yaz�lmas� %s (--norewrite %s).\n"
 
-#: fetchmail.c:1605 fetchmail.c:1608 fetchmail.c:1611 fetchmail.c:1614
-#: fetchmail.c:1617 fetchmail.c:1620 fetchmail.c:1767
-msgid "disabled"
-msgstr "etkin de�il"
+# carriage-return?? Ba�kalar�na sor
+#: fetchmail.c:1682
+#, fuzzy
+msgid "  Carriage-return stripping is enabled (stripcr on).\n"
+msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1607
-#, c-format
-msgid "  Carriage-return stripping is %s (stripcr %s).\n"
+#: fetchmail.c:1683
+#, fuzzy
+msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return'lerin silinmesi %s (stripcr %s).\n"
 
 # carriage-return?? Ba�kalar�na sor
-#: fetchmail.c:1610
-#, c-format
-msgid "  Carriage-return forcing is %s (forcecr %s).\n"
+#: fetchmail.c:1685
+#, fuzzy
+msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
 
-#: fetchmail.c:1613
-#, c-format
-msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
+# carriage-return?? Ba�kalar�na sor
+#: fetchmail.c:1686
+#, fuzzy
+msgid "  Carriage-return forcing is disabled (forcecr off).\n"
+msgstr "  Carriage-return'lerin zorunlu kullan�m� %s (orcecr %s).\n"
+
+#: fetchmail.c:1688
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
 
-#: fetchmail.c:1616
-#, c-format
-msgid "  MIME decoding is %s (mimedecode %s).\n"
+#: fetchmail.c:1689
+#, fuzzy
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr "  Content-Transfer-Encoding'in yorumu %s (pass8bits %s).\n"
+
+#: fetchmail.c:1691
+#, fuzzy
+msgid "  MIME decoding is enabled (mimedecode on).\n"
+msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
+
+#: fetchmail.c:1692
+#, fuzzy
+msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME kod ��z�m� %s (mimedecode %s).\n"
 
 # idle = ?? Ba�kalar�na sor
-#: fetchmail.c:1619
-#, c-format
-msgid "  Idle after poll is %s (idle %s).\n"
+#: fetchmail.c:1694
+#, fuzzy
+msgid "  Idle after poll is enabled (idle on).\n"
+msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
+
+# idle = ?? Ba�kalar�na sor
+#: fetchmail.c:1695
+#, fuzzy
+msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Yoklamadan sonra 'idle' kalma %s (idle %s).\n"
 
 # Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1622
-#, c-format
-msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
+#: fetchmail.c:1697
+#, fuzzy
+msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
 
-# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
-# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropstatus ? "on" : "off");
-# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
-# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
-# 		   ctl->dropdelivered ? "on" : "off");
-#
-# DIKKAT: 'discarded' ve 'kept'in durumlari �zel; at�lacak ve tutulacak
-# olarak �evrilmeleri gerekiyor.
-#: fetchmail.c:1623 fetchmail.c:1626
-msgid "discarded"
-msgstr "at�lacak"
+# Bunun a�a��daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
+# d���n�lmeliler.
+#: fetchmail.c:1698
+#, fuzzy
+msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
+msgstr "  Bo� olmayan Status sat�rlar� %s (dropstatus %s)\n"
 
-#: fetchmail.c:1623 fetchmail.c:1626
-msgid "kept"
-msgstr "tutulacak"
+# Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
+# d���n�lmeliler.
+#: fetchmail.c:1700
+#, fuzzy
+msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
+msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
 
 # Bunun yukar�daki 'discarded' ve 'kept' ile ili�kisi var, birlikte
 # d���n�lmeliler.
-#: fetchmail.c:1625
-#, c-format
-msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
+#: fetchmail.c:1701
+#, fuzzy
+msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To sat�rlar� %s (dropdelivered %s)\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1705
 #, 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:1634
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  �leti boyut s�n�r� yok (--limit 0).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1710
 #, 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:1639
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Her yoklamada b�y�kl�k uyar�s� (--warnings 0).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Al�nan ileti s�n�r� %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Al�nan ileti s�n�r� yok (--fetchlimit 0).\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Getirilen ileti boyut s�n�r� %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Getirilen ileti boyut s�n�r� yok (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Her yoklama s�ras�nda UID'lerin 'binary' aramas�n� yap (--fastuidl %d).\n"
+msgstr ""
+"  Her yoklama s�ras�nda UID'lerin 'binary' aramas�n� yap (--fastuidl %d).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Her %2$d yoklaman�n %1$d tanesinde UID'lerin 'binary' aramas�n� yap (--fastuidl %3$d).\n"
+msgstr ""
+"  Her %2$d yoklaman�n %1$d tanesinde UID'lerin 'binary' aramas�n� yap (--"
+"fastuidl %3$d).\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Her yoklama s�ras�nda UID'ler i�in do�rusal arama yap (--fastuidl 0).\n"
+msgstr ""
+"   Her yoklama s�ras�nda UID'ler i�in do�rusal arama yap (--fastuidl 0).\n"
 
 # batch = ?
-#: fetchmail.c:1661
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP ileti 'batch' limiti %d.\n"
 
 # batch = ??
-#: fetchmail.c:1663
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  SMTP iletisi 'batch' limiti yok (--batchlimit 0).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1741
 #, 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"
+msgstr ""
+"  Silmeler aras�ndaki zaman aral��� olarak %d kullan�lacak (--expunge %d).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1743
 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:1676
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  �u alanlar (domains) i�in posta getirilecek:"
 
-#: fetchmail.c:1681 fetchmail.c:1701
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (�ntan�ml�)"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  �letiler %s'e BSMTP olarak eklenecek\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  �letiler \"%s\" ile ula�t�r�lacak.\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  �letiler %cMTP ile a�a��dakilere iletilecek:"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1780
 #, 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:1709
+#: fetchmail.c:1783
 #, 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:1718
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Bilinen dinleyici spam engelleme yan�tlar� ��yle:"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam engelleme etkin de�il\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile a��lacak.\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sunucu ba�lant�s� \"%s\" ile kopat�lacak.\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Hi�bir ba�lant� �ncesi komutu yok.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Bu makina i�in hi�bir yerel ad tan�mlanmam��.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop kipi: "
 
-#: fetchmail.c:1750
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Single-drop kipi: "
 
-#: fetchmail.c:1752
-#, c-format
-msgid "%d local name(s) recognized.\n"
-msgstr "%d yerel ad tan�nd�.\n"
+#: fetchmail.c:1826
+#, fuzzy, c-format
+msgid "%d local name recognized.\n"
+msgid_plural "%d local names recognized.\n"
+msgstr[0] "%d yerel ad tan�nd�.\n"
+msgstr[1] "%d yerel ad tan�nd�.\n"
 
 # buradaki %s 'enabled' ve 'disabled' oluyor :(
-#: fetchmail.c:1766
-#, c-format
-msgid "  DNS lookup for multidrop addresses is %s.\n"
+#: fetchmail.c:1841
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is enabled.\n"
+msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
+
+# buradaki %s 'enabled' ve 'disabled' oluyor :(
+#: fetchmail.c:1842
+#, fuzzy
+msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Multidrop adresler i�in DNS sorgulamas� %s.\n"
 
 # Bu string'den hemen sonra a�a��daki iki string geliyor ("IP address."
 # ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
 # bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
 # bakmak gerek niye b�yle oldu�unu anlamak i�in.
-#: fetchmail.c:1770
-msgid "  Server aliases will be compared with multidrop addresses by "
+#: fetchmail.c:1846
+#, fuzzy
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  "
 
-# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
-# bak�n�z.
-#: fetchmail.c:1772
-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:1774
-msgid "name.\n"
-msgstr "Sunucu takma adlar�, adlar� kullan�larak kar��la�t�r�lacak.\n"
+# Bu string'den hemen sonra a�a��daki iki string geliyor ("IP address."
+# ve "name.". Dilbilgisi yap�s� T�rk�eye t�m�yle ters oldu�undan
+# bunlar� a�a��daki iki iletide �evirmeyi uygun buldum. Kaynak koduna
+# bakmak gerek niye b�yle oldu�unu anlamak i�in.
+#: fetchmail.c:1848
+#, fuzzy
+msgid "  Server aliases will be compared with multidrop addresses by name.\n"
+msgstr "  "
 
-#: fetchmail.c:1777
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing etkin de�il\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1854
 #, 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:1781
-msgid "Received"
-msgstr "Received"
-
-#: fetchmail.c:1783
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#: fetchmail.c:1857
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Parse edilecek envelope ba�l��� say�s�: %d\n"
 
-#: fetchmail.c:1786
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  %s �neki kullan�c� kimli�inden silinecek\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Sonekler silinmeyecek\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  �nceden tan�mlanm�� posta sunucusu takma adlar�:"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Yerel alanlar:"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Ba�lat� %s aray�z�nden olmal�.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Belirli bir aray�z�n kullan�lmas� zorunlu ko�ulmam��.\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Yoklama d�ng�s� %s'i g�zleyecek.\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  G�zleme aray�z� belirtilmemi�.\n"
 
 # plugin == ?
-#: fetchmail.c:1825
+#: fetchmail.c:1899
 #, 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:1827
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Plugin komutu belirtilmemi�.\n"
 
 # plugout da ne demek?
-#: fetchmail.c:1829
+#: fetchmail.c:1903
 #, 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:1831
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Plugout komutu belirtilmemi�.\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Bu makineden hi�bir UID saklanmad�.\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID sakland�.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Received ba�l���na yoklama izleme bilgisi eklenecek.\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1522,24 +1681,16 @@ msgstr ""
 "  Received ba�l���na yoklama izleme bilgisi eklenmeyecek.\n"
 ".\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1932
 #, 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:584 fetchmail.h:590
-msgid "alloca failed"
-msgstr "alloca ba�ar�s�z oldu"
-
-#: getpass.c:72
+#: getpass.c:71
 msgid "ERROR: no support for getpassword() routine\n"
 msgstr "HATA: getpassword() desteklenmiyor\n"
 
-#: getpass.c:194
+#: getpass.c:193
 msgid ""
 "\n"
 "Caught SIGINT... bailing out.\n"
@@ -1547,207 +1698,239 @@ msgstr ""
 "\n"
 "SIGINT yakaland�... ��k�yorum.\n"
 
-#: gssapi.c:62
+#: gssapi.c:66
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "[%s] i�in hizmet ad� al�namad�\n"
 
-#: gssapi.c:68
+#: gssapi.c:72
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Hizmet ad� olarak [%s] kullan�l�yor\n"
 
-#: gssapi.c:84
+#: gssapi.c:89
 msgid "Sending credentials\n"
 msgstr "Credential'lar g�nderiliyor\n"
 
-#: gssapi.c:102
+#: gssapi.c:107
 msgid "Error exchanging credentials\n"
 msgstr "Credential takas�nda hata\n"
 
-#: gssapi.c:144
+#: gssapi.c:152
 msgid "Couldn't unwrap security level data\n"
 msgstr "G�venlik d�zeyi verisi elde edilemedi\n"
 
-#: gssapi.c:149
+#: gssapi.c:157
 msgid "Credential exchange complete\n"
 msgstr "Crendential takas� tamamland�\n"
 
-#: gssapi.c:153
+#: gssapi.c:161
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Sunucu i� tutarl�l�k ve/ya da mahremiyet gerektiriyor\n"
 
-#: gssapi.c:162
+#: gssapi.c:170
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "G�venlik d�zeyi bayraklar�: %s%s%s\n"
 
-#: gssapi.c:166
+#: gssapi.c:174
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "En b�y�k GSS token boyutu %ld\n"
 
-#: gssapi.c:179
+#: gssapi.c:187
 msgid "Error creating security level request\n"
 msgstr "G�venlik d�zeyi iste�ini olu�tururken hata\n"
 
-#: gssapi.c:190
+#: gssapi.c:198
 msgid "Releasing GSS credentials\n"
 msgstr "GSS credential'lar� b�rak�l�yor\n"
 
-#: gssapi.c:193
+#: gssapi.c:201
 msgid "Error releasing credentials\n"
 msgstr "Credential'lar b�rak�l�rken hata\n"
 
-#: idle.c:62
+#: idle.c:61
 #, c-format
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread %d saniye uyuyor.\n"
 
-#: imap.c:280
+#: imap.c:326
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protokol IMAP4 rev 1 olarak belirlendi\n"
 
-#: imap.c:286
+#: imap.c:332
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protokol IMAP rev 0 olarak belirlendi.\n"
 
-#: imap.c:293
+#: imap.c:339
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
 
-#: imap.c:308
+#: imap.c:354
 msgid "will idle after poll\n"
 msgstr "yoklamadan sonra idle kal�nacak\n"
 
-#: imap.c:460
+#: imap.c:446 pop3.c:518
+#, c-format
+msgid "%s: upgrade to TLS succeeded.\n"
+msgstr ""
+
+#: imap.c:455 pop3.c:527
+#, c-format
+msgid "%s: upgrade to TLS failed.\n"
+msgstr ""
+
+#: imap.c:459
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr ""
+
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli OTP deste�i ile derlenmemi�\n"
 
-#: imap.c:482
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "fetchmail gerekli NTLM deste�i ile derlenmemi�\n"
 
-#: imap.c:491
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Sunucu gerekli LOGIN yetene�ini desteklemiyor\n"
 
-#: imap.c:641 imap.c:707
-msgid "expunge failed\n"
-msgstr "silme ba�ar�s�z oldu\n"
+#: imap.c:667
+#, fuzzy, c-format
+msgid "mail expunge mismatch (%d actual != %d expected)\n"
+msgstr ""
+"%s@%s:%d iletisinin uzunlu�u beklendi�i kadar de�il (ger�ekte %d != beklenen "
+"%d)\n"
 
-#: imap.c:663 imap.c:692
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "yeniden yoklama ba�ar�s�z oldu\n"
 
-#: imap.c:671
-#, c-format
-msgid "%d messages waiting after re-poll\n"
-msgstr "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
+#: imap.c:781 imap.c:837
+#, fuzzy, c-format
+msgid "%d message waiting after re-poll\n"
+msgid_plural "%d messages waiting after re-poll\n"
+msgstr[0] "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
+msgstr[1] "yeniden yoklad�ktan sonra %d ileti bekliyor\n"
 
-#: imap.c:681
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "posta kutusu se�imi ba�ar�s�z oldu\n"
 
-#: imap.c:685
-#, c-format
-msgid "%d messages waiting after first poll\n"
-msgstr "ilk yoklamadan sonra %d ileti bekliyor\n"
+#: imap.c:802
+#, fuzzy, c-format
+msgid "%d message waiting after first poll\n"
+msgid_plural "%d messages waiting after first poll\n"
+msgstr[0] "ilk yoklamadan sonra %d ileti bekliyor\n"
+msgstr[1] "ilk yoklamadan sonra %d ileti bekliyor\n"
 
-#: imap.c:711
-#, c-format
-msgid "%d messages waiting after expunge\n"
-msgstr "silinmeden sonra %d ileti bekliyor\n"
+#: imap.c:816
+msgid "expunge failed\n"
+msgstr "silme ba�ar�s�z oldu\n"
+
+#: imap.c:820
+#, fuzzy, c-format
+msgid "%d message waiting after expunge\n"
+msgid_plural "%d messages waiting after expunge\n"
+msgstr[0] "silinmeden sonra %d ileti bekliyor\n"
+msgstr[1] "silinmeden sonra %d ileti bekliyor\n"
 
-#: imap.c:734
+#: imap.c:862
 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:658 pop3.c:670 pop3.c:887 pop3.c:894
-#, c-format
-msgid "%u is unseen\n"
+#: imap.c:890
+#, fuzzy, c-format
+msgid "%lu is unseen\n"
 msgstr "%u g�r�lmemi�\n"
 
-#: imap.c:776 pop3.c:679
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ilk g�r�lmemi�\n"
 
-#: interface.c:253
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+
+#: 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:589
 msgid "missing IP interface address\n"
 msgstr "IP aray�z� adresi yok\n"
 
-#: interface.c:608
+#: interface.c:605
 msgid "invalid IP interface address\n"
 msgstr "ge�ersiz IP aray�z� adresi\n"
 
-#: interface.c:614
+#: interface.c:611
 msgid "invalid IP interface mask\n"
 msgstr "ge�ersiz IP aray�z� maskesi\n"
 
-#: interface.c:653
+#: interface.c:650
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:668
+#: interface.c:665
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "%s'in yoklanmas�n� atl�yorum, %s �al��m�yor\n"
 
-#: interface.c:687
+#: interface.c:684
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "%s'in yoklamas� atlan�yor, %s IP adresi d��ar�da tutuluyor\n"
 
-#: interface.c:699
+#: interface.c:696
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:725
+#: interface.c:722
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "%s'in yoklamas� atlan�yor, %s etkin de�il\n"
 
-#: interface.c:732
+#: interface.c:729
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "%s'de etkinlik %d idi, �imdi %d\n"
@@ -1774,952 +1957,1106 @@ 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:86
+#, fuzzy, c-format
+msgid "fetchmail: error reading lockfile \"%s\": %s\n"
+msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
+
+#: lock.c:97
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
 
-#: lock.c:122
+#: lock.c:121
+#, fuzzy, c-format
+msgid "fetchmail: error opening lockfile \"%s\": %s\n"
+msgstr "fetchmail: eski kilit dosyas�n� siliyorum \n"
+
+#: lock.c:168
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: kilit olu�turulamad�.\n"
 
-#: netrc.c:218
-#, c-format
-msgid "warning: found \"%s\" before any host names"
-msgstr "uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu"
-
-#: netrc.c:222
+#: netrc.c:219
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu\n"
 
-#: netrc.c:261
+#: netrc.c:257
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: uyar�: bilinmeyen token \"%s\"\n"
 
-#: odmr.c:65
+#: odmr.c:66
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "%s'in SMTP dinleyicisi ATRN'yi desteklemiyor\n"
 
-#: odmr.c:103
+#: odmr.c:104
 msgid "Turnaround now...\n"
 msgstr "Roller de�i�iliyor...\n"
 
-#: odmr.c:108
+#: odmr.c:109
 msgid "ATRN request refused.\n"
 msgstr "ATRN iste�i reddedildi.\n"
 
-#. Unable to process ATRN request now
-#: odmr.c:112
+#: odmr.c:113
 msgid "Unable to process ATRN request now\n"
 msgstr "ATRN iste�ini �imdi i�leyemiyorum\n"
 
-#: odmr.c:117
+#: odmr.c:118
 msgid "You have no mail.\n"
 msgstr "Mektubunuz yok.\n"
 
-#. Command not implemented
-#: odmr.c:121
+#: odmr.c:122
 msgid "Command not implemented\n"
 msgstr "Bu komut ger�eklenmemi�\n"
 
-#. Authentication required
-#: odmr.c:125
+#: odmr.c:126
 msgid "Authentication required.\n"
 msgstr "Kimlik kan�tlamas� gerekiyor.\n"
 
-#: odmr.c:129
+#: odmr.c:130
 #, c-format
 msgid "Unknown ODMR error %d\n"
 msgstr "Bilinmeyen ODMR hatas� %d\n"
 
-#: odmr.c:244
+#: odmr.c:189
+#, fuzzy
+msgid "receiving message data\n"
+msgstr "ileti metni yaz�l�yor\n"
+
+#: odmr.c:242
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "--keep se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:248
+#: odmr.c:246
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "--flush se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:252
-msgid "Option --remote is not supported with ODMR\n"
-msgstr "--remote se�ene�i ODMR ile desteklenmiyor\n"
+#: odmr.c:250
+#, fuzzy
+msgid "Option --folder is not supported with ODMR\n"
+msgstr "--flush se�ene�i ODMR ile desteklenmiyor\n"
 
-#: odmr.c:256
+#: odmr.c:254
 msgid "Option --check is not supported with ODMR\n"
 msgstr "--check se�ene�i ODMR ile desteklenmiyor\n"
 
-#: opie.c:37
+#: opie.c:42
 msgid "server recv fatal\n"
 msgstr "sunucu recv �l�mc�l\n"
 
-#: opie.c:51
+#: opie.c:56
 msgid "Could not decode OTP challenge\n"
 msgstr "OPT challenge'�n�n kodu ��z�lemedi\n"
 
-#: opie.c:59 pop3.c:495
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Parola: "
 
-#: options.c:201 options.c:245
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "'%s' katar� ge�erli bir say� katar� de�il.\n"
 
-#: options.c:210
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "'%1$s'in de�eri %3$d'den %2$s.\n"
 
-#: options.c:211
+#: options.c:178
 msgid "smaller"
 msgstr "k���k"
 
-#: options.c:211
+#: options.c:178
 msgid "larger"
 msgstr "b�y�k"
 
-#: options.c:383
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ge�ersiz protokol `%s' belirtilmi�.\n"
 
-#: options.c:429
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ge�ersiz kimlik denetlemesi y�ntemi `%s' belirtilmi�.\n"
 
-#: options.c:567
-msgid "fetchmail: network security support is disabled\n"
-msgstr "fetchmail: a� g�venli�i deste�i etkin de�il\n"
-
-#: options.c:660
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "kullan�m: fetchmail [se�enekler] [sunucu ...]\n"
 
-#: options.c:661
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  A�a��daki se�enekler kullan�labilir:\n"
 
-#: options.c:662
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        bu yard�m iletisini g�ster\n"
 
-#: options.c:663
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     s�r�m bilgisini g�ster\n"
 
-#: options.c:665
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       iletileri kontrol et ama getirme\n"
 
-#: options.c:666
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      sessizce �al��\n"
 
-#: options.c:667
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     �ok ayr�nt�l� bilgi ver (tan�lama ��kt�s�)\n"
 
-#: options.c:668
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      n saniye i�in bir kez daemon olarak  �al��\n"
 
-#: options.c:669
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    deamon s�recini 'detach' etme\n"
 
-#: options.c:670
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        daemon s�recini �ld�r\n"
 
-#: options.c:671
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     kay�t dosyas� ad�n� belirle\n"
 
-#: options.c:672
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
-msgstr "      --syslog      daemon olarak �al���rken �o�u ileti i�in syslog(3) kullan\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
+msgstr ""
+"      --syslog      daemon olarak �al���rken �o�u ileti i�in syslog(3) "
+"kullan\n"
 
-#: options.c:673
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr "      --invisible   'Received' sat�rlar�n� yazma ve 'spoof' etmeye izin ver\n"
+msgstr ""
+"      --invisible   'Received' sat�rlar�n� yazma ve 'spoof' etmeye izin ver\n"
 
-#: options.c:674
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc ba�ka bir yap�land�rma dosyas� kullan\n"
 
-#: options.c:675
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
 
-#: options.c:676
+#: options.c:607
+#, fuzzy
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "  -i, --idfile      ba�ka bir UID dosyas� kullan\n"
+
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  ba�ka bir \"son �are\" al�c�s� belirle\n"
 
-#: options.c:677
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr "      --nobounce    bounce eden iletileri kullan�c�dan postmaster'a g�nder.\n"
+msgstr ""
+"      --nobounce    bounce eden iletileri kullan�c�dan postmaster'a g�nder.\n"
 
-#: options.c:679
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:680
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     aray�z�n etkinli�ini g�zle\n"
 
-#: options.c:683
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ssl ile �ifrelenmi� oturumu etkinle�tir\n"
 
-#: options.c:684
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl �zel anahtar dosyas�\n"
 
-#: options.c:685
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl istemci sertifikas�\n"
 
-#: options.c:686
-msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
+#: options.c:618
+#, fuzzy
+msgid "      --sslcertck   do strict server certificate check (recommended)\n"
+msgstr "      --sslcert     ssl istemci sertifikas�\n"
+
+#: options.c:619
+#, fuzzy
+msgid "      --sslcertpath path to ssl certificates\n"
+msgstr "      --sslcert     ssl istemci sertifikas�\n"
+
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
+msgstr ""
+
+#: options.c:622
+#, fuzzy
+msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    ssl protokol�n� se� (ssl2/ssl3/tls1)\n"
 
-#: options.c:688
+#: options.c:624
 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"
+msgstr ""
+"      --plugin      ba�lat�lar� a�mak i�in d��ar�dan bir program belirle\n"
 
-#: options.c:689
+#: options.c:625
 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"
+msgstr ""
+"      --plugout     SMTP ba�lant�lar�n� yapmak i�in d��ar�dan bir program "
+"belirle\n"
 
-#: options.c:691
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr "  -p, --protocol    belirtilen protokol� kullan (man sayfas�na bak�n�z)\n"
+msgstr ""
+"  -p, --protocol    belirtilen protokol� kullan (man sayfas�na bak�n�z)\n"
 
-#: options.c:692
+#: options.c:628
 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"
+msgstr ""
+"  -U, --uidl        UIDL kullan�m�n� zorunlu k�l (yaln�zca pop3 i�in)\n"
 
-#: options.c:693
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:629
+#, fuzzy
+msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
+msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
+
+#: options.c:630
+#, fuzzy
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr "  -P, --port        ba�lan�lacak TCP/IP portu\n"
 
-#: options.c:694
+#: options.c:631
 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:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     sunucu zamana��m� s�resi\n"
 
-#: options.c:696
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope   envelope adresi ba�l���\n"
 
-#: options.c:697
+#: options.c:634
 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:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   posta hizmeti pricipal'�\n"
 
-#: options.c:699
+#: options.c:636
 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:638
 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
-msgid "  -a, --all         retrieve old and new messages\n"
+#: options.c:639
+#, fuzzy
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --all         eski ve yeni iletileri getir\n"
 
-#: options.c:703
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      getirdikten sonra yeni iletileri sil\n"
 
-#: options.c:704
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep       getirdikten sonra yeni iletileri sakla\n"
 
-#: options.c:705
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
 
-#: options.c:706
+#: options.c:643
+#, fuzzy
+msgid "      --limitflush  delete oversized messages\n"
+msgstr "  -F, --flush       eski iletileri sunucudan sil\n"
+
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ba�l�k adreslerini yeniden yazma\n"
 
-#: options.c:707
+#: options.c:645
 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:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    posta bildirimleri aras�ndaki zaman aral���\n"
 
-#: options.c:711
-msgid "  -T, --netsec      set IP security request\n"
-msgstr "  -T, --netsec      IP g�venli�i iste\n"
-
-#: options.c:713
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    bu SMTP sunucusunu kullan\n"
 
-#: options.c:714
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr "      --fetchdomains belirtilen alan adlar� i�in gelen postalar� getir\n"
+msgstr ""
+"      --fetchdomains belirtilen alan adlar� i�in gelen postalar� getir\n"
 
-#: options.c:715
+#: options.c:650
 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:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    bu SMTP kullan�c�@alanad� adresini kullan\n"
 
-#: options.c:717
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    antispam yan�t de�erlerini kullan\n"
 
-#: options.c:718
+#: options.c:653
 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:654
 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:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit getirilen iletilerin boyut s�n�r�n� ayarla\n"
 
-#: options.c:721
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    UIDL'ler i�in 'binary' arama yap\n"
 
-#: options.c:722
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:723
+#: options.c:658
 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:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       BSMTP ��kt�s�n� bu dosyaya al\n"
 
-#: options.c:725
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        da��t�m i�in LMTP (RFC2033) kullan\n"
 
-#: options.c:726
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder    uzaktaki klas�r ad� olarak bunu kullan\n"
 
-#: options.c:727
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    ilerlemeyi g�steren noktalar� kay�t dosyalar�nda bile g�ster\n"
+msgstr ""
+"      --showdots    ilerlemeyi g�steren noktalar� kay�t dosyalar�nda bile "
+"g�ster\n"
+
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+
+#: pop3.c:454
+msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
+
+#: pop3.c:455
+msgid "The CAPA command is however necessary for TLS.\n"
+msgstr ""
+
+#: pop3.c:538
+#, c-format
+msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr ""
+
+#: pop3.c:646
+msgid "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
 
 # timestamp = zaman damgas� (zaman belirteci daha do�al olurdu bence ama b�yle kullan�lm��
 # ba�ka yerlerde)
-#: pop3.c:533
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman damgas� selamlama i�erisinde bulunamad�\n"
 
-#: pop3.c:542
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Selamlama i�indeki zaman damgas�nda s�zdizim yanl��� var\n"
 
-#: pop3.c:564
+#: pop3.c:685
+msgid "Invalid APOP timestamp.\n"
+msgstr ""
+
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth'ta tan�mlanmam�� protokol iste�i\n"
 
-#: pop3.c:572
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "kilit me�gul!  Ba�ka bir oturum a��k olabilir\n"
 
-#: pop3.c:649 pop3.c:878
+#: pop3.c:809
+msgid "Cannot handle UIDL response from upstream server.\n"
+msgstr ""
+
+#: pop3.c:832
+msgid "Server responded with UID for wrong message.\n"
+msgstr ""
+
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) silinmi�ti, fakat hala burada!\n"
 
-#: pop3.c:751
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u g�r�lmemi�\n"
+
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Sunucuda listeye iletiler araya sokulmu�. Bu durumu idare edemem.\n"
 
-#: pop3.c:837
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "protokol hatas�\n"
 
-#: pop3.c:852
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL'leri getirirken protokol hatas�\n"
 
-#: pop3.c:1210
-msgid "Option --remote is not supported with POP3\n"
+#: pop3.c:1443
+#, fuzzy
+msgid "Option --folder is not supported with POP3\n"
 msgstr "--remote se�ene�i POP3 ile desteklenmiyor\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "kullan�c� se�eneklerinden sonra sunucu se�ene�i verilmi�"
 
-#: rcfile_y.y:170
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "SDPS etkin de�il."
 
-#: rcfile_y.y:218
-msgid "invalid security request"
-msgstr "ge�ersiz g�venlik iste�i"
-
-#: rcfile_y.y:224
-msgid "network-security support disabled"
-msgstr "a� g�venli�i deste�ini etkisizle�tirildi"
-
-#: rcfile_y.y:231
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: 'interface' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de destekleniyor\n"
+#: rcfile_y.y:213
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: 'interface' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
+"destekleniyor\n"
 
-#: rcfile_y.y:238
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: 'monitor' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de destekleniyor\n"
+#: rcfile_y.y:220
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: 'monitor' se�ene�i yaln�zca Linux'ta (IPv6's�z) ve FreeBSD'de "
+"destekleniyor\n"
 
-#: rcfile_y.y:350
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL etkin de�il."
 
-#: rcfile_y.y:398
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "girdi sonu"
 
 # symbolic link?
-#: rcfile_y.y:435
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "%s dosyas� normal bir dosya olmal�.\n"
 
-#: rcfile_y.y:442
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "Dosyan�n (%s) izinleri -rwx--x--- (0710)'den �ok olmamal�.\n"
 
-#: rcfile_y.y:454
+#: rcfile_y.y:443
 #, c-format
 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
+#: rpa.c:117
 msgid "Success"
 msgstr "Ba�ar�l�"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Restricted user (something wrong with account)"
-msgstr "S�n�rl� kullan�c� (kullan�c� hesab� ile ilgili yanl�� bir�eyler olabilir)"
+msgstr ""
+"S�n�rl� kullan�c� (kullan�c� hesab� ile ilgili yanl�� bir�eyler olabilir)"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Invalid userid or passphrase"
 msgstr "Kullan�c� ad� ya da parolas� ge�ersiz"
 
 # deity error???
-#: rpa.c:119
+#: rpa.c:120
 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:371
 msgid "Get response\n"
 msgstr "Yan�t al\n"
 
-#: rpa.c:400
+#: rpa.c:401
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Yan�t alma %d d�nd� [%s]\n"
 
-#: rpa.c:463
+#: rpa.c:462
 msgid "Hdr not 60\n"
 msgstr "Ba�l�k 60 de�il\n"
 
-#: rpa.c:484
+#: rpa.c:483
 msgid "Token length error\n"
 msgstr "Token uzunluk hatas�\n"
 
-#: rpa.c:489
+#: rpa.c:488
 #, 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:494
 msgid "Mechanism field incorrect\n"
 msgstr "Mekanizma alan� do�ru de�il\n"
 
-#: rpa.c:532
+#: rpa.c:530
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "karakter %d'de dec64 hatas�: %x\n"
 
-#: rpa.c:547
+#: rpa.c:545
 msgid "Inbound binary data:\n"
 msgstr "Gelen ikilik veri:\n"
 
-#: rpa.c:585
+#: rpa.c:581
 msgid "Outbound data:\n"
 msgstr "Giden veri:\n"
 
-#: rpa.c:651
+#: rpa.c:644
 msgid "RPA String too long\n"
 msgstr "RPA katar� �ok uzun\n"
 
-#: rpa.c:656
+#: rpa.c:649
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:718
+#: rpa.c:708
 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:709
 msgid "    prevent you logging in, but means you\n"
 msgstr "    girmenize engel de�ildir, ancak konu�tu�unuzu\n"
 
-#: rpa.c:720
+#: rpa.c:710
 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:711
 msgid "    service that you think you are (replay\n"
 msgstr "    olabilirsiniz (k�t� niyetli sistemler\n"
 
-#: rpa.c:722
+#: rpa.c:712
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    `replay' sald�r�s� yapabilir).\n"
 
-#: rpa.c:733
+#: rpa.c:723
 msgid "User challenge:\n"
 msgstr "Kullan�c� challenge'�:\n"
 
-#: rpa.c:891
+#: rpa.c:873
 msgid "MD5 being applied to data block:\n"
 msgstr "Veri blo�una MD5 uygulan�yor:\n"
 
-#: rpa.c:904
+#: rpa.c:886
 msgid "MD5 result is: \n"
 msgstr "MD5 sonucu:\n"
 
-#: sink.c:249
+#: servport.c:53
+#, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr ""
+
+#: servport.c:80
+#, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:81
+msgid "Please specify the service as decimal port number.\n"
+msgstr ""
+
+#: sink.c:220
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "%s'e iletiliyor\n"
 
-#: sink.c:351
+#: sink.c:306
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: ('bounce' iletisi g�vdesi)\n"
 
-#. this will usually go to sylog...
-#: sink.c:354
+#: sink.c:309
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
 
-#: sink.c:464
+#: sink.c:442
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Kaydedilen hata hala %d\n"
 
-#: sink.c:527 sink.c:607
+#: sink.c:502 sink.c:587
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP hatas�: %s\n"
 
-#: sink.c:761
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:712
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
+
+#: sink.c:758
+#, fuzzy
+msgid "BSMTP preamble write failed.\n"
 msgstr "BSMTP dosya a��lamad� ya da �ns�z yaz�lamad�\n"
 
-#: sink.c:982
+#: sink.c:972
 #, 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:989
+#: sink.c:979
 #, 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:1027
+#: sink.c:1025
 msgid "no address matches; no postmaster set.\n"
 msgstr "hi�bir adres uyu�mad�; postmaster yok.\n"
 
-#: sink.c:1039
+#: sink.c:1037
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr ""
 "%s'e bile g�nderilemedi!\n"
 "\n"
 
-#: sink.c:1045
+#: sink.c:1043
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "hi�bir adres uymuyor; %s'e iletiyorum.\n"
 
-#: sink.c:1198
+#: sink.c:1199
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "iletmek �zereyim: %s\n"
 
-#: sink.c:1222
+#: sink.c:1223
 msgid "MDA open failed\n"
 msgstr "MDA a�ma ba�ar�s�z oldu\n"
 
-#: sink.c:1259
+#: sink.c:1260
 #, 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:1283
+#: sink.c:1284
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "dinleyici �al��t�r�lamad�; %s denenecek"
 
-#: sink.c:1339
+#: sink.c:1346
+#, fuzzy, c-format
+msgid "Error writing to MDA: %s\n"
+msgstr "%s'e iletiliyor\n"
+
+#: sink.c:1349
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA %d sinyali ile �ld�r�ld�\n"
 
-#: sink.c:1342
+#: sink.c:1352
 #, 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:1345
-#, c-format
-msgid "Strange: MDA pclose returned %d, cannot handle at %s:%d\n"
+#: sink.c:1355
+#, fuzzy, c-format
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "Garip: MDA pclose durum kodu olarak %d d�nd�rd�, %s:%d'de sorun\n"
 
-#: sink.c:1366
+#: sink.c:1377
 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"
+msgstr ""
+"�letiyi bitirme ya da BSMTP dosyas�n� kapatma i�lemi ba�ar�s�zl�kla "
+"sonu�land�\n"
 
-#: sink.c:1387
+#: sink.c:1399
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP dinleyicisi da��t�m� reddetti\n"
 
-#: sink.c:1417
+#: sink.c:1429
 msgid "LMTP delivery error on EOM\n"
 msgstr "�leti sonunda LMTP da��t�m hatas�\n"
 
-#: sink.c:1420
+#: sink.c:1432
 #, 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:1570
+#: sink.c:1587
+#, 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:79
 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:86 smtp.c:137
 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:94 smtp.c:144 smtp.c:154 smtp.c:160
 msgid "Bad base64 reply from server.\n"
 msgstr "Sunucudan ge�ersiz base64 yan�t�.\n"
 
-#: smtp.c:105
+#: smtp.c:98
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "'Challenge'�n kodu ��z�ld�: %s\n"
 
-#: smtp.c:126
+#: smtp.c:115
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN Kimlik kan�tlamas�...\n"
 
-#: smtp.c:146
+#: smtp.c:130
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Kimlik kan�tlamas�...\n"
 
-#: smtp.c:361 smtp.c:384
+#: smtp.c:331 smtp.c:354
 msgid "smtp listener protocol error\n"
 msgstr "smtp dinleyicisi protokol hatas�\n"
 
-#: socket.c:108 socket.c:134
+#: socket.c:114 socket.c:140
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc ba�ar�s�z oldu\n"
 
-#: socket.c:166
+#: socket.c:172
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair ba�ar�s�z oldu\n"
 
-#. error
-#: socket.c:172
+#: socket.c:178
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork ba�ar�s�z oldu\n"
 
-#: socket.c:180
+#: socket.c:185
 msgid "dup2 failed\n"
 msgstr "dup2 ba�ar�s�z oldu\n"
 
-#: socket.c:186
+#: socket.c:191
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "%s �al��t�r�l�yor (makina %s hizmet %s)\n"
 
-#: socket.c:189
+#: socket.c:194
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ba�ar�s�z oldu\n"
 
-#: socket.c:281
+#: socket.c:282
 #, c-format
-msgid "fetchmail: getaddrinfo(%s.%s)\n"
-msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgstr ""
+
+#: socket.c:285
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:296 socket.c:299
+#, fuzzy, c-format
+msgid "unknown (%s)"
+msgstr "bilinmeyen"
 
-#: socket.c:428
+#: socket.c:302
 #, 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"
+msgid "Trying to connect to %s/%s..."
+msgstr ""
+
+#: socket.c:310
+#, fuzzy, c-format
+msgid "cannot create socket: %s\n"
+msgstr ""
+"%s'e bile g�nderilemedi!\n"
+"\n"
+
+#: socket.c:326
+#, fuzzy
+msgid "connection failed.\n"
+msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
+
+#: socket.c:328
+#, fuzzy, c-format
+msgid "connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "%2$s'ye %1$s ba�lant�s� ba�ar�s�z oldu"
+
+#: socket.c:334
+#, fuzzy
+msgid "connected.\n"
+msgstr "SSL ba�lant�s� ba�ar�s�z oldu.\n"
 
-#: socket.c:778
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "��karan Kurum: %s\n"
 
-#: socket.c:780
+#: socket.c:613
 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:615
 msgid "Unknown Organization\n"
 msgstr "Bilinmeyen Kurum\n"
 
-#: socket.c:784
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "��karan `CommonName'i: %s\n"
 
-#: socket.c:786
+#: socket.c:619
 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:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Bilinmeyen ��karan `CommonName'i\n"
 
-#: socket.c:792
+#: socket.c:625
 #, 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:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "K�t� sertifika: `Subject CommonName' �ok uzun!\n"
 
-#: socket.c:812
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Sunucu CommonName'i uyu�mazl���: %s != %s\n"
 
-#: socket.c:818
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Sunucu ad� ayarlanmam��, sertifikay� do�rulayam�yorum!\n"
 
-#: socket.c:823
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Bilinmeyen Sunucu `CommonName'i\n"
 
-#: socket.c:825
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Sunucu ad� sertifikada belirtilmemi�!\n"
 
-#: socket.c:835
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ba�ar�s�z oldu!\n"
 
-#: socket.c:839
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Bellek yetmedi!\n"
 
-#: socket.c:851
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "`Digest' metni tamponu �ok k���k!\n"
 
-#: socket.c:857
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s anahtar� parmak izi: %s\n"
 
-#: socket.c:861
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s parmak izleri uyu�uyor.\n"
 
-#: socket.c:864
+#: socket.c:724
 #, 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:733
+#, fuzzy, c-format
+msgid "Server certificate verification error: %s\n"
 msgstr "Uyar�: sunucu sertifikas� do�rulamas�: %s\n"
 
-#: socket.c:878
+#: socket.c:739
 #, 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:826
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL i�in s�n�rlar d���nda"
 
-#: socket.c:948
+#: socket.c:842
 #, 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"
+msgstr ""
+"Ge�ersiz SSL protokol� '%s' belirtildi, �ntan�ml� olan kullan�l�yor "
+"(SSLv23).\n"
 
-#: socket.c:1008
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi do�rulamas� bir bi�imde atland�!\n"
 
-#: socket.c:1080
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1083
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma ba�ar�s�z oldu!\n"
 
-#: transact.c:70
+#: transact.c:67
+#, fuzzy, c-format
+msgid "mapped address %s to local %s\n"
+msgstr "%s yerel %s'e e�lendi\n"
+
+#: transact.c:89
 #, 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:156
 #, 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:226
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2728,126 +3065,141 @@ msgstr ""
 "'Received' sat�r� ��z�mleniyor:\n"
 "%s"
 
-#: transact.c:242
+#: transact.c:265
 #, 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:271
 #, 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:345
 msgid "no Received address found\n"
 msgstr "hi�bir Received adresi bulunamad�\n"
 
-#: transact.c:331
+#: transact.c:354
 #, 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:551
 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:582
 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:584
 #, c-format
 msgid "line: %s"
 msgstr "sat�r: %s"
 
-#: transact.c:1074
+#: transact.c:1130
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "yerelde uyan bulunamad�, %s'e iletiliyor\n"
 
-#: transact.c:1089
+#: transact.c:1145
 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:1255
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "RFC822 msgblk.headers yaz�l�yor\n"
 
-#: transact.c:1246
+#: transact.c:1273
 msgid "no recipient addresses matched declared local names"
-msgstr "al�c� adreslerinden hi�biri bildirilen yerel adlardan hi�birine uymuyor"
+msgstr ""
+"al�c� adreslerinden hi�biri bildirilen yerel adlardan hi�birine uymuyor"
 
-#: transact.c:1257
+#: transact.c:1280
 #, 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:1289
 msgid "message has embedded NULs"
 msgstr "iletinin i�inde NUL karakterleri var"
 
 # listener = dinleyici
-#: transact.c:1284
+#: transact.c:1297
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP dinleyicisi yerel al�c� adreslerini reddetti: "
 
-#: transact.c:1409
-msgid "writing message text\n"
+#: transact.c:1445
+#, fuzzy
+msgid "error writing message text\n"
 msgstr "ileti metni yaz�l�yor\n"
 
-#: uid.c:137
-#, c-format
-msgid "lstat: %s: %s\n"
-msgstr "lstat: %s: %s\n"
-
-#: uid.c:248
+#: uid.c:250
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "%s'den eski UID listesi:"
 
 # kaynak koduna bak�lacak
-#: uid.c:253 uid.c:264 uid.c:518 uid.c:567
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
 msgid " <empty>"
 msgstr " <bo�>"
 
-#: uid.c:260
+#: uid.c:262
 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
+#: uid.c:517 uid.c:569
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr "%s'den UID listesi birle�tirildi:"
 
-#: uid.c:514
+#: uid.c:519
 #, c-format
 msgid "New UID list from %s:"
 msgstr "%s'den yeni UID listesi:"
 
-#: uid.c:542
+#: uid.c:548
 msgid "swapping UID lists\n"
 msgstr "UID listeleri takas ediliyor\n"
 
-#: uid.c:550
+#: uid.c:556
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "UID listeleri takas edilmiyor, hi�bir UID bu sorguyu g�rmedi\n"
 
-#: uid.c:575
+#: uid.c:581
 msgid "discarding new UID list\n"
 msgstr "yeni UID listeleri siliniyor\n"
 
-#: uid.c:610
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "fetchids dosyas� siliniyor.\n"
 
-#: uid.c:616
+#: uid.c:620
+#, fuzzy, c-format
+msgid "Error deleting %s: %s\n"
+msgstr "Credential'lar b�rak�l�rken hata\n"
+
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "fetchids dosyas� yaz�l�yor.\n"
 
+#: uid.c:645
+#, c-format
+msgid "Error writing to fetchids file %s, old file left in place.\n"
+msgstr ""
+
+#: uid.c:649
+#, c-format
+msgid "Cannot rename fetchids file %s to %s: %s\n"
+msgstr ""
+
+#: uid.c:653
+#, c-format
+msgid "Cannot open fetchids file %s for writing: %s\n"
+msgstr ""
+
 #: xmalloc.c:33
 msgid "malloc failed\n"
 msgstr "malloc ba�ar�s�z oldu\n"
@@ -2856,12 +3208,139 @@ msgstr "malloc ba�ar�s�z oldu\n"
 msgid "realloc failed\n"
 msgstr "realloc ba�ar�s�z oldu\n"
 
+#~ msgid ""
+#~ "Subject: Fetchmail oversized-messages warning.\n"
+#~ "\n"
+#~ "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�:"
+
+#~ msgid "header "
+#~ msgstr "ba�l�k "
+
+#~ 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"
+
+#~ msgid "internal inconsistency\n"
+#~ msgstr "i� tutars�zl�k\n"
+
+#~ msgid "name is valid but has no IP address."
+#~ msgstr "ad ge�erli ama IP adresi yok."
+
+# unrecoverable = d�zeltilemez (Sankur'un s�zl��� 'kurtar�lamaz' diyor ama buraya pek
+# uymuyor bence...
+#~ msgid "unrecoverable name server error."
+#~ msgstr "d�zeltilemeyen ad sunucusu hatas�."
+
+#~ msgid "temporary name server error."
+#~ msgstr "ge�ici ad sunucusu hatas�."
+
+#~ msgid "unknown DNS error %d."
+#~ msgstr "bilinmeyen DNS hatas� %d."
+
+# 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 "Option --remote is not supported with ETRN\n"
+#~ msgstr "--remote se�ene�i ETRN ile desteklenmiyor\n"
+
+#~ msgid "Cannot support ETRN without gethostbyname(2).\n"
+#~ msgstr "`gethostbyname(2)' olmadan ETRN'yi destekleyemem.\n"
+
+#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
+#~ msgstr "`gethostbyname(2)' olmadan ODMR'yi destekleyemem.\n"
+
+#~ msgid " (using network security options %s)"
+#~ msgstr " (�u a� g�venli�i se�eneklerini kullan�yorum: %s)"
+
+#~ msgid " (using port %d)"
+#~ msgstr " (port %d kullan�l�yor)"
+
+#~ msgid "All"
+#~ msgstr "Hepsi"
+
+#~ msgid "Only new"
+#~ msgstr "Yaln�zca yeniler"
+
+#~ msgid "enabled"
+#~ msgstr "etkin"
+
+#~ msgid "disabled"
+#~ msgstr "etkin de�il"
+
+# 	    printf(GT_("  Nonempty Status lines will be %s (dropstatus %s)\n"),
+# 		   ctl->dropstatus ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropstatus ? "on" : "off");
+# 	    printf(GT_("  Delivered-To lines will be %s (dropdelivered %s)\n"),
+# 		   ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
+# 		   ctl->dropdelivered ? "on" : "off");
+#
+# DIKKAT: 'discarded' ve 'kept'in durumlari �zel; at�lacak ve tutulacak
+# olarak �evrilmeleri gerekiyor.
+#~ msgid "discarded"
+#~ msgstr "at�lacak"
+
+#~ msgid "kept"
+#~ msgstr "tutulacak"
+
+# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
+# bak�n�z.
+#~ msgid "IP address.\n"
+#~ msgstr "Sunucu takma adlar� IP adresleri kullan�larak kar��la�t�r�lacak.\n"
+
+# Ni�in b�yle �evrildi�ini anlamak i�in yukar�daki iletiye
+# bak�n�z.
+#~ msgid "name.\n"
+#~ msgstr "Sunucu takma adlar�, adlar� kullan�larak kar��la�t�r�lacak.\n"
+
+# Bu ileti yukar�daki "Envelope header is assumed to be: %" iletisine
+# ba�l�.
+#~ msgid "Received"
+#~ msgstr "Received"
+
+#~ msgid "alloca failed"
+#~ msgstr "alloca ba�ar�s�z oldu"
+
+#~ msgid "warning: found \"%s\" before any host names"
+#~ msgstr "uyar�: herhangi bir makina ad�ndan �nce \"%s\" bulundu"
+
+#~ msgid "Option --remote is not supported with ODMR\n"
+#~ msgstr "--remote se�ene�i ODMR ile desteklenmiyor\n"
+
+#~ msgid "fetchmail: network security support is disabled\n"
+#~ msgstr "fetchmail: a� g�venli�i deste�i etkin de�il\n"
+
+#~ msgid "  -T, --netsec      set IP security request\n"
+#~ msgstr "  -T, --netsec      IP g�venli�i iste\n"
+
+#~ msgid "invalid security request"
+#~ msgstr "ge�ersiz g�venlik iste�i"
+
+#~ msgid "network-security support disabled"
+#~ msgstr "a� g�venli�i deste�ini etkisizle�tirildi"
+
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "hata ileti tamponu ta�mas�"
+
+#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
+#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#~ msgid "fetchmail: illegal address length received for host %s\n"
+#~ msgstr "fetchmail: %s makinesi i�in ge�ersiz adres uzunlu�u al�nd�\n"
+
+#~ msgid "lstat: %s: %s\n"
+#~ msgstr "lstat: %s: %s\n"
+
 #~ msgid "Skipping message %d, length -1\n"
 #~ msgstr "�leti %d atlan�yor, uzunluk -1\n"
 
-#, fuzzy
-#~ msgid "unknown issuer= %s"
-#~ msgstr "bilinmeyen"
-
 #~ msgid "Server Certificate expired"
 #~ msgstr "Sunucu Seritifikas�'n�n kullan�m s�resi doldu"
diff --git a/po/vi.po b/po/vi.po
index 10b592d7..8370c04e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2007-05-28 21:48+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -32,12 +32,14 @@ msgstr "Không phải, hai địa chỉ IP không trùng\n"
 #: checkalias.c:198
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr "trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s: %s\n"
+msgstr ""
+"trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s: %s\n"
 
 #: checkalias.c:223
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr "trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s.\n"
+msgstr ""
+"trình phục vụ tên thất bại trong khi tìm « %s »  trong việc thăm dò %s.\n"
 
 #: cram.c:95
 msgid "could not decode BASE64 challenge\n"
@@ -65,7 +67,8 @@ msgstr "Chủ đề : cảnh báo Fetchmail về thư quá lớn"
 #: driver.c:339
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr "Những thư quá lớn theo đây đã bị xoá bỏ trên máy phục vụ %s tài khoản %s:"
+msgstr ""
+"Những thư quá lớn theo đây đã bị xoá bỏ trên máy phục vụ %s tài khoản %s:"
 
 #: driver.c:343
 #, c-format
@@ -102,89 +105,93 @@ msgstr " (độ dài -1)"
 msgid " (oversized)"
 msgstr " (quá lớn)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "không thể lấy các dòng đầu, thư %s@%s:%d (%d octet)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "đang đọc thư %s@%s:%d trên %d"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octet)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d octet dòng đầu)"
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d octet thân)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "thư %s@%s:%d không có độ dài đã ngờ (%d thật != %d đã ngờ)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr " vẫn giữ\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr " đã xoá sạch\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr " chưa xoá sạch\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "tới hạn lấy %d; %d thư còn lại trên máy phục vụ %s tài khoản %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "quá giờ sau %d giây đợi kết nối đến máy phục vụ %s.\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "quá giờ sau %d giây đợi máy phục vụ %s.\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "quá giờ sau %d giây đợi %s.\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "quá giờ sau %d giây đợi bộ lắng nghe đáp ứng.\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "quá giờ sau %d giây.\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Chủ đề : fetchmail thấy nhiều việc quá giờ"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
 msgstr "Fetchmail thấy hơn %d việc quá giờ trong khi cố lấy thư từ %s@%s.\n"
 
-#: driver.c:911
+#: driver.c:914
 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"
@@ -193,77 +200,79 @@ msgid ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 msgstr ""
-"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị hỏng do lỗi trình phục vụ. Bạn có thể chạy lệnh « fetchmail -v -v » để chẩn đoán vấn đề này.\n"
+"Có thể nghĩa là trình phục vụ thư bế tắc, hoặc trình phục vụ SMTP không lối "
+"thoát, hoặc tập tin hôp thư trên máy phục vụ đã bị hỏng do lỗi trình phục "
+"vụ. Bạn có thể chạy lệnh « fetchmail -v -v » để chẩn đoán vấn đề này.\n"
 "\n"
 "Fetchmail sẽ không thăm dò hộp thư này cho đến khi bạn khởi động nó.\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "lệnh tiền kết nối đã thất bại với trạng thái là %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "không tìm thấy pobox HESIOD cho %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "Máy phục vụ đi trước không có tên.\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "không tìm thấy tên DNS đúng tiêu chuẩn của %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "kết nối %s đến %s bị lỗi"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Chủ đề : cảnh báo Fetchmail về máy phục vụ không tới được"
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail không thể tới máy phục vụ thư %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "Kết nối SSL đã thất bại.\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu khoá-bận trên %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu máy phục vụ bận trên %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Việc xác thực bị lỗi trên %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr " (đã cho quyền trước này)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Chủ đề : việc xác thực fetchmail bị lỗi trên %s@%s"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail không thể lấy thư từ %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -276,7 +285,7 @@ msgstr ""
 "chế độ thất bại khác (v.d. máy phục vụ bận tạm) mà fetchmail\n"
 "không thể phân biệt vì máy phục vụ chưa gởi thông điệp lỗi hữu ích."
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -295,7 +304,7 @@ msgstr ""
 "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -314,165 +323,165 @@ msgstr ""
 "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Thăm dò lại ngay trên %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Lỗi đăng nhập hay xác thực không rõ trên %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Đã được quyền trên %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Chủ đề : fetchmail đã được quyền trên %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail đã đăng nhập được vào %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "Dịch vụ đã được phục hồi.\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "đang chọn hoặc thăm dò thư mục %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "đang chọn hoặc thăm dò thư mục mặc định\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s lúc %s (thư mục %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s lúc %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "Đang thăm dò %s...\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d thư (%d %s) cho %s"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "đã thấy"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d thư cho %s"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octet).\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Không có thư cho %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "số đếm thư giả !"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "ổ cắm"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "dòng đầu RFC822 xấu hay còn thiếu"
 
 # Name: don't translate / Tên: đừng dịch
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "đồng bộ hoá ứng dụng khách/trình phục vụ"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "giao thức ứng dụng khách/trình phục vụ"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "khoá bận trên máy phục vụ"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "giao tác SMTP"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "Tra cứu DNS"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "chưa xác định"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s và phát cho máy SMTP %s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "không rõ"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "lệnh cuối cùng kết nối đã thất bại với trạng thái là %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V4.\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V5.\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --flush » (xoá sạch) với %s\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --all » (tất cả) với %s\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --limit » (hạn chế) với %s\n"
@@ -498,7 +507,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -527,12 +537,14 @@ msgstr "Việc gethostbyname (lấy máy theo tên) bị lỗi cho %s\n"
 
 #: env.c:170
 msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr "Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó.\n"
+msgstr ""
+"Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó.\n"
 
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "Đang cố tiếp tục với tên máy không có đủ khả năng.\n"
@@ -605,14 +617,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Không hỗ trợ tùy chọn « --check » (kiểm tra) đối với ETRN\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Tác quyền © năm 2002, 2003 của Eric S. Raymond\n"
-"Tác quyền © năm 2004 của Matthias Andree, Eric S. Raymond, Robert F. Funk, Graham Wilson\n"
+"Tác quyền © năm 2004 của Matthias Andree, Eric S. Raymond, Robert F. Funk, "
+"Graham Wilson\n"
 "Tác quyền © năm 2005-2006 của Sunil Shetye\n"
 "Tác quyền © năm 2005-2007 của Matthias Andree\n"
 
@@ -669,7 +684,8 @@ msgstr "fetchmail: không có thẻ hiện fetchmail khác đang chạy\n"
 #: fetchmail.c:440
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr "fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %d nên hủy bỏ.\n"
+msgstr ""
+"fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %d nên hủy bỏ.\n"
 
 #: fetchmail.c:441 fetchmail.c:450
 msgid "background"
@@ -685,13 +701,20 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: fetchmail %s tại %d được buộc kết thúc.\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-msgstr "fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail khác đang chạy tới cùng một máy.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
+msgstr ""
+"fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail "
+"khác đang chạy tới cùng một máy.\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: không thể thăm dò các máy đã xác định khi có thể hiện fetchmail khác chạy tại %d\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: không thể thăm dò các máy đã xác định khi có thể hiện fetchmail "
+"khác chạy tại %d\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -699,8 +722,11 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: một thể hiện fetchmail cảnh gần khác đang chạy tại %d.\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr "fetchmail: không thể chấp nhận tùy chọn trong khi một thể hiện fetchmail nền đang chạy.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr ""
+"fetchmail: không thể chấp nhận tùy chọn trong khi một thể hiện fetchmail nền "
+"đang chạy.\n"
 
 #: fetchmail.c:501
 #, c-format
@@ -724,7 +750,9 @@ msgstr "Hãy gõ mật khẩu cho %s@%s: "
 
 #: fetchmail.c:557 fetchmail.c:593
 msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: cảnh báo : cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi lưu) đều đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
+msgstr ""
+"fetchmail: cảnh báo : cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi "
+"lưu) đều đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
 
 #: fetchmail.c:569
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
@@ -740,764 +768,829 @@ msgstr "đang khởi chạy trình nền fetchmail %s...\n"
 msgid "could not open %s to append logs to \n"
 msgstr "không thể mở %s để phụ thêm các bản ghi vào nó\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "không thể kiểm tra giờ %s (lỗi %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "đang khởi chạy lại fetchmail (%s đã được thay đổi)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "việc cố thực hiện lại có thể thất bại vì thư mục chưa được phục hồi\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "việc cố thực hiện lại fetchmail đã thất bại\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr "việc thăm dò %s bị bỏ qua (xác thực đã thất bại hoặc quá giờ quá nhiều lần)\n"
+msgstr ""
+"việc thăm dò %s bị bỏ qua (xác thực đã thất bại hoặc quá giờ quá nhiều lần)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "Chưa tới khoảng nên không truy vấn %s\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Trạng thái truy vấn=0 (THÀNH CÔNG)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Trạng thái truy vấn=1 (KHÔNG THƯ)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Trạng thái truy vấn=2 (Ổ CẮM)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Trạng thái truy vấn=3 (XÁC THỰC THẤT BẠI)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Trạng thái truy vấn=4 (GIAO THỨC)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Trạng thái truy vấn=5 (CÚ PHÁP)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "Trạng thái truy vấn=6 (LỖI NHẬP/XUẤT)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "Trạng thái truy vấn=7 (LỖI)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Trạng thái truy vấn=8 (LOẠI TRỪ)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Trạng thái truy vấn=9 (KHOÁ BẬN)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "Trạng thái truy vấn=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "Trạng thái truy vấn=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Trạng thái truy vấn=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Trạng thái truy vấn=13 (LẤY TỐI ĐA)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Trạng thái truy vấn=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Mọi sự kết nối là bế tắc nên thoát.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "đang ngủ tại %s trong %d giây\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "bị %s kích hoạt lại\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "bị tín hiệu %d kích hoạt lại\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "được kích hoạt lại tại %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "đã kết thúc chuẩn, trạng thái %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 msgid "couldn't time-check the run-control file\n"
 msgstr "không thể kiểm tra giờ của tập tin điều kiển việc chạy (run-control)\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Cảnh báo : gặp tên máy %s nhiều lần trong tập tin cấu hình\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr "fetchmail: lỗi : gặp nhiều mục ghi « mặc định » trong tập tin cấu hình.\n"
+msgstr ""
+"fetchmail: lỗi : gặp nhiều mục ghi « mặc định » trong tập tin cấu hình.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "Chưa biên dịch cách hỗ trợ SSL.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "Khả năng hỗ trợ KERBEROS v4 đã được cấu hình còn chưa được biên dịch vào.\n"
+msgstr ""
+"Khả năng hỗ trợ KERBEROS v4 đã được cấu hình còn chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "Khả năng hỗ trợ KERBEROS v5 đã được cấu hình còn chưa được biên dịch vào.\n"
+msgstr ""
+"Khả năng hỗ trợ KERBEROS v5 đã được cấu hình còn chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "Khả năng hỗ trợ GSSAPI đã được cấu hình còn chưa được biên dịch vào.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr "fetchmail: cảnh báo : không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr ""
+"fetchmail: cảnh báo : không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %"
+"s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "cảnh báo : việc đa thả cho %s cần thiết tùy chọn bao bọc (envelope).\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr "cảnh báo : đừng yêu cầu sự hỗ trợ nếu mọi thư được phát cho postmaster (giám đốc sở bưu điện).\n"
+msgstr ""
+"cảnh báo : đừng yêu cầu sự hỗ trợ nếu mọi thư được phát cho postmaster (giám "
+"đốc sở bưu điện).\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-msgstr "fetchmail: cấu hình %s không hợp lệ; hãy xác định số hiệu cổng dương cho dịch vụ hay cổng\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
+msgstr ""
+"fetchmail: cấu hình %s không hợp lệ; hãy xác định số hiệu cổng dương cho "
+"dịch vụ hay cổng\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr "fetchmail: cấu hình %s không hợp lệ; RPOP cần thiết một cổng có quyền đặc biệt\n"
+msgstr ""
+"fetchmail: cấu hình %s không hợp lệ; RPOP cần thiết một cổng có quyền đặc "
+"biệt\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "cấu hình %s không hợp lệ; LMTP không thể sử dụng cổng SMTP mặc định\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình nền là trường hợp xấu.\n"
+msgstr ""
+"Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình nền là "
+"trường hợp xấu.\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "đã kết thúc với tín hiệu %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã khởi chạy\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ POP2.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ POP3.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ IMAP.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ ETRN.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "Chưa cấu hình cách hỗ trợ ODMR.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "đã chọn giao thức không được hỗ trợ.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã chạy xong\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Khoảng thăm dò là %d giây\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Tập tin bản ghi là %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Tập tin Id là %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
-msgstr "Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
+msgstr ""
+"Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
-msgstr "Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu « Received » (đã nhận)\n"
+msgstr ""
+"Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu « Received » (đã nhận)\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr "Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
+msgstr ""
+"Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail sẽ chuyển tiếp các thư đa thả có địa chỉ sai tới %s\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới postmaster (giám đốc sở bưu điện).\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail sẽ chỉ các thư lỗi tới người gởi.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Tùy chọn về việc lấy từ %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Thư sẽ được lấy bằng %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Máy phục vụ này sẽ được thăm dò mỗi %d khoảng.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Tên đúng của máy phục vụ là %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Máy này sẽ không được truy vấn khi chưa xác định máy nào.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Máy này sẽ được truy vấn khi chưa xác định máy nào.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "  Sẽ nhắc với mật khẩu.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Bí mất APOP = « %s ».\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  ID RPOP = « %s ».\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mật khẩu = « %s ».\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Giao thức là KPOP cùng với sự xác thực Kerberos %s"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Giao thức là %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (dùng dịch vụ %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (dùng cổng mặc định)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (buộc dùng UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Sẽ cố dùng mọi phương pháp xác thực sẵn sàng.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức bằng mật khẩu.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức MSN.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức NTLM.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức OTP.\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức CRAM-Md5.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức GSSAPI.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức Kerberos V4.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Sẽ buộc xác thức Kerberos V5.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  GIả sử sự mật mã cuối đến cuối.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Điều chính trong dịch vụ thư là : %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Phiên chạy đã mật mã bằng SSL đã được bật.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Giao thức SSL: %s\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Khả năng kiểm tra chứng nhận máy phục vụ SSL đã được bật.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Thư mục chứng nhận đáng tin SSL: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Tên Chung trình phục vụ: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Vân tay khoá SSL (so sánh với khoá máy phục vụ): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Thời hạn không đáp ứng của máy phục vụ là %d giây"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (mặc định).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr "  Hộp thư mặc định đã được chọn.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr "  Các hộp thư đã chọn là :"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Mọi thư sẽ được lấy (« --all » bật).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Chỉ thư mới sẽ được lấy (« --all » tắt).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Các thư đã lấy sẽ được giữ lại trên máy phục vụ (« --keep » bật).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
-msgstr "  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (« --keep » tắt).\n"
+msgstr ""
+"  Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (« --keep » tắt).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  Các thư cũ sẽ được xoá sạch trước khi lấy thư (« --flush » bật).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr "  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (« --flush » tắt).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr ""
+"  Các thư cũ sẽ không được xoá sạch trước khi lấy thư (« --flush » tắt).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-msgstr "  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (« --limitflush » bật).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
+msgstr ""
+"  Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (« --limitflush » "
+"bật).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-msgstr "  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (« --limitflush » tắt).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
+msgstr ""
+"  Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (« --limitflush » "
+"tắt).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (« --norewrite » tắt).\n"
+msgstr ""
+"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (« --"
+"norewrite » tắt).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr "  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (« --norewrite » bật).\n"
+msgstr ""
+"  Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (« --"
+"norewrite » bật).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
-msgstr "  Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được bật (« stripcr » bật).\n"
+msgstr ""
+"  Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được bật (« stripcr » bật).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
-msgstr "  Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được tắt (« stripcr » tắt).\n"
+msgstr ""
+"  Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được tắt (« stripcr » tắt).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Việc buộc ký tự về đầu dòng đã được bật (« forcecr » bật).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Việc buộc ký tự về đầu dòng đã được tắt (« forcecr » tắt).\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truyền) đã được tắt (« pass8bits » bật).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr ""
+"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
+"truyền) đã được tắt (« pass8bits » bật).\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr "  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truyền) đã được bật (« pass8bits » tắt).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr ""
+"  Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được "
+"truyền) đã được bật (« pass8bits » tắt).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Khả năng giải mã MIME đã được bật (« mimedecode » bật).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Khả năng giải mã MIME đã được tắt (« mimedecode » tắt).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được bật (nghỉ bật).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Nghỉ sau khi việc thăm dò được tắt (nghỉ tắt).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Các dòng Trạng thái sẽ được hủy (« dropstatus » bật).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Các dòng Status (Trạng thái) sẽ được giữ (« dropstatus » tắt).\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr "  Các dòng Delivered-To (Được phát cho) sẽ được hủy (« dropdelivered » bật).\n"
+msgstr ""
+"  Các dòng Delivered-To (Được phát cho) sẽ được hủy (« dropdelivered » "
+"bật).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr "  Các dòng Delivered-To (Được phát cho) sẽ được giữ (« dropdelivered » tắt).\n"
+msgstr ""
+"  Các dòng Delivered-To (Được phát cho) sẽ được giữ (« dropdelivered » "
+"tắt).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Giới hạn kích cỡ thư là %d octet (« --limit » %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư (« --limit » 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Khoảng cảnh báo kích cỡ thư là %d giây (« --warnings » %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Cảnh báo về kích cỡ mỗi lần thăm dò (« --warnings » 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Giới hạn thư đã nhận là %d (« --fetchlimit » %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Không có giới hạn thư đã nhận (« --fetchlimit » 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Giới hạn kích cỡ thư lấy là %d (« (--fetchsizelimit » %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Không có giới hạn kích cỡ thư lấy (« (--fetchsizelimit » 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr "  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (« --fastuidl » 1).\n"
+msgstr ""
+"  Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (« --fastuidl » 1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr "  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (« --fastuidl » %d).\n"
+msgstr ""
+"  Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (« --fastuidl "
+"» %d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr "   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (« --fastuidl » 0).\n"
+msgstr ""
+"   Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (« --fastuidl » 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Giới hạn bó thư SMTP là %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Không có giới hạn bó thư SMTP (« --batchlimit » 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr "  Khoảng xoá bỏ giữa hai lần xoá hẳn đã được buộc thành %d (« --expunge » %d).\n"
+msgstr ""
+"  Khoảng xoá bỏ giữa hai lần xoá hẳn đã được buộc thành %d (« --expunge » %"
+"d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Không có việc xoá hẳn đã buộc) (« --expunge » 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Các miền cho đó sẽ lấy thư là :"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (mặc định)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Các thư sẽ được phụ thêm vào %s là BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Các thư sẽ được phát bằng « %s ».\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Các thư sẽ được chuyển tiếp %cMTP tới :"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Phần máy của dòng MAIL FROM (thư từ) sẽ là %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Địa chỉ cần chèn vào dòng RCPT TO được gởi cho SMTP sẽ là %s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Các đáp ứng chặn thư rác đã nhận diện của bộ lắng nghe là :"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr "  Khả năng chặn thư rác được tắt\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được tạo bằng « %s ».\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr "  Không có lệnh tiền kết nối.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Sự kết nối đến máy phục vụ sẽ được đóng bằng « %s ».\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr "  Không có lệnh hậu kết nối.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr "  Chưa xác định tên cục bộ (localname) cho máy này.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr "  Chế độ đa thả : "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr "  Chế độ thả đơn: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "Chấp nhân %d tên cục bộ.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được bật.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  Khả năng tra tìm DNS cho địa chỉ đa thả đã được tắt.\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr ""
+"  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo tên.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Khả năng định tuyến phong bì-địa chỉ đã được tắt\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Giả sử dòng đầu phong bì là : %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Số dòng đầu phong bì cần bỏ qua : %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Tiền tố %s sẽ được gỡ bỏ ra ID người dùng\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr "  Không gỡ bỏ tiền tố\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Các bí danh trình phục vụ thư xác định sẵn:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr "  Miền cục bộ :"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Phải kết nối qua giao diện %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr "  Chưa xác định giao diện cần thiết.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Vòng lặp thăm dò sẽ theo dõi %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr "  Chưa xác định giao diện theo dõi.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Sẽ kết nối đến máy phục vụ bằng bộ cầm phít %s (« --plugin » %s).\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr "  Chưa xác định lệnh bộ cầm phít.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Sẽ kết nối lắng nghe bằng bộ kéo phít %s (« --plugout » %s).\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr "  Chưa xác định lệnh bộ kéo phít.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Không có UID được lưu từ máy này.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UID đã được lưu.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
-msgstr "  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
+msgstr ""
+"  Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu « Received ».\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Tài sản gởi qua « %s ».\n"
@@ -1587,85 +1680,90 @@ msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "sẽ nghỉ sau khi thăm dò\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: việc nâng cấp lên TLS đã thành công.\n"
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: việc nâng cấp lên TLS bị lỗi.\n"
 
-#: imap.c:454
+#: imap.c:459
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
+msgstr ""
+"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
-msgstr "Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
+msgstr ""
+"Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
 
-#: imap.c:662
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ngờ)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "việc thăm dò lại bị lỗi\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lại\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "việc chọn hộp thư bị lỗi\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "việc xoá hẳn bị lỗi\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d thư đợi sau khi xoá hẳn\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "việc tìm kiếm các thư chưa xem bị lỗi\n"
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu chưa xem\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u là thư đầu chưa xem\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr "Cảnh báo : đang bỏ qua dữ liệu giả về kích cỡ các thư bị máy phục vụ trả về.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr ""
+"Cảnh báo : đang bỏ qua dữ liệu giả về kích cỡ các thư bị máy phục vụ trả "
+"về.\n"
 
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1857,374 +1955,418 @@ msgstr "recv (nhận) của máy phục vụ là nghiêm trọng\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Không thể giải mã yêu cầu OTP\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "Cụm từ mật khẩu bí mật: "
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Chuỗi « %s » không phải là một chuỗi số hợp lệ.\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Giá trị của chuỗi « %s » là %s hơn %d.\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "nhỏ hơn"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "lớn hơn"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Xác định giao thức « %s » không hợp lệ.\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Xác định sự xác thực « %s » không hợp lệ.\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [các_tùy_chọn] [máy phục vụ ...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  Các tùy chọn có sẵn:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        hiển thì _trợ giúp_ này về tùy chọn\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version       hiển thị thông tin _phiên bản_\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       _kiểm tra_ có thư mới, không lấy gì\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent                 không xuất chi tiết (_im_)\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose                xuất _chi tiết_ chẩn đoán\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      chạy là _trình nền_ một lần trong n giây\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    _không tách rời_ tiến trình nền\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        buộc tiến trình nền _thoát_\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     xác định tên _tập tin ghi lưu_\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr ""
-"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn thông điệp\n"
+"      --syslog      dùng syslog(3) (bản ghi hệ thống) để ghi lưu phần lớn "
+"thông điệp\n"
 "\t\t\t\ttrong khi chạy là trình nền\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
-"      --invisible   không ghi Received (dòng đầu Đã nhận) và bật khả năng ẩn máy đúng)\n"
+"      --invisible   không ghi Received (dòng đầu Đã nhận) và bật khả năng ẩn "
+"máy đúng)\n"
 "\t\t\t\t(_vô hình_)\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr "  -f, --fetchmailrc \t\txác định tập tin _điều khiển chạy_ (rc) xen kẽ\n"
+msgstr ""
+"  -f, --fetchmailrc \t\txác định tập tin _điều khiển chạy_ (rc) xen kẽ\n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
-msgstr "  -i, --idfile      xác định _tập tin nhận diện_ người dùng (UID) xen kẽ\n"
+msgstr ""
+"  -i, --idfile      xác định _tập tin nhận diện_ người dùng (UID) xen kẽ\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr "      --pidfile     xác định _tập tin nhận diện tiến trình_ (PID) (khoá) xen kẽ\n"
+msgstr ""
+"      --pidfile     xác định _tập tin nhận diện tiến trình_ (PID) (khoá) xen "
+"kẽ\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
-msgstr "      --postmaster  xác định người nhận cuối cùng (_giám đốc sở bưu điện_)\n"
+msgstr ""
+"      --postmaster  xác định người nhận cuối cùng (_giám đốc sở bưu điện_)\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    chuyển tiếp các thư nảy về từ người dùng\n"
 "\t\t\t\tsang giám đốc sở bưu điện (_không nảy_)\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   đặc tả cần thiết _giao diện_\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     _theo dõi_ hoạt động trên giao diện\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         bật phiên chạy đã mật mã bằng SSL\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      tập tin _khoá SSL_ riêng\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     _chứng nhận_ ứng dụng khách SSL\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr "      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên dùng)\n"
+msgstr ""
+"      --sslcertck   _kiểm tra_ chặt chẽ _chứng nhận SSL_ máy phục vụ (khuyên "
+"dùng)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath \t_đường dẫn đến các chứng nhận SSL_\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
 msgstr ""
 "      --sslfingerprint \t_vân tay SSL_ phải khớp điều trong chứng nhận\n"
 "\t\t\t\t\t\tcủa máy phục vụ\n"
 
-#: options.c:615
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    buộc dùng _giao thức SSL_ (SSL2/SSL3/TLS1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
-msgstr "      --plugin      xác định lệnh bên ngoài để mở kết nối (_bộ cầm phít_)\n"
+msgstr ""
+"      --plugin      xác định lệnh bên ngoài để mở kết nối (_bộ cầm phít_)\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr "      --plugout     xác định lệnh bên ngoài để mở kết nối SMTP (_bộ kéo phít_)\n"
+msgstr ""
+"      --plugout     xác định lệnh bên ngoài để mở kết nối SMTP (_bộ kéo "
+"phít_)\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr "  -p, --protocol    xác định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
+msgstr ""
+"  -p, --protocol    xác định _giao thức_ lấy thư (xem trang hướng dẫn)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        buộc dùng UIDL (chỉ pop3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr "      --port        _cổng_ TCP nơi cần kết nối (quá cũ, hãy dùng « --service »)\n"
+msgstr ""
+"      --port        _cổng_ TCP nơi cần kết nối (quá cũ, hãy dùng « --service "
+"»)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr "  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP số)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+"  -P, --service     _dịch vụ_ TCP nơi cần kết nối (có thể có dạng cổng TCP "
+"số)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        kiểu _xác thực_ (mật khẩu/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     _thời hạn_ máy phục vụ không đáp ứng\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    dòng đầu địa chỉ _phong bì_\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
-"  -Q, --qvirtual    tiền tố cần gỡ bỏ ra mã nhận diện người dùng (UID) cục bộ\n"
+"  -Q, --qvirtual    tiền tố cần gỡ bỏ ra mã nhận diện người dùng (UID) cục "
+"bộ\n"
 "\t\t\t\t(_q ảo_)\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   _điều chính_ dịch vụ thư\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  thêm thông tin _tìm đường thăm dò_\n"
 "\t\t\t\tvào dòng đầu Received (Đã nhận)\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    xác định _tên người dùng_ trên máy phục vụ\n"
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  _lấy mọi_ thư : cả cũ lẫn mới\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      xoá bỏ các thư mới sau khi lấy (_không giữ_)\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        lưu các thư mới sau khi lấy (_giữ_)\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       xoá bỏ các thư cũ ra máy phục vụ (_xoá sạch_)\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  xoá bỏ các thư quá lớn (_xoá sạch đã hạn chế_)\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   _không ghi lại_ các địa chỉ dòng đầu\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr "  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
+msgstr ""
+"  -l, --limit       không lấy thư nào lớn hơn kích cỡ đưa ra (_hạn chế_)\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    khoảng giữa hai lần thông báo thư _cảnh báo_\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    đặt _máy_ chuyển tiếp SMTP\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr "      --fetchdomains \t_lấy_ thư chỉ cho _những miền_ đã xác định này\n"
+msgstr ""
+"      --fetchdomains \t_lấy_ thư chỉ cho _những miền_ đã xác định này\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress \tđặt _miền_ phát thư SMTP cần dùng (_địa chỉ_)\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    đặt tên đầy đủ SMTP <tên_người_dùng@miền>\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   đặt các giá trị đáp ứng _chống thư rác_\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  \tđặt _hạn chế bó_ thư cho sự kết nối SMTP\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr "  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
+msgstr ""
+"  -B, --fetchlimit  \tđặt _hạn chế lấy_ thư cho sự kết nối máy phục vụ\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit \tđặt _hạn chế kích cỡ_ thư khi _lấy_ thư\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    tìm kiếm UIDL một cách nhị phân (_nhanh_)\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr "  -e, --expunge     đặt số thư đã xoá bỏ tối đa giữa hai lần _xoá hẳn_\n"
+msgstr ""
+"  -e, --expunge     đặt số thư đã xoá bỏ tối đa giữa hai lần _xoá hẳn_\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         đặt MDA cần dùng để chuyển tiếp thư\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       đặt tập tin xuất BSMTP\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        dùng LMTP (RFC2033) để phát thư\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      xác định tên _thư mục_ từ xa\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr "      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
+msgstr ""
+"      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-msgstr "Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR thay vào TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
+msgstr ""
+"Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR "
+"thay vào TOP.\n"
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr "Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối lệnh CAPA.\n"
+msgstr ""
+"Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối "
+"lệnh CAPA.\n"
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "Còn lệnh CAPA cần thiết cho TLS.\n"
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục.\n"
+msgstr ""
+"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp "
+"tục.\n"
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "Hết các bộ xác thực được phép nên không thể tiếp tục.\n"
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Không tìm thấy nhãn thời gian APOP cần thiết trong lời chào mừng\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gặp lỗi cú pháp nhãn thời gian trong lời chào mừng\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "Nhãn giờ APOP không hợp lệ.\n"
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
-msgstr "Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
+msgstr ""
+"Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n"
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n"
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n"
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (số=%d) đã được xoá bỏ, nhưng còn có.\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u chưa xem\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr "Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp này.\n"
+msgstr ""
+"Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp "
+"này.\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "lỗi giao thức\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Không hỗ trợ tùy chọn « --folder » (thư mục) với POP3\n"
 
@@ -2237,32 +2379,41 @@ msgid "SDPS not enabled."
 msgstr "Chưa bật SDPS."
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: tùy chọn giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: tùy chọn giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và "
+"FreeBSD (kiểu UNIX)\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-msgstr "fetchmail: tùy chọn theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
+msgstr ""
+"fetchmail: tùy chọn theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và "
+"FreeBSD (kiểu UNIX)\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "Chưa bật SSL"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "kết thúc kết nhập"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Tập tin %s phải là một tập tin chuẩn.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
-msgstr "Không cho phép tập tin %s có quyền hạn lớn hơn « -rws--x--- » (0710).\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+msgstr ""
+"Không cho phép tập tin %s có quyền hạn lớn hơn « -rws--x--- » (0710).\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Tập tin %s phải bị bạn sở hữu.\n"
@@ -2569,8 +2720,11 @@ msgstr "MDA đã trả về trạng thái không phải số không %d\n"
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý tại %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr ""
+"Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý "
+"tại %s:%d\n"
 
 #: sink.c:1377
 msgid "Message termination or close of BSMTP file failed\n"
@@ -2659,7 +2813,9 @@ msgstr "Lỗi getaddrinfo(\"%s\",\"%s\"): %s\n"
 
 #: socket.c:285
 msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr "Hãy cố thêm tùy chọn « --service » (dịch vụ) (xem cũng mục FAQ [Hỏi Đáp] R12).\n"
+msgstr ""
+"Hãy cố thêm tùy chọn « --service » (dịch vụ) (xem cũng mục FAQ [Hỏi Đáp] "
+"R12).\n"
 
 #: socket.c:296 socket.c:299
 #, c-format
@@ -2689,113 +2845,114 @@ msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
 msgid "connected.\n"
 msgstr "đã kết nối.\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Tổ chức phát hành: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Cảnh báo : tên Tổ chức Phát hành quá dài (có thể bị cắt xén).\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "Không biết Tổ chức\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Tên Chung phát hành: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Cảnh báo : Tên Chung nhà phát hành quá dài (có thể bị cắt xén).\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "Không biết Tên Chung nhà phát hành\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Tên Chung trình phục vụ: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Chứng nhận sai: Tên Chung Chủ đề quá dài.\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Tên Chung máy phục vụ không khớp: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Chpa đặt tên máy phục vụ nên không thể thẩm tra chứng nhận.\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "Không biết Tên Chung máy phục vụ\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "Không xác định tên máy phục vụ trong chứng nhận.\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() bị lỗi.\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "Hết bộ nhớ.\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Bộ đệm digest quá nhỏ.\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Vân tay khoá %s: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Vân tay khoá %s trùng.\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Vân tay khoá %s không trùng.\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Lỗi thẩm tra chứng nhận máy phục vụ : %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "không biết nhà phát hành (%d ký tự đầu): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "Bộ mô tả tập tin ở ngoại phạm vị SSL"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "Xác định giao thức SSL không hợp lệ « %s » nên dùng mặc định (SSLv23).\n"
+msgstr ""
+"Xác định giao thức SSL không hợp lệ « %s » nên dùng mặc định (SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Việc thẩm tra chứng nhận/vân tay bị bỏ qua vì lý do nào.\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "Việc cố lại đọc ổ cắm Cygwin\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Việc cố lại đọc ổ cắm Cygwin bị lỗi.\n"
 
@@ -2924,30 +3081,31 @@ msgstr "không trao đổi danh sách UID, chưa xem UID trong việc truy vấn
 msgid "discarding new UID list\n"
 msgstr "đang hủy danh sách UID mới...\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "Đang xoá bỏ tập tin fetchids (lấy các ID)...\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Gặp lỗi khi xoá bỏ %s: %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "Đang ghi tập tin fetchids (lấy các ID)...\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr "Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
+msgstr ""
+"Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Không thể đổi tên tập tin  fetchids (lấy các ID) %s thành %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Không thể mở tập tin  fetchids (lấy các ID) %s để ghi: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76421a7c..ed5c2837 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-30 09:56+0200\n"
+"POT-Creation-Date: 2008-06-30 15:43+0200\n"
 "PO-Revision-Date: 2008-02-23 15:37+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,89 +104,93 @@ msgstr "( 长度 -1)"
 msgid " (oversized)"
 msgstr "(超大)"
 
-#: driver.c:591
+#: driver.c:594
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "无法获取邮件头，邮件 %s@%s:%d (%d 字节)\n"
 
-#: driver.c:608
+#: driver.c:611
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "读取 %1$s@%2$s:%4$d 封中的 %3$d 封邮件"
 
-#: driver.c:613
+#: driver.c:616
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d 字节)"
 
-#: driver.c:614
+#: driver.c:617
 #, c-format
 msgid " (%d header octets)"
 msgstr "(邮件头 %d 字节)"
 
-#: driver.c:682
+#: driver.c:685
 #, c-format
 msgid " (%d body octets)"
 msgstr "(邮件内容 %d 字节)"
 
-#: driver.c:743
+#: driver.c:746
 #, c-format
-msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid ""
+"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "%s@%s:%d 邮件非所需大小 (实际 %d 字节!= 所要求的 %d 字节)\n"
 
-#: driver.c:774
+#: driver.c:777
 msgid " retained\n"
 msgstr "已保留\n"
 
-#: driver.c:784
+#: driver.c:787
 msgid " flushed\n"
 msgstr "已删除\n"
 
-#: driver.c:801
+#: driver.c:804
 msgid " not flushed\n"
 msgstr "未删除\n"
 
-#: driver.c:819
+#: driver.c:822
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgid_plural ""
+"fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "到达收件上限 %d；%d 封邮件留在服务器 %s 帐号为 %s\n"
 
-#: driver.c:876
+#: driver.c:879
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "等待连接服务器 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:880
+#: driver.c:883
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "等待服务器 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:884
+#: driver.c:887
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "等待 %2$s %1$d 秒后超时。\n"
 
-#: driver.c:889
+#: driver.c:892
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "等待接收端 %d 秒无响应超时。\n"
 
-#: driver.c:892
+#: driver.c:895
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "等待 %d 秒后超时。\n"
 
-#: driver.c:904
+#: driver.c:907
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "主题: fetchmail 发现反复超时"
 
-#: driver.c:907
+#: driver.c:910
 #, c-format
-msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgid ""
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
+"s.\n"
 msgstr "Fetchmail 尝试从 %2$s@%3$s 收取邮件时发现多于 %1$d 次超时。\n"
 
-#: driver.c:911
+#: driver.c:914
 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,73 +205,73 @@ msgstr ""
 "\n"
 "Fetchmail 不会再查寻此邮箱中的邮件，除非您重启\n"
 
-#: driver.c:936
+#: driver.c:939
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "预连接命令失败，返回状态 %d\n"
 
-#: driver.c:960
+#: driver.c:963
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "HESIOD pobox 中找不到 %s\n"
 
-#: driver.c:981
+#: driver.c:984
 msgid "Lead server has no name.\n"
 msgstr "主服务器无名字。\n"
 
-#: driver.c:1005
+#: driver.c:1008
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "无法找到规范的 %s (%s) 的 DNS 名称： %s\n"
 
-#: driver.c:1052
+#: driver.c:1055
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s 连接至 %s 时失败"
 
-#: driver.c:1068
+#: driver.c:1071
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "主题: Fetchmail 警告，找不到服务器。"
 
-#: driver.c:1070
+#: driver.c:1073
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail 不能找到邮件服务器 %s:"
 
-#: driver.c:1096
+#: driver.c:1101
 msgid "SSL connection failed.\n"
 msgstr "SSL 连接失败。\n"
 
-#: driver.c:1149
+#: driver.c:1154
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "%s@%s 出现死锁错误\n"
 
-#: driver.c:1153
+#: driver.c:1158
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s 出现服务器繁忙错误\n"
 
-#: driver.c:1158
+#: driver.c:1163
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s 出现授权失败错误\n"
 
-#: driver.c:1161
+#: driver.c:1166
 msgid " (previously authorized)"
 msgstr "(事先已授权)"
 
-#: driver.c:1182
+#: driver.c:1187
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "主题: fetchmail 在 %s@%s 上验证失败"
 
-#: driver.c:1186
+#: driver.c:1191
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail 无法从 %s@%s 中获取邮件。\n"
 
-#: driver.c:1190
+#: driver.c:1195
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -279,7 +284,7 @@ msgstr ""
 "提示信息，因此这可能是另一种错误情况(比如服务器忙)，从而导致\n"
 " fetchmail 无法区分这些错误。"
 
-#: driver.c:1196
+#: driver.c:1201
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -297,7 +302,7 @@ msgstr ""
 "fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非\n"
 "服务重置，否则它不会再发送任何提示信息了。"
 
-#: driver.c:1206
+#: driver.c:1211
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -315,164 +320,164 @@ msgstr ""
 "fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非服务\n"
 "重置，否则它不会再发送任何提示信息了。"
 
-#: driver.c:1222
+#: driver.c:1227
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "立即从 %s@%s 中重新收件\n"
 
-#: driver.c:1227
+#: driver.c:1232
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s 有未知的登录或验证错误\n"
 
-#: driver.c:1251
+#: driver.c:1256
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "验证正确 %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1262
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "主题: fetchmail 验证正确 %s@%s"
 
-#: driver.c:1261
+#: driver.c:1266
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail 可登录 %s@%s。\n"
 
-#: driver.c:1265
+#: driver.c:1270
 msgid "Service has been restored.\n"
 msgstr "服务已经被重置。\n"
 
-#: driver.c:1297
+#: driver.c:1302
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "正在选择或重新检索邮箱 %s\n"
 
-#: driver.c:1299
+#: driver.c:1304
 msgid "selecting or re-polling default folder\n"
 msgstr "正在选择或重检默认邮箱\n"
 
-#: driver.c:1311
+#: driver.c:1316
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s 在 %s (邮箱 %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1319 rcfile_y.y:382
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
 
-#: driver.c:1319
+#: driver.c:1324
 #, c-format
 msgid "Polling %s\n"
 msgstr "正在检取 %s\n"
 
-#: driver.c:1323
+#: driver.c:1328
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%4$s 有 %1$d 封邮件 (%2$d %3$s)"
 
-#: driver.c:1326
+#: driver.c:1331
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "已读"
 
-#: driver.c:1329
+#: driver.c:1334
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%2$s 有 %1$d 封邮件"
 
-#: driver.c:1336
+#: driver.c:1341
 #, c-format
 msgid " (%d octets).\n"
 msgstr "(%d 字节)。\n"
 
-#: driver.c:1342
+#: driver.c:1347
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s 无邮件\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1380 imap.c:90
 msgid "bogus message count!"
 msgstr "发现无效邮件！"
 
-#: driver.c:1517
+#: driver.c:1522
 msgid "socket"
 msgstr "套接口"
 
-#: driver.c:1520
+#: driver.c:1525
 msgid "missing or bad RFC822 header"
 msgstr "未找到或错误的 RFC822 协议头"
 
-#: driver.c:1523
+#: driver.c:1528
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1531
 msgid "client/server synchronization"
 msgstr "客户端/服务器同步"
 
-#: driver.c:1529
+#: driver.c:1534
 msgid "client/server protocol"
 msgstr "客户端/服务器协议"
 
-#: driver.c:1532
+#: driver.c:1537
 msgid "lock busy on server"
 msgstr "服务器死锁"
 
-#: driver.c:1535
+#: driver.c:1540
 msgid "SMTP transaction"
 msgstr "处理 SMTP"
 
-#: driver.c:1538
+#: driver.c:1543
 msgid "DNS lookup"
 msgstr "查询 DNS"
 
-#: driver.c:1541
+#: driver.c:1546
 msgid "undefined"
 msgstr "未定义"
 
-#: driver.c:1547
+#: driver.c:1552
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "从 %2$s@%3$s 收邮件并投递至 SMTP 主机 %4$s 时出现错误 %1$s\n"
 
-#: driver.c:1549
+#: driver.c:1554
 msgid "unknown"
 msgstr "未知"
 
-#: driver.c:1551
+#: driver.c:1556
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "从 %2$s@%3$s 收件时产生错误 %1$s\n"
 
-#: driver.c:1562
+#: driver.c:1567
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "连接后执行程序失败，错误代码 %d\n"
 
-#: driver.c:1581
+#: driver.c:1586
 msgid "Kerberos V4 support not linked.\n"
 msgstr "未连接 Kerberos V4 支持\n"
 
-#: driver.c:1589
+#: driver.c:1594
 msgid "Kerberos V5 support not linked.\n"
 msgstr "未连接 Kerberos V5 支持\n"
 
-#: driver.c:1600
+#: driver.c:1605
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "%s 不支持 --flush 选项\n"
 
-#: driver.c:1606
+#: driver.c:1611
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "%s 不支持 --all 选项\n"
 
-#: driver.c:1615
+#: driver.c:1620
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "%s 不支持 --limit 选项\n"
@@ -497,7 +502,8 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
+"headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -529,7 +535,8 @@ msgstr "无法在主机数据库中找到自己的主机来验证它！\n"
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
+"problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "正在尝试用未验证的主机名继续操作。\n"
@@ -601,14 +608,17 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "ETRN 不支持 --check 选项\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Wilson\n"
 "Copyright (C) 2005-2006 Sunil Shetye\n"
 "Copyright (C) 2005-2007 Matthias Andree\n"
 
@@ -680,13 +690,17 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %d 终止\n"
 
 #: fetchmail.c:472
-msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgid ""
+"fetchmail: can't check mail while another fetchmail to same host is "
+"running.\n"
 msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
 
 #: fetchmail.c:478
 #, c-format
-msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr "fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
+msgid ""
+"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr ""
+"fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
 
 #: fetchmail.c:485
 #, c-format
@@ -694,7 +708,8 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %d 正在运行。\n"
 
 #: fetchmail.c:495
-msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid ""
+"fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
 
 #: fetchmail.c:501
@@ -735,760 +750,780 @@ msgstr "开启 fetchmail %s 后台服务\n"
 msgid "could not open %s to append logs to \n"
 msgstr "无法打开 %s 添加记录\n"
 
-#: fetchmail.c:630
+#: fetchmail.c:612
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:634
 #, fuzzy, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "无法时限检测 %s (错误号 %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:639
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "正在重启 fetchmail (%s 改变了)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:644
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "由于目录尚未重置，因此重新执行的尝试可能失败\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:671
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "重新执行 fetchmail 的尝试失败了\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:701
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:713
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "时间间隔未到，不查寻 %s \n"
 
-#: fetchmail.c:761
+#: fetchmail.c:751
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "查询状态=0 (成功)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:753
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "查询状态=1 (无邮件)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:755
 msgid "Query status=2 (SOCKET)\n"
 msgstr "查询状态=2 (套接字输入输出错误)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:757
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "查询状态=3 (用户验证失败)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:759
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "查询状态=4 (协议无效)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:761
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "查询状态=5 (命令行语法错误)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:763
 msgid "Query status=6 (IOERR)\n"
 msgstr "查询状态=6 (配置文件权限错误)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:765
 msgid "Query status=7 (ERROR)\n"
 msgstr "查询状态=7 (协议错误)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:767
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "查询状态=8 (客户端受到排斥)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:769
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "查询状态=9 (服务器死锁)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:771
 msgid "Query status=10 (SMTP)\n"
 msgstr "查询状态=10 (SMTP 错误)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:773
 msgid "Query status=11 (DNS)\n"
 msgstr "查询状态=11 (DNS 错误)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:775
 msgid "Query status=12 (BSMTP)\n"
 msgstr "查询状态=12 (无法打开批量输出)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:777
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "查询状态=13 (到达收件上限)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:779
 #, c-format
 msgid "Query status=%d\n"
 msgstr "查询状态=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:821
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "所有连接堵塞。退出\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:828
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "在 %s 休眠 %d 秒\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:852
 #, c-format
 msgid "awakened by %s\n"
 msgstr "通过信号 %s 唤醒\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:855
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "通过信号 %d 唤醒\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:862
 #, c-format
 msgid "awakened at %s\n"
 msgstr "在 %s 被唤醒\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:868
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1021
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1054
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1087
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1209
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 支持未编译在内\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1216
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1222
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1228
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "设置了 GSSAPI 支持，但未编译在内\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1258
 #, c-format
-msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid ""
+"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1269
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1270
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1287
 #, c-format
-msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "fetchmail: %s 配置无效，为服务或端口指定大于零的端口\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1294
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1312
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1326
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1351
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1424
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%1$s 在 %4$s 查寻 %2$s (协议 %3$s): 收件开始\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1449
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1461
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1471
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1477
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1485
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1492
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1502
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%1$s 在 %4$s 查询 %2$s (协议 %3$s): 收件完成\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1519
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1521
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1523
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1526
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1529
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1531
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1533
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1537
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1539
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1546
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1550
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr " 邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1553
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "每隔 %d 秒将收取此服务器中的邮件\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1557
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr " 服务器的实名为 %s。\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1560
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr " 若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1561
 msgid "  This host will be queried when no host is specified.\n"
 msgstr " 若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1565
 msgid "  Password will be prompted for.\n"
 msgstr "密码会被提示\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1569
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr " APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1572
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr " RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1575
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr " 密码 = “%s”\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1584
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1587
 #, c-format
 msgid "  Protocol is %s"
 msgstr " 协议是 %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1589
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1591
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1593
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1599
 msgid "  All available authentication methods will be tried.\n"
 msgstr " 将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1602
 msgid "  Password authentication will be forced.\n"
 msgstr " 强制密码验证\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1605
 msgid "  MSN authentication will be forced.\n"
 msgstr " 强制 MSN 验证\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1608
 msgid "  NTLM authentication will be forced.\n"
 msgstr " 强制 NTLM 验证\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1611
 msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验证\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1614
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr " 强制 CRAM-Md5 验证\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1617
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr " 强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1620
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr " 强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1623
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " 强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1626
 msgid "  End-to-end encryption assumed.\n"
 msgstr " 假设为终端到终端加密\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1630
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr " 邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1633
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "启用 SSL 加密会话\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1635
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr " SSL 协议: %s\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1637
 msgid "  SSL server certificate checking enabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1639
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1642
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "服务器通用名: %s\n"
+
+#: fetchmail.c:1644
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1647
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr " 服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1649
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1656
 msgid "  Default mailbox selected.\n"
 msgstr " 已选中默认邮箱。\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1661
 msgid "  Selected mailboxes are:"
 msgstr " 选中的邮箱是:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1667
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr " 收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1668
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr " 只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1670
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1671
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1673
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1685
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1674
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1687
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+#: fetchmail.c:1676
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1688
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+#: fetchmail.c:1677
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1679
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1680
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1682
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr " 回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1683
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr " 不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1685
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1686
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1699
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1688
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1700
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1689
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1691
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1692
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1694
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr " 收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1695
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1697
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1698
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1700
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1701
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1705
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1708
 msgid "  No message size limit (--limit 0).\n"
 msgstr " 邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1710
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1713
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1716
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1719
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr " 无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1721
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1724
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1728
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1730
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr " 每 %2$d 次收件中有 %1$d 次对 UIDs 进行折半查找 (--fastuidl %3$d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1733
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1735
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1737
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1741
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1743
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1750
 msgid "  Domains for which mail will be fetched are:"
 msgstr " 要收取的邮件位于服务器:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1755 fetchmail.c:1775
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1760
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr " 邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1762
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr " 邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1769
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr " 邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1780
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1783
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr " RCPT TO 这一行中将要被送往 SMTP 的地址是　%s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1792
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1809
+#: fetchmail.c:1798
 msgid "  Spam-blocking disabled\n"
 msgstr " 关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1801
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1804
 msgid "  No pre-connection command.\n"
 msgstr " 无连接前要执行的程序。\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1806
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1809
 msgid "  No post-connection command.\n"
 msgstr " 无连接后要执行的程序。\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1812
 msgid "  No localnames declared for this host.\n"
 msgstr " 此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1822
 msgid "  Multi-drop mode: "
 msgstr " 多投模式: "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1824
 msgid "  Single-drop mode: "
 msgstr " 单投模式: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1826
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1841
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr " 启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1842
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1857
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1846
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1848
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr " 服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1851
 msgid "  Envelope-address routing is disabled\n"
 msgstr " 禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1854
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr " 邮件头假定为: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1857
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr " 跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1860
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr " 将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1863
 msgid "  No prefix stripping\n"
 msgstr " 没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1870
 msgid "  Predeclared mailserver aliases:"
 msgstr " 预先声明的邮件服务器昵称: "
 
-#: fetchmail.c:1890
+#: fetchmail.c:1879
 msgid "  Local domains:"
 msgstr " 本地域:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1889
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr " 必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1891
 msgid "  No interface requirement specified.\n"
 msgstr " 未指定地址要求。\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1893
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr " 收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1895
 msgid "  No monitor interface specified.\n"
 msgstr " 未指定监听地址。\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1899
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1901
 msgid "  No plugin command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1903
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1905
 msgid "  No plugout command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1910
 msgid "  No UIDs saved from this host.\n"
 msgstr " 未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1919
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr " 保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1927
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1929
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1496,7 +1531,7 @@ msgstr ""
 " 无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1932
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1586,84 +1621,85 @@ msgstr "协议被识别为 IMAP2 或 IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "收件后恢复至 idle 模式\n"
 
-#: imap.c:441 pop3.c:505
+#: imap.c:446 pop3.c:518
 #, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
 msgstr "%s: 成功升级至 TLS 协议。\n"
 
-#: imap.c:450 pop3.c:514
+#: imap.c:455 pop3.c:527
 #, c-format
 msgid "%s: upgrade to TLS failed.\n"
 msgstr "%s: 升级至 TLS 协议失败。\n"
 
-#: imap.c:454
+#: imap.c:459
 #, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
 msgstr "%s: 升级至 TLS 失败，继续尝试\n"
 
-#: imap.c:565
+#: imap.c:570
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "需要的 OTP 功能未被编译进 fetchmail\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:592 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "需要的 NTLM 功能未被编译进 fetchmail\n"
 
-#: imap.c:596
+#: imap.c:601
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "需要的 LOGIN 功能未被编译进 fetchmail\n"
 
-#: imap.c:662
+#: imap.c:667
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "邮件删除数不相等 (实际删除 %d 封!= 已删除 %d 封)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:773 imap.c:832
 msgid "re-poll failed\n"
 msgstr "重新收件失败\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:781 imap.c:837
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "重新收件后又有 %d 封邮件等待收取\n"
 
-#: imap.c:793
+#: imap.c:798
 msgid "mailbox selection failed\n"
 msgstr "邮箱选择失败\n"
 
-#: imap.c:797
+#: imap.c:802
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "首次收件后又有 %d 封邮件等待收取\n"
 
-#: imap.c:811
+#: imap.c:816
 msgid "expunge failed\n"
 msgstr "删除操作失败\n"
 
-#: imap.c:815
+#: imap.c:820
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "删除操作后有 %d 封邮件等待收取\n"
 
-#: imap.c:857
+#: imap.c:862
 msgid "search for unseen messages failed\n"
 msgstr "查找未读邮件失败\n"
 
-#: imap.c:885
+#: imap.c:890
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu 封未读\n"
 
-#: imap.c:897 pop3.c:876
+#: imap.c:902 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
-#: imap.c:988
-msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+#: imap.c:993
+msgid ""
+"Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
 
 #: interface.c:256
@@ -1856,362 +1892,374 @@ msgstr "服务器 recv 错\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "无法解码 OTP 请求\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:610
 msgid "Secret pass phrase: "
 msgstr "密码短语:"
 
-#: options.c:166 options.c:210
+#: options.c:168 options.c:212
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
 
-#: options.c:175
+#: options.c:177
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
 
-#: options.c:176
+#: options.c:178
 msgid "smaller"
 msgstr "小"
 
-#: options.c:176
+#: options.c:178
 msgid "larger"
 msgstr "大"
 
-#: options.c:337
+#: options.c:339
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "指定了无效的协议 ‘%s’\n"
 
-#: options.c:384
+#: options.c:386
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "指定了无效的认证方式 ‘%s’\n"
 
-#: options.c:585
+#: options.c:591
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "用法: fetchmail [选项] [服务器...]\n"
 
-#: options.c:586
+#: options.c:592
 msgid "  Options are as follows:\n"
 msgstr "  以下这些是选项:\n"
 
-#: options.c:587
+#: options.c:593
 msgid "  -?, --help        display this option help\n"
 msgstr " -?, --help     显示此选项帮助\n"
 
-#: options.c:588
+#: options.c:594
 msgid "  -V, --version     display version info\n"
 msgstr " -V, --version  显示版本信息\n"
 
-#: options.c:590
+#: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr " -c, --check    只检查邮件而不收取\n"
 
-#: options.c:591
+#: options.c:597
 msgid "  -s, --silent      work silently\n"
 msgstr " -s, --silent   运行时不要显示多余信息\n"
 
-#: options.c:592
+#: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr " -v, --verbose  运行时给出信息 (诊断型的输出)\n"
 
-#: options.c:593
+#: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr " -d, --daemon   每 n 秒运行后台服务一次\n"
 
-#: options.c:594
+#: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr " -N, --nodetach 不分离后台进程\n"
 
-#: options.c:595
+#: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
 msgstr " -q, --quit     终止后台进程\n"
 
-#: options.c:596
+#: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile  指定日志文件名\n"
 
-#: options.c:597
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+#: options.c:603
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr " --syslog       以后台服务运行时用 syslog(3) 得到更多的信息\n"
 
-#: options.c:598
+#: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr " --invisible    不写 Received 邮件头并允许伪装主机\n"
 
-#: options.c:599
+#: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr " -f, --fetchmailrc 指定可选的配置文件\n"
 
-#: options.c:600
+#: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr " -i, --idfile   指定可选的 UIDs 文件\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr " --pidfile      指定可选的进程(锁)文件\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr " --postmaster   指定邮件管理员\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce     将回送邮件从用户重定向至邮件管理员\n"
 
-#: options.c:605
+#: options.c:611
 msgid "  -I, --interface   interface required specification\n"
 msgstr " -I, --interface  指定网络地址\n"
 
-#: options.c:606
+#: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr " -M, --moniter  监控指定网络地址的活跃度\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr " --ssl  启用 ssl 加密会话\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --sslkey      ssl private key file\n"
 msgstr " --sslkey       ssl 私钥文件\n"
 
-#: options.c:611
+#: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
 msgstr " --sslcert      ssl 客户端证书\n"
 
-#: options.c:612
+#: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr " --sslcertck    进行严格的服务器证书检查(推荐)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr " --sslcertpath  ssl 证书目录\n"
 
-#: options.c:614
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+#: options.c:620
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:621
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
 msgstr " --sslfingerprint      指定一个指纹，它必须与服务器证书的指纹匹配\n"
 
-#: options.c:615
+#: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr " --sslproto     指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
 
-#: options.c:617
+#: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
 msgstr " --plugin       指定外部程序打开连接\n"
 
-#: options.c:618
+#: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr " --plugout      指定外部程序打开 smtp 连接\n"
 
-#: options.c:620
+#: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr " -p, --protocol 指定收件协议 (看 man 手册页)\n"
 
-#: options.c:621
+#: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr " -U, --uidl     强制使用 UIDLs(仅适用于 pop3)\n"
 
-#: options.c:622
+#: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port 要连接的 TCP 端口(过时了，用 --service)\n"
 
-#: options.c:623
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:630
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr " -P, --service  要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
 
-#: options.c:624
+#: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr " --auth   指定验证方式(password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr " -t, --timeout  指定服务器超时无响应的时间\n"
 
-#: options.c:626
+#: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
 msgstr " -E, --envelope   指定邮件地址头\n"
 
-#: options.c:627
+#: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr " -Q, --qvirtual   从当前用户移除前缀\n"
 
-#: options.c:628
+#: options.c:635
 msgid "      --principal   mail service principal\n"
 msgstr "--principal     邮件服务验证方\n"
 
-#: options.c:629
+#: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr " --tracepolls   Received 邮件头中添加收件跟踪信息\n"
 
-#: options.c:631
+#: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
 msgstr " -u, --username 指定登录服务器的用户名\n"
 
-#: options.c:632
+#: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr " -a, --[fetch]all       收取所有新旧邮件\n"
 
-#: options.c:633
+#: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr " -K, --nokeep   收件后删除服务器上新邮件\n"
 
-#: options.c:634
+#: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr " -k, --keep     收件后保留服务器上新邮件\n"
 
-#: options.c:635
+#: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr " -F, --flush    从服务器上删除旧邮件\n"
 
-#: options.c:636
+#: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
 msgstr " --limitflush   删除超大的邮件\n"
 
-#: options.c:637
+#: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr " -n, --norewrite        不要重写地址头\n"
 
-#: options.c:638
+#: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr " -l, --limit    不收超过指定大小的邮件\n"
 
-#: options.c:639
+#: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr " -w, --warnings    邮件通知警告的间隔\n"
 
-#: options.c:641
+#: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr " -S, --smtphost    设置 SMTP 转发主机\n"
 
-#: options.c:642
+#: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr " --fetchdomains   收取指定域的邮件\n"
 
-#: options.c:643
+#: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr " -D, --smtpaddress      设置 SMTP 投递域\n"
 
-#: options.c:644
+#: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr " --smtpname     设置 SMTP 全名，用户名@域\n"
 
-#: options.c:645
+#: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr " -Z, --antispam,        设置 antispam 响应值\n"
 
-#: options.c:646
+#: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr " -b, --bathlimit        为 SMTP 连接设置批量处理限制\n"
 
-#: options.c:647
+#: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr " -B, --fetchlimit       为服务器连接设置收取限制\n"
 
-#: options.c:648
+#: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr " --fetchsizelimit       设置收件大小限制\n"
 
-#: options.c:649
+#: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr " --fastuidl     对 UIDLs 进行折半查找\n"
 
-#: options.c:650
+#: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr " -e, --expunge  设置删除操作发生在多少封邮件之后\n"
 
-#: options.c:651
+#: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr " -m, --mda      设置用于转发的 MDA\n"
 
-#: options.c:652
+#: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr " --bsmtp          设置 BSMTP 文件输出\n"
 
-#: options.c:653
+#: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr " --lmtp            用 LMTP 协议(RFC2033) 投递邮件\n"
 
-#: options.c:654
+#: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr " -r, --folder   指定远程邮箱名\n"
 
-#: options.c:655
+#: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots     即使在日志文件中也要显示进度条(以点的形式)\n"
 
-#: pop3.c:350
-msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+#: pop3.c:355
+msgid ""
+"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
+"of TOP.\n"
 msgstr "警告: 发现“ POP3 代理服务器”，用 RETR 命令代替 TOP。\n"
 
-#: pop3.c:449
+#: pop3.c:454
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
 msgstr "强制使用 TLS 会话，但服务器拒绝 CAPA 命令。\n"
 
-#: pop3.c:450
+#: pop3.c:455
 msgid "The CAPA command is however necessary for TLS.\n"
 msgstr "而 CPAC 命令对于 TLS 协议来说是必须要有的。\n"
 
-#: pop3.c:525
+#: pop3.c:538
 #, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
 msgstr "%s: 升级到 TLS 协议失败了，继续尝试。\n"
 
-#: pop3.c:633
+#: pop3.c:646
 msgid "We've run out of allowed authenticators and cannot continue.\n"
 msgstr "我们已经用完了可用的验证方式，无法继续\n"
 
-#: pop3.c:647
+#: pop3.c:660
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在 greeting 中未发现所需的 APOP 时间戳\n"
 
-#: pop3.c:656
+#: pop3.c:669
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中时间戳语法错误\n"
 
-#: pop3.c:672
+#: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
 msgstr "无效的 APOP 时间戳\n"
 
-#: pop3.c:696
+#: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中有未定义的协议请求\n"
 
-#: pop3.c:717
+#: pop3.c:730
 msgid "lock busy!  Is another session active?\n"
 msgstr "死锁！是否有另一个会话在运行？\n"
 
-#: pop3.c:796
+#: pop3.c:809
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "无法操作来自上游服务器的 UIDL 响应。\n"
 
-#: pop3.c:819
+#: pop3.c:832
 msgid "Server responded with UID for wrong message.\n"
 msgstr "响应的服务器带有错误消息的 UID。\n"
 
-#: pop3.c:846 pop3.c:1092
+#: pop3.c:859 pop3.c:1105
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id = %s (数量 = %d 封) 已被删除，但仍然存在！\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
+#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u 未读\n"
 
-#: pop3.c:952
+#: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "邮件被插入服务器列表。无法处理。\n"
 
-#: pop3.c:1044
+#: pop3.c:1057
 msgid "protocol error\n"
 msgstr "协议错\n"
 
-#: pop3.c:1060
+#: pop3.c:1073
 msgid "protocol error while fetching UIDLs\n"
 msgstr "正在读取 UIDLs 时协议出错\n"
 
-#: pop3.c:1430
+#: pop3.c:1443
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 不支持 --folder 选项\n"
 
@@ -2224,32 +2272,36 @@ msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
 #: rcfile_y.y:213
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
 #: rcfile_y.y:220
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
 #: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL 不可用"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:383
 msgid "end of input"
 msgstr "输入结束"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:421
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "文件 %s 必须是个普通文件。\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:431
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "文件 %s 不能拥有多于 -rwx--x--- (0710) 的权限。\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:443
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "文件 %s 必须归您所有。\n"
@@ -2556,7 +2608,8 @@ msgstr "MDA 返回非零值 %d\n"
 
 #: sink.c:1355
 #, c-format
-msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgid ""
+"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s，在 %s:%d 无法处理\n"
 
 #: sink.c:1377
@@ -2676,113 +2729,113 @@ msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:660
+#: socket.c:611
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:662
+#: socket.c:613
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:664
+#: socket.c:615
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:666
+#: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者通用名: %s\n"
 
-#: socket.c:668
+#: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者通用名太长 (可能截短)。\n"
 
-#: socket.c:670
+#: socket.c:621
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者通用名\n"
 
-#: socket.c:674
+#: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "服务器通用名: %s\n"
 
-#: socket.c:678
+#: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 主通用名太长!\n"
 
-#: socket.c:724
+#: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器通用名不匹配: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:735
+#: socket.c:686
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器通用名\n"
 
-#: socket.c:737
+#: socket.c:688
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:749
+#: socket.c:700
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:753
+#: socket.c:704
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:761
+#: socket.c:712
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:767
+#: socket.c:718
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:771
+#: socket.c:722
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:773
+#: socket.c:724
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:782
+#: socket.c:733
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:788
+#: socket.c:739
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "未知的发行者　(前 %d 个字符): %s\n"
 
-#: socket.c:875
+#: socket.c:826
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:891
+#: socket.c:842
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:964
+#: socket.c:916
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1042
+#: socket.c:994
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1045
+#: socket.c:997
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -2911,30 +2964,30 @@ msgstr "不转储 UID 列表，本次查寻无 UIDs 读取\n"
 msgid "discarding new UID list\n"
 msgstr "正在撤消新的 UID 列表\n"
 
-#: uid.c:616
+#: uid.c:617
 msgid "Deleting fetchids file.\n"
 msgstr "正在删除 fetchids 文件\n"
 
-#: uid.c:618
+#: uid.c:620
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "删除 %s 时出错: %s\n"
 
-#: uid.c:624
+#: uid.c:626
 msgid "Writing fetchids file.\n"
 msgstr "正在写入 fetchids 文件。\n"
 
-#: uid.c:643
+#: uid.c:645
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "写入 fetchids 文件 %s 时出错，存在旧文件。\n"
 
-#: uid.c:647
+#: uid.c:649
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
 
-#: uid.c:651
+#: uid.c:653
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "无法打开 fetchids 文件 %s 写入: %s\n"