aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS20
-rw-r--r--po/de.po39
-rw-r--r--po/it.po639
-rw-r--r--po/nl.po921
-rw-r--r--po/zh_CN.po648
5 files changed, 935 insertions, 1332 deletions
diff --git a/NEWS b/NEWS
index 4bff3c52..27dc0bf6 100644
--- a/NEWS
+++ b/NEWS
@@ -81,15 +81,17 @@ fetchmail 6.3.15 (not yet released):
* The fetchmail manual page is now much clearer on the user id switching
(seteuid) when using --mda while running as the super user.
-# TRANSLATION UPDATES
-* [cs] Czech, by Petr Pisar
-* [fr] French, by Frédéric Marchal
-* [de] German
-* [id] Indonesian, by Andhika Padmawan
-* [it] Italian, by Vincenzo Campanella
-* [ja] Japanese, by Takeshi Hamasaki
-* [pl] Polish, by Jakub Bogusz
-* [vi] Vietnamese, by Clytie Siddall
+# TRANSLATION UPDATES, by language name
+* [zh_CN] Chinese (Simplified), by Ji Zheng-Yu
+* [cs] Czech, by Petr Pisar
+* [nl] Dutch, by Erwin Poeze
+* [fr] French, by Frédéric Marchal
+* [de] German
+* [id] Indonesian, by Andhika Padmawan
+* [it] Italian, by Vincenzo Campanella
+* [ja] Japanese, by Takeshi Hamasaki
+* [pl] Polish, by Jakub Bogusz
+* [vi] Vietnamese, by Clytie Siddall
fetchmail 6.3.14 (released 2010-02-05, 25487 LoC):
diff --git a/po/de.po b/po/de.po
index 87a1fc0f..d61d70e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.15-pre1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-26 01:04+0100\n"
+"POT-Creation-Date: 2010-02-26 10:14+0100\n"
"PO-Revision-Date: 2010-02-24 01:58+0100\n"
"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
"Language-Team: Deutsch <de@li.org>\n"
@@ -2782,41 +2782,52 @@ msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
msgid "about to deliver with: %s\n"
msgstr "dabei, auszuliefern mit: %s\n"
-#: sink.c:1252
+#: sink.c:1239
+#, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "Kann nicht zur User-ID %ld umschalten: %s\n"
+
+#: sink.c:1251
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr "Kann nicht zur ursprünglichen User-ID %ld zurückschalten: %s\n"
+
+#: sink.c:1258
msgid "MDA open failed\n"
msgstr "MDA Öffnen fehlgeschlagen\n"
-#: sink.c:1291
+#: sink.c:1297
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP-Verbindung zu %s fehlgeschlagen\n"
-#: sink.c:1315
+#: sink.c:1321
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "kann SMTP/LMTP-Server nicht erreichen; falle zurück auf %s"
-#: sink.c:1373
+#: sink.c:1379
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
-msgstr "Nachrichtenbeendigung oder Schließen der BSMTP-Datei fehlgeschlagen: %s\n"
+msgstr ""
+"Nachrichtenbeendigung oder Schließen der BSMTP-Datei fehlgeschlagen: %s\n"
-#: sink.c:1400
+#: sink.c:1406
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Fehler beim Transport an den MDA: %s\n"
-#: sink.c:1403
+#: sink.c:1409
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA starb durch Signal %d\n"
-#: sink.c:1406
+#: sink.c:1412
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA gab Status %d ungleich Null zurück\n"
-#: sink.c:1409
+#: sink.c:1415
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2824,20 +2835,20 @@ msgstr ""
"Merkwürdig: MDA pclose gab %d und errno %d/%s zurück, kann das nicht "
"behandeln bei %s:%d\n"
-#: sink.c:1434
+#: sink.c:1440
msgid "SMTP listener refused delivery\n"
msgstr "SMTP-Server verweigerte Auslieferung\n"
-#: sink.c:1464
+#: sink.c:1470
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP-Auslieferungsfehler bei EOM\n"
-#: sink.c:1467
+#: sink.c:1473
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Unerwartete Nicht-503-Erwiderung auf LMTP EOM: %s\n"
-#: sink.c:1622
+#: sink.c:1628
msgid ""
"-- \n"
"The Fetchmail Daemon"
diff --git a/po/it.po b/po/it.po
index 84485b68..1ebfbde8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,13 +1,13 @@
-# ITALIAN TRANSLATION OF FETCHMAIL-6.3.15-PRE1
+# ITALIAN TRANSLATION OF FETCHMAIL-6.3.15-PRE2
# This file is distributed under the same license as the fetchmail package.
#
# Vincenzo Campanella <vinz65@gmail.com>, 2008, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail-6.3.15-pre1\n"
+"Project-Id-Version: fetchmail-6.3.15-pre2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-25 23:11+0100\n"
-"PO-Revision-Date: 2010-02-24 14:17+0100\n"
+"POT-Creation-Date: 2010-02-26 01:04+0100\n"
+"PO-Revision-Date: 2010-02-26 08:14+0100\n"
"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -32,15 +32,12 @@ msgstr "No, i loro indirizzi IP non corrispondono\n"
#: checkalias.c:203
#, c-format
msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
-msgstr ""
-"errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s: %"
-"s\n"
+msgstr "errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s: %s\n"
#: checkalias.c:228
#, c-format
msgid "nameserver failure while looking for `%s' during poll of %s.\n"
-msgstr ""
-"errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s\n"
+msgstr "errore del nameserver nella ricerca di «%s» durante l'interrogazione di %s\n"
#: cram.c:95
msgid "could not decode BASE64 challenge\n"
@@ -73,15 +70,12 @@ msgstr "Oggetto: avviso di Fetchmail per messaggi sovradimensionati"
#: driver.c:339
#, c-format
msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"I seguenti messaggi sovradimensionati sono stati eliminati sul server %s "
-"account %s:"
+msgstr "I seguenti messaggi sovradimensionati sono stati eliminati sul server %s account %s:"
#: driver.c:343
#, c-format
msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"I seguenti messaggi sovradimensionati rimangono sul server %s account %s:"
+msgstr "I seguenti messaggi sovradimensionati rimangono sul server %s account %s:"
#: driver.c:362
#, c-format
@@ -118,8 +112,7 @@ msgstr " (sovradimensionato)"
#: driver.c:602
#, c-format
msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-msgstr ""
-"impossibile recuperare le intestazioni, messaggio %s@%s: %d (%d ottetti)\n"
+msgstr "impossibile recuperare le intestazioni, messaggio %s@%s: %d (%d ottetti)\n"
#: driver.c:619
#, c-format
@@ -143,11 +136,8 @@ msgstr " (%d ottetti nel corpo del messaggio)"
#: driver.c:751
#, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"il messaggio %s@%s:%d non era della lunghezza attesa (%d effettiva != %d "
-"attesa)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "il messaggio %s@%s:%d non era della lunghezza attesa (%d effettiva != %d attesa)\n"
#: driver.c:783
msgid " retained\n"
@@ -164,21 +154,14 @@ msgstr " non eliminato\n"
#: driver.c:828
#, 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] ""
-"limite di scaricamento di Fetchmail %d raggiunto; %d messaggio lasciato sul "
-"server %s, account %s\n"
-msgstr[1] ""
-"limite di scaricamento di Fetchmail %d raggiunto; %d messaggi lasciati sul "
-"server %s, account %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgstr[0] "limite di scaricamento di Fetchmail %d raggiunto; %d messaggio lasciato sul server %s, account %s\n"
+msgstr[1] "limite di scaricamento di Fetchmail %d raggiunto; %d messaggi lasciati sul server %s, account %s\n"
#: driver.c:885
#, c-format
msgid "timeout after %d seconds waiting to connect to server %s.\n"
-msgstr ""
-"tempo scaduto dopo %d secondi durante l'attesa della connessione al server %"
-"s.\n"
+msgstr "tempo scaduto dopo %d secondi durante l'attesa della connessione al server %s.\n"
#: driver.c:889
#, c-format
@@ -193,8 +176,7 @@ msgstr "tempo scaduto dopo %d secondi in attesa di %s.\n"
#: driver.c:898
#, c-format
msgid "timeout after %d seconds waiting for listener to respond.\n"
-msgstr ""
-"tempo scaduto dopo %d secondi in attesa della risposta dell'ascoltatore.\n"
+msgstr "tempo scaduto dopo %d secondi in attesa della risposta dell'ascoltatore.\n"
#: driver.c:901
#, c-format
@@ -207,12 +189,8 @@ msgstr "Oggetto: si sono verificate ripetute situazioni di tempo scaduto"
#: driver.c:916
#, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
-"s.\n"
-msgstr ""
-"Si sono verificate più di %d situazioni di tempo scaduto durante il "
-"tentativo di ottenere la posta da %s@%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Si sono verificate più di %d situazioni di tempo scaduto durante il tentativo di ottenere la posta da %s@%s.\n"
#: driver.c:920
msgid ""
@@ -223,14 +201,12 @@ msgid ""
"\n"
"Fetchmail won't poll this mailbox again until you restart it.\n"
msgstr ""
-"Questo potrebbe significare che il proprio server di posta è bloccato, o che "
-"il proprio server SMTP\n"
+"Questo potrebbe significare che il proprio server di posta è bloccato, o che il proprio server SMTP\n"
"è incastrato, oppure che il file della casella di posta sul server è stato\n"
"compromesso da un errore del server. Per diagnosticare il problema,\n"
"eseguire «fetchmail -v -v».\n"
"\n"
-"Questa casella di posta elettronica non sarà interrogata ulteriormente fino "
-"al prossimo riavvio del programma.\n"
+"Questa casella di posta elettronica non sarà interrogata ulteriormente fino al prossimo riavvio del programma.\n"
#: driver.c:946
#, c-format
@@ -313,10 +289,8 @@ msgid ""
msgstr ""
"Il tentativo di ottenere l'autorizzazione è fallito.\n"
"Poiché in precedenza questa connessione era stata autorizzata, questa\n"
-"situazione è probabilmente dovuta ad altre cause, per esempio a server "
-"occupato,\n"
-"che non è possibile determinare in quanto il server non ha inviato un "
-"messaggio\n"
+"situazione è probabilmente dovuta ad altre cause, per esempio a server occupato,\n"
+"che non è possibile determinare in quanto il server non ha inviato un messaggio\n"
"d'errore utile."
#: driver.c:1214
@@ -485,8 +459,7 @@ msgstr "indefinito"
#: driver.c:1567
#, c-format
msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-msgstr ""
-"Errore %s durante il recupero da %s@%s e la consegna all'host SMTP %s\n"
+msgstr "Errore %s durante il recupero da %s@%s e la consegna all'host SMTP %s\n"
#: driver.c:1569
msgid "unknown"
@@ -540,10 +513,8 @@ msgid ""
"%s: Abort.\n"
msgstr ""
"%s: la variabile di ambiente «QMAILINJECT» è impostata.\n"
-"Questo è pericoloso, in quanto può consentire che qmail-inject o il "
-"contenitore di qmail,\n"
-"sendmail, manomettano i campi «From:» o «Message-ID» nelle intestazioni dei "
-"messaggi.\n"
+"Questo è pericoloso, in quanto può consentire che qmail-inject o il contenitore di qmail,\n"
+"sendmail, manomettano i campi «From:» o «Message-ID» nelle intestazioni dei messaggi.\n"
"Usare «env QMAILINJECT= %s ARGOMENTI-QUI».\n"
"%s: annullato.\n"
@@ -552,16 +523,13 @@ 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: la variabile di ambiente «NULLMAILER_FLAGS» è impostata.\n"
-"Questo è pericoloso, in quanto può consentire che qmail-inject o il "
-"contenitore di qmail, sendmail,\n"
-"manomettano i campi «From:», «Message-ID» o «Return-Path» nelle intestazioni "
-"dei messaggi.\n"
+"Questo è pericoloso, in quanto può consentire che qmail-inject o il contenitore di qmail, sendmail,\n"
+"manomettano i campi «From:», «Message-ID» o «Return-Path» nelle intestazioni dei messaggi.\n"
"Usare «env NULLMAILER_FLAGS= %s ARGOMENTI-QUI»\n"
"%s: annullato.\n"
@@ -582,23 +550,17 @@ msgstr "gethostbyname fallito per %s\n"
#: env.c:170
msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Impossibile trovare il proprio host nel database degli host per "
-"qualificarlo.\n"
+msgstr "Impossibile trovare il proprio host nel database degli host per qualificarlo.\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 ""
-"Tentativo di continuare a ricevere con nome di host non qualificato in "
-"corso.\n"
-"NON si riportino intestazioni «Received:» interrotte, righe «HELO/EHLO» o "
-"problemi simili.\n"
-"Si provveda, invece, alla riparazione del proprio /etc/hosts, DNS, NIS o "
-"LDAP.\n"
+"Tentativo di continuare a ricevere con nome di host non qualificato in corso.\n"
+"NON si riportino intestazioni «Received:» interrotte, righe «HELO/EHLO» o problemi simili.\n"
+"Si provveda, invece, alla riparazione del proprio /etc/hosts, DNS, NIS o LDAP.\n"
#: etrn.c:49 odmr.c:60
#, c-format
@@ -684,11 +646,9 @@ 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 viene distribuito ASSOLUTAMENTE SENZA ALCUNA GARANZIA. Questo è "
-"software libero\n"
+"Fetchmail viene distribuito ASSOLUTAMENTE SENZA ALCUNA GARANZIA. Questo è software libero\n"
"e la sua ridistribuzione è incoraggiata a talune condizioni. Per dettagli\n"
-"consultare il file «COPYING» nella directory del sorgente o della "
-"documentazione.\n"
+"consultare il file «COPYING» nella directory del sorgente o della documentazione.\n"
#: fetchmail.c:177
msgid "WARNING: Running as root is discouraged.\n"
@@ -719,9 +679,7 @@ msgstr " e "
#: fetchmail.c:410
#, c-format
msgid "No mailservers set up -- perhaps %s is missing?\n"
-msgstr ""
-"Nessuna impostazione dei server di posta. Probabilmente questo è dovuto a %s "
-"mancante.\n"
+msgstr "Nessuna impostazione dei server di posta. Probabilmente questo è dovuto a %s mancante.\n"
#: fetchmail.c:431
msgid "fetchmail: no mailservers have been specified.\n"
@@ -734,9 +692,7 @@ msgstr "fetchmail: nessun'altra istanza di Fetchmail in esecuzione\n"
#: fetchmail.c:449
#, c-format
msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-msgstr ""
-"fetchmail: errore in fase di arresto forzato di %s Fetchmail su %d; uscita "
-"in corso.\n"
+msgstr "fetchmail: errore in fase di arresto forzato di %s Fetchmail su %d; uscita in corso.\n"
#: fetchmail.c:450 fetchmail.c:459
msgid "background"
@@ -752,34 +708,22 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
msgstr "fetchmail: %s Fetchmail su %d arrestato forzatamente.\n"
#: fetchmail.c:481
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: impossibile controllare la posta mentre un'altra istanza di "
-"Fetchmail è in esecuzione sul medesimo host.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: impossibile controllare la posta mentre un'altra istanza di Fetchmail è in esecuzione sul medesimo host.\n"
#: fetchmail.c:487
#, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr ""
-"fetchmail: impossibile interrogare gli host specificati mentre un'altra "
-"istanza di Fetchmail è in esecuzione su %d.\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: impossibile interrogare gli host specificati mentre un'altra istanza di Fetchmail è in esecuzione su %d.\n"
#: fetchmail.c:494
#, c-format
msgid "fetchmail: another foreground fetchmail is running at %d.\n"
-msgstr ""
-"fetchmail: un'altra istanza di Fetchmail è in esecuzione in primo piano su %"
-"d.\n"
+msgstr "fetchmail: un'altra istanza di Fetchmail è in esecuzione in primo piano su %d.\n"
#: fetchmail.c:504
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: impossibile accettare opzioni mentre un'istanza di Fetchmail è in "
-"esecuzione in secondo piano.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: impossibile accettare opzioni mentre un'istanza di Fetchmail è in esecuzione in secondo piano.\n"
#: fetchmail.c:510
#, c-format
@@ -803,8 +747,7 @@ msgstr "Inserire la password per %s@%s:"
#: fetchmail.c:583
msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr ""
-"fetchmail: impossibile portare in secondo piano. Annullamento in corso.\n"
+msgstr "fetchmail: impossibile portare in secondo piano. Annullamento in corso.\n"
#: fetchmail.c:587
#, c-format
@@ -818,9 +761,7 @@ msgstr "impossibile aprire %s per aggiungervi messaggi di registro \n"
#: fetchmail.c:607
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr ""
-"fetchmail: attenzione: sono impostati sia il registro di sistema che il file "
-"di registro. Controllarli entrambi.\n"
+msgstr "fetchmail: attenzione: sono impostati sia il registro di sistema che il file di registro. Controllarli entrambi.\n"
#: fetchmail.c:626
msgid "--check mode enabled, not fetching mail\n"
@@ -838,9 +779,7 @@ msgstr "riavvio in corso (%s modificato)\n"
#: fetchmail.c:658
msgid "attempt to re-exec may fail as directory has not been restored\n"
-msgstr ""
-"il tentativo di nuova esecuzione potrebbe fallire, poiché la directory non è "
-"stata ripristinata\n"
+msgstr "il tentativo di nuova esecuzione potrebbe fallire, poiché la directory non è stata ripristinata\n"
#: fetchmail.c:685
msgid "attempt to re-exec fetchmail failed\n"
@@ -849,9 +788,7 @@ msgstr "tentativo di nuova esecuzione fallito\n"
#: fetchmail.c:715
#, c-format
msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
-msgstr ""
-"interrogazione di %s omessa (autenticazione fallita o troppe situazioni di "
-"tempo scaduto)\n"
+msgstr "interrogazione di %s omessa (autenticazione fallita o troppe situazioni di tempo scaduto)\n"
#: fetchmail.c:727
#, c-format
@@ -955,13 +892,11 @@ msgstr "impossibile temporizzare il file di controllo di esecuzione\n"
#: fetchmail.c:1072
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
-msgstr ""
-"Attenzione: l'host %s è menzionato più volte nel file di configurazione\n"
+msgstr "Attenzione: l'host %s è menzionato più volte nel file di configurazione\n"
#: fetchmail.c:1105
msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-msgstr ""
-"fetchmail: errore: molteplici record «defaults» nel file di configurazione.\n"
+msgstr "fetchmail: errore: molteplici record «defaults» nel file di configurazione.\n"
#: fetchmail.c:1227
msgid "SSL support is not compiled in.\n"
@@ -981,11 +916,8 @@ msgstr "Il supporto per GSSAPI è configurato, ma non compilato.\n"
#: fetchmail.c:1276
#, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: avviso: nessun DNS disponibile per controllare recuperi "
-"«multidrop» da %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: avviso: nessun DNS disponibile per controllare recuperi «multidrop» da %s\n"
#: fetchmail.c:1287
#, c-format
@@ -994,37 +926,26 @@ msgstr "avviso: «multidrop» per %s richiede l'opzione «envelope».\n"
#: fetchmail.c:1288
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"avviso: non richiedere supporto se tutte le mail vanno al postmaster.\n"
+msgstr "avviso: non richiedere supporto se tutte le mail vanno al postmaster.\n"
#: fetchmail.c:1305
#, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: la configurazione %s non è valida, specificare un numero di porta "
-"positivo per il servizio o la porta\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: la configurazione %s non è valida, specificare un numero di porta positivo per il servizio o la porta\n"
#: fetchmail.c:1312
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-msgstr ""
-"fetchmail: la configurazione %s non è valida, RPOP richiede una porta "
-"privilegiata\n"
+msgstr "fetchmail: la configurazione %s non è valida, RPOP richiede una porta privilegiata\n"
#: fetchmail.c:1330
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
-msgstr ""
-"La configurazione %s non è valida, LMTP non può usare la porta SMTP "
-"predefinita\n"
+msgstr "La configurazione %s non è valida, LMTP non può usare la porta SMTP predefinita\n"
#: fetchmail.c:1344
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr ""
-"«fetchall» e «keep on» contemporaneamente nel demone o in modalità inattiva "
-"costituiscono un errore.\n"
+msgstr "«fetchall» e «keep on» contemporaneamente nel demone o in modalità inattiva costituiscono un errore.\n"
#: fetchmail.c:1369
#, c-format
@@ -1082,8 +1003,7 @@ msgstr "Il file di identificazione è %s\n"
#: fetchmail.c:1544
msgid "Progress messages will be logged via syslog\n"
-msgstr ""
-"I messaggi di avanzamento saranno registrati tramite il registro di sistema\n"
+msgstr "I messaggi di avanzamento saranno registrati tramite il registro di sistema\n"
#: fetchmail.c:1547
msgid "Fetchmail will masquerade and will not generate Received\n"
@@ -1091,8 +1011,7 @@ msgstr "Fetchmail si maschererà e non genererà «Received»\n"
#: fetchmail.c:1549
msgid "Fetchmail will show progress dots even in logfiles.\n"
-msgstr ""
-"I puntini di avanzamento saranno mostrati anche nei file di registro.\n"
+msgstr "I puntini di avanzamento saranno mostrati anche nei file di registro.\n"
#: fetchmail.c:1551
#, c-format
@@ -1109,14 +1028,11 @@ msgstr "Le mail di errore saranno indirizzate al mittente.\n"
#: fetchmail.c:1560
msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail tratterà gli errori permanenti come permanenti (scarta messaggi).\n"
+msgstr "Fetchmail tratterà gli errori permanenti come permanenti (scarta messaggi).\n"
#: fetchmail.c:1562
msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail tratterà gli errori permanenti come temporanei (mantieni "
-"messaggi).\n"
+msgstr "Fetchmail tratterà gli errori permanenti come temporanei (mantieni messaggi).\n"
#: fetchmail.c:1569
#, c-format
@@ -1132,10 +1048,8 @@ msgstr " Le mail saranno recuperate via %s\n"
#, 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] ""
-" L'interrogazione di questo server sarà effettuata ogni %d intervallo.\n"
-msgstr[1] ""
-" L'interrogazione di questo server sarà effettuata ogni %d intervalli.\n"
+msgstr[0] " L'interrogazione di questo server sarà effettuata ogni %d intervallo.\n"
+msgstr[1] " L'interrogazione di questo server sarà effettuata ogni %d intervalli.\n"
#: fetchmail.c:1580
#, c-format
@@ -1144,8 +1058,7 @@ msgstr " Il vero nome del server è %s.\n"
#: fetchmail.c:1583
msgid " This host will not be queried when no host is specified.\n"
-msgstr ""
-" Questo host non verrà interrogato quando nessuno host è specificato.\n"
+msgstr " Questo host non verrà interrogato quando nessuno host è specificato.\n"
#: fetchmail.c:1584
msgid " This host will be queried when no host is specified.\n"
@@ -1293,55 +1206,35 @@ msgstr " Verranno scaricati solo i nuovi messaggi («--all» disabilitato).\n"
#: fetchmail.c:1693
msgid " Fetched messages will be kept on the server (--keep on).\n"
-msgstr ""
-" I messaggi recuperati verranno mantenuti sul server («--keep» abilitato).\n"
+msgstr " I messaggi recuperati verranno mantenuti sul server («--keep» abilitato).\n"
#: fetchmail.c:1694
msgid " Fetched messages will not be kept on the server (--keep off).\n"
-msgstr ""
-" I messaggi recuperati non verranno mantenuti sul server («--keep» "
-"disabilitato).\n"
+msgstr " I messaggi recuperati non verranno mantenuti sul server («--keep» disabilitato).\n"
#: fetchmail.c:1696
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-" I vecchi messaggi verranno cancellati prima dello scaricamento dei "
-"messaggi («--flush» abilitato).\n"
+msgstr " I vecchi messaggi verranno cancellati prima dello scaricamento dei messaggi («--flush» abilitato).\n"
#: fetchmail.c:1697
-msgid ""
-" Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-" I vecchi messaggi non verranno cancellati prima dello scaricamento dei "
-"messaggi («--flush» disabilitato).\n"
+msgid " Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr " I vecchi messaggi non verranno cancellati prima dello scaricamento dei messaggi («--flush» disabilitato).\n"
#: fetchmail.c:1699
-msgid ""
-" Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-" I messaggi sovradimensionati verranno cancellati prima dello scaricamento "
-"dei messaggi («--limitflush» abilitato).\n"
+msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr " I messaggi sovradimensionati verranno cancellati prima dello scaricamento dei messaggi («--limitflush» abilitato).\n"
#: fetchmail.c:1700
-msgid ""
-" Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-" I messaggi sovradimensionati non verranno cancellati prima dello "
-"scaricamento dei messaggi («--limitflush» disabilitato).\n"
+msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr " I messaggi sovradimensionati non verranno cancellati prima dello scaricamento dei messaggi («--limitflush» disabilitato).\n"
#: fetchmail.c:1702
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-" La riscrittura degli indirizzi del server locale è abilitata («--norewrite» "
-"disabilitato).\n"
+msgstr " La riscrittura degli indirizzi del server locale è abilitata («--norewrite» disabilitato).\n"
#: fetchmail.c:1703
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-" La riscrittura degli indirizzi del server locale è disabilitata («--"
-"norewrite» abilitato).\n"
+msgstr " La riscrittura degli indirizzi del server locale è disabilitata («--norewrite» abilitato).\n"
#: fetchmail.c:1705
msgid " Carriage-return stripping is enabled (stripcr on).\n"
@@ -1349,8 +1242,7 @@ msgstr " La rimozione dei ritorni a capo è abilitata («stripcr» abilitato).\
#: fetchmail.c:1706
msgid " Carriage-return stripping is disabled (stripcr off).\n"
-msgstr ""
-" La rimozione dei ritorni a capo è disabilitata («stripcr» disabilitato).\n"
+msgstr " La rimozione dei ritorni a capo è disabilitata («stripcr» disabilitato).\n"
#: fetchmail.c:1708
msgid " Carriage-return forcing is enabled (forcecr on).\n"
@@ -1358,22 +1250,15 @@ msgstr " La forzatura dei ritorni a capo è abilitata («forcecr» abilitato).\
#: fetchmail.c:1709
msgid " Carriage-return forcing is disabled (forcecr off).\n"
-msgstr ""
-" La forzatura dei ritorni a capo è disabilitata («forcecr» disabilitato).\n"
+msgstr " La forzatura dei ritorni a capo è disabilitata («forcecr» disabilitato).\n"
#: fetchmail.c:1711
-msgid ""
-" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-" L'interpretazione di «Content-Transfer-Econding» è disabilitata («pass8bits» "
-"abilitato).\n"
+msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr " L'interpretazione di «Content-Transfer-Econding» è disabilitata («pass8bits» abilitato).\n"
#: fetchmail.c:1712
-msgid ""
-" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-" L'interpretazione di «Content-Transfer-Encoding» è abilitata («pass8bits» "
-"disabilitato).\n"
+msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr " L'interpretazione di «Content-Transfer-Encoding» è abilitata («pass8bits» disabilitato).\n"
#: fetchmail.c:1714
msgid " MIME decoding is enabled (mimedecode on).\n"
@@ -1385,40 +1270,32 @@ msgstr " La decodifica MIME è disabilitata («mimedecode» disabilitato).\n"
#: fetchmail.c:1717
msgid " Idle after poll is enabled (idle on).\n"
-msgstr ""
-" La modalità inattiva dopo lo scaricamento è abilitata («idle» abilitato).\n"
+msgstr " La modalità inattiva dopo lo scaricamento è abilitata («idle» abilitato).\n"
#: fetchmail.c:1718
msgid " Idle after poll is disabled (idle off).\n"
-msgstr ""
-" La modalità inattiva dopo lo scaricamento è disabilitata («idle» "
-"disabilitato).\n"
+msgstr " La modalità inattiva dopo lo scaricamento è disabilitata («idle» disabilitato).\n"
#: fetchmail.c:1720
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
-msgstr ""
-" Le righe di stato non vuote verranno scartate («dropstatus» abilitato)\n"
+msgstr " Le righe di stato non vuote verranno scartate («dropstatus» abilitato)\n"
#: fetchmail.c:1721
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
-msgstr ""
-" Le righe di stato non vuote verranno mantenute («dropstatus» disabilitato)\n"
+msgstr " Le righe di stato non vuote verranno mantenute («dropstatus» disabilitato)\n"
#: fetchmail.c:1723
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
-msgstr ""
-" Le righe «Delivered-To» verranno scartate («dropdelivered» abilitato)\n"
+msgstr " Le righe «Delivered-To» verranno scartate («dropdelivered» abilitato)\n"
#: fetchmail.c:1724
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
-msgstr ""
-" Le righe «Delivered-To» verranno mantenute («dropdelivered» disabilitato)\n"
+msgstr " Le righe «Delivered-To» verranno mantenute («dropdelivered» disabilitato)\n"
#: fetchmail.c:1728
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
-msgstr ""
-" Il limite della dimensione dei messaggi è %d ottetti («--limit %d»).\n"
+msgstr " Il limite della dimensione dei messaggi è %d ottetti («--limit %d»).\n"
#: fetchmail.c:1731
msgid " No message size limit (--limit 0).\n"
@@ -1427,15 +1304,11 @@ msgstr " Nessun limite della dimensione dei messaggi («--limit 0»).\n"
#: fetchmail.c:1733
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
-msgstr ""
-" L'intervallo fra avvisi relativi alla dimensione dei messaggi è %d secondi "
-"(«--warnings %d»).\n"
+msgstr " L'intervallo fra avvisi relativi alla dimensione dei messaggi è %d secondi («--warnings %d»).\n"
#: fetchmail.c:1736
msgid " Size warnings on every poll (--warnings 0).\n"
-msgstr ""
-" Gli avvisi relativi alla dimensione dei messaggi verranno mostrati ad ogni "
-"interrogazione («--warnings 0»).\n"
+msgstr " Gli avvisi relativi alla dimensione dei messaggi verranno mostrati ad ogni interrogazione («--warnings 0»).\n"
#: fetchmail.c:1739
#, c-format
@@ -1449,34 +1322,24 @@ msgstr " Nessun limite dei messaggi ricevuti («--fetchlimit 0»).\n"
#: fetchmail.c:1744
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
-msgstr ""
-" Il limite della dimensione dei messaggi da scaricare è %d («--"
-"fetchsizelimit %d»).\n"
+msgstr " Il limite della dimensione dei messaggi da scaricare è %d («--fetchsizelimit %d»).\n"
#: fetchmail.c:1747
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
-msgstr ""
-" Nessun limite della dimensione dei messaggi da scaricare («--fetchsizelimit "
-"0»).\n"
+msgstr " Nessun limite della dimensione dei messaggi da scaricare («--fetchsizelimit 0»).\n"
#: fetchmail.c:1751
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
-msgstr ""
-" Effettuare una ricerca binaria degli UID durante ogni interrogazione («--"
-"fastuidl 1»).\n"
+msgstr " Effettuare una ricerca binaria degli UID durante ogni interrogazione («--fastuidl 1»).\n"
#: fetchmail.c:1753
#, c-format
msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-" Effettuare una ricerca binaria degli UID durante %d di %d interrogazioni "
-"(«--fastuidl %d»).\n"
+msgstr " Effettuare una ricerca binaria degli UID durante %d di %d interrogazioni («--fastuidl %d»).\n"
#: fetchmail.c:1756
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
-msgstr ""
-" Effettuare una ricerca binaria degli UID durante ogni interrogazione («--"
-"fastuidl 0»).\n"
+msgstr " Effettuare una ricerca binaria degli UID durante ogni interrogazione («--fastuidl 0»).\n"
#: fetchmail.c:1758
#, c-format
@@ -1490,9 +1353,7 @@ msgstr " Nessun limite della serie di messaggi SMTP («--batchlimit 0»).\n"
#: fetchmail.c:1764
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
-msgstr ""
-" L'intervallo di cancellazione fra ripuliture è forzato a %d («--expunge %"
-"d»).\n"
+msgstr " L'intervallo di cancellazione fra ripuliture è forzato a %d («--expunge %d»).\n"
#: fetchmail.c:1766
msgid " No forced expunges (--expunge 0).\n"
@@ -1529,14 +1390,11 @@ msgstr " La parte host della riga «MAIL FROM» sarà %s\n"
#: fetchmail.c:1806
#, c-format
msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-msgstr ""
-" L'indirizzo da inserire nelle righe «RCPT TO» inviate a SMTP sarà %s\n"
+msgstr " L'indirizzo da inserire nelle righe «RCPT TO» inviate a SMTP sarà %s\n"
#: fetchmail.c:1815
msgid " Recognized listener spam block responses are:"
-msgstr ""
-" Gli ascoltatori delle risposte di blocco della posta indesiderata "
-"riconosciuti sono:"
+msgstr " Gli ascoltatori delle risposte di blocco della posta indesiderata riconosciuti sono:"
#: fetchmail.c:1821
msgid " Spam-blocking disabled\n"
@@ -1588,17 +1446,12 @@ msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " La ricerca DNS per indirizzi multidrop è disabilitata.\n"
#: fetchmail.c:1869
-msgid ""
-" Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-" Gli alias del server verranno confrontati per indirizzo IP con gli "
-"indirizzi multidrop.\n"
+msgid " Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr " Gli alias del server verranno confrontati per indirizzo IP con gli indirizzi multidrop.\n"
#: fetchmail.c:1871
msgid " Server aliases will be compared with multidrop addresses by name.\n"
-msgstr ""
-" Gli alias del server verranno confrontati per nome con gli indirizzi "
-"multidrop.\n"
+msgstr " Gli alias del server verranno confrontati per nome con gli indirizzi multidrop.\n"
#: fetchmail.c:1874
msgid " Envelope-address routing is disabled\n"
@@ -1652,9 +1505,7 @@ msgstr " Nessuna interfaccia di monitoraggio specificata.\n"
#: fetchmail.c:1922
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
-msgstr ""
-" Le connessioni al server verranno effettuate tramite il plugin %s («--"
-"plugin %s»).\n"
+msgstr " Le connessioni al server verranno effettuate tramite il plugin %s («--plugin %s»).\n"
#: fetchmail.c:1924
msgid " No plugin command specified.\n"
@@ -1663,9 +1514,7 @@ msgstr " Nessun comando di plugin specificato.\n"
#: fetchmail.c:1926
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
-msgstr ""
-" Le connessioni all'ascoltatore verranno effettuate tramite il plugout %s "
-"(«--plugout %s»).\n"
+msgstr " Le connessioni all'ascoltatore verranno effettuate tramite il plugout %s («--plugout %s»).\n"
#: fetchmail.c:1928
msgid " No plugout command specified.\n"
@@ -1682,15 +1531,11 @@ msgstr " %d UID salvati.\n"
#: fetchmail.c:1950
msgid " Poll trace information will be added to the Received header.\n"
-msgstr ""
-" Le informazioni di tracciamento dell'interrogazione verranno aggiunte "
-"all'intestazione «Received».\n"
+msgstr " Le informazioni di tracciamento dell'interrogazione verranno aggiunte all'intestazione «Received».\n"
#: fetchmail.c:1952
msgid " No poll trace information will be added to the Received header.\n"
-msgstr ""
-" Nessuna informazione di tracciamento dell'interrogazione verrà aggiunta "
-"all'intestazione «Received».\n"
+msgstr " Nessuna informazione di tracciamento dell'interrogazione verrà aggiunta all'intestazione «Received».\n"
#: fetchmail.c:1957
msgid " Messages with bad headers will be rejected.\n"
@@ -1818,9 +1663,7 @@ msgstr "%s: aggiornamento a TLS fallito.\n"
#: imap.c:520
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr ""
-"%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
-"corso\n"
+msgstr "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in corso\n"
#: imap.c:640
msgid "Required OTP capability not compiled into fetchmail\n"
@@ -1837,8 +1680,7 @@ msgstr "La capacità LOGIN richiesta non è supportata dal server\n"
#: imap.c:737
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr ""
-"differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
+msgstr "differenza durante la ripulitura della posta (%d effettivo != %d atteso)\n"
#: imap.c:876
#, c-format
@@ -1893,17 +1735,12 @@ msgid "%u is first unseen\n"
msgstr "%u è il primo non visto\n"
#: imap.c:1144
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
-msgstr ""
-"Avviso: i dati fasulli per le dimensioni dei messaggi restituiti dal server "
-"vengono ignorati.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgstr "Avviso: i dati fasulli per le dimensioni dei messaggi restituiti dal server vengono ignorati.\n"
#: interface.c:256
msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
-msgstr ""
-"Impossibile aprire l'interfaccia kvm. Assicurarsi che Fetchmail sia «SGID "
-"kmem»."
+msgstr "Impossibile aprire l'interfaccia kvm. Assicurarsi che Fetchmail sia «SGID kmem»."
#: interface.c:396
#, c-format
@@ -2173,24 +2010,16 @@ msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile specifica il nome del file di registro\n"
#: options.c:626
-msgid ""
-" --syslog use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-" --syslog usa syslog(3) per la maggior parte dei messaggi "
-"durante l'esecuzione come demone\n"
+msgid " --syslog use syslog(3) for most messages when running as a daemon\n"
+msgstr " --syslog usa syslog(3) per la maggior parte dei messaggi durante l'esecuzione come demone\n"
#: options.c:627
msgid " --invisible don't write Received & enable host spoofing\n"
-msgstr ""
-" --invisible non scrivere «Received» e abilita lo spoofing "
-"dell'host\n"
+msgstr " --invisible non scrivere «Received» e abilita lo spoofing dell'host\n"
#: options.c:628
msgid " -f, --fetchmailrc specify alternate run control file\n"
-msgstr ""
-" -f, --fetchmailrc specifica un file di controllo dell'esecuzione "
-"alternativo\n"
+msgstr " -f, --fetchmailrc specifica un file di controllo dell'esecuzione alternativo\n"
#: options.c:629
msgid " -i, --idfile specify alternate UIDs file\n"
@@ -2202,29 +2031,19 @@ msgstr " --pidfile specifica un file PID (blocco) alternativo\n"
#: options.c:631
msgid " --postmaster specify recipient of last resort\n"
-msgstr ""
-" --postmaster specifica il ricevente che funge da ultima istanza\n"
+msgstr " --postmaster specifica il ricevente che funge da ultima istanza\n"
#: options.c:632
msgid " --nobounce redirect bounces from user to postmaster.\n"
-msgstr ""
-" --nobounce reindirizza le mail rifiutate dall'utente al "
-"postmaster.\n"
+msgstr " --nobounce reindirizza le mail rifiutate dall'utente al postmaster.\n"
#: options.c:633
-msgid ""
-" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-" --nosoftbounce fetchmail elimina i messaggi non recapitabili in modo "
-"permanente.\n"
+msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr " --nosoftbounce fetchmail elimina i messaggi non recapitabili in modo permanente.\n"
#: options.c:634
-msgid ""
-" --softbounce keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-" --softbounce mantiene sul server in modo permanente i messaggi non "
-"recapitabili (predefinito).\n"
+msgid " --softbounce keep permanently undeliverable messages on server (default).\n"
+msgstr " --softbounce mantiene sul server in modo permanente i messaggi non recapitabili (predefinito).\n"
#: options.c:636
msgid " -I, --interface interface required specification\n"
@@ -2248,28 +2067,19 @@ msgstr " --sslcert certificato client SSL\n"
#: options.c:643
msgid " --sslcertck do strict server certificate check (recommended)\n"
-msgstr ""
-" --sslcertck effettua un rigoroso controllo del certificato del "
-"server (raccomandato)\n"
+msgstr " --sslcertck effettua un rigoroso controllo del certificato del server (raccomandato)\n"
#: options.c:644
msgid " --sslcertpath path to ssl certificates\n"
msgstr " --sslcertpath percorso dei certificati SSL\n"
#: options.c:645
-msgid ""
-" --sslcommonname expect this CommonName from server (discouraged)\n"
-msgstr ""
-" --sslcommonname si aspetta questo nome comune dal server "
-"(assolutamente sconsigliato)\n"
+msgid " --sslcommonname expect this CommonName from server (discouraged)\n"
+msgstr " --sslcommonname si aspetta questo nome comune dal server (assolutamente sconsigliato)\n"
#: options.c:646
-msgid ""
-" --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-" --sslfingerprint impronta digitale che deve coincidere con quella del "
-"certificato del server.\n"
+msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr " --sslfingerprint impronta digitale che deve coincidere con quella del certificato del server.\n"
#: options.c:647
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
@@ -2277,31 +2087,23 @@ msgstr " --sslproto forza il protocollo SSL (SSL2/SSL3/TLS1)\n"
#: options.c:649
msgid " --plugin specify external command to open connection\n"
-msgstr ""
-" --plugin specifica il comando esterno per aprire la "
-"connessione\n"
+msgstr " --plugin specifica il comando esterno per aprire la connessione\n"
#: options.c:650
msgid " --plugout specify external command to open smtp connection\n"
-msgstr ""
-" --plugout specifica il comando esterno per aprire la "
-"connessione SMTP\n"
+msgstr " --plugout specifica il comando esterno per aprire la connessione SMTP\n"
#: options.c:651
-#, fuzzy
msgid ""
" --bad-header {reject|accept}\n"
" specify policy for handling messages with bad headers\n"
msgstr ""
-" --bad-header {reject|pass}\n"
-" specificare la politica per il trattamento di messaggi "
-"con intestazione non valida\n"
+" --bad-header {reject|accept}\n"
+" specificare la politica per il trattamento di messaggi con intestazione non valida\n"
#: options.c:654
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
-msgstr ""
-" -p, --protocol specifica il protocollo di scaricamento (vedere pagina "
-"man)\n"
+msgstr " -p, --protocol specifica il protocollo di scaricamento (vedere pagina man)\n"
#: options.c:655
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
@@ -2309,21 +2111,15 @@ msgstr " -U, --uidl forza l'uso di UIDL (solo per POP3)\n"
#: options.c:656
msgid " --port TCP port to connect to (obsolete, use --service)\n"
-msgstr ""
-" --port porta TCP alla quale collegarsi (obsoleto, usare «--"
-"service» in sostituzione)\n"
+msgstr " --port porta TCP alla quale collegarsi (obsoleto, usare «--service» in sostituzione)\n"
#: options.c:657
-msgid ""
-" -P, --service TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-" -P, --service servizio TCP al quale collegarsi (può essere una porta "
-"TCP numerica)\n"
+msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n"
+msgstr " -P, --service servizio TCP al quale collegarsi (può essere una porta TCP numerica)\n"
#: options.c:658
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
-msgstr ""
-" --auth tipo di autenticazione (password/kerberos/ssh/otp)\n"
+msgstr " --auth tipo di autenticazione (password/kerberos/ssh/otp)\n"
#: options.c:659
msgid " -t, --timeout server nonresponse timeout\n"
@@ -2343,9 +2139,7 @@ msgstr " --principal principal del server di posta\n"
#: options.c:663
msgid " --tracepolls add poll-tracing information to Received header\n"
-msgstr ""
-" --tracepolls aggiunge le informazioni di tracciamento "
-"dell'interrogazione all'intestazione «Received»\n"
+msgstr " --tracepolls aggiunge le informazioni di tracciamento dell'interrogazione all'intestazione «Received»\n"
#: options.c:665
msgid " -u, --username specify users's login on server\n"
@@ -2377,14 +2171,11 @@ msgstr " -n, --norewrite non riscrivere gli indirizzi dell'intestazione\n"
#: options.c:672
msgid " -l, --limit don't fetch messages over given size\n"
-msgstr ""
-" -l, --limit non scaricare i messaggi al di sopra della dimensione "
-"data\n"
+msgstr " -l, --limit non scaricare i messaggi al di sopra della dimensione data\n"
#: options.c:673
msgid " -w, --warnings interval between warning mail notification\n"
-msgstr ""
-" -w, --warnings intervallo fra le notifiche degli avvisi di posta\n"
+msgstr " -w, --warnings intervallo fra le notifiche degli avvisi di posta\n"
#: options.c:675
msgid " -S, --smtphost set SMTP forwarding host\n"
@@ -2400,8 +2191,7 @@ msgstr " -D, --smtpaddress imposta il dominio di consegna SMTP da usare\n"
#: options.c:678
msgid " --smtpname set SMTP full name username@domain\n"
-msgstr ""
-" --smtpname imposta il nome completo SMTP nomeutente@dominio\n"
+msgstr " --smtpname imposta il nome completo SMTP nomeutente@dominio\n"
#: options.c:679
msgid " -Z, --antispam, set antispam response values\n"
@@ -2413,15 +2203,11 @@ msgstr " -b, --batchlimit imposta il limite batch per connessioni SMTP\n"
#: options.c:681
msgid " -B, --fetchlimit set fetch limit for server connections\n"
-msgstr ""
-" -B, --fetchlimit imposta il limite di scaricamento per connessioni a "
-"server\n"
+msgstr " -B, --fetchlimit imposta il limite di scaricamento per connessioni a server\n"
#: options.c:682
msgid " --fetchsizelimit set fetch message size limit\n"
-msgstr ""
-" --fetchsizelimit imposta il limite delle dimensioni dei messaggi da "
-"scaricare\n"
+msgstr " --fetchsizelimit imposta il limite delle dimensioni dei messaggi da scaricare\n"
#: options.c:683
msgid " --fastuidl do a binary search for UIDLs\n"
@@ -2429,9 +2215,7 @@ msgstr " --fastuidl effettua una ricerca binaria degli UIDL\n"
#: options.c:684
msgid " -e, --expunge set max deletions between expunges\n"
-msgstr ""
-" -e, --expunge imposta il numero massimo di cancellazioni fra "
-"ripuliture\n"
+msgstr " -e, --expunge imposta il numero massimo di cancellazioni fra ripuliture\n"
#: options.c:685
msgid " -m, --mda set MDA to use for forwarding\n"
@@ -2451,23 +2235,15 @@ msgstr " -r, --folder specifica il nome della cartella remota\n"
#: options.c:689
msgid " --showdots show progress dots even in logfiles\n"
-msgstr ""
-" --showdots mostra i puntini di avanziamento anche nei file di "
-"registro\n"
+msgstr " --showdots mostra i puntini di avanziamento anche nei file di registro\n"
#: pop3.c:355
-msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
-msgstr ""
-"Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, "
-"anziché di TOP, in corso.\n"
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Attenzione: trovato server «Maillennium POP3/PROXY», uso del comando RETR, anziché di TOP, in corso.\n"
#: pop3.c:454
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"TLS è obbligatorio per questa sessione, ma il server rifiuta il comando "
-"CAPA.\n"
+msgstr "TLS è obbligatorio per questa sessione, ma il server rifiuta il comando CAPA.\n"
#: pop3.c:455
msgid "The CAPA command is however necessary for TLS.\n"
@@ -2476,20 +2252,15 @@ msgstr "Il comando CAPA è comunque necessario per TLS.\n"
#: pop3.c:538
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr ""
-"%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in "
-"corso.\n"
+msgstr "%s: aggiornamento opportunistico a TLS fallito, tentativo di continuare in corso.\n"
#: pop3.c:646
msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
+msgstr "Impossibile continuare, esauriti i metodi di autenticazione permessi.\n"
#: pop3.c:660
msgid "Required APOP timestamp not found in greeting\n"
-msgstr ""
-"Data e ora APOP sono richieste, ma non sono state trovate nel messaggio di "
-"benvenuto\n"
+msgstr "Data e ora APOP sono richieste, ma non sono state trovate nel messaggio di benvenuto\n"
#: pop3.c:669
msgid "Timestamp syntax error in greeting\n"
@@ -2522,9 +2293,7 @@ msgstr "id=%s (num=%d) è stato eliminato, ma è sempre presente.\n"
#: pop3.c:965
msgid "Messages inserted into list on server. Cannot handle this.\n"
-msgstr ""
-"Messaggi inseriti nell'elenco sul server. Impossibile gestire questa "
-"situazione.\n"
+msgstr "Messaggi inseriti nell'elenco sul server. Impossibile gestire questa situazione.\n"
#: pop3.c:1057
msgid "protocol error\n"
@@ -2547,20 +2316,12 @@ msgid "SDPS not enabled."
msgstr "SDPS non abilitato."
#: rcfile_y.y:218
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opzione di interfaccia è supportata solo in Linux (senza IPv6) "
-"e FreeBSD\n"
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opzione di interfaccia è supportata solo in Linux (senza IPv6) e FreeBSD\n"
#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: l'opzione di monitoraggio è supportata solo in Linux (senza IPv6) "
-"e FreeBSD\n"
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: l'opzione di monitoraggio è supportata solo in Linux (senza IPv6) e FreeBSD\n"
#: rcfile_y.y:340
msgid "SSL is not enabled"
@@ -2750,8 +2511,7 @@ msgstr "Unicode:\n"
#: rpa.c:708
msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
-msgstr ""
-"RPA ha fallito l'apertura di «/dev/urandom». Questo non dovrebbe accadere\n"
+msgstr "RPA ha fallito l'apertura di «/dev/urandom». Questo non dovrebbe accadere\n"
#: rpa.c:709
msgid " prevent you logging in, but means you\n"
@@ -2829,8 +2589,9 @@ msgid "BSMTP file open failed: %s\n"
msgstr "Apertura del file BSMTP fallita: %s\n"
#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
-msgstr "Scrittura del preambolo BSMTP fallita.\n"
+#, c-format
+msgid "BSMTP preamble write failed: %s.\n"
+msgstr "Scrittura del preambolo BSMTP fallita: %s.\n"
#: sink.c:1001
#, c-format
@@ -2840,14 +2601,11 @@ msgstr "L'ascoltatore %cMTP non gradisce l'indirizzo di destinatario «%s»\n"
#: sink.c:1008
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr ""
-"L'ascoltatore %cMTP non gradisce assolutamente l'indirizzo di destinatario «%"
-"s»\n"
+msgstr "L'ascoltatore %cMTP non gradisce assolutamente l'indirizzo di destinatario «%s»\n"
#: sink.c:1054
msgid "no address matches; no postmaster set.\n"
-msgstr ""
-"nessun indirizzo corrispondente; nessun postmaster è stato impostato.\n"
+msgstr "nessun indirizzo corrispondente; nessun postmaster è stato impostato.\n"
#: sink.c:1066
#, c-format
@@ -2868,57 +2626,55 @@ msgstr "in procinto di consegnare con: %s\n"
msgid "MDA open failed\n"
msgstr "Apertura di MDA fallita\n"
-#: sink.c:1289
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Connessione di %cMTP a %s fallita\n"
-#: sink.c:1313
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "impossibile raggiungere l'ascoltatore, ritorno su %s in corso"
-#: sink.c:1375
+#: sink.c:1373
+#, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Terminazione del messaggio o chiusura del file BSTMP fallita: %s\n"
+
+#: sink.c:1400
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Errore durante la scrittura su MDA: %s\n"
-#: sink.c:1378
+#: sink.c:1403
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA terminato da segnale %d\n"
-#: sink.c:1381
+#: sink.c:1406
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA ha ritornato uno stato %d diverso da zero\n"
-#: sink.c:1384
+#: sink.c:1409
#, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ""
-"Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile "
-"trattare a %s:%d\n"
-
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Terminazione del messaggio o chiusura del file BSTMP fallita\n"
+msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+msgstr "Strano: MDA pclose ha restituito %d ed errore numero %d/%s, impossibile trattare a %s:%d\n"
-#: sink.c:1428
+#: sink.c:1434
msgid "SMTP listener refused delivery\n"
msgstr "L'ascoltatore SMTP ha rifiutato la consegna\n"
-#: sink.c:1458
+#: sink.c:1464
msgid "LMTP delivery error on EOM\n"
msgstr "Errore di consegna LMTP su EOM\n"
-#: sink.c:1461
+#: sink.c:1467
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Risposta differente da 503 inattesa a LTP EOM: %s\n"
-#: sink.c:1616
+#: sink.c:1622
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -2988,9 +2744,7 @@ msgstr "getaddrinfo(\"%s\",\"%s\") errore: %s\n"
#: socket.c:289
msgid "Try adding the --service option (see also FAQ item R12).\n"
-msgstr ""
-"Provare ad aggiungere l'opzione «--service» (vedere anche le FAQ, paragrafo "
-"R12).\n"
+msgstr "Provare ad aggiungere l'opzione «--service» (vedere anche le FAQ, paragrafo R12).\n"
#: socket.c:300 socket.c:303
#, c-format
@@ -3027,9 +2781,7 @@ msgstr "Organizzazione emittente: %s\n"
#: socket.c:619
msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr ""
-"Attenzione: nome dell'organizzazione emittente troppo lungo (possibile "
-"troncatura).\n"
+msgstr "Attenzione: nome dell'organizzazione emittente troppo lungo (possibile troncatura).\n"
#: socket.c:621
msgid "Unknown Organization\n"
@@ -3042,8 +2794,7 @@ msgstr "Nome comune dell'emittente: %s\n"
#: socket.c:626
msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr ""
-"Attenzione: nome comune dell'emittente troppo lungo (possibile troncatura).\n"
+msgstr "Attenzione: nome comune dell'emittente troppo lungo (possibile troncatura).\n"
#: socket.c:628
msgid "Unknown Issuer CommonName\n"
@@ -3060,9 +2811,7 @@ msgstr "Certificato non valido: il nome comune del «Subject» è troppo lungo.\
#: socket.c:644
msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr ""
-"Certificato non valido: il nome comune del «Subject» contiene NUL, "
-"interruzione in corso.\n"
+msgstr "Certificato non valido: il nome comune del «Subject» contiene NUL, interruzione in corso.\n"
#: socket.c:665
#, c-format
@@ -3071,9 +2820,7 @@ msgstr "Nome alternativo del «Subject»: %s\n"
#: socket.c:671
msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr ""
-"Certificato non valido: il nome alternativo del «Subject» contiene NUL, "
-"interruzione in corso.\n"
+msgstr "Certificato non valido: il nome alternativo del «Subject» contiene NUL, interruzione in corso.\n"
#: socket.c:699
#, c-format
@@ -3082,8 +2829,7 @@ msgstr "Errore di corrispondenza del nome comune del server: %s != %s\n"
#: socket.c:706
msgid "Server name not set, could not verify certificate!\n"
-msgstr ""
-"Nome del server non impostato, impossibile verificare il certificato.\n"
+msgstr "Nome del server non impostato, impossibile verificare il certificato.\n"
#: socket.c:711
msgid "Unknown Server CommonName\n"
@@ -3137,9 +2883,7 @@ msgstr "Descrittore del file fuori tolleranza per SSL"
#: socket.c:867
#, c-format
msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr ""
-"Specificato un protocollo SSL «%s» non valido, utilizzo di quello predefinito "
-"(SSLv23) in corso.\n"
+msgstr "Specificato un protocollo SSL «%s» non valido, utilizzo di quello predefinito (SSLv23) in corso.\n"
#: socket.c:943
msgid "Certificate/fingerprint verification was somehow skipped!\n"
@@ -3198,9 +2942,7 @@ msgstr "trovato indirizzo «Received» «%s»\n"
#: transact.c:595
msgid "incorrect header line found while scanning headers\n"
-msgstr ""
-"trovata riga d'intestazione non corretta durante la scansione "
-"dell'intestazione\n"
+msgstr "trovata riga d'intestazione non corretta durante la scansione dell'intestazione\n"
#: transact.c:597
#, c-format
@@ -3270,9 +3012,7 @@ msgstr "scambio di elenchi degli UID in corso\n"
#: uid.c:556
msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr ""
-"nessuno scambio di elenchi degli UID in corso, nessun UID trovato durante "
-"l'interrogazione\n"
+msgstr "nessuno scambio di elenchi degli UID in corso, nessun UID trovato durante l'interrogazione\n"
#: uid.c:581
msgid "discarding new UID list\n"
@@ -3294,9 +3034,7 @@ msgstr "Scrittura del file fetchids in corso.\n"
#: uid.c:645
#, c-format
msgid "Error writing to fetchids file %s, old file left in place.\n"
-msgstr ""
-"Errore durante la scrittura del file fetchids %s, lasciato il vecchio file "
-"al suo posto.\n"
+msgstr "Errore durante la scrittura del file fetchids %s, lasciato il vecchio file al suo posto.\n"
#: uid.c:649
#, c-format
@@ -3317,5 +3055,4 @@ msgid "realloc failed\n"
msgstr "realloc fallita\n"
#~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr ""
-#~ "trovato delimitatore di messaggio durante la scansione dell'intestazione\n"
+#~ msgstr "trovato delimitatore di messaggio durante la scansione dell'intestazione\n"
diff --git a/po/nl.po b/po/nl.po
index 0da872e9..7be26154 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,13 +4,13 @@
#
# Tony Vroon <tony@vroon.org>, 2003.
# Benno Schulenberg <benno@vertaalt.nl>, 2008.
-# Erwin Poeze <erwin.poeze@gmail.com>, 2009
+# Erwin Poeze <erwin.poeze@gmail.com>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail-6.3.12\n"
+"Project-Id-Version: fetchmail-6.3.15-pre2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
-"PO-Revision-Date: 2009-10-21 08:33+0100\n"
+"POT-Creation-Date: 2010-02-26 01:04+0100\n"
+"PO-Revision-Date: 2010-02-26 08:52+0100\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"MIME-Version: 1.0\n"
@@ -57,13 +57,13 @@ msgstr "Kerberos-fout %s\n"
#: driver.c:249
#, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
-msgstr "krb5_sendauth(): %s [server zegt '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
+msgstr "krb5_sendauth(): %s [server zegt '%s']\n"
#: driver.c:254
#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
-msgstr "krb5_sendauth(): %s [server zegt '%*s'] \n"
+msgid "krb5_sendauth: %s [server says '%*s']\n"
+msgstr "krb5_sendauth(): %s [server zegt '%*s']\n"
#: driver.c:335
msgid "Subject: Fetchmail oversized-messages warning"
@@ -72,8 +72,7 @@ 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
@@ -139,10 +138,8 @@ msgstr " (%d bytes in berichttekst) "
#: driver.c:751
#, 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:783
msgid " retained\n"
@@ -159,12 +156,9 @@ msgstr " niet verwijderd\n"
#: driver.c:828
#, 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:885
#, c-format
@@ -184,8 +178,7 @@ msgstr "wachten op %2$s duurde te lang -- gestopt na %1$d seconden\n"
#: driver.c:898
#, 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:901
#, c-format
@@ -198,12 +191,8 @@ msgstr "Subject: fetchmail ziet herhaaldelijk tijdslimietoverschrijdingen"
#: driver.c:916
#, 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:920
msgid ""
@@ -385,7 +374,7 @@ msgstr "standaardmap wordt geselecteerd of opnieuw opgehaald\n"
msgid "%s at %s (folder %s)"
msgstr "%s op %s (map %s)"
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1332 rcfile_y.y:389
#, c-format
msgid "%s at %s"
msgstr "%s op %s"
@@ -532,14 +521,12 @@ 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: Stoppen.\n"
@@ -561,20 +548,16 @@ msgstr "gethostbyname() is mislukt voor %s\n"
#: env.c:170
msgid "Cannot find my own host in hosts database to qualify it!\n"
-msgstr ""
-"Kan mijn eigen host niet in de hostsdatabase vinden om deze te "
-"kwalificeren!\n"
+msgstr "Kan mijn eigen host niet in de hostsdatabase vinden om deze te kwalificeren!\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 ""
"Probeert door te gaan met een niet gekwalificeerde hostname.\n"
-"Rapporteer GEEN misvormde berichten: koppen, HELO/EHLO-regels of "
-"soortgelijke problemen!\n"
+"Rapporteer GEEN misvormde berichten: koppen, HELO/EHLO-regels of soortgelijke problemen!\n"
"Repareer in plaats daarvan uw /etc/hosts, NDS, NIS of LDAP.\n"
#: etrn.c:49 odmr.c:60
@@ -642,7 +625,6 @@ 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,\n"
@@ -651,10 +633,10 @@ msgid ""
"Copyright (C) 2005 - 2010 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) 2005 - 2006 Sunil Shetye\n"
-"Copyright (C) 2005 - 2009 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
+" Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
+"Copyright (C) 2005 - 2010 Matthias Andree\n"
#: fetchmail.c:143
msgid ""
@@ -724,20 +706,15 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
msgstr "fetchmail: %s fetchmail op %d geëlimineerd.\n"
#: fetchmail.c:481
-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:487
#, 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:494
#, c-format
@@ -745,11 +722,8 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
msgstr "fetchmail: een andere fetchmail draait op de voorgrond op %d.\n"
#: fetchmail.c:504
-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:510
#, c-format
@@ -759,8 +733,7 @@ msgstr "fetchmail: fetchmail-service in de achtergrond op %d wakkergeschud.\n"
#: fetchmail.c:522
#, 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:537
#, c-format
@@ -778,19 +751,17 @@ msgstr "fetchmail: Kan niet naar de achtergrond gaan. Gestopt.\n"
#: fetchmail.c:587
#, c-format
-msgid "starting fetchmail %s daemon \n"
-msgstr "starten van fetchmail %s-service \n"
+msgid "starting fetchmail %s daemon\n"
+msgstr "starten van fetchmail %s-service\n"
#: fetchmail.c:603 fetchmail.c:605
#, c-format
-msgid "could not open %s to append logs to \n"
-msgstr "kan %s niet openen voor het toevoegen van loginformatie \n"
+msgid "could not open %s to append logs to\n"
+msgstr "kan %s niet openen voor het toevoegen van loginformatie\n"
#: fetchmail.c:607
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:626
msgid "--check mode enabled, not fetching mail\n"
@@ -817,9 +788,7 @@ msgstr "poging tot herstarten van fetchmail is mislukt\n"
#: fetchmail.c:715
#, 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:727
#, c-format
@@ -916,722 +885,667 @@ msgstr "gewekt op %s\n"
msgid "normal termination, status %d\n"
msgstr "normale afsluiting, afsluitwaarde %d\n"
-#: fetchmail.c:1037
+#: fetchmail.c:1039
msgid "couldn't time-check the run-control file\n"
msgstr "kan geen tijdcontrole uitvoeren op het run-control-bestand\n"
-#: fetchmail.c:1070
+#: fetchmail.c:1072
#, 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:1103
+#: fetchmail.c:1105
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:1225
+#: fetchmail.c:1227
msgid "SSL support is not compiled in.\n"
msgstr "SSL-ondersteuning is niet ingebouwd.\n"
-#: fetchmail.c:1232
+#: fetchmail.c:1234
msgid "KERBEROS v4 support is configured, but not compiled in.\n"
msgstr "Kerberos V4-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
-#: fetchmail.c:1238
+#: fetchmail.c:1240
msgid "KERBEROS v5 support is configured, but not compiled in.\n"
msgstr "Kerberos V5-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
-#: fetchmail.c:1244
+#: fetchmail.c:1246
msgid "GSSAPI support is configured, but not compiled in.\n"
msgstr "GSSAPI-ondersteuning is geconfigureerd maar niet ingebouwd.\n"
-#: fetchmail.c:1274
+#: fetchmail.c:1276
#, 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:1285
+#: fetchmail.c:1287
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "waarschuwing: multidrop van %s vereist envelopoptie!\n"
-#: fetchmail.c:1286
+#: fetchmail.c:1288
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
-msgstr ""
-"waarschuwing: vraag niet om ondersteuning als alle e-mail naar postmaster "
-"gaat!\n"
+msgstr "waarschuwing: vraag niet om ondersteuning als alle e-mail naar postmaster gaat!\n"
-#: fetchmail.c:1303
+#: fetchmail.c:1305
#, 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:1310
+#: fetchmail.c:1312
#, 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:1328
+#: fetchmail.c:1330
#, 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:1342
+#: fetchmail.c:1344
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:1367
+#: fetchmail.c:1369
#, c-format
msgid "terminated with signal %d\n"
msgstr "beëindigd door signaal %d\n"
-#: fetchmail.c:1440
+#: fetchmail.c:1442
#, 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:1465
+#: fetchmail.c:1467
msgid "POP2 support is not configured.\n"
msgstr "POP2-ondersteuning is niet geconfigureerd.\n"
-#: fetchmail.c:1477
+#: fetchmail.c:1479
msgid "POP3 support is not configured.\n"
msgstr "POP3-ondersteuning is niet geconfigureerd.\n"
-#: fetchmail.c:1487
+#: fetchmail.c:1489
msgid "IMAP support is not configured.\n"
msgstr "IMAP-ondersteuning is niet geconfigureerd.\n"
-#: fetchmail.c:1493
+#: fetchmail.c:1495
msgid "ETRN support is not configured.\n"
msgstr "ETRN-ondersteuning is niet geconfigureerd.\n"
-#: fetchmail.c:1501
+#: fetchmail.c:1503
msgid "ODMR support is not configured.\n"
msgstr "ODMR-ondersteuning is niet geconfigureerd.\n"
-#: fetchmail.c:1508
+#: fetchmail.c:1510
msgid "unsupported protocol selected.\n"
msgstr "een niet-ondersteund protocol is geselecteerd.\n"
-#: fetchmail.c:1518
+#: fetchmail.c:1520
#, 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:1535
+#: fetchmail.c:1537
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "Ophaalinterval is %d seconden\n"
-#: fetchmail.c:1537
+#: fetchmail.c:1539
#, c-format
msgid "Logfile is %s\n"
msgstr "Logbestand is %s\n"
-#: fetchmail.c:1539
+#: fetchmail.c:1541
#, c-format
msgid "Idfile is %s\n"
msgstr "ID-bestand is %s\n"
-#: fetchmail.c:1542
+#: fetchmail.c:1544
msgid "Progress messages will be logged via syslog\n"
msgstr "Voortgangsberichten worden via syslog opgeslagen\n"
-#: fetchmail.c:1545
+#: fetchmail.c:1547
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail verstopt zich en maakt geen 'Received'-kopregels aan\n"
-#: fetchmail.c:1547
+#: fetchmail.c:1549
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail toont voortgangspuntjes ook in logbestanden.\n"
-#: fetchmail.c:1549
+#: fetchmail.c:1551
#, 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:1553
+#: fetchmail.c:1555
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail zal foutmeldingen naar de postmaster sturen.\n"
-#: fetchmail.c:1555
+#: fetchmail.c:1557
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail zal foutmeldingen naar de afzender sturen.\n"
-#: fetchmail.c:1558
-#, fuzzy
+#: fetchmail.c:1560
msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr ""
-"Fetchmail zal definitieve foutmeldingen als definitief afhandelen (berichten "
-"verwijderen).\n"
+msgstr "Fetchmail zal definitieve foutmeldingen als definitief afhandelen (berichten verwijderen).\n"
-#: fetchmail.c:1560
+#: fetchmail.c:1562
msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr ""
-"Fetchmail zal definitieve foutmeldingen als tijdelijk afhandelen (berichten "
-"behouden).\n"
+msgstr "Fetchmail zal definitieve foutmeldingen als tijdelijk afhandelen (berichten behouden).\n"
-#: fetchmail.c:1567
+#: fetchmail.c:1569
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "Opties voor het ophalen van %s@%s:\n"
-#: fetchmail.c:1571
+#: fetchmail.c:1573
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " Mail wordt opgehaald via %s\n"
-#: fetchmail.c:1574
+#: fetchmail.c:1576
#, 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:1578
+#: fetchmail.c:1580
#, c-format
msgid " True name of server is %s.\n"
msgstr " Werkelijke naam van server is %s.\n"
-#: fetchmail.c:1581
+#: fetchmail.c:1583
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:1582
+#: fetchmail.c:1584
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:1586
+#: fetchmail.c:1588
msgid " Password will be prompted for.\n"
msgstr " Wachtwoord wordt aan gebruiker gevraagd.\n"
-#: fetchmail.c:1590
+#: fetchmail.c:1592
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP-geheim = \"%s\".\n"
-#: fetchmail.c:1593
+#: fetchmail.c:1595
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP-ID = \"%s\".\n"
-#: fetchmail.c:1596
+#: fetchmail.c:1598
#, c-format
msgid " Password = \"%s\".\n"
msgstr " Wachtwoord = \"%s\".\n"
-#: fetchmail.c:1605
+#: fetchmail.c:1607
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " Protocol is KPOP met Kerberos %s-authenticatie"
-#: fetchmail.c:1608
+#: fetchmail.c:1610
#, c-format
msgid " Protocol is %s"
msgstr " Protocol is %s"
-#: fetchmail.c:1610
+#: fetchmail.c:1612
#, c-format
msgid " (using service %s)"
msgstr " (gebruikmakend van service %s)"
-#: fetchmail.c:1612
+#: fetchmail.c:1614
msgid " (using default port)"
msgstr " (gebruikmakend van de standaard poort)"
-#: fetchmail.c:1614
+#: fetchmail.c:1616
msgid " (forcing UIDL use)"
msgstr " (gebruik van UIDL wordt afgedwongen)"
-#: fetchmail.c:1620
+#: fetchmail.c:1622
msgid " All available authentication methods will be tried.\n"
msgstr " Alle beschikbare authenticatiemethoden worden geprobeerd.\n"
-#: fetchmail.c:1623
+#: fetchmail.c:1625
msgid " Password authentication will be forced.\n"
msgstr " Wachtwoordauthenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1626
+#: fetchmail.c:1628
msgid " MSN authentication will be forced.\n"
msgstr " MSN-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1629
+#: fetchmail.c:1631
msgid " NTLM authentication will be forced.\n"
msgstr " NTLM-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1632
+#: fetchmail.c:1634
msgid " OTP authentication will be forced.\n"
msgstr " OTP-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1635
+#: fetchmail.c:1637
msgid " CRAM-Md5 authentication will be forced.\n"
msgstr " CRAM-MD5-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1638
+#: fetchmail.c:1640
msgid " GSSAPI authentication will be forced.\n"
msgstr " GSSAPI-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1641
+#: fetchmail.c:1643
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " Kerberos V4-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1644
+#: fetchmail.c:1646
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " Kerberos V5-authenticatie wordt afgedwongen.\n"
-#: fetchmail.c:1647
+#: fetchmail.c:1649
msgid " End-to-end encryption assumed.\n"
msgstr " Versleuteling van-eindpunt-tot-eindpunt wordt aangenomen.\n"
-#: fetchmail.c:1651
+#: fetchmail.c:1653
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " Belangrijkste mailservice is: %s\n"
-#: fetchmail.c:1654
+#: fetchmail.c:1656
msgid " SSL encrypted sessions enabled.\n"
msgstr " SSL-versleutelde sessies zijn ingeschakeld.\n"
-#: fetchmail.c:1656
+#: fetchmail.c:1658
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL-protocol: %s.\n"
-#: fetchmail.c:1658
+#: fetchmail.c:1660
msgid " SSL server certificate checking enabled.\n"
msgstr " Certificaat-controle voor SSL-server is ingeschakeld.\n"
-#: fetchmail.c:1660
+#: fetchmail.c:1662
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " Map voor vertrouwde SSL-certificaten: %s\n"
-#: fetchmail.c:1663
+#: fetchmail.c:1665
#, c-format
msgid " SSL server CommonName: %s\n"
msgstr " CommonName SLL-server: %s\n"
-#: fetchmail.c:1665
+#: fetchmail.c:1667
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL-sleutelafdruk (geverifieerd tegenover serversleutel): %s\n"
-#: fetchmail.c:1668
+#: fetchmail.c:1670
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " Server-timeout voor geen respons is %d seconden"
-#: fetchmail.c:1670
+#: fetchmail.c:1672
msgid " (default).\n"
msgstr " (standaard).\n"
-#: fetchmail.c:1677
+#: fetchmail.c:1679
msgid " Default mailbox selected.\n"
msgstr " Standaard mailbox geselecteerd.\n"
-#: fetchmail.c:1682
+#: fetchmail.c:1684
msgid " Selected mailboxes are:"
msgstr " Geselecteerde mailboxen zijn:"
-#: fetchmail.c:1688
+#: fetchmail.c:1690
msgid " All messages will be retrieved (--all on).\n"
msgstr " Alle berichten zullen worden opgehaald ('--all on').\n"
-#: fetchmail.c:1689
+#: fetchmail.c:1691
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " Alleen nieuwe berichten zullen worden opgehaald ('--all off').\n"
-#: fetchmail.c:1691
+#: fetchmail.c:1693
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:1692
+#: fetchmail.c:1694
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:1694
+#: fetchmail.c:1696
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-" Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
-
-#: fetchmail.c:1695
-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"
+msgstr " Oude berichten worden verwijderd voor het ophalen begint ('--flush on').\n"
#: fetchmail.c:1697
-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"
+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:1698
-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:1699
+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:1700
+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:1702
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr ""
-" Herschrijven van lokale serveradressen is ingeschakeld ('--norewrite "
-"off').\n"
+msgstr " Herschrijven van lokale serveradressen is ingeschakeld ('--norewrite off').\n"
-#: fetchmail.c:1701
+#: fetchmail.c:1703
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr ""
-" Herschrijven van lokale serveradressen is uitgeschakeld ('--norewrite "
-"on').\n"
+msgstr " Herschrijven van lokale serveradressen is uitgeschakeld ('--norewrite on').\n"
-#: fetchmail.c:1703
+#: fetchmail.c:1705
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " Verwijderen van CR-tekens is ingeschakeld ('stripcr on').\n"
-#: fetchmail.c:1704
+#: fetchmail.c:1706
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " Verwijderen van CR-tekens is uitgeschakeld ('stripcr off').\n"
-#: fetchmail.c:1706
+#: fetchmail.c:1708
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " Afdwingen van CR-tekens is ingeschakeld ('forcecr on').\n"
-#: fetchmail.c:1707
+#: fetchmail.c:1709
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " Afdwingen van CR-tekens is uitgeschakeld ('forcecr off').\n"
-#: fetchmail.c:1709
-msgid ""
-" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-" Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits "
-"on').\n"
-
-#: fetchmail.c:1710
-msgid ""
-" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-" Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits "
-"off').\n"
+#: fetchmail.c:1711
+msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr " Interpretatie van Content-Transfer-Encoding is uitgeschakeld ('pass8bits on').\n"
#: fetchmail.c:1712
+msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr " Interpretatie van Content-Transfer-Encoding is ingeschakeld ('pass8bits off').\n"
+
+#: fetchmail.c:1714
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " MIME decoderen is ingeschakeld ('mimedecode on').\n"
-#: fetchmail.c:1713
+#: fetchmail.c:1715
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " MIME decoderen is uitgeschakeld ('mimedecode off').\n"
-#: fetchmail.c:1715
+#: fetchmail.c:1717
msgid " Idle after poll is enabled (idle on).\n"
msgstr " Nietsdoen na ophalen is ingeschakeld ('idle on').\n"
-#: fetchmail.c:1716
+#: fetchmail.c:1718
msgid " Idle after poll is disabled (idle off).\n"
msgstr " Nietsdoen na ophalen is uitgeschakeld ('idle off').\n"
-#: fetchmail.c:1718
+#: fetchmail.c:1720
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " Niet-lege Status-regels worden weggegooid ('dropstatus on')\n"
-#: fetchmail.c:1719
+#: fetchmail.c:1721
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " Niet-lege Status-regels worden behouden ('dropstatus off')\n"
-#: fetchmail.c:1721
+#: fetchmail.c:1723
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " Delivered-To-regels worden weggegooid ('dropdelivered on')\n"
-#: fetchmail.c:1722
+#: fetchmail.c:1724
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " Delivered-To-regels worden behouden ('dropdelivered off')\n"
-#: fetchmail.c:1726
+#: fetchmail.c:1728
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " Berichtgrootte-limiet is %d tekens ('--limit %d').\n"
-#: fetchmail.c:1729
+#: fetchmail.c:1731
msgid " No message size limit (--limit 0).\n"
msgstr " Berichtgrootte is onbegrensd ('--limit 0').\n"
-#: fetchmail.c:1731
+#: fetchmail.c:1733
#, 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:1734
+#: fetchmail.c:1736
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:1737
+#: fetchmail.c:1739
#, 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:1740
+#: fetchmail.c:1742
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:1742
+#: fetchmail.c:1744
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " Maximale berichtgrootte is %d ('--fetchsizelimit %d').\n"
-#: fetchmail.c:1745
+#: fetchmail.c:1747
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " Geen beperking op berichtgrootte ('--fetchsizelimit 0').\n"
-#: fetchmail.c:1749
+#: fetchmail.c:1751
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:1751
+#: fetchmail.c:1753
#, 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:1754
+#: fetchmail.c:1756
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:1756
+#: fetchmail.c:1758
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " Limiet SMTP-berichtenbatch is %d.\n"
-#: fetchmail.c:1758
+#: fetchmail.c:1760
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " Er is geen limiet voor SMTP-berichtenbatch (--batchlimit 0).\n"
-#: fetchmail.c:1762
+#: fetchmail.c:1764
#, 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:1764
+#: fetchmail.c:1766
msgid " No forced expunges (--expunge 0).\n"
msgstr " Geen geforceerde expunges (--expunge 0).\n"
-#: fetchmail.c:1771
+#: fetchmail.c:1773
msgid " Domains for which mail will be fetched are:"
msgstr " Er wordt mail opgehaald voor de volgende domeinen:"
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1778 fetchmail.c:1798
msgid " (default)"
msgstr " (standaard)"
-#: fetchmail.c:1781
+#: fetchmail.c:1783
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " Berichten worden toegevoegd aan %s als BSMTP\n"
-#: fetchmail.c:1783
+#: fetchmail.c:1785
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " Berichten worden bezorgd met \"%s\".\n"
-#: fetchmail.c:1790
+#: fetchmail.c:1792
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " Berichten worden %cMTP-geforward naar:"
-#: fetchmail.c:1801
+#: fetchmail.c:1803
#, 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:1804
+#: fetchmail.c:1806
#, 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:1813
+#: fetchmail.c:1815
msgid " Recognized listener spam block responses are:"
msgstr " Herkende foutcodes van spam-blokkades zijn:"
-#: fetchmail.c:1819
+#: fetchmail.c:1821
msgid " Spam-blocking disabled\n"
msgstr " Spam-blokkades uitgeschakeld\n"
-#: fetchmail.c:1822
+#: fetchmail.c:1824
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " Serververbinding wordt tot stand gebracht met \"%s\".\n"
-#: fetchmail.c:1825
+#: fetchmail.c:1827
msgid " No pre-connection command.\n"
msgstr " Geen voor-verbindingscommando.\n"
-#: fetchmail.c:1827
+#: fetchmail.c:1829
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " Serververbinding wordt verbroken met \"%s\".\n"
-#: fetchmail.c:1830
+#: fetchmail.c:1832
msgid " No post-connection command.\n"
msgstr " Geen na-verbindingscommando.\n"
-#: fetchmail.c:1833
+#: fetchmail.c:1835
msgid " No localnames declared for this host.\n"
msgstr " Geen lokale namen gedeclareerd voor deze host.\n"
-#: fetchmail.c:1843
+#: fetchmail.c:1845
msgid " Multi-drop mode: "
msgstr " Multi-drop modus: "
-#: fetchmail.c:1845
+#: fetchmail.c:1847
msgid " Single-drop mode: "
msgstr " Single-drop modus: "
-#: fetchmail.c:1847
+#: fetchmail.c:1849
#, 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:1862
+#: fetchmail.c:1864
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " DNS-zoekactie voor multidrop-adressen is ingeschakeld.\n"
-#: fetchmail.c:1863
+#: fetchmail.c:1865
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " DNS-zoekactie voor multidrop-adressen is uitgeschakeld.\n"
-#: fetchmail.c:1867
-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:1869
+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:1871
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:1872
+#: fetchmail.c:1874
msgid " Envelope-address routing is disabled\n"
msgstr " Envelopadres-routering is uitgeschakeld\n"
-#: fetchmail.c:1875
+#: fetchmail.c:1877
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " Envelopkoppen is aangenomen als zijnde: %s\n"
-#: fetchmail.c:1878
+#: fetchmail.c:1880
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " Aantal over te slaan envelopkoppen: %d\n"
-#: fetchmail.c:1881
+#: fetchmail.c:1883
#, 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:1884
+#: fetchmail.c:1886
msgid " No prefix stripping\n"
msgstr " Geen prefix-verwijdering\n"
-#: fetchmail.c:1891
+#: fetchmail.c:1893
msgid " Predeclared mailserver aliases:"
msgstr " Voorgedefinieerde mailserver-aliassen:"
-#: fetchmail.c:1900
+#: fetchmail.c:1902
msgid " Local domains:"
msgstr " Lokale domeinen:"
-#: fetchmail.c:1910
+#: fetchmail.c:1912
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " Connectie moet door interface %s.\n"
-#: fetchmail.c:1912
+#: fetchmail.c:1914
msgid " No interface requirement specified.\n"
msgstr " Geen interface-eisen opgegeven.\n"
-#: fetchmail.c:1914
+#: fetchmail.c:1916
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " Ophaallus monitort %s.\n"
-#: fetchmail.c:1916
+#: fetchmail.c:1918
msgid " No monitor interface specified.\n"
msgstr " Geen monitor-interface opgegeven.\n"
-#: fetchmail.c:1920
+#: fetchmail.c:1922
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " Serverconnecties worden gelegd via plugin %s ('--plugin %s').\n"
-#: fetchmail.c:1922
+#: fetchmail.c:1924
msgid " No plugin command specified.\n"
msgstr " Geen plugin-commando opgegeven.\n"
-#: fetchmail.c:1924
+#: fetchmail.c:1926
#, 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:1926
+#: fetchmail.c:1928
msgid " No plugout command specified.\n"
msgstr " Geen plugout-commando opgegeven.\n"
-#: fetchmail.c:1931
+#: fetchmail.c:1933
msgid " No UIDs saved from this host.\n"
msgstr " Geen UID's opgeslagen voor deze host.\n"
-#: fetchmail.c:1940
+#: fetchmail.c:1942
#, c-format
msgid " %d UIDs saved.\n"
msgstr " %d UID's opgeslagen.\n"
-#: fetchmail.c:1948
+#: fetchmail.c:1950
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:1950
-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"
+#: fetchmail.c:1952
+msgid " No poll trace information will be added to the Received header.\n"
+msgstr " Er wordt geen poll-trace-informatie aan de Received-header toegevoegd.\n"
+
+#: fetchmail.c:1957
+msgid " Messages with bad headers will be rejected.\n"
+msgstr " Berichten met een ongeldige hoofding worden afgewezen.\n"
-#: fetchmail.c:1953
+#: fetchmail.c:1960
+msgid " Messages with bad headers will be passed on.\n"
+msgstr " Berichten met een ongeldige hoofding worden doorgegeven.\n"
+
+#: fetchmail.c:1965
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " Doorvoereigenschappen \"%s\".\n"
@@ -1708,17 +1622,17 @@ msgstr "fetchmail: thread slaapt gedurende %d seconden.\n"
#: imap.c:73
#, c-format
msgid "Received BYE response from IMAP server: %s"
-msgstr ""
+msgstr "BYE-reactie ontvangen van IMAP-server: %s"
#: imap.c:91
-#, fuzzy, c-format
+#, c-format
msgid "bogus message count in \"%s\"!"
-msgstr "onjuist berichtenaantal!"
+msgstr "onjuist berichtenaantal in \"%s\"!"
#: imap.c:138
#, c-format
msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
+msgstr "onjuist EXPUNGE-aantal in \"%s\"!"
#: imap.c:387
msgid "Protocol identified as IMAP4 rev 1\n"
@@ -1821,8 +1735,7 @@ msgid "%u is first unseen\n"
msgstr "%u is als eerste nog niet gelezen\n"
#: imap.c:1144
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "Waarschuwing: server geeft onzinnige berichtgrootten terug.\n"
#: interface.c:256
@@ -2019,339 +1932,318 @@ msgstr "Kan OTP-challenge niet decoderen\n"
msgid "Secret pass phrase: "
msgstr "Geheime wachtwoordzin: "
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "String '%s' is geen geldige numerieke tekenreeks.\n"
-#: options.c:181
+#: options.c:183
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "Waarde van string '%s' is %s dan %d.\n"
-#: options.c:182
+#: options.c:184
msgid "smaller"
msgstr "kleiner"
-#: options.c:182
+#: options.c:184
msgid "larger"
msgstr "groter"
-#: options.c:349
+#: options.c:321
+#, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Ongeldig protocol onjuiste hoofding `%s' opgegeven.\n"
+
+#: options.c:362
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "Ongeldig protocol '%s' opgegeven.\n"
-#: options.c:396
+#: options.c:409
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "Ongeldige authenticatie '%s' opgegeven.\n"
-#: options.c:601
+#: options.c:614
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "Gebruik: fetchmail [opties] [server ...]\n"
-#: options.c:602
+#: options.c:615
msgid " Options are as follows:\n"
msgstr " Mogelijke opties zijn:\n"
-#: options.c:603
+#: options.c:616
msgid " -?, --help display this option help\n"
msgstr " -?, --help deze hulptekst tonen\n"
-#: options.c:604
+#: options.c:617
msgid " -V, --version display version info\n"
msgstr " -V, --version programmaversie tonen\n"
-#: options.c:606
+#: options.c:619
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check op berichten controleren, maar deze niet ophalen\n"
-#: options.c:607
+#: options.c:620
msgid " -s, --silent work silently\n"
msgstr " -s, --silent in stilte functioneren\n"
-#: options.c:608
+#: options.c:621
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:609
+#: options.c:622
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon als systeemservice elke N seconden draaien\n"
-#: options.c:610
+#: options.c:623
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:611
+#: options.c:624
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit systeemserviceproces elimineren\n"
-#: options.c:612
+#: options.c:625
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile te gebruiken logbestand\n"
-#: options.c:613
-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:626
+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:614
+#: options.c:627
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible onzichtbaar; geen Received-headers aanmaken\n"
-#: options.c:615
+#: options.c:628
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc te gebruiken run-control-bestand \n"
-#: options.c:616
+#: options.c:629
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile te gebruiken bestand met UID's\n"
-#: options.c:617
+#: options.c:630
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile te gebruiken PID-/vergrendelingsbestand\n"
-#: options.c:618
+#: options.c:631
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster mail-ontvanger indien alles faalt\n"
-#: options.c:619
+#: options.c:632
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:620
-msgid ""
-" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-" --nosoftbounce fetchmail verwijdert definitief niet-bestelbare "
-"berichten.\n"
+#: options.c:633
+msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr " --nosoftbounce fetchmail verwijdert definitief niet-bestelbare berichten.\n"
-#: options.c:621
-msgid ""
-" --softbounce keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-" --softbounce definitief onbestelbare berichten op de server behouden "
-"(standaard).\n"
+#: options.c:634
+msgid " --softbounce keep permanently undeliverable messages on server (default).\n"
+msgstr " --softbounce definitief onbestelbare berichten op de server behouden (standaard).\n"
-#: options.c:623
+#: options.c:636
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface vereiste interface\n"
-#: options.c:624
+#: options.c:637
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --monitor deze interface op activiteit monitoren\n"
-#: options.c:627
+#: options.c:640
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl SSL-beveiligde sessies inschakelen\n"
-#: options.c:628
+#: options.c:641
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey bestand met SSL-privésleutels\n"
-#: options.c:629
+#: options.c:642
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert SSL-cliëntcertificaat\n"
-#: options.c:630
+#: options.c:643
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:631
+#: options.c:644
msgid " --sslcertpath path to ssl certificates\n"
msgstr " --sslcertpath pad naar SSL-certificaten\n"
-#: options.c:632
-msgid ""
-" --sslcommonname expect this CommonName from server (discouraged)\n"
-msgstr ""
-" --sslcommonname verwacht deze CommonName van server (afgeraden)\n"
+#: options.c:645
+msgid " --sslcommonname expect this CommonName from server (discouraged)\n"
+msgstr " --sslcommonname verwacht deze CommonName van server (afgeraden)\n"
-#: options.c:633
-msgid ""
-" --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-" --sslfingerprint fingerprint dat overeen moet komen met het "
-"servercertificaat.\n"
+#: options.c:646
+msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr " --sslfingerprint fingerprint dat overeen moet komen met het servercertificaat.\n"
-#: options.c:634
+#: options.c:647
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto SSL-protocol afdwingen (SSL2/SSL3/TLS1)\n"
-#: options.c:636
+#: options.c:649
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin extern commando om verbinding te openen\n"
-#: options.c:637
+#: options.c:650
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout extern commando om SMTP-verbinding te openen\n"
-#: options.c:639
+#: options.c:651
+msgid ""
+" --bad-header {reject|accept}\n"
+" specify policy for handling messages with bad headers\n"
+msgstr ""
+" --bad-header {reject|accept}\n"
+" protocol voor afhandeling berichten met ongeldige hoofding instellen\n"
+
+#: options.c:654
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol ophaal-protocol (zie man-pagina)\n"
-#: options.c:640
+#: options.c:655
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl gebruik van UIDL's afdwingen (alleen POP3)\n"
-#: options.c:641
+#: options.c:656
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:642
-msgid ""
-" -P, --service TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:657
+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:643
+#: options.c:658
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth authenticatietype (password/kerberos/ssh/otp)\n"
-#: options.c:644
+#: options.c:659
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout server-timeout voor geen respons\n"
-#: options.c:645
+#: options.c:660
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope envelopadreskop\n"
-#: options.c:646
+#: options.c:661
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual prefix te verwijderen van lokaal user-ID\n"
-#: options.c:647
+#: options.c:662
msgid " --principal mail service principal\n"
msgstr " --principal principal voor mail service\n"
-#: options.c:648
+#: options.c:663
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:650
+#: options.c:665
msgid " -u, --username specify users's login on server\n"
msgstr " -u, --username loginnaam voor gebruiker op server\n"
-#: options.c:651
+#: options.c:666
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all zowel oude als nieuwe berichten ophalen\n"
-#: options.c:652
+#: options.c:667
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep nieuwe berichten verwijderen na het ophalen\n"
-#: options.c:653
+#: options.c:668
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:654
+#: options.c:669
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush oude berichten van de server verwijderen\n"
-#: options.c:655
+#: options.c:670
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush te grote berichten verwijderen\n"
-#: options.c:656
+#: options.c:671
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite header-adressen niet herschrijven\n"
-#: options.c:657
+#: options.c:672
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit berichten boven de genoemde grootte niet ophalen\n"
-#: options.c:658
+#: options.c:673
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings interval tussen waarschuwingsmails\n"
-#: options.c:660
+#: options.c:675
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost SMTP forwarding host\n"
-#: options.c:661
+#: options.c:676
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains mail voor deze domeinen ophalen\n"
-#: options.c:662
+#: options.c:677
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress te gebruiken SMTP-afleverdomein\n"
-#: options.c:663
+#: options.c:678
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname SMTP volledige naam gebruikersnaam@domein\n"
-#: options.c:664
+#: options.c:679
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam antispam-responswaarden\n"
-#: options.c:665
+#: options.c:680
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --batchlimit stapel-limiet voor SMTP-connecties instellen\n"
-#: options.c:666
+#: options.c:681
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit maximum aantal berichten per ophaalsessie\n"
-#: options.c:667
+#: options.c:682
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit maximumgrootte van op te halen berichten\n"
-#: options.c:668
+#: options.c:683
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl UIDL's binair zoeken\n"
-#: options.c:669
+#: options.c:684
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge maximaal aantal verwijderingen tussen expunges\n"
-#: options.c:670
+#: options.c:685
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda MDA voor forwarding\n"
-#: options.c:671
+#: options.c:686
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp BSMTP-uitvoerbestand\n"
-#: options.c:672
+#: options.c:687
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp LMTP (RFC2033) gebruiken voor bezorging\n"
-#: options.c:673
+#: options.c:688
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder te gebruiken map op server\n"
-#: options.c:674
+#: options.c:689
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots voortgangspuntjes ook in logbestanden tonen\n"
#: pop3.c:355
-msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
-msgstr ""
-"Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-"
-"commando in plaats van TOP.\n"
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-commando in plaats van TOP.\n"
#: pop3.c:454
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-"TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
+msgstr "TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
#: pop3.c:455
msgid "The CAPA command is however necessary for TLS.\n"
@@ -2364,9 +2256,7 @@ msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
#: pop3.c:646
msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
-"Het maximum aantal toegestane authenticators is bereikt, kan niet verder "
-"gaan.\n"
+msgstr "Het maximum aantal toegestane authenticators is bereikt, kan niet verder gaan.\n"
#: pop3.c:660
msgid "Required APOP timestamp not found in greeting\n"
@@ -2403,8 +2293,7 @@ msgstr "id=%s (num=%d) is al verwijderd, maar bestaat nog steeds!\n"
#: 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:1057
msgid "protocol error\n"
@@ -2418,53 +2307,45 @@ msgstr "protocolfout tijdens het ophalen van UIDLs\n"
msgid "Option --folder is not supported with POP3\n"
msgstr "Optie '--folder' is niet mogelijk met POP3\n"
-#: rcfile_y.y:126
+#: rcfile_y.y:129
msgid "server option after user options"
msgstr "serveroptie na gebruikersopties"
-#: rcfile_y.y:169
+#: rcfile_y.y:172
msgid "SDPS not enabled."
msgstr "SPDS niet ingeschakeld."
-#: rcfile_y.y:215
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:218
+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:222
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:225
+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:335
+#: rcfile_y.y:340
msgid "SSL is not enabled"
msgstr "SSL is niet ingeschakeld"
-#: rcfile_y.y:385
+#: rcfile_y.y:390
msgid "end of input"
msgstr "einde invoer"
-#: rcfile_y.y:423
+#: rcfile_y.y:428
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "Bestand %s moet een regulier bestand zijn.\n"
-#: rcfile_y.y:433
+#: rcfile_y.y:438
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr ""
-"Bestandspermissies op %s mogen niet minder stringent zijn dan -rwx------ "
-"(0700).\n"
+msgstr "Bestandspermissies op %s mogen niet minder stringent zijn dan -rwx------ (0700).\n"
-#: rcfile_y.y:445
+#: rcfile_y.y:450
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "Je moet de eigenaar zijn van bestand %s.\n"
@@ -2661,8 +2542,8 @@ msgid "MD5 being applied to data block:\n"
msgstr "MD5 wordt toegepast op data-blok:\n"
#: rpa.c:886
-msgid "MD5 result is: \n"
-msgstr "MD5-resultaat is: \n"
+msgid "MD5 result is:\n"
+msgstr "MD5-resultaat is:\n"
#: servport.c:53
#, c-format
@@ -2712,8 +2593,9 @@ msgid "BSMTP file open failed: %s\n"
msgstr "Openen van BSMTP-bestand is mislukt: %s\n"
#: sink.c:787
-msgid "BSMTP preamble write failed.\n"
-msgstr "Schrijven van BSMTP-voorwoord is mislukt.\n"
+#, c-format
+msgid "BSMTP preamble write failed: %s.\n"
+msgstr "Schrijven van BSMTP-voorwoord is mislukt: %s.\n"
#: sink.c:1001
#, c-format
@@ -2748,57 +2630,57 @@ msgstr "Staat op het punt te bezorgen met: %s\n"
msgid "MDA open failed\n"
msgstr "Openen van MDA mislukt\n"
-#: sink.c:1289
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP-verbinding met %s is mislukt\n"
-#: sink.c:1313
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "kan geen contact krijgen met luisterend programma; valt terug naar %s"
-#: sink.c:1375
+#: sink.c:1373
+#, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Berichtafsluiting of sluiten van BSMTP-bestand is mislukt: %s\n"
+
+#: sink.c:1400
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Fout bij schrijven naar MDA: %s\n"
-#: sink.c:1378
+#: sink.c:1403
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA is geëlimineerd door signaal %d\n"
-#: sink.c:1381
+#: sink.c:1406
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "afsluitwaarde van MDA is niet nul: %d\n"
-#: sink.c:1384
+#: sink.c:1409
#, 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 ""
"Vreemd: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
"kan dit niet verwerken, op %s:%d\n"
-#: sink.c:1406
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Berichtafsluiting of sluiten van BSMTP-bestand is mislukt\n"
-
-#: sink.c:1428
+#: sink.c:1434
msgid "SMTP listener refused delivery\n"
msgstr "SMTP-programma weigert te bezorgen\n"
-#: sink.c:1458
+#: sink.c:1464
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP-bezorgfout op EOM\n"
-#: sink.c:1461
+#: sink.c:1467
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Onverwachte respons (niet 503) op LMTP-EOM: %s\n"
-#: sink.c:1616
+#: sink.c:1622
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -2905,9 +2787,7 @@ msgstr "Uitgevende organisatie: %s\n"
#: socket.c:619
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:621
msgid "Unknown Organization\n"
@@ -3009,14 +2889,11 @@ msgstr "Bestandsdescriptor valt buiten bereik voor SSL"
#: socket.c:867
#, 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:943
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:1021
msgid "Cygwin socket read retry\n"
@@ -3069,47 +2946,46 @@ msgstr "geen Received-adres gevonden\n"
msgid "found Received address `%s'\n"
msgstr "Received-adres gevonden: '%s'\n"
-#: transact.c:592
+#: transact.c:595
msgid "incorrect header line found while scanning headers\n"
msgstr "incorrecte kopregel gevonden tijdens scannen van de kopregels\n"
-#: transact.c:594
+#: transact.c:597
#, c-format
msgid "line: %s"
msgstr "regel: %s"
-#: transact.c:1133
+#: transact.c:1136
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "geen lokale overeenkomsten; doorsturen naar %s\n"
-#: transact.c:1148
+#: transact.c:1151
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "doorsturen en verwijderen is onderdrukt vanwege DNS-fouten\n"
-#: transact.c:1258
+#: transact.c:1261
msgid "writing RFC822 msgblk.headers\n"
msgstr "schrijven van RFC822 msgblk.headers\n"
-#: transact.c:1277
+#: transact.c:1280
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:1284
+#: transact.c:1287
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "ontvangeradres %s komt niet overeen met een lokale naam"
-#: transact.c:1293
+#: transact.c:1296
msgid "message has embedded NULs"
msgstr "bericht bevat NUL-tekens"
-#: transact.c:1301
+#: transact.c:1304
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP-programma heeft de volgende lokale ontvangers geweigerd: "
-#: transact.c:1440
+#: transact.c:1443
msgid "error writing message text\n"
msgstr "fout bij schrijven van berichttekst\n"
@@ -3164,8 +3040,7 @@ msgstr "Schrijven van fetchids-bestand.\n"
#: 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:649
#, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b936f78c..eb6e15d9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
# fetchmail 软件包的简体中文翻译.
# Copyright (C) 2008 Eric S. Raymond (msgids)
# This file is distributed under the same license as the fetchmail package.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.12\n"
+"Project-Id-Version: fetchmail 6.3.15-pre1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
-"PO-Revision-Date: 2009-10-12 11:45中国标准时间\n"
+"POT-Creation-Date: 2010-02-24 01:55+0100\n"
+"PO-Revision-Date: 2010-02-26 08:51+0800\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -56,12 +56,12 @@ msgstr "kerberos 认证系统出错 %s\n"
#: driver.c:249
#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
#: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
#: driver.c:335
@@ -135,8 +135,7 @@ msgstr "(邮件内容 %d 字节)"
#: driver.c:751
#, 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:783
@@ -154,8 +153,7 @@ msgstr "未删除\n"
#: driver.c:828
#, 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:885
@@ -189,9 +187,7 @@ msgstr "主题: fetchmail 发现反复超时"
#: driver.c:916
#, 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:920
@@ -372,7 +368,7 @@ msgstr "正在选择或重检默认邮箱\n"
msgid "%s at %s (folder %s)"
msgstr "%s 在 %s (邮箱 %s)"
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1332 rcfile_y.y:389
#, c-format
msgid "%s at %s"
msgstr "%s 在 %s"
@@ -516,8 +512,7 @@ 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 ""
@@ -549,8 +544,7 @@ 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"
@@ -622,7 +616,6 @@ 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,\n"
@@ -630,11 +623,11 @@ msgid ""
"Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
"Copyright (C) 2005 - 2010 Matthias Andree\n"
msgstr ""
-"版权所有 (C) 2002, 2003 Eric S. Raymond\n"
-"版权所有 (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
-"Wilson\n"
-"版权所有 (C) 2005 - 2006 Sunil Shetye\n"
-"版权所有 (C) 2005 - 2009 Matthias Andree\n"
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
+" Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
+"Copyright (C) 2005 - 2010 Matthias Andree\n"
#: fetchmail.c:143
msgid ""
@@ -704,17 +697,13 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
msgstr "fetchmail: %s fetchmail 进程号 %d 终止\n"
#: fetchmail.c:481
-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:487
#, 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:494
#, c-format
@@ -722,8 +711,7 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
msgstr "fetchmail: 另一个前台 fetchmail 进程号 %d 正在运行。\n"
#: fetchmail.c:504
-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:510
@@ -752,12 +740,12 @@ msgstr "fetchmail: 无法转入后台。退出\n"
#: fetchmail.c:587
#, c-format
-msgid "starting fetchmail %s daemon \n"
+msgid "starting fetchmail %s daemon\n"
msgstr "开启 fetchmail %s 后台服务\n"
#: fetchmail.c:603 fetchmail.c:605
#, c-format
-msgid "could not open %s to append logs to \n"
+msgid "could not open %s to append logs to\n"
msgstr "无法打开 %s 添加记录\n"
#: fetchmail.c:607
@@ -886,675 +874,669 @@ msgstr "在 %s 被唤醒\n"
msgid "normal termination, status %d\n"
msgstr "正常结束,返回值 %d\n"
-#: fetchmail.c:1037
+#: fetchmail.c:1039
#, fuzzy
msgid "couldn't time-check the run-control file\n"
msgstr "无法对 run-control 文件进行时限检测\n"
-#: fetchmail.c:1070
+#: fetchmail.c:1072
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
msgstr "警告: 在配置文件中多次提及主机 %s\n"
-#: fetchmail.c:1103
+#: fetchmail.c:1105
msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
-#: fetchmail.c:1225
+#: fetchmail.c:1227
msgid "SSL support is not compiled in.\n"
msgstr "SSL 支持未编译在内\n"
-#: fetchmail.c:1232
+#: fetchmail.c:1234
msgid "KERBEROS v4 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v4 支持,但未编译在内\n"
-#: fetchmail.c:1238
+#: fetchmail.c:1240
msgid "KERBEROS v5 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v5 支持,但未编译在内\n"
-#: fetchmail.c:1244
+#: fetchmail.c:1246
msgid "GSSAPI support is configured, but not compiled in.\n"
msgstr "设置了 GSSAPI 支持,但未编译在内\n"
-#: fetchmail.c:1274
+#: fetchmail.c:1276
#, 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:1285
+#: fetchmail.c:1287
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "警告: %s 设置了多投邮件,需设置 envelope 选项!\n"
-#: fetchmail.c:1286
+#: fetchmail.c:1288
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
msgstr "警告: 如果所有邮件均被邮件管理员收取,不要寻求支持!\n"
-#: fetchmail.c:1303
+#: fetchmail.c:1305
#, 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:1310
+#: fetchmail.c:1312
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
msgstr "fetchmail: %s 配置无效,RPOP 要求开放一个特许端口\n"
-#: fetchmail.c:1328
+#: fetchmail.c:1330
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "%s 配置无效,LMTP 不能用默认的 SMTP 端口\n"
-#: fetchmail.c:1342
+#: fetchmail.c:1344
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的!\n"
-#: fetchmail.c:1367
+#: fetchmail.c:1369
#, c-format
msgid "terminated with signal %d\n"
msgstr "以信号 %d 终止\n"
-#: fetchmail.c:1440
+#: fetchmail.c:1442
#, 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:1465
+#: fetchmail.c:1467
msgid "POP2 support is not configured.\n"
msgstr "未设置 POP2 支持\n"
-#: fetchmail.c:1477
+#: fetchmail.c:1479
msgid "POP3 support is not configured.\n"
msgstr "未设置 POP3 支持\n"
-#: fetchmail.c:1487
+#: fetchmail.c:1489
msgid "IMAP support is not configured.\n"
msgstr "未设置 IMAP 支持\n"
-#: fetchmail.c:1493
+#: fetchmail.c:1495
msgid "ETRN support is not configured.\n"
msgstr "未设置 ETRN 支持\n"
-#: fetchmail.c:1501
+#: fetchmail.c:1503
msgid "ODMR support is not configured.\n"
msgstr "未设置 ODMR 支持\n"
-#: fetchmail.c:1508
+#: fetchmail.c:1510
msgid "unsupported protocol selected.\n"
msgstr "选中了不支持的协议\n"
-#: fetchmail.c:1518
+#: fetchmail.c:1520
#, 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:1535
+#: fetchmail.c:1537
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "收件间隔 %d 秒\n"
-#: fetchmail.c:1537
+#: fetchmail.c:1539
#, c-format
msgid "Logfile is %s\n"
msgstr "日志文件为 %s\n"
-#: fetchmail.c:1539
+#: fetchmail.c:1541
#, c-format
msgid "Idfile is %s\n"
msgstr "Idfile 文件为 %s\n"
-#: fetchmail.c:1542
+#: fetchmail.c:1544
msgid "Progress messages will be logged via syslog\n"
msgstr "邮件情况将通过 syslog 来记录\n"
-#: fetchmail.c:1545
+#: fetchmail.c:1547
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
-#: fetchmail.c:1547
+#: fetchmail.c:1549
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
-#: fetchmail.c:1549
+#: fetchmail.c:1551
#, c-format
msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
-#: fetchmail.c:1553
+#: fetchmail.c:1555
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
-#: fetchmail.c:1555
+#: fetchmail.c:1557
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail 将把错误邮件退给发送者\n"
-#: fetchmail.c:1558
-#, fuzzy
+#: fetchmail.c:1560
msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "Fetchmail 将把惯性错误当成不可恢复的错误(删除邮件)。\n"
+msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
-#: fetchmail.c:1560
+#: fetchmail.c:1562
msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
-#: fetchmail.c:1567
+#: fetchmail.c:1569
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "从 %s@%s 收件时的选项:\n"
-#: fetchmail.c:1571
+#: fetchmail.c:1573
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " 邮件将通过 %s 收取\n"
-#: fetchmail.c:1574
+#: fetchmail.c:1576
#, 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:1578
+#: fetchmail.c:1580
#, c-format
msgid " True name of server is %s.\n"
msgstr " 服务器的实名为 %s。\n"
-#: fetchmail.c:1581
+#: fetchmail.c:1583
msgid " This host will not be queried when no host is specified.\n"
msgstr " 若不指明主机将不查询此主机\n"
-#: fetchmail.c:1582
+#: fetchmail.c:1584
msgid " This host will be queried when no host is specified.\n"
msgstr " 若不指明主机将查询此主机\n"
-#: fetchmail.c:1586
+#: fetchmail.c:1588
msgid " Password will be prompted for.\n"
msgstr "密码会被提示\n"
-#: fetchmail.c:1590
+#: fetchmail.c:1592
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP 密码 = “%s”\n"
-#: fetchmail.c:1593
+#: fetchmail.c:1595
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP 密码 = “%s”\n"
-#: fetchmail.c:1596
+#: fetchmail.c:1598
#, c-format
msgid " Password = \"%s\".\n"
msgstr " 密码 = “%s”\n"
-#: fetchmail.c:1605
+#: fetchmail.c:1607
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
-#: fetchmail.c:1608
+#: fetchmail.c:1610
#, c-format
msgid " Protocol is %s"
msgstr " 协议是 %s"
-#: fetchmail.c:1610
+#: fetchmail.c:1612
#, c-format
msgid " (using service %s)"
msgstr " (正在使用服务 %s)"
-#: fetchmail.c:1612
+#: fetchmail.c:1614
msgid " (using default port)"
msgstr " (正在使用默认端口)"
-#: fetchmail.c:1614
+#: fetchmail.c:1616
msgid " (forcing UIDL use)"
msgstr " (正在强制使用 UIDL)"
-#: fetchmail.c:1620
+#: fetchmail.c:1622
msgid " All available authentication methods will be tried.\n"
msgstr " 将尝试所有有效的验证方式\n"
-#: fetchmail.c:1623
+#: fetchmail.c:1625
msgid " Password authentication will be forced.\n"
msgstr " 强制密码验证\n"
-#: fetchmail.c:1626
+#: fetchmail.c:1628
msgid " MSN authentication will be forced.\n"
msgstr " 强制 MSN 验证\n"
-#: fetchmail.c:1629
+#: fetchmail.c:1631
msgid " NTLM authentication will be forced.\n"
msgstr " 强制 NTLM 验证\n"
-#: fetchmail.c:1632
+#: fetchmail.c:1634
msgid " OTP authentication will be forced.\n"
msgstr " 强制 OTP 验证\n"
-#: fetchmail.c:1635
+#: fetchmail.c:1637
msgid " CRAM-Md5 authentication will be forced.\n"
msgstr " 强制 CRAM-Md5 验证\n"
-#: fetchmail.c:1638
+#: fetchmail.c:1640
msgid " GSSAPI authentication will be forced.\n"
msgstr " 强制 GSSAPI 验证\n"
-#: fetchmail.c:1641
+#: fetchmail.c:1643
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " 强制 Kerberos V4 验证\n"
-#: fetchmail.c:1644
+#: fetchmail.c:1646
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " 强制 Kerberos V5 验证\n"
-#: fetchmail.c:1647
+#: fetchmail.c:1649
msgid " End-to-end encryption assumed.\n"
msgstr " 假设为终端到终端加密\n"
-#: fetchmail.c:1651
+#: fetchmail.c:1653
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " 邮件服务协议验证方为: %s\n"
-#: fetchmail.c:1654
+#: fetchmail.c:1656
msgid " SSL encrypted sessions enabled.\n"
msgstr "启用 SSL 加密会话\n"
-#: fetchmail.c:1656
+#: fetchmail.c:1658
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL 协议: %s\n"
-#: fetchmail.c:1658
+#: fetchmail.c:1660
msgid " SSL server certificate checking enabled.\n"
msgstr " 启用 SSL 服务器证书检查\n"
-#: fetchmail.c:1660
+#: fetchmail.c:1662
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL 受信证书目录: %s\n"
-#: fetchmail.c:1663
+#: fetchmail.c:1665
#, c-format
msgid " SSL server CommonName: %s\n"
msgstr " SSL 服务器名: %s\n"
-#: fetchmail.c:1665
+#: fetchmail.c:1667
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
-#: fetchmail.c:1668
+#: fetchmail.c:1670
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " 服务器未响应,超时 %d 秒"
-#: fetchmail.c:1670
+#: fetchmail.c:1672
msgid " (default).\n"
msgstr " (默认)。\n"
-#: fetchmail.c:1677
+#: fetchmail.c:1679
msgid " Default mailbox selected.\n"
msgstr " 已选中默认邮箱。\n"
-#: fetchmail.c:1682
+#: fetchmail.c:1684
msgid " Selected mailboxes are:"
msgstr " 选中的邮箱是:"
-#: fetchmail.c:1688
+#: fetchmail.c:1690
msgid " All messages will be retrieved (--all on).\n"
msgstr " 收取所有邮件( --all 选项开启).\n"
-#: fetchmail.c:1689
+#: fetchmail.c:1691
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " 只收取新邮件( --all 选项关闭).\n"
-#: fetchmail.c:1691
+#: fetchmail.c:1693
msgid " Fetched messages will be kept on the server (--keep on).\n"
msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
-#: fetchmail.c:1692
+#: fetchmail.c:1694
msgid " Fetched messages will not be kept on the server (--keep off).\n"
msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
-#: fetchmail.c:1694
+#: fetchmail.c:1696
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
-#: fetchmail.c:1695
-msgid ""
-" Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1697
+msgid " Old messages will not be flushed before message retrieval (--flush off).\n"
msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
-#: fetchmail.c:1697
-msgid ""
-" Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+#: fetchmail.c:1699
+msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n"
msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
-#: fetchmail.c:1698
-msgid ""
-" Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1700
+msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
-#: fetchmail.c:1700
+#: fetchmail.c:1702
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
-#: fetchmail.c:1701
+#: fetchmail.c:1703
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
-#: fetchmail.c:1703
+#: fetchmail.c:1705
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " 回车符清除(stripcr 开启).\n"
-#: fetchmail.c:1704
+#: fetchmail.c:1706
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " 不清除回车符(stripcr 关闭).\n"
-#: fetchmail.c:1706
+#: fetchmail.c:1708
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
-#: fetchmail.c:1707
+#: fetchmail.c:1709
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
-#: fetchmail.c:1709
-msgid ""
-" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1711
+msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
-#: fetchmail.c:1710
-msgid ""
-" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1712
+msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
-#: fetchmail.c:1712
+#: fetchmail.c:1714
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
-#: fetchmail.c:1713
+#: fetchmail.c:1715
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
-#: fetchmail.c:1715
+#: fetchmail.c:1717
msgid " Idle after poll is enabled (idle on).\n"
msgstr " 收件后回到 idle 模式 (idle 开启).\n"
-#: fetchmail.c:1716
+#: fetchmail.c:1718
msgid " Idle after poll is disabled (idle off).\n"
msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
-#: fetchmail.c:1718
+#: fetchmail.c:1720
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
-#: fetchmail.c:1719
+#: fetchmail.c:1721
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
-#: fetchmail.c:1721
+#: fetchmail.c:1723
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
-#: fetchmail.c:1722
+#: fetchmail.c:1724
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
-#: fetchmail.c:1726
+#: fetchmail.c:1728
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
-#: fetchmail.c:1729
+#: fetchmail.c:1731
msgid " No message size limit (--limit 0).\n"
msgstr " 邮件大小无限制 (--limit 0).\n"
-#: fetchmail.c:1731
+#: fetchmail.c:1733
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
-#: fetchmail.c:1734
+#: fetchmail.c:1736
msgid " Size warnings on every poll (--warnings 0).\n"
msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
-#: fetchmail.c:1737
+#: fetchmail.c:1739
#, c-format
msgid " Received-message limit is %d (--fetchlimit %d).\n"
msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
-#: fetchmail.c:1740
+#: fetchmail.c:1742
msgid " No received-message limit (--fetchlimit 0).\n"
msgstr " 无收件限制 (--fetchlimit 0).\n"
-#: fetchmail.c:1742
+#: fetchmail.c:1744
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
-#: fetchmail.c:1745
+#: fetchmail.c:1747
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
-#: fetchmail.c:1749
+#: fetchmail.c:1751
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
-#: fetchmail.c:1751
+#: fetchmail.c:1753
#, 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:1754
+#: fetchmail.c:1756
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
-#: fetchmail.c:1756
+#: fetchmail.c:1758
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
-#: fetchmail.c:1758
+#: fetchmail.c:1760
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
-#: fetchmail.c:1762
+#: fetchmail.c:1764
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
-#: fetchmail.c:1764
+#: fetchmail.c:1766
msgid " No forced expunges (--expunge 0).\n"
msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
-#: fetchmail.c:1771
+#: fetchmail.c:1773
msgid " Domains for which mail will be fetched are:"
msgstr " 要收取的邮件位于服务器:"
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1778 fetchmail.c:1798
msgid " (default)"
msgstr " (默认)"
-#: fetchmail.c:1781
+#: fetchmail.c:1783
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " 邮件作为 BSMTP 附加至 %s\n"
-#: fetchmail.c:1783
+#: fetchmail.c:1785
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " 邮件通过 “%s” 投递。\n"
-#: fetchmail.c:1790
+#: fetchmail.c:1792
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " 邮件将被 %cMPT 转发到:"
-#: fetchmail.c:1801
+#: fetchmail.c:1803
#, c-format
msgid " Host part of MAIL FROM line will be %s\n"
msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
-#: fetchmail.c:1804
+#: fetchmail.c:1806
#, 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:1813
+#: fetchmail.c:1815
msgid " Recognized listener spam block responses are:"
msgstr " 识别出的监听端垃圾邮件拒收响应为:"
# fetchmail.c:1809
-#: fetchmail.c:1819
+#: fetchmail.c:1821
msgid " Spam-blocking disabled\n"
msgstr " 关闭垃圾邮件拒收\n"
-#: fetchmail.c:1822
+#: fetchmail.c:1824
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 唤起\n"
-#: fetchmail.c:1825
+#: fetchmail.c:1827
msgid " No pre-connection command.\n"
msgstr " 无连接前要执行的程序。\n"
-#: fetchmail.c:1827
+#: fetchmail.c:1829
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 关闭。\n"
-#: fetchmail.c:1830
+#: fetchmail.c:1832
msgid " No post-connection command.\n"
msgstr " 无连接后要执行的程序。\n"
-#: fetchmail.c:1833
+#: fetchmail.c:1835
msgid " No localnames declared for this host.\n"
msgstr " 此服务器没有要关联的本地用户名。\n"
-#: fetchmail.c:1843
+#: fetchmail.c:1845
msgid " Multi-drop mode: "
msgstr " 多投模式: "
-#: fetchmail.c:1845
+#: fetchmail.c:1847
msgid " Single-drop mode: "
msgstr " 单投模式: "
-#: fetchmail.c:1847
+#: fetchmail.c:1849
#, c-format
msgid "%d local name recognized.\n"
msgid_plural "%d local names recognized.\n"
msgstr[0] "识别出 %d 个本地用户名。\n"
-#: fetchmail.c:1862
+#: fetchmail.c:1864
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " 启用 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1863
+#: fetchmail.c:1865
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " 关闭 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1867
-msgid ""
-" Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1869
+msgid " Server aliases will be compared with multidrop addresses by IP address.\n"
msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
-#: fetchmail.c:1869
+#: fetchmail.c:1871
msgid " Server aliases will be compared with multidrop addresses by name.\n"
msgstr " 服务器昵称将以名字与多投地址进行比较\n"
-#: fetchmail.c:1872
+#: fetchmail.c:1874
msgid " Envelope-address routing is disabled\n"
msgstr " 禁用 Envelope-address 路由\n"
-#: fetchmail.c:1875
+#: fetchmail.c:1877
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " 邮件头假定为: %s\n"
-#: fetchmail.c:1878
+#: fetchmail.c:1880
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " 跳过的邮件头数目为: %d\n"
-#: fetchmail.c:1881
+#: fetchmail.c:1883
#, c-format
msgid " Prefix %s will be removed from user id\n"
msgstr " 将从用户 id 中移除前缀 %s\n"
-#: fetchmail.c:1884
+#: fetchmail.c:1886
msgid " No prefix stripping\n"
msgstr " 没有要从用户 id 中清除的前缀\n"
-#: fetchmail.c:1891
+#: fetchmail.c:1893
msgid " Predeclared mailserver aliases:"
msgstr " 预先声明的邮件服务器昵称: "
-#: fetchmail.c:1900
+#: fetchmail.c:1902
msgid " Local domains:"
msgstr " 本地域:"
-#: fetchmail.c:1910
+#: fetchmail.c:1912
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " 必须通过地址 %s 连接\n"
-#: fetchmail.c:1912
+#: fetchmail.c:1914
msgid " No interface requirement specified.\n"
msgstr " 未指定地址要求。\n"
-#: fetchmail.c:1914
+#: fetchmail.c:1916
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " 收件轮循将监听 %s。\n"
-#: fetchmail.c:1916
+#: fetchmail.c:1918
msgid " No monitor interface specified.\n"
msgstr " 未指定监听地址。\n"
-#: fetchmail.c:1920
+#: fetchmail.c:1922
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
-#: fetchmail.c:1922
+#: fetchmail.c:1924
msgid " No plugin command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1924
+#: fetchmail.c:1926
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
-#: fetchmail.c:1926
+#: fetchmail.c:1928
msgid " No plugout command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1931
+#: fetchmail.c:1933
msgid " No UIDs saved from this host.\n"
msgstr " 未从此主机上保存 UIDs。\n"
-#: fetchmail.c:1940
+#: fetchmail.c:1942
#, c-format
msgid " %d UIDs saved.\n"
msgstr " 保存了 %d 个UIDs。\n"
-#: fetchmail.c:1948
+#: fetchmail.c:1950
msgid " Poll trace information will be added to the Received header.\n"
msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
-#: fetchmail.c:1950
-msgid ""
-" No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1952
+msgid " No poll trace information will be added to the Received header.\n"
msgstr ""
" 无收件跟踪信息要被加入 Received 邮件头。\n"
"。\n"
-#: fetchmail.c:1953
+#: fetchmail.c:1957
+msgid " Messages with bad headers will be rejected.\n"
+msgstr " 邮件头错误的邮件将被拒收。\n"
+
+#: fetchmail.c:1960
+msgid " Messages with bad headers will be passed on.\n"
+msgstr " 邮件头错误的邮件可以接收。\n"
+
+#: fetchmail.c:1965
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1631,17 +1613,17 @@ msgstr "fetchmail: 线程休眠 %d 秒。\n"
#: imap.c:73
#, c-format
msgid "Received BYE response from IMAP server: %s"
-msgstr ""
+msgstr "从IMAP 服务器收到 BYE 指令: %s"
#: imap.c:91
-#, fuzzy, c-format
+#, c-format
msgid "bogus message count in \"%s\"!"
-msgstr "发现无效邮件!"
+msgstr "发现伪造邮件\"%s\"!"
#: imap.c:138
#, c-format
msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
+msgstr "发现伪造的EXPUNGE \"%s\"!"
#: imap.c:387
msgid "Protocol identified as IMAP4 rev 1\n"
@@ -1741,8 +1723,7 @@ msgid "%u is first unseen\n"
msgstr "%u 是首个未读邮件\n"
#: imap.c:1144
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
#: interface.c:256
@@ -1939,311 +1920,313 @@ msgstr "无法解码 OTP 请求\n"
msgid "Secret pass phrase: "
msgstr "密码短语:"
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
-#: options.c:181
+#: options.c:183
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
-#: options.c:182
+#: options.c:184
msgid "smaller"
msgstr "小"
-#: options.c:182
+#: options.c:184
msgid "larger"
msgstr "大"
-#: options.c:349
+#: options.c:321
+#, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "设定的错误邮件头处理方式‘%s’无效。\n"
+
+#: options.c:362
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "指定了无效的协议 ‘%s’\n"
-#: options.c:396
+#: options.c:409
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "指定了无效的认证方式 ‘%s’\n"
-#: options.c:601
+#: options.c:614
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "用法: fetchmail [选项] [服务器...]\n"
-#: options.c:602
+#: options.c:615
msgid " Options are as follows:\n"
msgstr "选项如下:\n"
-#: options.c:603
+#: options.c:616
msgid " -?, --help display this option help\n"
msgstr " -?, --help\t显示此选项帮助\n"
-#: options.c:604
+#: options.c:617
msgid " -V, --version display version info\n"
msgstr " -V, --version\t显示版本信息\n"
-#: options.c:606
+#: options.c:619
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check\t只检查邮件而不收取\n"
-#: options.c:607
+#: options.c:620
msgid " -s, --silent work silently\n"
msgstr " -s, --silent\t运行时不要显示多余信息\n"
-#: options.c:608
+#: options.c:621
msgid " -v, --verbose work noisily (diagnostic output)\n"
msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
-#: options.c:609
+#: options.c:622
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
-#: options.c:610
+#: options.c:623
msgid " -N, --nodetach don't detach daemon process\n"
msgstr " -N, --nodetach\t不分离后台进程\n"
-#: options.c:611
+#: options.c:624
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit\t终止后台进程\n"
-#: options.c:612
+#: options.c:625
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile\t指定日志文件名\n"
-#: options.c:613
-msgid ""
-" --syslog use syslog(3) for most messages when running as a "
-"daemon\n"
+#: options.c:626
+msgid " --syslog use syslog(3) for most messages when running as a daemon\n"
msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
-#: options.c:614
+#: options.c:627
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
-#: options.c:615
+#: options.c:628
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
-#: options.c:616
+#: options.c:629
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
-#: options.c:617
+#: options.c:630
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile\t指定可选的进程(锁)文件\n"
-#: options.c:618
+#: options.c:631
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster\t指定邮件管理员\n"
-#: options.c:619
+#: options.c:632
msgid " --nobounce redirect bounces from user to postmaster.\n"
msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
-#: options.c:620
-msgid ""
-" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+#: options.c:633
+msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
msgstr " --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
-#: options.c:621
-msgid ""
-" --softbounce keep permanently undeliverable messages on server "
-"(default).\n"
+#: options.c:634
+msgid " --softbounce keep permanently undeliverable messages on server (default).\n"
msgstr " --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
-#: options.c:623
+#: options.c:636
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface\t指定网络地址\n"
-#: options.c:624
+#: options.c:637
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
-#: options.c:627
+#: options.c:640
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl\t启用 ssl 加密会话\n"
-#: options.c:628
+#: options.c:641
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey\tssl 私钥文件\n"
-#: options.c:629
+#: options.c:642
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert\tssl 客户端证书\n"
-#: options.c:630
+#: options.c:643
msgid " --sslcertck do strict server certificate check (recommended)\n"
msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
-#: options.c:631
+#: options.c:644
msgid " --sslcertpath path to ssl certificates\n"
msgstr " --sslcertpath\tssl 证书目录\n"
-#: options.c:632
-msgid ""
-" --sslcommonname expect this CommonName from server (discouraged)\n"
+#: options.c:645
+msgid " --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
-#: options.c:633
-msgid ""
-" --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+#: options.c:646
+msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n"
msgstr " --sslfingerprint\t指定一个指纹,它必须与服务器证书的指纹匹配\n"
-#: options.c:634
+#: options.c:647
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
-#: options.c:636
+#: options.c:649
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin\t指定外部程序打开连接\n"
-#: options.c:637
+#: options.c:650
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
-#: options.c:639
+#: options.c:651
+msgid ""
+" --bad-header {reject|pass}\n"
+" specify policy for handling messages with bad headers\n"
+msgstr ""
+" --bad-header {reject|pass}\n"
+" 设定对邮件头错误的邮件的处理方式\n"
+
+#: options.c:654
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
-#: options.c:640
+#: options.c:655
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
-#: options.c:641
+#: options.c:656
msgid " --port TCP port to connect to (obsolete, use --service)\n"
msgstr " --port\t要连接的 TCP 端口(过时了,用 --service)\n"
-#: options.c:642
-msgid ""
-" -P, --service TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:657
+msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n"
msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
-#: options.c:643
+#: options.c:658
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
-#: options.c:644
+#: options.c:659
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
-#: options.c:645
+#: options.c:660
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope\t指定邮件地址头\n"
-#: options.c:646
+#: options.c:661
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
-#: options.c:647
+#: options.c:662
msgid " --principal mail service principal\n"
msgstr " --principal\t邮件服务验证方\n"
-#: options.c:648
+#: options.c:663
msgid " --tracepolls add poll-tracing information to Received header\n"
msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
-#: options.c:650
+#: options.c:665
msgid " -u, --username specify users's login on server\n"
msgstr " -u, --username\t指定登录服务器的用户名\n"
-#: options.c:651
+#: options.c:666
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
-#: options.c:652
+#: options.c:667
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
-#: options.c:653
+#: options.c:668
msgid " -k, --keep save new messages after retrieval\n"
msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
-#: options.c:654
+#: options.c:669
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush\t从服务器上删除旧邮件\n"
-#: options.c:655
+#: options.c:670
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush\t删除过大的邮件\n"
-#: options.c:656
+#: options.c:671
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite\t不要重写地址头\n"
-#: options.c:657
+#: options.c:672
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit\t不收超过指定大小的邮件\n"
-#: options.c:658
+#: options.c:673
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings\t邮件通知警告的间隔\n"
-#: options.c:660
+#: options.c:675
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
-#: options.c:661
+#: options.c:676
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains\t收取指定域的邮件\n"
-#: options.c:662
+#: options.c:677
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
-#: options.c:663
+#: options.c:678
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname\t设置 SMTP 全名,用户名@域\n"
-#: options.c:664
+#: options.c:679
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
-#: options.c:665
+#: options.c:680
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
-#: options.c:666
+#: options.c:681
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
-#: options.c:667
+#: options.c:682
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit\t设置收件大小限制\n"
-#: options.c:668
+#: options.c:683
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
-#: options.c:669
+#: options.c:684
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
-#: options.c:670
+#: options.c:685
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda\t设置用于转发的 MDA\n"
-#: options.c:671
+#: options.c:686
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
-#: options.c:672
+#: options.c:687
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
-#: options.c:673
+#: options.c:688
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder\t指定远程邮箱名\n"
-#: options.c:674
+#: options.c:689
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
#: pop3.c:355
-msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
msgstr "警告: 发现“ POP3 代理服务器”,用 RETR 命令代替 TOP。\n"
#: pop3.c:454
@@ -2312,45 +2295,41 @@ msgstr "正在读取 UIDLs 时协议出错\n"
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 不支持 --folder 选项\n"
-#: rcfile_y.y:126
+#: rcfile_y.y:129
msgid "server option after user options"
msgstr "服务器选项在用户选项后"
-#: rcfile_y.y:169
+#: rcfile_y.y:172
msgid "SDPS not enabled."
msgstr "SDPS 不可用"
-#: rcfile_y.y:215
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
-#: rcfile_y.y:222
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:225
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
-#: rcfile_y.y:335
+#: rcfile_y.y:340
msgid "SSL is not enabled"
msgstr "SSL 不可用"
-#: rcfile_y.y:385
+#: rcfile_y.y:390
msgid "end of input"
msgstr "输入结束"
-#: rcfile_y.y:423
+#: rcfile_y.y:428
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "文件 %s 必须是个普通文件。\n"
-#: rcfile_y.y:433
+#: rcfile_y.y:438
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
-#: rcfile_y.y:445
+#: rcfile_y.y:450
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "文件 %s 必须归您所有。\n"
@@ -2547,8 +2526,8 @@ msgid "MD5 being applied to data block:\n"
msgstr "数据块使用了 MD5:\n"
#: rpa.c:886
-msgid "MD5 result is: \n"
-msgstr "MD5 值: \n"
+msgid "MD5 result is:\n"
+msgstr "MD5 值:\n"
#: servport.c:53
#, c-format
@@ -2661,8 +2640,7 @@ msgstr "MDA 返回非零值 %d\n"
#: sink.c:1384
#, 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:1406
@@ -2948,46 +2926,46 @@ msgstr "找不到 Received 地址\n"
msgid "found Received address `%s'\n"
msgstr "找到 Received 地址 ‘%s’\n"
-#: transact.c:592
+#: transact.c:595
msgid "incorrect header line found while scanning headers\n"
msgstr "查找邮件头时发现不正确的行\n"
-#: transact.c:594
+#: transact.c:597
#, c-format
msgid "line: %s"
msgstr "行: %s"
-#: transact.c:1133
+#: transact.c:1136
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "无本地匹配的收件人,正在转发至 %s\n"
-#: transact.c:1148
+#: transact.c:1151
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "正在转发且由于 DNS 错误,删除被取消了\n"
-#: transact.c:1258
+#: transact.c:1261
msgid "writing RFC822 msgblk.headers\n"
msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
-#: transact.c:1277
+#: transact.c:1280
msgid "no recipient addresses matched declared local names"
msgstr "收件人地址与本地已知的用户名不匹配"
-#: transact.c:1284
+#: transact.c:1287
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
-#: transact.c:1293
+#: transact.c:1296
msgid "message has embedded NULs"
msgstr "邮件嵌入了 NULs"
-#: transact.c:1301
+#: transact.c:1304
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 端拒绝本地收件人地址:"
-#: transact.c:1440
+#: transact.c:1443
msgid "error writing message text\n"
msgstr "在写邮件文本时出错\n"