Add pidfile option, requested by Héctor García.

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

12 files changed, 701 insertions, 657 deletions

diff --git a/Makefile.am b/Makefile.am
index a4476777..c053d600 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,8 @@ fetchmail_SOURCES=	fetchmail.h getopt.h \
 		driver.c transact.c sink.c smtp.c \
 		uid.c mxget.c md5ify.c cram.c kerberos.c gssapi.c \
 		opie.c rpa.c interface.c netrc.c \
-		unmime.c conf.c checkalias.c lock.c \
+		unmime.c conf.c checkalias.c \
+		lock.h lock.c \
 		rcfile_l.l rcfile_y.y ucs/norm_charmap.c \
 		libesmtp/getaddrinfo.h libesmtp/getaddrinfo.c \
 		KAME/getnameinfo.c
diff --git a/NEWS b/NEWS
index 9dd92bd5..6eb7dccd 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,12 @@ fetchmail 6.3.4 (not yet released):
 * lexer: add %option noyywrap to avoid link errors about missing yywrap().
 * a few more type fixes for report/snprintf, patch by Miloslav Trmac.
 
+# CHANGES:
+* pidfile: there is a new command-line (--pidfile PATH) and global option for
+  the rcfile (set pidfile [=] "/path/to/pidfile") option to allow overriding
+  the default location of the PID file.
+  Requested by Héctor García, Debian maintainer.
+
 fetchmail 6.3.3 (released 2006-03-30):
 
 # KNOWN BUGS:
diff --git a/fetchmail.c b/fetchmail.c
index 7712820b..4bba7ad1 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -43,6 +43,7 @@
 #include "smtp.h"
 #include "netrc.h"
 #include "i18n.h"
+#include "lock.h"
 
 #ifndef ENETUNREACH
 #define ENETUNREACH   128       /* Interactive doesn't know this */
@@ -315,7 +316,7 @@ int main(int argc, char **argv)
 #endif /* POP3_ENABLE */
 
     /* construct the lockfile */
-    lock_setup();
+    lock_setup(&run);
 
 #ifdef HAVE_SETRLIMIT
     /*
@@ -1067,6 +1068,8 @@ static int load_params(int argc, char **argv, int optind)
 	run.logfile = cmd_run.logfile;
     if (cmd_run.idfile)
 	run.idfile = cmd_run.idfile;
+    if (cmd_run.pidfile)
+	run.pidfile = cmd_run.pidfile;
     /* do this before the keep/fetchall test below, otherwise -d0 may fail */
     if (cmd_run.poll_interval >= 0)
 	run.poll_interval = cmd_run.poll_interval;
diff --git a/fetchmail.h b/fetchmail.h
index b6ecb534..a44d0399 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -157,15 +157,17 @@ typedef	char	flag;
 #define FLAG_TRUE	2
 #define FLAG_FALSE	1
 
+/** run control data */
 struct runctl
 {
-    char	*logfile;
-    char	*idfile;
-    int		poll_interval;
+    char	*logfile;	/** where to write log information */
+    char	*idfile;	/** where to store UID data */
+    char	*pidfile;	/** where to record the PID of daemon mode processes */
     char	*postmaster;
+    char	*properties;
+    int		poll_interval;
     flag	bouncemail;
     flag	spambounce;
-    char	*properties;
     flag	use_syslog;
     flag	invisible;
     flag	showdots;
@@ -505,14 +507,6 @@ int gen_transact();
 #endif
 extern struct msgblk msgblk;
 
-/* lock.c: concurrency locking */
-void lock_setup(void);
-void lock_assert(void);
-void lock_or_die(void);
-void fm_lock_release(void);
-int lock_state(void);
-void lock_dispose(void);
-
 /* use these to track what was happening when the nonresponse timer fired */
 #define GENERAL_WAIT	0	/* unknown wait type */
 #define OPEN_WAIT	1	/* waiting from mailserver open */
diff --git a/fetchmail.man b/fetchmail.man
index 7d988fe0..9ce4ad10 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -747,6 +747,11 @@ and renames it into the place of the real idfile only if the temporary
 file has been written successfully. This avoids the truncation of
 idfiles when running out of disk space.
 .TP
+.B \--pidfile <pathname>
+(Keyword: pidfile; since fetchmail v6.3.4)
+Override the default location of the PID file. Default: see
+"ENVIRONMENT" below.
+.TP
 .B \-n | \-\-norewrite
 (Keyword: no rewrite)
 Normally,
diff --git a/lock.c b/lock.c
index 89f767da..277e20bf 100644
--- a/lock.c
+++ b/lock.c
@@ -21,30 +21,39 @@
 
 #include "fetchmail.h"
 #include "i18n.h"
+#include "lock.h"
 
 static char *lockfile;		/* name of lockfile */
 static int lock_acquired;	/* have we acquired a lock */
 
-void lock_setup(void)
+void lock_setup(struct runctl *ctl)
 /* set up the global lockfile name */
 {
     /* set up to do lock protocol */
-#define	FETCHMAIL_PIDFILE	"fetchmail.pid"
+    const char *const FETCHMAIL_PIDFILE="fetchmail.pid";
+
+    /* command-line option override */
+    if (ctl->pidfile) {
+	lockfile = xstrdup(ctl->pidfile);
+	return;
+    }
+
+    /* defaults */
     if (getuid() == ROOT_UID) {
-	lockfile = (char *)xmalloc(
-		sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE) + 1);
+	lockfile = (char *)xmalloc(strlen(PID_DIR)
+		+ strlen(FETCHMAIL_PIDFILE) + 2); /* 2: "/" and NUL */
 	strcpy(lockfile, PID_DIR);
 	strcat(lockfile, "/");
 	strcat(lockfile, FETCHMAIL_PIDFILE);
     } else {
-	lockfile = (char *)xmalloc(strlen(fmhome)+sizeof(FETCHMAIL_PIDFILE)+2);
+	lockfile = (char *)xmalloc(strlen(fmhome)
+		+ strlen(FETCHMAIL_PIDFILE) + 3); /* 3: "/", "." and NUL */
 	strcpy(lockfile, fmhome);
 	strcat(lockfile, "/");
-        if (fmhome == home)
- 	   strcat(lockfile, ".");
+	if (fmhome == home)
+	   strcat(lockfile, ".");
 	strcat(lockfile, FETCHMAIL_PIDFILE);
     }
-#undef FETCHMAIL_PIDFILE
 }
 
 static void unlockit(void)
diff --git a/lock.h b/lock.h
new file mode 100644
index 00000000..0c9a5951
--- /dev/null
+++ b/lock.h
@@ -0,0 +1,12 @@
+#ifndef FM_LOCK_H
+#define FM_LOCK_H
+
+/* lock.c: concurrency locking */
+void lock_setup(struct runctl *);
+void lock_assert(void);
+void lock_or_die(void);
+void fm_lock_release(void);
+int lock_state(void);
+void lock_dispose(void);
+
+#endif
diff --git a/options.c b/options.c
index 9bfc7586..25ea005e 100644
--- a/options.c
+++ b/options.c
@@ -24,6 +24,7 @@
 
 enum {
     LA_INVISIBLE = 256,
+    LA_PIDFILE,
     LA_SYSLOG,
     LA_NOSYSLOG,
     LA_POSTMASTER,
@@ -73,6 +74,7 @@ static const struct option longoptions[] = {
   {"nosyslog",	no_argument,	   (int *) 0, LA_NOSYSLOG },
   {"fetchmailrc",required_argument,(int *) 0, 'f' },
   {"idfile",	required_argument, (int *) 0, 'i' },
+  {"pidfile",	required_argument, (int *) 0, LA_PIDFILE },
   {"postmaster",required_argument, (int *) 0, LA_POSTMASTER },
   {"nobounce",	no_argument,	   (int *) 0, LA_NOBOUNCE },
 
@@ -287,6 +289,9 @@ int parsecmdline (int argc /** argument count */,
 	case 'i':
 	    rctl->idfile = prependdir (optarg, currentwd);
 	    break;
+	case LA_PIDFILE:
+	    rctl->pidfile = prependdir (optarg, currentwd);
+	    break;
 	case LA_POSTMASTER:
 	    rctl->postmaster = (char *) xstrdup(optarg);
 	    break;
@@ -591,6 +596,7 @@ int parsecmdline (int argc /** argument count */,
 	P(GT_("      --invisible   don't write Received & enable host spoofing\n"));
 	P(GT_("  -f, --fetchmailrc specify alternate run control file\n"));
 	P(GT_("  -i, --idfile      specify alternate UIDs file\n"));
+	P(GT_("      --pidfile     specify alternate PID (lock) file\n"));
 	P(GT_("      --postmaster  specify recipient of last resort\n"));
 	P(GT_("      --nobounce    redirect bounces from user to postmaster.\n"));
 #ifdef CAN_MONITOR
@@ -621,7 +627,7 @@ int parsecmdline (int argc /** argument count */,
 	P(GT_("      --tracepolls  add poll-tracing information to Received header\n"));
 
 	P(GT_("  -u, --username    specify users's login on server\n"));
-	P(GT_("  -a, --all         retrieve old and new messages\n"));
+	P(GT_("  -a, --[fetch]all  retrieve old and new messages\n"));
 	P(GT_("  -K, --nokeep      delete new messages after retrieval\n"));
 	P(GT_("  -k, --keep        save new messages after retrieval\n"));
 	P(GT_("  -F, --flush       delete old messages from server\n"));
diff --git a/po/de.po b/po/de.po
index 670fe683..74c3e44e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.2-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-03-25 15:35+0100\n"
+"POT-Creation-Date: 2006-04-02 12:40+0200\n"
 "PO-Revision-Date: 2006-01-06 14:24+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -384,138 +384,138 @@ msgstr "Fetchmail war in der Lage, sich bei %s@%s einzuloggen.\n"
 msgid "Service has been restored.\n"
 msgstr "Der Dienst ist wieder hergestellt.\n"
 
-#: driver.c:1311
+#: driver.c:1312
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "Ordner %s wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1313
+#: driver.c:1314
 msgid "selecting or re-polling default folder\n"
 msgstr "Vorgabe-Ordner wird gewählt oder erneut abgefragt\n"
 
-#: driver.c:1325
+#: driver.c:1326
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s bei %s (Ordner %s)"
 
-#: driver.c:1328 rcfile_y.y:380
+#: driver.c:1329 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s bei %s"
 
-#: driver.c:1333
+#: driver.c:1334
 #, c-format
 msgid "Polling %s\n"
 msgstr "Frage %s ab\n"
 
-#: driver.c:1337
+#: driver.c:1338
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d Nachricht (%d %s) für %s"
 msgstr[1] "%d Nachrichten (%d %s) für %s"
 
-#: driver.c:1340
+#: driver.c:1341
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "gesehene"
 msgstr[1] "gesehene"
 
-#: driver.c:1343
+#: driver.c:1344
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d Nachricht für %s"
 msgstr[1] "%d Nachrichten für %s"
 
-#: driver.c:1350
+#: driver.c:1351
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d Bytes).\n"
 
-#: driver.c:1356
+#: driver.c:1357
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Keine Post für %s\n"
 
-#: driver.c:1389 imap.c:89
+#: driver.c:1390 imap.c:89
 msgid "bogus message count!"
 msgstr "ungültige Nachrichtenanzahl!"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "socket"
 msgstr "Socket"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "missing or bad RFC822 header"
 msgstr "fehlende oder fehlerhafte RFC822-Kopfzeile"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "client/server synchronization"
 msgstr "Klient/Server-Synchronisation"
 
-#: driver.c:1543
+#: driver.c:1544
 msgid "client/server protocol"
 msgstr "Klient/Server-Protokoll"
 
-#: driver.c:1546
+#: driver.c:1547
 msgid "lock busy on server"
 msgstr "Lock auf Server beschäftigt"
 
-#: driver.c:1549
+#: driver.c:1550
 msgid "SMTP transaction"
 msgstr "SMTP-Transaktion"
 
-#: driver.c:1552
+#: driver.c:1553
 msgid "DNS lookup"
 msgstr "DNS-Nachschlag"
 
-#: driver.c:1555
+#: driver.c:1556
 msgid "undefined"
 msgstr "undefinierter"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s-Fehler beim Abholen von %s@%s und Auslieferung zum SMTP-Host %s\n"
 
-#: driver.c:1563
+#: driver.c:1564
 msgid "unknown"
 msgstr "unbekannt"
 
-#: driver.c:1565
+#: driver.c:1566
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s-Fehler beim Abholen von %s@%s\n"
 
-#: driver.c:1575
+#: driver.c:1577
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "Nach-Verbindungs-Befehl scheiterte mit Status %d\n"
 
-#: driver.c:1595
+#: driver.c:1597
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos-V4-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1603
+#: driver.c:1605
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos-V5-Unterstützung nicht vorhanden.\n"
 
-#: driver.c:1614
+#: driver.c:1616
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush ist mit %s nicht unterstützt\n"
 
-#: driver.c:1620
+#: driver.c:1622
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all ist mit %s nicht unterstützt\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit ist mit %s nicht unterstützt\n"
@@ -650,7 +650,7 @@ msgstr "Option --folder ist mit ETRN nicht unterstützt\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "Option --check ist mit ETRN nicht unterstützt\n"
 
-#: fetchmail.c:131
+#: fetchmail.c:132
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -662,7 +662,7 @@ msgstr ""
 "Wilson\n"
 "Copyright © 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:135
+#: fetchmail.c:136
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -673,64 +673,64 @@ msgstr ""
 "hierzu lesen Sie bitte in der Datei COPYING (englisch) im Quell- oder\n"
 "Dokumentationsverzeichnis nach.\n"
 
-#: fetchmail.c:169
+#: fetchmail.c:170
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WARNUNG: Vom Betrieb mit root-Rechten wird abgeraten.\n"
 
-#: fetchmail.c:181
+#: fetchmail.c:182
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: aufgerufen mit"
 
-#: fetchmail.c:205
+#: fetchmail.c:206
 msgid "could not get current working directory\n"
 msgstr "konnte aktuelles Arbeitsverzeichnis nicht bestimmen\n"
 
-#: fetchmail.c:267
+#: fetchmail.c:268
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Dies ist fetchmail Version %s"
 
-#: fetchmail.c:382
+#: fetchmail.c:383
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Erhalte Optionen von Kommandozeile%s%s\n"
 
-#: fetchmail.c:383
+#: fetchmail.c:384
 msgid " and "
 msgstr " und "
 
-#: fetchmail.c:388
+#: fetchmail.c:389
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Keine Mailserver konfiguriert -- vielleicht fehlt %s?\n"
 
-#: fetchmail.c:409
+#: fetchmail.c:410
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: es wurden keine Mailserver spezifiziert.\n"
 
-#: fetchmail.c:421
+#: fetchmail.c:422
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: kein weiteres fetchmail läuft\n"
 
-#: fetchmail.c:427
+#: fetchmail.c:428
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: Fehler beim Abschießen von %s-fetchmail bei %d; Abbruch.\n"
 
-#: fetchmail.c:428 fetchmail.c:437
+#: fetchmail.c:429 fetchmail.c:438
 msgid "background"
 msgstr "Hintergrund"
 
-#: fetchmail.c:428 fetchmail.c:437
+#: fetchmail.c:429 fetchmail.c:438
 msgid "foreground"
 msgstr "Vordergrund"
 
-#: fetchmail.c:436
+#: fetchmail.c:437
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s-fetchmail bei %d abgeschossen.\n"
 
-#: fetchmail.c:459
+#: fetchmail.c:460
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -738,7 +738,7 @@ msgstr ""
 "fetchmail: kann Mail nicht abholen, solange auf dem Rechner ein weiteres "
 "fetchmail läuft.\n"
 
-#: fetchmail.c:465
+#: fetchmail.c:466
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -746,189 +746,189 @@ msgstr ""
 "fetchmail: kann spezifizierte Hosts nicht abfragen, solange ein weiteres "
 "fetchmail läuft bei %d.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:473
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: ein weiteres Vordergrund-fetchmail läuft bei %d.\n"
 
-#: fetchmail.c:482
+#: fetchmail.c:483
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: kann keine Optionen akzeptieren, solange Hintergrund-fetchmail "
 "läuft.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:489
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: Hintergrund-fetchmail bei %d aufgeweckt.\n"
 
-#: fetchmail.c:500
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: älteres Geschwister bei %d ist mysteriös gestorben.\n"
 
-#: fetchmail.c:515
+#: fetchmail.c:516
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: kann kein Passwort für %s@%s finden.\n"
 
-#: fetchmail.c:519
+#: fetchmail.c:520
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Geben Sie das Passwort für %s@%s ein: "
 
-#: fetchmail.c:550
+#: fetchmail.c:551
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "fetchmail %s Dämon wird gestartet \n"
 
-#: fetchmail.c:565 fetchmail.c:567
+#: fetchmail.c:566 fetchmail.c:568
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "konnte %s nicht öffnen, um Protokolle anzuhängen \n"
 
-#: fetchmail.c:603
+#: fetchmail.c:604
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "konnte keine Zeitüberprüfung bei %s durchführen (Fehler %d)\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:609
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "starte fetchmail erneut (%s verändert)\n"
 
-#: fetchmail.c:613
+#: fetchmail.c:614
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "Versuch, fetchmail erneut auszuführen, kann fehlschlagen,\n"
 "da Verzeichnis nicht wieder hergestellt wurde\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:641
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "Versuch, fetchmail erneut auszuführen, fehlgeschlagen\n"
 
-#: fetchmail.c:668
+#: fetchmail.c:669
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "Abfrage von %s übersprungen (fehlgeschlagene Authentifikation oder zu viele "
 "Zeitüberschreitungen)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:681
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "Intervall nicht erreicht, %s wird nicht abgefragt\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:719
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Abfragestatus=0 (SUCCESS)\n"
 
-#: fetchmail.c:720
+#: fetchmail.c:721
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Abfragestatus=1 (NOMAIL)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:723
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Abfragestatus=2 (SOCKET)\n"
 
-#: fetchmail.c:724
+#: fetchmail.c:725
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Abfragestatus=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:727
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Abfragestatus=4 (PROTOCOL)\n"
 
-#: fetchmail.c:728
+#: fetchmail.c:729
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Abfragestatus=5 (SYNTAX)\n"
 
-#: fetchmail.c:730
+#: fetchmail.c:731
 msgid "Query status=6 (IOERR)\n"
 msgstr "Abfragestatus=6 (IOERR)\n"
 
-#: fetchmail.c:732
+#: fetchmail.c:733
 msgid "Query status=7 (ERROR)\n"
 msgstr "Abfragestatus=7 (ERROR)\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:735
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Abfragestatus=8 (EXCLUDE)\n"
 
-#: fetchmail.c:736
+#: fetchmail.c:737
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Abfragestatus=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:738
+#: fetchmail.c:739
 msgid "Query status=10 (SMTP)\n"
 msgstr "Abfragestatus=10 (SMTP)\n"
 
-#: fetchmail.c:740
+#: fetchmail.c:741
 msgid "Query status=11 (DNS)\n"
 msgstr "Abfragestatus=11 (DNS)\n"
 
-#: fetchmail.c:742
+#: fetchmail.c:743
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Abfragestatus=12 (BSMTP)\n"
 
-#: fetchmail.c:744
+#: fetchmail.c:745
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Abfragestatus=13 (MAXFETCH)\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:747
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Abfragestatus=%d\n"
 
-#: fetchmail.c:792
+#: fetchmail.c:793
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Alle Verbindungen verkeilt. Abbruch.\n"
 
-#: fetchmail.c:799
+#: fetchmail.c:800
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "schlafe um %s\n"
 
-#: fetchmail.c:823
+#: fetchmail.c:824
 #, c-format
 msgid "awakened by %s\n"
 msgstr "erweckt durch %s\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:827
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "erweckt durch Signal %d\n"
 
-#: fetchmail.c:833
+#: fetchmail.c:834
 #, c-format
 msgid "awakened at %s\n"
 msgstr "erweckt um %s\n"
 
-#: fetchmail.c:839
+#: fetchmail.c:840
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normale Beendigung, Status %d\n"
 
-#: fetchmail.c:991
+#: fetchmail.c:992
 msgid "couldn't time-check the run-control file\n"
 msgstr "konnte keine Zeitüberprüfung der Run-Control-Datei durchführen\n"
 
-#: fetchmail.c:1024
+#: fetchmail.c:1025
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Warnung: mehrfache Erwähnung von Host %s in Konfigurationsdatei\n"
 
-#: fetchmail.c:1057
+#: fetchmail.c:1058
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Fehler: mehrere „defaults”-Einträge in Konfigurationsdatei\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1180
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL-Unterstützung ist nicht einkompiliert.\n"
 
-#: fetchmail.c:1208
+#: fetchmail.c:1211
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -936,17 +936,17 @@ msgstr ""
 "fetchmail: Warnung: Kein DNS verfügbar, um Multidrop-Abholung von %s zu "
 "überprüfen\n"
 
-#: fetchmail.c:1219
+#: fetchmail.c:1222
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "Warnung: multidrop für %s erfordert envelope-Option!\n"
 
-#: fetchmail.c:1220
+#: fetchmail.c:1223
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "Warnung: Fragen Sie nicht nach Hilfe, wenn alle Mail zum Postmaster geht!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1240
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -955,293 +955,293 @@ msgstr ""
 "fetchmail: %s-Konfiguration ungültig, bitte positive Portnummer für Port/"
 "Service angeben\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1247
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: %s-Konfiguration ungültig, RPOP erfordert einen privilegierten "
 "Port\n"
 
-#: fetchmail.c:1262
+#: fetchmail.c:1265
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "%s-Konfiguration ungültig, LMTP kann nicht den Standard-SMTP-Port benutzen\n"
 
-#: fetchmail.c:1276
+#: fetchmail.c:1279
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr ""
 "Sowohl „fetchall“ als auch „keep“ anzuschalten, ist im Dämon-Modus ein "
 "Fehler!\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1304
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "beendet mit Signal %d\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1377
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s fragt %s ab (Protokoll %s) um %s: Abfrage gestartet\n"
 
-#: fetchmail.c:1399
+#: fetchmail.c:1402
 msgid "POP2 support is not configured.\n"
 msgstr "POP2-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1411
+#: fetchmail.c:1414
 msgid "POP3 support is not configured.\n"
 msgstr "POP3-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1424
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1430
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1435
+#: fetchmail.c:1438
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR-Unterstützung ist nicht konfiguriert.\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1445
 msgid "unsupported protocol selected.\n"
 msgstr "nicht unterstütztes Protokoll ausgewählt.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1455
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s fragt ab %s (Protokoll %s) um %s: Abfrage beendet\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1472
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Abfrageintervall ist %d Sekunden\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1474
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Log-Datei ist %s\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1476
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile ist %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1479
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Fortschrittsnachrichten werden via syslog geloggt\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1482
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail wird maskieren und kein „Received“ generieren\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1484
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail wird Fortschrittspunkte auch in Log-Dateien zeigen.\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1486
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail wird fehladressierte Multidrop-Nachricht an %s weiterleiten.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1490
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an „postmaster“ schicken.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1492
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail wird Fehlerbenachrichtigungen an den Absender schicken.\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1499
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Optionen für Abholen von %s@%s:\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1503
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Post wird abgeholt via %s\n"
 
-#: fetchmail.c:1503
+#: fetchmail.c:1506
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  Abfrage dieses Servers wird jedesmal erfolgen.\n"
 msgstr[1] "  Abfrage dieses Servers wird alle %d Intervalle erfolgen.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1510
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Wahrer Name des Servers ist %s.\n"
 
-#: fetchmail.c:1510
+#: fetchmail.c:1513
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Dieser Host wird nicht abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1514
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Dieser Host wird abgefragt, wenn kein Host angegeben ist.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1518
 msgid "  Password will be prompted for.\n"
 msgstr "  Nach Passwörtern wird nachgefragt.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1522
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP-Geheimnis = „%s“.\n"
 
-#: fetchmail.c:1522
+#: fetchmail.c:1525
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = „%s“.\n"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1528
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Passwort = „%s“.\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1537
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protokoll ist KPOP mit Kerberos-%s-Authentifikation"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protokoll ist %s"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1542
 #, c-format
 msgid " (using service %s)"
 msgstr " (unter Benutzung von Service %s)"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1544
 msgid " (using default port)"
 msgstr " (unter Benutzung des Standard-Ports)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 msgid " (forcing UIDL use)"
 msgstr " (erzwungene UIDL-Benutzung)"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1552
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Alle verfügbaren Authentifikationsmethoden werden versucht.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1555
 msgid "  Password authentication will be forced.\n"
 msgstr "  Passwort-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1558
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1561
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1564
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1567
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1570
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1573
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos-V4-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1576
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos-V5-Authentifikation wird erzwungen.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1579
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  Ende-zu-Ende-Verschlüsselung wird angenommen.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1583
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Prinzipal des Mailservice ist: %s\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1586
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL-verschlüsselte Sitzungen ermöglicht.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1588
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL-Protokoll: %s.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1590
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL-Server-Zertifikat-Überprüfung ermöglicht.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1592
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL-Verzeichnis für vertrauenswürdige Zertifikate: %s\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL-Schlüssel-Fingerabdruck (gegen Server-Schlüssel überprüft): %s\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1598
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Auszeit für nichtantwortenden Server ist %d Sekunden"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1600
 msgid " (default).\n"
 msgstr " (Voreinstellung).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1607
 msgid "  Default mailbox selected.\n"
 msgstr "  Standard-Postfach ausgewählt.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1612
 msgid "  Selected mailboxes are:"
 msgstr "  Gewählte Postfächer sind:"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1618
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Alle Nachrichten werden abgeholt (--all on).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1619
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Nur neue Nachrichten werden abgeholt (--all off).\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1621
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Abgeholte Nachrichten werden auf dem Server belassen (--keep on).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1622
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Abgeholte Nachrichten werden nicht auf dem Server belassen (--keep off).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1624
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung gelöscht (--flush "
 "on).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1625
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Alte Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--"
 "flush off).\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1627
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1249,7 +1249,7 @@ msgstr ""
 "  Übergroße Nachrichten werden vor der Nachrichtenabholung gelöscht (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1628
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1257,334 +1257,334 @@ msgstr ""
 "  Übergroße Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1630
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist an (--norewrite off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1631
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Umschreiben von server-lokalen Adressen ist aus (--norewrite on).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1633
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist ein (stripcr on).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1634
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Entfernen von Carriage-Return-Zeichen ist aus (stripcr off).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1636
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist ein (forcecr on).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1637
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Erzwingen von Carriage-Return-Zeichen ist aus (forcecr off).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1639
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist aus (pass8bits on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1640
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation von Content-Transfer-Encoding ist ein (pass8bits off).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1642
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME-Decodierung ist ein (mimedecode on).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1643
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME-Decodierung ist aus (mimedecode off).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1645
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  „Idle“ nach Abfrage ist ein (idle on).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1646
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  „Idle“ nach Abfrage ist aus (idle off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1648
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nichtleere Statuszeilen werden verworfen (dropstatus on)\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1649
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nichtleere Statuszeilen werden beibehalten (dropstatus off)\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1651
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To-Zeilen werden verworfen (dropdelivered on)\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1652
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To-Zeilen werden beibehalten (dropdelivered off)\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1656
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Nachrichtengrößen-Beschränkung ist %d Bytes (--limit %d).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1659
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengröße (--limit 0).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1661
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Nachrichtengröße-Warnungsintervall ist %d Sekunden (--warnings %d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1664
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Größenwarnungen bei jeder Abfragen (--warnings 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Limit für erhaltene Nachrichten ist %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Kein Limit für erhaltene Nachrichten (--fetchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1672
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  Limit für die Größe erhaltener Nachrichten ist %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1675
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  Keine Beschränkung der Nachrichtengröße (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1679
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Bei jeder Abfrage binäre Suche nach UIDs durchführen (--fastuidl 1).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Binäre Suche nach UIDs bei %d von %d Abfragen durchführen (--fastuidl %"
 "d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1684
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Bei jeder Abfrage lineare Suche nach UIDs durchführen (--fastuidl 0).\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1686
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Limit für SMTP-Stapelauslieferung ist %d.\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1688
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Kein Limit für SMTP-Stapelauslieferung (--batchlimit 0).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Anzahl der Löschvorgänge zwischen tatsächlichen Säuberungen auf %d gesetzt "
 "(--expunge %d).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Keine erzwungenen Säuberungen (--expunge 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1701
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domänen, für die Mail abgeholt werden wird, sind:"
 
-#: fetchmail.c:1703 fetchmail.c:1723
+#: fetchmail.c:1706 fetchmail.c:1726
 msgid " (default)"
 msgstr " (Voreinstellung)"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1711
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Nachrichten werden an %s als BSMTP angehängt\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1713
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Nachrichten werden mit „%s“ ausgeliefert.\n"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Nachrichten werden mit %cMTP weitergeleitet an:"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1731
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host-Teil der „MAIL FROM“-Zeile ist %s\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1734
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 "  Adresse, die in „RCPT TO“-Zeilen, die an SMTP ausgeliefert werden, "
 "verwendet wird, ist %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1743
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Erkannte Spam-Abblock-Antworten des SMTP/LMTP-Servers sind:"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-Abblocken deaktiviert\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1752
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server-Verbindung wird aktiviert mit „%s“.\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  No pre-connection command.\n"
 msgstr "  Kein Vor-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1757
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server-Verbindungs wird beendet mit „%s“.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1760
 msgid "  No post-connection command.\n"
 msgstr "  Kein Nach-Verbindungs-Befehl.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 msgid "  No localnames declared for this host.\n"
 msgstr "  Keine lokalen Namen (localnames) für diesen Host definiert.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1773
 msgid "  Multi-drop mode: "
 msgstr "  Multi-Drop-Modus: "
 
-#: fetchmail.c:1772
+#: fetchmail.c:1775
 msgid "  Single-drop mode: "
 msgstr "  Einzel-Drop-Modus: "
 
-#: fetchmail.c:1774
+#: fetchmail.c:1777
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d lokaler Name erkannt.\n"
 msgstr[1] "%d lokale Namen erkannt.\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1792
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist ein.\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1793
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS-Suche für Multi-Drop-Adressen ist aus.\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1797
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand der IP.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Server-Aliase werden mit multidrop-Adressen verglichen anhand des Namens.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1802
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Umschlag-Adress-Routing ist deaktiviert\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Umschlag-Header wird angenommen als: %s\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Anzahl der zu überspringenden Umschlag-Kopfzeilen: %d\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Präfix %s wird von Nutzer-ID entfernt\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1814
 msgid "  No prefix stripping\n"
 msgstr "  Keine Präfix-Entfernung\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1821
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Vordeklarierte Mailserver-Aliase:"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1830
 msgid "  Local domains:"
 msgstr "  Lokale Domänen:"
 
-#: fetchmail.c:1837
+#: fetchmail.c:1840
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Verbindung muss durch Schnittstelle %s geschehen.\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1842
 msgid "  No interface requirement specified.\n"
 msgstr "  Kein Schnittstellen-Bindung angefordert.\n"
 
-#: fetchmail.c:1841
+#: fetchmail.c:1844
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Abfrageschleife wird %s überwachen.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 msgid "  No monitor interface specified.\n"
 msgstr "  Kein Überwachungsinterface angegeben.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 "  Serververbindungen werden mittels Plugin %s durchgeführt (--plugin %s).\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No plugin command specified.\n"
 msgstr "  Kein Plugin-Befehl angegeben.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1854
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 "  SMTP/LMTP-Server-Verbindungen werden mittels Plugout %s durchgeführt (--"
 "plugout %s).\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 msgid "  No plugout command specified.\n"
 msgstr "  Kein Plugout-Befehl angegeben.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1861
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Keine UIDs von diesem Host gespeichert.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1870
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs gespeichert.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1878
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Abfrage-Nachverfolgungsinformationen werden dem Received-Header "
 "hinzugefügt.\n"
 
-#: fetchmail.c:1877
+#: fetchmail.c:1880
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1593,7 +1593,7 @@ msgstr ""
 "  hinzugefügt.\n"
 ".\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1883
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Eigenschaften zum Durchleiten „%s“.\n"
@@ -1854,21 +1854,21 @@ msgstr "konnte BASE64-Bestätigungs-Erwiderung nicht dekodieren\n"
 msgid "challenge mismatch\n"
 msgstr "Herausforderung stimmt nicht überein\n"
 
-#: lock.c:77
+#: lock.c:86
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: Fehler beim Lesen der Lockdatei „%s”: %s\n"
 
-#: lock.c:89
+#: lock.c:98
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: entferne alte Lockdatei\n"
 
-#: lock.c:96
+#: lock.c:105
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: Fehler beim Öffnen der Lockdatei „%s”: %s\n"
 
-#: lock.c:143
+#: lock.c:152
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: Lock-Herstellung fehlgeschlagen.\n"
 
@@ -1948,79 +1948,79 @@ msgstr "Konnte OTP-Herausforderung nicht dekodieren\n"
 msgid "Secret pass phrase: "
 msgstr "Geheime Passphrase: "
 
-#: options.c:164 options.c:208
+#: options.c:166 options.c:210
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Zeichenkette „%s“ ist keine gültige Zahl.\n"
 
-#: options.c:173
+#: options.c:175
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Wert der Zeichenkette „%s“ ist %s als %d.\n"
 
-#: options.c:174
+#: options.c:176
 msgid "smaller"
 msgstr "kleiner"
 
-#: options.c:174
+#: options.c:176
 msgid "larger"
 msgstr "größer"
 
-#: options.c:332
+#: options.c:337
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Ungültiges Protokoll „%s“ angegeben.\n"
 
-#: options.c:377
+#: options.c:382
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Ungültige Authentifikation „%s“ angegeben.\n"
 
-#: options.c:578
+#: options.c:583
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "Aufruf:  fetchmail [Optionen] [Server ...]\n"
 
-#: options.c:579
+#: options.c:584
 msgid "  Options are as follows:\n"
 msgstr "  Optionen sind wie folgt:\n"
 
-#: options.c:580
+#: options.c:585
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        diese Options-Hilfe anzeigen\n"
 
-#: options.c:581
+#: options.c:586
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     Versionsinformationen anzeigen\n"
 
-#: options.c:583
+#: options.c:588
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       auf Nachrichten überprüfen, ohne abzuholen\n"
 
-#: options.c:584
+#: options.c:589
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      schweigsam arbeiten\n"
 
-#: options.c:585
+#: options.c:590
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     redselig arbeiten (diagnostische Ausgaben)\n"
 
-#: options.c:586
+#: options.c:591
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      alle n Sekunden als Dämon laufen\n"
 
-#: options.c:587
+#: options.c:592
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    nicht von Dämon-Prozess ablösen\n"
 
-#: options.c:588
+#: options.c:593
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        Dämon-Prozess abschießen\n"
 
-#: options.c:589
+#: options.c:594
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     Logdatei-Name angeben\n"
 
-#: options.c:590
+#: options.c:595
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2028,59 +2028,63 @@ msgstr ""
 "      --syslog      als Dämon syslog(3) für die meisten Mitteilungen "
 "verwenden\n"
 
-#: options.c:591
+#: options.c:596
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   Received nicht schreiben und Host-Spoofing erlauben\n"
 
-#: options.c:592
+#: options.c:597
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc alternative Konfigurationsdatei angeben\n"
 
-#: options.c:593
+#: options.c:598
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      alternative UID-Datei angeben\n"
 
-#: options.c:594
+#: options.c:599
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr "      --pidfile     alternative PID-Datei angeben\n"
+
+#: options.c:600
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr ""
 "      --postmaster  Empfänger angeben, der als letzte Zuflucht gebraucht "
 "wird\n"
 
-#: options.c:595
+#: options.c:601
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    Bounces vom Nutzer zum Postmaster umleiten\n"
 
-#: options.c:597
+#: options.c:603
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   erforderliche Schnittstellen-Angabe\n"
 
-#: options.c:598
+#: options.c:604
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     Schnittstelle auf Aktivität hin beobachten\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         SSL-verschlüsselte Sitzung ermöglichen\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      SSL-Privater-Schlüssel-Datei\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     SSL-Klienten-Zertifikat\n"
 
-#: options.c:604
+#: options.c:610
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   strenge Prüfung des SSL-Serverzertifikats (empfohlen)\n"
 
-#: options.c:605
+#: options.c:611
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath Pfad zu den SSL-Zertifikaten\n"
 
-#: options.c:606
+#: options.c:612
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2088,158 +2092,158 @@ msgstr ""
 "      --sslfingerprint verlangter Fingerabdruck des Zertifikats des "
 "Servers.\n"
 
-#: options.c:607
+#: options.c:613
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    SSL-Protokoll erzwingen (SSL2/SSL3/TLS1)\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      externes Kommando zum Öffnen der Verbindung\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     externes Kommando zum Öffnen der SMTP-Verbindung\n"
 
-#: options.c:612
+#: options.c:618
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    Abhol-Protokoll angeben (siehe Manpage)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        Benutzung von UIDL erzwingen (nur POP3)\n"
 
-#: options.c:614
+#: options.c:620
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        TCP-Port für Verbindung (veraltet, siehe --service)\n"
 
-#: options.c:615
+#: options.c:621
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     TCP-Dienst für die Verbindung (kann eine Portnummer "
 "sein)\n"
 
-#: options.c:616
+#: options.c:622
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        Authentifikations-Typ (Passwort/Kerberos/SSH/OTP)\n"
 
-#: options.c:617
+#: options.c:623
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     Auszeit für nichtantwortenden Server\n"
 
-#: options.c:618
+#: options.c:624
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    Umschlag-Adress-Header\n"
 
-#: options.c:619
+#: options.c:625
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    Präfix, der von lokaler Nutzerkennung entfernt wird\n"
 
-#: options.c:620
+#: options.c:626
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   Prinzipal des Mailservice\n"
 
-#: options.c:621
+#: options.c:627
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  Poll-Tracing-Information zum Received-Header hinzufügen\n"
 
-#: options.c:623
+#: options.c:629
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    Nutzerkennung beim Server angeben\n"
 
-#: options.c:624
-msgid "  -a, --all         retrieve old and new messages\n"
-msgstr "  -a, --all         alte und neue Nachrichten abholen\n"
+#: options.c:630
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
+msgstr "  -a, --[fetch]all  alte und neue Nachrichten abholen\n"
 
-#: options.c:625
+#: options.c:631
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      neue Nachrichten nach Abholung löschen\n"
 
-#: options.c:626
+#: options.c:632
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        neue Nachrichten nach Abholung aufheben\n"
 
-#: options.c:627
+#: options.c:633
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       alte Nachrichten auf dem Server löschen\n"
 
-#: options.c:628
+#: options.c:634
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  übergroße Nachrichten auf dem Server löschen\n"
 
-#: options.c:629
+#: options.c:635
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   Header-Adressen nicht umschreiben\n"
 
-#: options.c:630
+#: options.c:636
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       Nachrichten über angegebener Größe nicht abholen\n"
 
-#: options.c:631
+#: options.c:637
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    Intervall zwischen Warnungs-Emails\n"
 
-#: options.c:633
+#: options.c:639
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    SMTP-Weiterleitungs-Host festlegen\n"
 
-#: options.c:634
+#: options.c:640
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains  Post für angegebene Domänen abholen\n"
 
-#: options.c:635
+#: options.c:641
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress zu benutzende SMTP-Auslieferungs-Domäne setzen\n"
 
-#: options.c:636
+#: options.c:642
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    SMTP-Nutzernamen nutzer@domain setzen\n"
 
-#: options.c:637
+#: options.c:643
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    Antispam-Antwort-Werte setzen\n"
 
-#: options.c:638
+#: options.c:644
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  Stapellimit für SMTP-Verbindungen setzen\n"
 
-#: options.c:639
+#: options.c:645
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  Limit für Server-Verbindungen setzen\n"
 
-#: options.c:640
+#: options.c:646
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit Beschränkung für Nachrichtengröße setzen.\n"
 
-#: options.c:641
+#: options.c:647
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    binäre Suche nach UIDS durchführen\n"
 
-#: options.c:642
+#: options.c:648
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     max. Löschungen zwischen Säuberungen setzen\n"
 
-#: options.c:643
+#: options.c:649
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         MDA für Weiterleitung setzen\n"
 
-#: options.c:644
+#: options.c:650
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       Ausgabe-BSMTP-Datei setzen\n"
 
-#: options.c:645
+#: options.c:651
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        LMTP (RFC2033) zum Ausliefern benutzen\n"
 
-#: options.c:646
+#: options.c:652
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      Namen des entfernten Ordners angeben\n"
 
-#: options.c:647
+#: options.c:653
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    Fortschrittspunkte auch in Log-Dateien zeigen\n"
 
@@ -2301,15 +2305,15 @@ msgstr "Protokollfehler beim Holen der UIDL\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder wird mit POP3 nicht unterstützt\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "Server-Optionen nach Nutzer-Optionen"
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "SDPS nicht ermöglicht."
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2317,7 +2321,7 @@ msgstr ""
 "fetchmail: Schnittstellen-Option wird nur unter Linux (ohne IPv6) und "
 "FreeBSD unterstützt\n"
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2325,25 +2329,25 @@ msgstr ""
 "fetchmail: Beobachtungs-Option wird nur unter Linux (ohne IPv6) und FreeBSD "
 "unterstützt\n"
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "SSL ist nicht aktiv"
 
-#: rcfile_y.y:381
+#: rcfile_y.y:382
 msgid "end of input"
 msgstr "Ende der Eingabe"
 
-#: rcfile_y.y:418
+#: rcfile_y.y:419
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Datei %s muss eine reguläre Datei sein.\n"
 
-#: rcfile_y.y:428
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Datei %s darf nicht mehr Zugriffrechte haben als -rwx--x-- (0710).\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Datei %s muss Ihnen gehören.\n"
@@ -2907,28 +2911,28 @@ msgstr "keine lokalen Übereinstimmungen, Weiterleitung an %s\n"
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "Weiterleiten und Löschen wegen DNS-Fehlern unterdrückt\n"
 
-#: transact.c:1230
+#: transact.c:1234
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "schreibe RFC822 msgblk.headers\n"
 
-#: transact.c:1248
+#: transact.c:1252
 msgid "no recipient addresses matched declared local names"
 msgstr "keine Empfängeradresse stimmt mit deklarierten lokalen Namen überein"
 
-#: transact.c:1255
+#: transact.c:1259
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "Empfängeradresse %s stimmt mit keinem lokalen Namen überein"
 
-#: transact.c:1264
+#: transact.c:1268
 msgid "message has embedded NULs"
 msgstr "Nachricht hat eingebettete NUL-Zeichen"
 
-#: transact.c:1272
+#: transact.c:1276
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP-Server lehnte Adressen mit lokalem Empfänger ab: "
 
-#: transact.c:1400
+#: transact.c:1404
 msgid "writing message text\n"
 msgstr "Nachrichtentext wird geschrieben\n"
 
diff --git a/po/fr.po b/po/fr.po
index 238768c4..6adcf69a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-03-25 15:35+0100\n"
+"POT-Creation-Date: 2006-04-02 12:40+0200\n"
 "PO-Revision-Date: 2005-12-18 11:50+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -384,139 +384,139 @@ msgstr "Fetchmail n'a pu enregistrer dans le journal (%s@%s).\n"
 msgid "Service has been restored.\n"
 msgstr "Le service a été réactivé\n"
 
-#: driver.c:1311
+#: driver.c:1312
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "sélection ou re-réception du dossier %s\n"
 
-#: driver.c:1313
+#: driver.c:1314
 msgid "selecting or re-polling default folder\n"
 msgstr "sélection ou re-réception du dossier par défaut\n"
 
-#: driver.c:1325
+#: driver.c:1326
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s dans %s (dossier %s)"
 
-#: driver.c:1328 rcfile_y.y:380
+#: driver.c:1329 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s dans %s"
 
-#: driver.c:1333
+#: driver.c:1334
 #, c-format
 msgid "Polling %s\n"
 msgstr "Réception de %s\n"
 
-#: driver.c:1337
+#: driver.c:1338
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d message (%d %s) pour %s"
 msgstr[1] "%d messages (%d %s) pour %s"
 
-#: driver.c:1340
+#: driver.c:1341
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "déjà vu"
 msgstr[1] "déjà vus"
 
-#: driver.c:1343
+#: driver.c:1344
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d message pour %s"
 msgstr[1] "%d messages pour %s"
 
-#: driver.c:1350
+#: driver.c:1351
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1356
+#: driver.c:1357
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Aucun message pour %s\n"
 
-#: driver.c:1389 imap.c:89
+#: driver.c:1390 imap.c:89
 msgid "bogus message count!"
 msgstr "nombre de messages erroné !"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "missing or bad RFC822 header"
 msgstr "l'en-tête RFC822 est manquant ou endommagé"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "client/server synchronization"
 msgstr "synchronisation client/serveur"
 
-#: driver.c:1543
+#: driver.c:1544
 msgid "client/server protocol"
 msgstr "protocole client/serveur"
 
-#: driver.c:1546
+#: driver.c:1547
 msgid "lock busy on server"
 msgstr "verrou occupé sur le serveur"
 
-#: driver.c:1549
+#: driver.c:1550
 msgid "SMTP transaction"
 msgstr "Transaction SMTP"
 
-#: driver.c:1552
+#: driver.c:1553
 msgid "DNS lookup"
 msgstr "requête au DNS"
 
-#: driver.c:1555
+#: driver.c:1556
 msgid "undefined"
 msgstr "non définie"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 "erreur %s durant la réception de %s@%s et l'envoi vers le serveur SMTP %s\n"
 
-#: driver.c:1563
+#: driver.c:1564
 msgid "unknown"
 msgstr "inconnu"
 
-#: driver.c:1565
+#: driver.c:1566
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "erreur %s durant la réception de %s@%s\n"
 
-#: driver.c:1575
+#: driver.c:1577
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "la commande de post-connexion a échoué avec l'état %d\n"
 
-#: driver.c:1595
+#: driver.c:1597
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Support de Kerberos V4 non inclus.\n"
 
-#: driver.c:1603
+#: driver.c:1605
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Support de Kerberos V5 non inclus.\n"
 
-#: driver.c:1614
+#: driver.c:1616
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush non supportée avec %s\n"
 
-#: driver.c:1620
+#: driver.c:1622
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all non supportée avec %s\n"
 
-#: driver.c:1629
+#: driver.c:1631
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit non supportée avec %s\n"
@@ -650,7 +650,7 @@ msgstr "L'option --folder n'est pas supportée avec ETRN\n"
 msgid "Option --check is not supported with ETRN\n"
 msgstr "L'option --check n'est pas supportée avec ETRN\n"
 
-#: fetchmail.c:131
+#: fetchmail.c:132
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
@@ -662,7 +662,7 @@ msgstr ""
 "Wilson\n"
 "Copyright © 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:135
+#: fetchmail.c:136
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -674,65 +674,65 @@ msgstr ""
 "savoir\n"
 "plus, voyez le fichier COPYING s'il vous plaît.\n"
 
-#: fetchmail.c:169
+#: fetchmail.c:170
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr ""
 "Avertissement: appeler fetchmail avec privilèges root est déconseille.\n"
 
-#: fetchmail.c:181
+#: fetchmail.c:182
 msgid "fetchmail: invoked with"
 msgstr "fetchmail appellé avec"
 
-#: fetchmail.c:205
+#: fetchmail.c:206
 msgid "could not get current working directory\n"
 msgstr "impossible de trouver le répertoire de travail courrant\n"
 
-#: fetchmail.c:267
+#: fetchmail.c:268
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "Ceci est fetchmail, version %s"
 
-#: fetchmail.c:382
+#: fetchmail.c:383
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Lecture des options sur la ligne de commande %s%s\n"
 
-#: fetchmail.c:383
+#: fetchmail.c:384
 msgid " and "
 msgstr " et "
 
-#: fetchmail.c:388
+#: fetchmail.c:389
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "Pas de serveur de courrier paramétré -- %s est peut-être manquant ?\n"
 
-#: fetchmail.c:409
+#: fetchmail.c:410
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: aucun serveur de courrier n'a été spécifié.\n"
 
-#: fetchmail.c:421
+#: fetchmail.c:422
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: aucun autre fetchmail n'est en cours d'exécution\n"
 
-#: fetchmail.c:427
+#: fetchmail.c:428
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: erreur en terminant %s fetchmail (%d); abandon.\n"
 
-#: fetchmail.c:428 fetchmail.c:437
+#: fetchmail.c:429 fetchmail.c:438
 msgid "background"
 msgstr "tâche de fond"
 
-#: fetchmail.c:428 fetchmail.c:437
+#: fetchmail.c:429 fetchmail.c:438
 msgid "foreground"
 msgstr "premier plan"
 
-#: fetchmail.c:436
+#: fetchmail.c:437
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail (%d) terminé.\n"
 
-#: fetchmail.c:459
+#: fetchmail.c:460
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -740,7 +740,7 @@ msgstr ""
 "fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est "
 "exécuté sur le même hôte\n"
 
-#: fetchmail.c:465
+#: fetchmail.c:466
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
@@ -748,193 +748,193 @@ msgstr ""
 "fetchmail: impossible de récupérer le courrier si un autre fetchmail est "
 "exécuté sur %d.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:473
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 "fetchmail: un autre fetchmail, au premier plan, est en exécution sur %d.\n"
 
-#: fetchmail.c:482
+#: fetchmail.c:483
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne "
 "en tâche de fond.\n"
 
-#: fetchmail.c:488
+#: fetchmail.c:489
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: fetchmail en tâche de fond (%d) a été réactivé.\n"
 
-#: fetchmail.c:500
+#: fetchmail.c:501
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: processus fils plus ancien (%d) terminé mystérieusement.\n"
 
-#: fetchmail.c:515
+#: fetchmail.c:516
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: ne trouve pas de mot de passe pour %s@%s.\n"
 
-#: fetchmail.c:519
+#: fetchmail.c:520
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Entrez le mot de passe pour %s@%s : "
 
-#: fetchmail.c:550
+#: fetchmail.c:551
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "démarrage de fetchmail %s en tâche de fond \n"
 
-#: fetchmail.c:565 fetchmail.c:567
+#: fetchmail.c:566 fetchmail.c:568
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "impossible d'ouvrir %s pour y ajouter les messages\n"
 
-#: fetchmail.c:603
+#: fetchmail.c:604
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "«time-check» %s impossible (erreur %d)\n"
 
-#: fetchmail.c:608
+#: fetchmail.c:609
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "redémarrage de fetchmail (%s  a changé)\n"
 
-#: fetchmail.c:613
+#: fetchmail.c:614
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 "la tentative de réexécution peut échouer car le répertoire n'a pas été "
 "recréé\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:641
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "la tentative d'exécuter à nouveau fetchmail a échoué\n"
 
-#: fetchmail.c:668
+#: fetchmail.c:669
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 "réception de %s ignorée (authentification échouée ou dépassements de "
 "délais)\n"
 
-#: fetchmail.c:680
+#: fetchmail.c:681
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "intervalle non atteint, pas de requête vers %s\n"
 
-#: fetchmail.c:718
+#: fetchmail.c:719
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "État de la requête=0 (SUCCES)\n"
 
-#: fetchmail.c:720
+#: fetchmail.c:721
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "État de la requête=1 (PAS DE MAIL)\n"
 
-#: fetchmail.c:722
+#: fetchmail.c:723
 msgid "Query status=2 (SOCKET)\n"
 msgstr "État de la requête=2 (SOCKET)\n"
 
-#: fetchmail.c:724
+#: fetchmail.c:725
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "État de la requête=3 (ECHEC DE L'AUTHENTIFICATION)\n"
 
-#: fetchmail.c:726
+#: fetchmail.c:727
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "État de la requête=4 (PROTOCOLE)\n"
 
-#: fetchmail.c:728
+#: fetchmail.c:729
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "État de la requête=5 (SYNTAXE)\n"
 
-#: fetchmail.c:730
+#: fetchmail.c:731
 msgid "Query status=6 (IOERR)\n"
 msgstr "État de la requête=6 (ERREUR E/S)\n"
 
-#: fetchmail.c:732
+#: fetchmail.c:733
 msgid "Query status=7 (ERROR)\n"
 msgstr "État de la requête=7 (ERREUR)\n"
 
-#: fetchmail.c:734
+#: fetchmail.c:735
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "État de la requête=8 (EXCLU)\n"
 
-#: fetchmail.c:736
+#: fetchmail.c:737
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "État de la requête=9 (verrou déjà pris)\n"
 
-#: fetchmail.c:738
+#: fetchmail.c:739
 msgid "Query status=10 (SMTP)\n"
 msgstr "État de la requête=10 (SMTP)\n"
 
-#: fetchmail.c:740
+#: fetchmail.c:741
 msgid "Query status=11 (DNS)\n"
 msgstr "État de la requête=11 (DNS)\n"
 
-#: fetchmail.c:742
+#: fetchmail.c:743
 msgid "Query status=12 (BSMTP)\n"
 msgstr "État de la requête=12 (BSMTP)\n"
 
-#: fetchmail.c:744
+#: fetchmail.c:745
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "État de la requête=13 (NOMBRE MAXIMUM DE MESSAGES ATTEINT)\n"
 
-#: fetchmail.c:746
+#: fetchmail.c:747
 #, c-format
 msgid "Query status=%d\n"
 msgstr "État de la requête=%d\n"
 
-#: fetchmail.c:792
+#: fetchmail.c:793
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "Toutes les connexions sont établies. Terminé.\n"
 
-#: fetchmail.c:799
+#: fetchmail.c:800
 #, c-format
 msgid "sleeping at %s\n"
 msgstr "mise en sommeil à %s\n"
 
-#: fetchmail.c:823
+#: fetchmail.c:824
 #, c-format
 msgid "awakened by %s\n"
 msgstr "réveillé par %s\n"
 
-#: fetchmail.c:826
+#: fetchmail.c:827
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "réveillé par un signal %d\n"
 
-#: fetchmail.c:833
+#: fetchmail.c:834
 #, c-format
 msgid "awakened at %s\n"
 msgstr "réveillé à %s\n"
 
-#: fetchmail.c:839
+#: fetchmail.c:840
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "terminaison normale, état %d\n"
 
-#: fetchmail.c:991
+#: fetchmail.c:992
 msgid "couldn't time-check the run-control file\n"
 msgstr "impossible de «time-check» le fichier run-control\n"
 
-#: fetchmail.c:1024
+#: fetchmail.c:1025
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 "Attention : plusieurs mentions de l'hôte %s dans le fichier de "
 "configuration\n"
 
-#: fetchmail.c:1057
+#: fetchmail.c:1058
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr ""
 "fetchmail: Erreur: plusieurs blocs \"defaults\" dans le fichier de "
 "configuration\n"
 
-#: fetchmail.c:1177
+#: fetchmail.c:1180
 msgid "SSL support is not compiled in.\n"
 msgstr "Le support de SSL n'est pas été activé à la compilation.\n"
 
-#: fetchmail.c:1208
+#: fetchmail.c:1211
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
@@ -942,20 +942,20 @@ msgstr ""
 "fetchmail: attention: aucun DNS disponible pour vérifier les réceptions "
 "«multidrop» depuis %s\n"
 
-#: fetchmail.c:1219
+#: fetchmail.c:1222
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr ""
 "attention: des réceptions «multidrop» depuis %s exigent l'option "
 "«envelope»!\n"
 
-#: fetchmail.c:1220
+#: fetchmail.c:1223
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr ""
 "attention: Ne chercher pas de l'aide si tout mail est expédié au "
 "postmaster!\n"
 
-#: fetchmail.c:1237
+#: fetchmail.c:1240
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -964,115 +964,115 @@ msgstr ""
 "fetchmail: configuration de %s invalide, service requiert un numéro de port "
 "positif\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1247
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "fetchmail: configuration de %s invalide, RPOP requiert un port privilégié\n"
 
-#: fetchmail.c:1262
+#: fetchmail.c:1265
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 "configuration de %s invalide, LMTP ne peut utiliser le port SMTP par défaut\n"
 
-#: fetchmail.c:1276
+#: fetchmail.c:1279
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr "Utiliser «fetchall» et «keep» ensemble en mode démon est une erreur!\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1304
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminé par un signal %d\n"
 
-#: fetchmail.c:1374
+#: fetchmail.c:1377
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s interroge %s (protocole %s) à %s : récupération en cours\n"
 
-#: fetchmail.c:1399
+#: fetchmail.c:1402
 msgid "POP2 support is not configured.\n"
 msgstr "Le support de POP2 n'est pas configuré.\n"
 
-#: fetchmail.c:1411
+#: fetchmail.c:1414
 msgid "POP3 support is not configured.\n"
 msgstr "Le support de POP3 n'est pas configuré.\n"
 
-#: fetchmail.c:1421
+#: fetchmail.c:1424
 msgid "IMAP support is not configured.\n"
 msgstr "Le support d'IMAP n'est pas configuré.\n"
 
-#: fetchmail.c:1427
+#: fetchmail.c:1430
 msgid "ETRN support is not configured.\n"
 msgstr "Le support d'ETRN n'est pas configuré.\n"
 
-#: fetchmail.c:1435
+#: fetchmail.c:1438
 msgid "ODMR support is not configured.\n"
 msgstr "Le support de ODMR n'est pas configuré.\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1445
 msgid "unsupported protocol selected.\n"
 msgstr "protocole sélectionné non supporté.\n"
 
-#: fetchmail.c:1452
+#: fetchmail.c:1455
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s interroge %s (protocole %s) à %s : interrogation finie\n"
 
-#: fetchmail.c:1469
+#: fetchmail.c:1472
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "L'intervalle entre les réceptions est de %d secondes\n"
 
-#: fetchmail.c:1471
+#: fetchmail.c:1474
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Le fichier de traces est %s\n"
 
-#: fetchmail.c:1473
+#: fetchmail.c:1476
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Le fichier des identificateurs est %s\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1479
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Les messages de progression sont enregistrés via syslog\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1482
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail va se masquer et ne générer aucun «Received»\n"
 
-#: fetchmail.c:1481
+#: fetchmail.c:1484
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail affichera des points de progression, même dans le journal\n"
 
-#: fetchmail.c:1483
+#: fetchmail.c:1486
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 "Fetchmail réexpédiera les messages «multidrop» mal aiguillés vers %s.\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1490
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 "Fetchmail expédiera les erreurs de messagerie\n"
 "au maître de poste.\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1492
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail expédiera les erreur de messagerie à l'envoyeur\n"
 
-#: fetchmail.c:1496
+#: fetchmail.c:1499
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options pour la réception depuis %s@%s :\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1503
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Le courrier sera reçu via %s\n"
 
-#: fetchmail.c:1503
+#: fetchmail.c:1506
 #, 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"
@@ -1080,176 +1080,176 @@ msgstr[0] "  La réception depuis ce serveur s'opérera tout %d intervalle.\n"
 msgstr[1] ""
 "  La réception depuis ce serveur s'opérera tous les %d intervalles.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1510
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  Le vrai nom du serveur est %s.\n"
 
-#: fetchmail.c:1510
+#: fetchmail.c:1513
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  Cet hôte ne sera pas interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1511
+#: fetchmail.c:1514
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  Cet hôte sera interrogé lorsqu'aucun hôte n'est spécifié.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1518
 msgid "  Password will be prompted for.\n"
 msgstr "  Le mot de passe sera requis.\n"
 
-#: fetchmail.c:1519
+#: fetchmail.c:1522
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  Secret APOP = \"%s\".\n"
 
-#: fetchmail.c:1522
+#: fetchmail.c:1525
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  Identification RPOP = \"%s\".\n"
 
-#: fetchmail.c:1525
+#: fetchmail.c:1528
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Mot de passe = \"%s\".\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1537
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Le protocole est KPOP avec authentification Kerberos %s"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1540
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Le protocole est %s"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1542
 #, c-format
 msgid " (using service %s)"
 msgstr " (utilisant le service %s)"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1544
 msgid " (using default port)"
 msgstr " (utilisant le port par défaut)"
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 msgid " (forcing UIDL use)"
 msgstr " (forçant l'usage des UIDL)"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1552
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  Toutes les méthodes d'authentification vont être essayées.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1555
 msgid "  Password authentication will be forced.\n"
 msgstr "Authentification par mot de passe forcé.\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1558
 msgid "  MSN authentication will be forced.\n"
 msgstr "L'authentification MSN forcée.\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1561
 msgid "  NTLM authentication will be forced.\n"
 msgstr "L'authentification NTLM forcée.\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1564
 msgid "  OTP authentication will be forced.\n"
 msgstr "  Authentification OTP forcée.\n"
 
-#: fetchmail.c:1564
+#: fetchmail.c:1567
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  Authentification CRAM-Md5 forcée.\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1570
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  Authentification GSSAPI forcée.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1573
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Authentification de Kerberos V4 forcée.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1576
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " Authentification de Kerberos V5 forcée.\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1579
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  cryptage «End-to-end» assumé.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1583
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Le principal service de mail est: %s\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1586
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  Les sessions encryptée SSL sont supportées.\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1588
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  Protocole SSL: %s\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1590
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  Activation de la vérification des certificats du serveur SSL.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1592
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  Répertoire des certificats SSL surs: %s\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1595
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  Signature de la clé SSL (vérifié via le serveur de clés): %s\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1598
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Le délai d'attente d'une réponse du serveur est de %d secondes"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1600
 msgid " (default).\n"
 msgstr " (par défaut).\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1607
 msgid "  Default mailbox selected.\n"
 msgstr "  La boîte aux lettres par défaut est sélectionnée.\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1612
 msgid "  Selected mailboxes are:"
 msgstr "  Les boîtes aux lettres sélectionnées sont :"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1618
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  Tous les messages seront reçus (--all on).\n"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1619
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Seulement des messages nouveaux seront reçus (--all off).\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1621
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Tout message récupéré sera conservé sur le serveur (--keep on).\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1622
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr ""
 "  Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1624
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Tout ancien message sera éliminé avant relève du courrier (--flush on).\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1625
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Tout ancien message ne sera pas éliminé avant relève du courrier (--flush "
 "off).\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1627
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1257,7 +1257,7 @@ msgstr ""
 "  Tout message trop grand sera éliminé avant relève du courrier (--"
 "limitflush on).\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1628
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1265,339 +1265,339 @@ msgstr ""
 "  Tout ancien trop grand ne sera pas éliminé avant relève du courrier (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1630
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  La ré-écriture des adresses locales est activée (--norewrite off).\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1631
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr ""
 "  La ré-écriture des adresses locales est inactivée (--norewrite on).\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1633
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  La suppression des retour-chariots est activé (stripcr on).\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1634
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  La suppression des retour-chariots est inactivée (stripcr off).\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1636
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Le forçage des retour-chariots est activé (forcecr on).\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1637
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Le forçage des retour-chariots est inactivé (forcecr off).\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1639
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est inactivée (pass8bits "
 "on).\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1640
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  L'interprétation des «Content-Transfer-Encoding» est activée (pass8bits "
 "off).\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1642
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  Le décodage MIME est activé (mimedecode on).\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1643
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  Le décodage MIME est inactivé (mimedecode off).\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1645
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  L'inoccupation après la réception est activé (idle on).\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1646
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  L'inoccupation après la réception est inactivé (idle off).\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1648
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Les lignes «Status» non vides seront ignorés (dropstatus on).\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1649
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Les lignes «Status» non vides seront conservées (dropstatus off).\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1651
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront ignorées (dropdelivered on).\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1652
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr ""
 "  Les lignes «Delivered-To» non vides seront conservées (dropdelivered "
 "off).\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1656
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  La taille des messages est limitée à %d octets (--limit %d).\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1659
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  La taille des messages n'est pas limitée (--limit 0).\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1661
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 "  Alertes sur la taille des messages toutes les %d secondes (--warnings %"
 "d).\n"
 
-#: fetchmail.c:1661
+#: fetchmail.c:1664
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 "  Alertes sur la taille des messages à chaque réception (--warnings 0).\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1667
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Le nombre de messages reçu est limité à %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  Le nombre de messages reçu n'est pas limité (--fetchlimit 0).\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1672
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 "  La limite de taille de récupération de messages est %d (--fetchsizelimit %"
 "d)\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1675
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 "  Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1679
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1681
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Effectue la recherche binaire des UIDs durant %d sondages sur %d (--"
 "fastuidl %d).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1684
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 "  Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1686
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  Le nombre de messages expédiés est limité à %d.\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1688
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1692
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 "  Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  Aucune purge forcée n'aura lieu (--expunge 0).\n"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1701
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domaines pour lesquels le mail est récupéré :"
 
-#: fetchmail.c:1703 fetchmail.c:1723
+#: fetchmail.c:1706 fetchmail.c:1726
 msgid " (default)"
 msgstr " (par défaut)"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1711
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Les messages seront ajoutés après %s en tant que BSMTP\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1713
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Les messages seront acheminés avec \"%s\".\n"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1720
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Les messages seront réexpédiés via %cMTP vers :"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1731
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Le nom de la machine sur la ligne «MAIL FROM» sera %s\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1734
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  L'adresse placée après la commande SMTP 'RCPT TO' sera %s\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1743
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Les réponses du serveur reconnaissant des blocs de «spam» sont :"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Spam-blocking disabled\n"
 msgstr "  Le blocage du «spam» est inactivé\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1752
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  La connexion au serveur sera initiée avec \"%s\".\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1755
 msgid "  No pre-connection command.\n"
 msgstr "  Aucune commande de pré-connexion définie.\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1757
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  La connexion au serveur sera terminée avec \"%s\".\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1760
 msgid "  No post-connection command.\n"
 msgstr "  Aucune commande de post-connexion définie.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 msgid "  No localnames declared for this host.\n"
 msgstr "  Aucun nom local déclaré pour cet hôte.\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1773
 msgid "  Multi-drop mode: "
 msgstr "  Mode «multi-drop»: "
 
-#: fetchmail.c:1772
+#: fetchmail.c:1775
 msgid "  Single-drop mode: "
 msgstr "  Mode «single-drop»: "
 
-#: fetchmail.c:1774
+#: fetchmail.c:1777
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d nom local reconnu.\n"
 msgstr[1] "%d noms locaux reconnus.\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1792
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est activée.\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1793
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  La requête DNS des adresses «multidrop» est inactivée.\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1797
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs adresses IP.\n"
 
-#: fetchmail.c:1796
+#: fetchmail.c:1799
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr ""
 "  Les alias du serveur seront comparés avec les adresses «multidrop» par "
 "leurs noms.\n"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1802
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Le routage vers l'adresse d'enveloppe est inactivé\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1805
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  L'en-tête d'enveloppe est pris comme étant : %s\n"
 
-#: fetchmail.c:1805
+#: fetchmail.c:1808
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Numéro de l'en-tête d'enveloppe devant être traité : %d\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1811
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Le préfixe %s sera soustrait des id d'utilisateur\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1814
 msgid "  No prefix stripping\n"
 msgstr "  Aucun préfixe ne sera soustrait\n"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1821
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Alias pré-déclarés du serveur de courrier :"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1830
 msgid "  Local domains:"
 msgstr "  Domaines locaux :"
 
-#: fetchmail.c:1837
+#: fetchmail.c:1840
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  La connexion se fera via l'interface %s.\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1842
 msgid "  No interface requirement specified.\n"
 msgstr "  Aucun choix d'interface n'a été spécifié.\n"
 
-#: fetchmail.c:1841
+#: fetchmail.c:1844
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  La boucle de réception observera %s.\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 msgid "  No monitor interface specified.\n"
 msgstr "  Aucune interface à observer n'a été spécifiée.\n"
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Connexions au serveur à travers le «plugin» %s (--plugin %s).\n"
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 msgid "  No plugin command specified.\n"
 msgstr "  Aucune commande de «plugin» n'a été spécifiée.\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1854
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Connexions au client à travers le «plugout» %s (--plugout %s).\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 msgid "  No plugout command specified.\n"
 msgstr "  Aucune commande de «plugout» n'a été spécifiée.\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1861
 msgid "  No UIDs saved from this host.\n"
 msgstr "  Aucun UID n'a été enregistré sur cet hôte.\n"
 
-#: fetchmail.c:1867
+#: fetchmail.c:1870
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs enregistrés.\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1878
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 "  Information de traçage de la réception ajoutée aux en-têtes Received.\n"
 
-#: fetchmail.c:1877
+#: fetchmail.c:1880
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1605,7 +1605,7 @@ msgstr ""
 "  Aucune ajout d'information de traçage de la réception aux en-têtes "
 "Received.\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1883
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Propriétés du passage \"%s\".\n"
@@ -1868,21 +1868,21 @@ msgstr "impossible de décoder la réponse BASE64 «ready»\n"
 msgid "challenge mismatch\n"
 msgstr "non coïncidence du challenge\n"
 
-#: lock.c:77
+#: lock.c:86
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: échec de lecture du fichier verrou \"%s\": %s\n"
 
-#: lock.c:89
+#: lock.c:98
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: suppression de l'ancien fichier verrou\n"
 
-#: lock.c:96
+#: lock.c:105
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: échec d'ouverture du fichier verrou \"%s\": %s\n"
 
-#: lock.c:143
+#: lock.c:152
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: impossible de créer le verrou.\n"
 
@@ -1962,137 +1962,142 @@ msgstr "Impossible de décoder le challenge OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Phrase de passe secrète : "
 
-#: options.c:164 options.c:208
+#: options.c:166 options.c:210
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La chaîne de caractères «%s» n'est pas un nombre valide.\n"
 
-#: options.c:173
+#: options.c:175
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "La valeur de la chaîne de caractères «%s» est %s que %d.\n"
 
-#: options.c:174
+#: options.c:176
 msgid "smaller"
 msgstr "moins"
 
-#: options.c:174
+#: options.c:176
 msgid "larger"
 msgstr "plus"
 
-#: options.c:332
+#: options.c:337
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Le protocole «%s» spécifié est invalide.\n"
 
-#: options.c:377
+#: options.c:382
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "La authentification «%s» spécifiée est invalide.\n"
 
-#: options.c:578
+#: options.c:583
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [options] [serveur ...]\n"
 
-#: options.c:579
+#: options.c:584
 msgid "  Options are as follows:\n"
 msgstr "  Les options sont les suivantes :\n"
 
-#: options.c:580
+#: options.c:585
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        afficher la présente aide\n"
 
-#: options.c:581
+#: options.c:586
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     informations sur la version courante\n"
 
-#: options.c:583
+#: options.c:588
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       vérifier les messages sans les récupérer\n"
 
-#: options.c:584
+#: options.c:589
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      travailler silencieusement\n"
 
-#: options.c:585
+#: options.c:590
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     travail verbeux (information de diagnostic)\n"
 
-#: options.c:586
+#: options.c:591
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      démarrer en démon toutes les n secondes\n"
 
-#: options.c:587
+#: options.c:592
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    ne pas lancer de processus démon\n"
 
-#: options.c:588
+#: options.c:593
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        terminer le processus démon\n"
 
-#: options.c:589
+#: options.c:594
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     spécifier le nom du fichier de traces\n"
 
-#: options.c:590
+#: options.c:595
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 "      --syslog      utiliser syslog(3) pour les messages, en mode démon\n"
 
-#: options.c:591
+#: options.c:596
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   ne pas écrire de `Received' y activer le spoofing\n"
 
-#: options.c:592
+#: options.c:597
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc spécifier un autre fichier de contrôle\n"
 
-#: options.c:593
+#: options.c:598
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      spécifier un autre fichier contenant les UIDs\n"
 
-#: options.c:594
+#: options.c:599
+msgid "      --pidfile     specify alternate PID (lock) file\n"
+msgstr ""
+"      --pidfile     spécifier un autre fichier contenant la PID (le verrou)\n"
+
+#: options.c:600
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  spécifier le destinataire en dernier ressort\n"
 
-#: options.c:595
+#: options.c:601
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirige les rebonds vers le maître de poste.\n"
 
-#: options.c:597
+#: options.c:603
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   spécifier l'interface requise\n"
 
-#: options.c:598
+#: options.c:604
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     surveiller l'activité d'une interface\n"
 
-#: options.c:601
+#: options.c:607
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         permettre les sessions cryptées SSL\n"
 
-#: options.c:602
+#: options.c:608
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      fichier de clé SSL privée\n"
 
-#: options.c:603
+#: options.c:609
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificat de session SSL\n"
 
-#: options.c:604
+#: options.c:610
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr ""
 "      --sslcertck   vérification stricte des certificats du serveur "
 "(recommandé)\n"
 
-#: options.c:605
+#: options.c:611
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath répertoire des certificats SSL\n"
 
-#: options.c:606
+#: options.c:612
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2100,173 +2105,173 @@ msgstr ""
 "      --sslfingerprint empreinte digital qui doit concerter de celle du "
 "serveur.\n"
 
-#: options.c:607
+#: options.c:613
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    force le protocole ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:609
+#: options.c:615
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      spécifier la commande externe pour ouvrir la connexion\n"
 
-#: options.c:610
+#: options.c:616
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     spécifier la commande externe pour ouvrir la connexion "
 "smtp\n"
 
-#: options.c:612
+#: options.c:618
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    spécifier le protocole de récupération (voir la page "
 "man)\n"
 
-#: options.c:613
+#: options.c:619
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forcer l'utilisation des UIDLs (uniquement pop3)\n"
 
-#: options.c:614
+#: options.c:620
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr ""
 "      --port        port TCP auquel se connecter (obsolète, utilisez --"
 "service)\n"
 
-#: options.c:615
+#: options.c:621
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service      service TCP auquel se connecter (peut être port "
 "numérique)\n"
 
-#: options.c:616
+#: options.c:622
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        type d'authentification (mot de passe/kerberos/ssh/otp)\n"
 
-#: options.c:617
+#: options.c:623
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     temps d'attente d'une réponse du serveur\n"
 
-#: options.c:618
+#: options.c:624
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    en-tête de l'adresse d'enveloppe\n"
 
-#: options.c:619
+#: options.c:625
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    préfixer à soustraire à l'id local d'utilisateur\n"
 
-#: options.c:620
+#: options.c:626
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal service mail\n"
 
-#: options.c:621
+#: options.c:627
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  ajoute des informations de tracage de la réception\n"
 "                    aux en-testes Received\n"
 
-#: options.c:623
+#: options.c:629
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    spécifier le `login' de l'utilisateur sur le serveur\n"
 
-#: options.c:624
-msgid "  -a, --all         retrieve old and new messages\n"
-msgstr "  -a, --all         récupérer anciens et nouveaux messages\n"
+#: options.c:630
+msgid "  -a, --[fetch]all  retrieve old and new messages\n"
+msgstr "  -a, --[fetch]all  récupérer anciens et nouveaux messages\n"
 
-#: options.c:625
+#: options.c:631
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 "  -K, --nokeep      supprimer les nouveaux messages après récupération\n"
 
-#: options.c:626
+#: options.c:632
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr ""
 "  -k, --keep        conserver les nouveaux messages après récupération\n"
 
-#: options.c:627
+#: options.c:633
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       supprimer les anciens messages du serveur\n"
 
-#: options.c:628
+#: options.c:634
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  eliminer les messages qui sont trop grands\n"
 
-#: options.c:629
+#: options.c:635
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   ne pas récrire les adresses d'en-tête\n"
 
-#: options.c:630
+#: options.c:636
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       limite maximale de la taille des messages à récupérer\n"
 
-#: options.c:631
+#: options.c:637
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalle entre les notifications de courrier\n"
 
-#: options.c:633
+#: options.c:639
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    spécifier l'hôte SMTP pour la réexpédition\n"
 
-#: options.c:634
+#: options.c:640
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains récupère le mail pour les domaines indiqués\n"
 
-#: options.c:635
+#: options.c:641
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress spécifier le domaine de délivrance SMTP à utiliser\n"
 
-#: options.c:636
+#: options.c:642
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    force le nom complet SMTP nom@domaine\n"
 
-#: options.c:637
+#: options.c:643
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurer les valeurs de réponse anti`spam'\n"
 
-#: options.c:638
+#: options.c:644
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  limite du nombre de messages pour chaque connexion SMTP\n"
 
-#: options.c:639
+#: options.c:645
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  limite des récupérations pour les connexions au serveur\n"
 
-#: options.c:640
+#: options.c:646
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchsizelimit indique la tialle limite des messages récupérés\n"
 
-#: options.c:641
+#: options.c:647
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    effectue une recherche binaire des UIDLs\n"
 
-#: options.c:642
+#: options.c:648
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     limite du nombre des suppressions entre deux purges\n"
 
-#: options.c:643
+#: options.c:649
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         spécifier le MDA à utiliser pour la réexpédition\n"
 
-#: options.c:644
+#: options.c:650
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       spécifier le fichier de sortie BSMTP\n"
 
-#: options.c:645
+#: options.c:651
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        utiliser LMTP (RFC2033) pour la délivrance\n"
 
-#: options.c:646
+#: options.c:652
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      spécifier le nom du dossier distant\n"
 
-#: options.c:647
+#: options.c:653
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    affiche des points de progression, même dans le journal\n"
@@ -2329,15 +2334,15 @@ msgstr "erreur de protocole durant la réception des UIDLs\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'option --folder n'est pas supportée avec POP3\n"
 
-#: rcfile_y.y:123
+#: rcfile_y.y:124
 msgid "server option after user options"
 msgstr "une option serveur est placée après les options utilisateur"
 
-#: rcfile_y.y:166
+#: rcfile_y.y:167
 msgid "SDPS not enabled."
 msgstr "le support de SDPS est désactivé"
 
-#: rcfile_y.y:212
+#: rcfile_y.y:213
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2346,7 +2351,7 @@ msgstr ""
 "et \n"
 "FreeBSD\n"
 
-#: rcfile_y.y:219
+#: rcfile_y.y:220
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2354,25 +2359,25 @@ msgstr ""
 "fetchmail: l'option monitor n'est supportée que sous Linux (sans IPv6) et \n"
 "FreeBSD\n"
 
-#: rcfile_y.y:332
+#: rcfile_y.y:333
 msgid "SSL is not enabled"
 msgstr "le support de SSL n'est pas activé"
 
-#: rcfile_y.y:381
+#: rcfile_y.y:382
 msgid "end of input"
 msgstr "fin de l'entrée"
 
-#: rcfile_y.y:418
+#: rcfile_y.y:419
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Le fichier %s doit etre un fichier normal.\n"
 
-#: rcfile_y.y:428
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Le fichier %s doit avoir au moins les permissions -rwx--x--- (0710)\n"
 
-#: rcfile_y.y:440
+#: rcfile_y.y:441
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Le fichier %s doit vous appartenir.\n"
@@ -2939,28 +2944,28 @@ msgstr "aucune correspondance locale, réexpédition vers %s\n"
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "réexpédition et effacement supprimés suite à des erreurs de DNS\n"
 
-#: transact.c:1230
+#: transact.c:1234
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "écriture d'en-têtes RFC822\n"
 
-#: transact.c:1248
+#: transact.c:1252
 msgid "no recipient addresses matched declared local names"
 msgstr "aucune adresse de destination ne correspond aux noms locaux déclarés"
 
-#: transact.c:1255
+#: transact.c:1259
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'adresse de destination %s ne correspond à aucun nom local"
 
-#: transact.c:1264
+#: transact.c:1268
 msgid "message has embedded NULs"
 msgstr "le message contient des caractères NULs"
 
-#: transact.c:1272
+#: transact.c:1276
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "Le serveur SMTP rejette les adresses locales de destination : "
 
-#: transact.c:1400
+#: transact.c:1404
 msgid "writing message text\n"
 msgstr "écriture du texte du message\n"
 
diff --git a/rcfile_l.l b/rcfile_l.l
index 9acb4bf0..7ae3db96 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -69,6 +69,7 @@ int prc_lineno = 1;
 set		{ return SET; }
 logfile		{ return LOGFILE; }
 idfile		{ return IDFILE; }
+pidfile		{ return PIDFILE; }
 daemon		{ return DAEMON; }
 syslog		{ return SYSLOG; }
 invisible	{ return INVISIBLE; }
diff --git a/rcfile_y.y b/rcfile_y.y
index 75d57c27..cf820ee4 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -68,7 +68,7 @@ extern char * yytext;
 %token INTERFACE MONITOR PLUGIN PLUGOUT
 %token IS HERE THERE TO MAP WILDCARD
 %token BATCHLIMIT FETCHLIMIT FETCHSIZELIMIT FASTUIDL EXPUNGE PROPERTIES
-%token SET LOGFILE DAEMON SYSLOG IDFILE INVISIBLE POSTMASTER BOUNCEMAIL 
+%token SET LOGFILE DAEMON SYSLOG IDFILE PIDFILE INVISIBLE POSTMASTER BOUNCEMAIL
 %token SPAMBOUNCE SHOWDOTS
 %token <proto> PROTO AUTHTYPE
 %token <sval>  STRING
@@ -95,6 +95,7 @@ optmap		: MAP | /* EMPTY */;
 /* future global options should also have the form SET <name> optmap <value> */
 statement	: SET LOGFILE optmap STRING	{run.logfile = prependdir ($4, rcfiledir);}
 		| SET IDFILE optmap STRING	{run.idfile = prependdir ($4, rcfiledir);}
+		| SET PIDFILE optmap STRING	{run.pidfile = prependdir ($4, rcfiledir);}
 		| SET DAEMON optmap NUMBER	{run.poll_interval = $4;}
 		| SET POSTMASTER optmap STRING	{run.postmaster = xstrdup($4);}
 		| SET BOUNCEMAIL		{run.bouncemail = TRUE;}
@@ -578,7 +579,4 @@ char *prependdir (const char *file, const char *dir)
     return newfile;
 }
 
-/* easier to do this than cope with variations in where the library lives */
-int yywrap(void) {return 1;}
-
 /* rcfile_y.y ends here */