Release 6.3.16.

26 files changed, 330 insertions, 289 deletions

diff --git a/NEWS b/NEWS
index 50436b0d..25f7e3ba 100644
--- a/NEWS
+++ b/NEWS
@@ -52,18 +52,19 @@ removed from a 6.4.0 or newer release.)
 
 --------------------------------------------------------------------------------
 
-fetchmail-6.3.16 (not yet released):
+fetchmail-6.3.16 (released 2010-04-06, 25574 LoC):
 
-# BUG FIXES
 # BUG FIX
 * Fix --interface option, broken in 6.3.15. Reported by Vladmimir Stavrinov.
   Fixes Debian Bug #576717.
 
+# CHANGE
 * Call OpenSSL_add_all_algorithms(). This is needed to support non-mandatory
   algorithms in certificates. Sjoerd Simons, to fix Debian Bug #576430.
   OpenSSL 0.9.8* does not load - for instance - the SHA256 digest by default.
   Reported as OpenSSL RT#2224.
 
+
 fetchmail-6.3.15 (released 2010-03-28, 25572 LoC):
 
 # FEATURE
diff --git a/RELEASE-INSTRUCTIONS b/RELEASE-INSTRUCTIONS
index aad1a23b..f9708f6c 100644
--- a/RELEASE-INSTRUCTIONS
+++ b/RELEASE-INSTRUCTIONS
@@ -8,12 +8,13 @@ To do a release:
 
 - Tag the new release with a signed tag.
 
-- Upload sig and tarball to ~/public_html/fetchmail/ and edit index.html
-  for the new files, NEWS, and the new release and last update.
+- cd to ~/public_html/fetchmail and edit index.html for the new tarballs
+  and NEWS files and last update.
 
-- Upload sig and tarball to ftp.berlios.de:/incoming/ and release
-
-- Upload lsm and tarball to ibiblio.org:/incoming/linux/
+- These would be done automatically by makerelease.pl:
+  - Upload sig and tarball to ~/public_html/fetchmail/
+  - Upload sig and tarball to ftp.berlios.de:/incoming/ and release
+  - Upload lsm, sig and tarball to ibiblio.org:/incoming/linux/
 
 - Update the fetchmail website for version, link to release nodes
   (update release_id) and last update, commit, and upload.
diff --git a/dist-tools/makerelease.pl b/dist-tools/makerelease.pl
index f32f6f32..c1339514 100755
--- a/dist-tools/makerelease.pl
+++ b/dist-tools/makerelease.pl
@@ -5,48 +5,59 @@
 # in RELEASE_NOTES
 #
 
-use POSIX qw(strftime);
-$tmp = $ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp";
+my $project = "fetchmail";
+my $website = "http://developer.berlios.de/projects/$project";
+my $mailfrom = "<$project-devel\@lists.berlios.de> (Fetchmail Development Team)";
+my $distsufx = '.tar.bz2';
+
+# ---------------------------------------------------------------------
 
-$project = "fetchmail";
-$website = "http://developer.berlios.de/projects/$project";
-$mailfrom = "<$project-devel-owner\@lists.berlios.de> (Fetchmail Development Team)";
+use POSIX qw(strftime);
+use Getopt::Long;
+use strict vars;
 
+# check environment
+(-r "NEWS" and -r "fetchmail.c" and -r "configure.ac") or die "Please cd to the top-level source directory!";
 die "Need GNU sort!" unless `sort --version | head -n1` =~ /GNU/;
+system("lftp --version >/dev/null 2>&1") and die "lftp not found!";
 
 # parse options
-$diffs = 0;
-$verbose = 0;
-$null = ">/dev/null";
-$errnull = "2>/dev/null";
-while ($i = shift @ARGV)
-{
-	if ($i =~ /^(--diffs|-d)$/i)
-	{
-		die "$0 does not yet work with --diffs - needs to be updated for Git first!";
-		$diffs = 1;
-		next;
-	}
+my $diffs = 0;
+my $verbose = 0;
+my $help = 0;
+my $null = ">/dev/null";
+my $errnull = "2>/dev/null";
 
-	if ($i =~ /^(--verbose|-v)$/i)
-	{
-		$verbose = 1;
-		$null = "";
-		next;
-	}
+sub usage($$) {
+    my ($own, $rc) = @_;
 
-	die "Error: Unknown option: $i\n";
+    print STDERR "Usage: $_[0] [--verbose,-v] [--help,-h,-?]\n";
+    exit($_[1]);
 }
 
+GetOptions("diffs|d" => \$diffs, "verbose|v" => \$verbose, "help|h|?" => \$help)
+    or usage($0, 1);
+
+usage($0, 0) if $help;
+
+die "$0 does not yet work with --diffs - needs to be updated for Git first!" if $diffs;
+
+if ($verbose) {
+    $null = "";
+}
+
+my $tmp = $ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp";
+
 # extract version from source
-$version =`grep 'AC_INIT' configure.ac`;
+my $version =`grep 'AC_INIT' configure.ac`;
 $version =~ /AC_INIT\([^,]*,\[?([0-9.rc-]+)\]?\,.*\)/;
 $version = $1;
 die "cannot determine version" unless defined $1;
-$tag = "RELEASE_$version";
+my $tag = "RELEASE_$version";
 $tag =~ tr/./-/;
 
 # extract existing tags
+my @versions;
 open(ID, "git tag | sort -t- -k1,1 -k2,2n -k3,3n |") || die "cannot run git tag: $!\naborting";
 while (<ID>) {
 	chomp;
@@ -56,6 +67,7 @@ while (<ID>) {
 }
 close ID || die "git tag   failed, aborting";
 
+my $oldtag; my $oldver;
 if ($versions[0] eq $tag) {
 	$tag = $versions[0];
 	$oldtag = $versions[1];
@@ -64,7 +76,7 @@ if ($versions[0] eq $tag) {
 	$oldtag = $versions[0];
 }
 
-$pwd = `pwd`; chomp $pwd;
+my $pwd = `pwd`; chomp $pwd;
 
 $ENV{PATH} .= ":$pwd/dist-tools:$pwd/dist-tools/shipper";
 
@@ -75,12 +87,20 @@ if (-d "autom4te.cache") {
 		and die "Failure in removing autom4te.cache";
 }
 
-if (system("autoreconf -ifs") . ($verbose ? 'v' : '')) {
+printf "### autoreconf\n";
+
+if (system("autoreconf -ifs" . ($verbose ? 'v' : ''))) {
 	die("Failure in regenerating autoconf files\n");
 }
 
+print "### configure\n";
+
+if (system("mkdir -p autobuild && cd autobuild " 
+	. " && ../configure -C --silent ")) { die("Configuration failure\n"); }
+
 print "### Test-building the software...\n";
-if (system("mkdir -p autobuild && cd autobuild && ../configure -C --silent && make -s clean && make " . ($verbose ? '' : '-s') . " check distcheck")) {
+if (system("cd autobuild && make -s clean"
+	. " && make " . ($verbose ? '' : '-s') . " check distcheck lsm")) {
 	die("Compilation failure\n");
 }
 
@@ -94,7 +114,7 @@ The $version release of $project is now available at the usual locations,
 including <$website>.
 
 The source archive is available at:
-<$website/$project-${version}.tar.gz>
+<$website/$project-$version$distsufx>
 
 Here are the release notes:
 
@@ -149,6 +169,24 @@ if ($diffs) {
 #unlink("$tmp/$project.PREAMBLE.$$");
 unlink("$tmp/$project.DIFFS.$$");
 
-print "Done\n";
+print "### Signing tarballs...\n";
+system("cd autobuild && gpg -ba --sign $project-$version$distsufx");
+
+print "### Uploading\n";
+print "=== local\n";
+
+system("cp", "autobuild/$project-$version$distsufx", "autobuild/$project-$version$distsufx.asc", "$ENV{HOME}/public_html/fetchmail/") and die "Cannot upload to \$HOME/public_html/fetchmail/: $!";
+
+print "=== ibiblio\n";
+
+system("lftp -e \"lcd autobuild ; mput $project-$version$distsufx $project-$version$distsufx.asc $project-$version.lsm ; quit\" ibiblio.org:/incoming/linux/") and warn "Upload to ibiblio failed: $!";
+
+print "=== berlios\n";
+
+system("lftp -e \"lcd autobuild ; mput $project-$version$distsufx $project-$version$distsufx.asc ; quit\" ftp.berlios.de:/incoming/") and warn "Upload to berlios failed: $!";
+
+print "Done - please review final tasks\n";
+
+system("cat RELEASE-INSTRUCTIONS");
 
 # makerelease ends here
diff --git a/genlsm.sh.in b/genlsm.sh.in
index a693b039..52834287 100644
--- a/genlsm.sh.in
+++ b/genlsm.sh.in
@@ -25,7 +25,8 @@ Author:		matthias.andree@gmx.de (Matthias Andree)
 Maintained-by:	fetchmail-devel@lists.berlios.de
 Primary-site:	http://developer.berlios.de/projects/fetchmail
 		`ls -sk @PACKAGE@-@VERSION@.tar.bz2 | \
-		 @AWK@ '{ printf "%dkB", $1 }'` @PACKAGE@-@VERSION@.tar.bz2
+		 @AWK@ '{ printf "%4dkB", $1 }'` @PACKAGE@-@VERSION@.tar.bz2
+		   1kB @PACKAGE@-@VERSION@.tar.bz2.asc
 Platforms:	All
 Copying-policy: GPL
 End
diff --git a/po/ca.po b/po/ca.po
index 0ea8182a..6b305a6b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.11\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2009-08-06 14:52+0200\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -2527,14 +2527,14 @@ msgstr "Error no identificat del sistema"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (missatge de registre incomplet)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Es reescriur� la cap�alera %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "La versi� reescrita �s %s\n"
 
 #: rpa.c:118
@@ -3072,24 +3072,24 @@ msgstr "Error en verificar el certificat del servidor: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emissor desconegut (primers %d car�cters): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor del fitxer fora d'abast per SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "El protocol SSL especificat `%s' no �s v�lid, s'usa SSLv23.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La verificaci� del certificat o de l'empremta s'ha om�s!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
 
diff --git a/po/cs.po b/po/cs.po
index a3b24745..064710ad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-22 12:59+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -2490,14 +2490,14 @@ msgstr "Neznámá chyba systému"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (zpráva protokolu nedokončena)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Chystám se přepsat %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Přepsaná verze je %s\n"
 
 #: rpa.c:118
@@ -3024,24 +3024,24 @@ msgstr "Chyba ověřování certifikátu serveru: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "neznámý vydavatel (prvních %d znaků): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Deskriptor souboru mimo rozsah pro SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Zadán neplatný protokol SSL „%s“, používám implicitní (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Ověření certifikátu/otisku bylo nějak přeskočeno!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Další pokus čtení ze socketu Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Další pokus čtení ze socketu Cygwin selhal!\n"
 
diff --git a/po/da.po b/po/da.po
index 3f019f13..735fd552 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2003-09-02 20:21+0200\n"
 "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -2481,14 +2481,14 @@ msgstr "Ukendt systemfejl"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (logbesked ikke komplet)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Skal til at omskrive %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Omskreven version er %s\n"
 
 #: rpa.c:118
@@ -3020,26 +3020,26 @@ msgstr "Advarsel: servercertifikat-verificering: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Ukendt udsteder (de f�rste %d tegn): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Fildeskriptor har forkert v�rdi til SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Ugyldig SSL-protokol '%s' specificeret, bruger SSLv23.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Certifikat/fingeraftryk-verifikation blev p� en eller anden m�de sprunget "
 "over!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Fors�ger igen at l�se cygwin-sokkel\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Fors�g p� at l�se cygwin-sokkel mislykkedes!\n"
 
diff --git a/po/de.po b/po/de.po
index 5df3bb2c..1a99e71d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-04-01 21:33+0200\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-02-24 01:58+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -3054,25 +3054,25 @@ msgstr "Fehler bei Server-Zertifikat-Überprüfung: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "unbekannter Herausgeber (erste %d Zeichen): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
 
diff --git a/po/el.po b/po/el.po
index 995cd6ca..29fa3ce0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2003-05-06 01:03+0300\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -2521,14 +2521,14 @@ msgstr "������� ������ ����������"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (�������� ������ ����������)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "�������� �� ������������ %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "������������ ������ ����� %s\n"
 
 #: rpa.c:118
@@ -3062,24 +3062,24 @@ msgstr "�������������: ���������� �������������� ����������: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "�������� ������� (������ %d ����������): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "� ����������� ������� ����� �������� ��� �� SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "����������� ����� ���������� SSL '%s', ����� �� ������� (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "���������� ��������������/������������ ����� �����������!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "��������������� ��������� �������� Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������������� ��������� �������� Cygwin �������!\n"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 93d0da78..f6491e6f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -2432,14 +2432,14 @@ msgstr "Unknown system error"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (log message incomplete)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "About to rewrite %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Rewritten version is %s\n"
 
 #: rpa.c:118
@@ -2968,24 +2968,24 @@ msgstr "Server certificate verification error: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "unknown issuer (first %d characters): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "File descriptor out of range for SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certificate/fingerprint verification was somehow skipped!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin socket read retry\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin socket read retry failed!\n"
 
diff --git a/po/es.po b/po/es.po
index fab140ee..22cb64c0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.12\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2009-10-06 19:04+0200\n"
 "Last-Translator: Francisco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -2554,14 +2554,14 @@ msgstr "Error de sistema desconocido"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (mensaje de registro incompleto)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "A punto de reescribir %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "La versión reescrita es %s\n"
 
 #: rpa.c:118
@@ -3098,27 +3098,27 @@ msgstr "Falló la verificación del certificado del servidor: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "El protocolo SSL «%s» especificado es inválido, usando el predeterminado "
 "(SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "¡La verificación de certificado/huella digital fue de algún modo omitida!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del zócalo cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del zócalo cygwin\n"
 
diff --git a/po/fi.po b/po/fi.po
index 1d1793ef..e099e760 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2007-11-06 01:17+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -2388,14 +2388,14 @@ msgstr "Tuntematon järjestelmävirhe"
 msgid "%s (log message incomplete)\n"
 msgstr ""
 
-#: rfc822.c:76
+#: rfc822.c:78
 #, c-format
-msgid "About to rewrite %s"
+msgid "About to rewrite %.*s...\n"
 msgstr ""
 
-#: rfc822.c:212
+#: rfc822.c:215
 #, c-format
-msgid "Rewritten version is %s\n"
+msgid "...rewritten version is %.*s.\n"
 msgstr ""
 
 #: rpa.c:118
@@ -2921,24 +2921,24 @@ msgstr ""
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index e2953521..4187aca0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-22 07:24+0100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -2547,14 +2547,14 @@ msgstr "Erreur système inconnue"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (message de trace incomplet)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Sur le point de réécrire %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "La version réécrite est %s\n"
 
 #: rpa.c:118
@@ -3089,26 +3089,26 @@ msgstr "Erreur de vérification du certificat du serveur : %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "expéditeur inconnu (%d premiers caractères) : %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Descripteur de fichier inaccessible pour SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Le protocole SSL «%s» spécifié est inconnu, le protocole par défaut (SSLv23) "
 "est utilisé.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La vérification du certificat ou de la signature n'a pas été faite!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Nouvel essai de lecture sur la socket Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Le nouvel essai de lecture sur la socket Cygwin a échoué!\n"
 
diff --git a/po/gl.po b/po/gl.po
index 02b36e1c..a0455aab 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 5.3.6\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2000-04-10 01:26+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -2532,14 +2532,14 @@ msgstr "Erro de sistema desco�ecido"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (mensaxe de rexistro incompleta)"
 
-#: rfc822.c:76
+#: rfc822.c:78
 #, fuzzy, c-format
-msgid "About to rewrite %s"
+msgid "About to rewrite %.*s...\n"
 msgstr "a piques de entregar con: %s\n"
 
-#: rfc822.c:212
+#: rfc822.c:215
 #, c-format
-msgid "Rewritten version is %s\n"
+msgid "...rewritten version is %.*s.\n"
 msgstr ""
 
 #: rpa.c:118
@@ -3069,24 +3069,24 @@ msgstr ""
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:862
+#: socket.c:860
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo indicado `%s' non v�lido.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 3e3d549b..beaa30f6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-22 22:35+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -2457,14 +2457,14 @@ msgstr "Galat sistem tak diketahui"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (pesan log tidak lengkap)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Akan menulis ulang %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Versi tulis ulang adalah %s\n"
 
 #: rpa.c:118
@@ -2995,25 +2995,25 @@ msgstr "Galat verifikasi sertifikat server: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "penerbit tak diketahui (karakter %d pertama): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Penjelas berkas di luar jangkauan untuk SSL."
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Protokol SSL tidak sah '%s' ditentukan, menggunakan standar (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikasi sertifikat/sidik jari entah bagaimana terlewatkan!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Coba ulang baca soket Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Coba ulang baca soket Cygwin gagal!\n"
 
diff --git a/po/it.po b/po/it.po
index 14a3deeb..9ce8712d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-22 07:00+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -2592,14 +2592,14 @@ msgstr "Errore di sistema sconosciuto"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (messaggio di registro incompleto)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "In procinto di riscrivere %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "La versione riscritta è %s\n"
 
 #: rpa.c:118
@@ -3141,26 +3141,26 @@ msgstr "Errore di verifica del certificato del server: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emittente sconosciuto (primi %d caratteri): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Descrittore del file fuori tolleranza per SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Specificato un protocollo SSL «%s» non valido, utilizzo di quello predefinito "
 "(SSLv23) in corso.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifica del certificato o dell'impronta digitale ignorata.\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Nuovo tentativo di lettura del socket Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Lettura del socket Cygwin fallita.\n"
 
diff --git a/po/ja.po b/po/ja.po
index a858dbc6..af32f42a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-28 21:36+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -2501,14 +2501,14 @@ msgstr "不明なシステムエラーです。"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (ログメッセージが不完全です)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "%s の再書き込みについて"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Rewritten バージョンは %s です。\n"
 
 #: rpa.c:118
@@ -3041,26 +3041,26 @@ msgstr "サーバ証明書検証エラー: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "不明な発行者 (はじめの %d 文字): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "ファイル識別子が SSL としては長過ぎます。"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "無効な SSL プロトコル `%s' が指定されたため、デフォルト (SSLv23)を利用しま"
 "す。\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "証明書/fingerprint 検証が幾つか飛ばされました。\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin ソケット読み込み リトライ\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n"
 
diff --git a/po/nl.po b/po/nl.po
index 7cd1ab57..27f49c2f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-25 10:25+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -2496,14 +2496,14 @@ msgstr "Onbekende systeemfout"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (log-entry niet compleet)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Staat op het punt om %s te herschrijven"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Herschreven versie is %s\n"
 
 #: rpa.c:118
@@ -3034,27 +3034,27 @@ msgstr "Fout bij verificatie van servercertificaat: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "onbekende uitgever (eerste %d tekens): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Bestandsdescriptor valt buiten bereik voor SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ongeldig SSL-protocol '%s' opgegeven; standaard (SSLv23) wordt gebruikt.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "Verificatie van certificaat/vingerafdruk is op een of andere manier "
 "overslagen!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Poging om Cygwin-socket opnieuw te lezen is mislukt!\n"
 
diff --git a/po/pl.po b/po/pl.po
index 2a3c797b..a05d5bf7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-21 21:15+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -2532,14 +2532,14 @@ msgstr "Nieznany b��d systemu"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (komunikat logu niekompletny)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Rozpocz�cie przepisywania %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Przepisana wersja to %s\n"
 
 #: rpa.c:118
@@ -3069,24 +3069,24 @@ msgstr "B��d weryfikacji certyfikatu serwera: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "nieznany wystawca (pierwsze %d znak�w): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Deskryptor pliku poza zakresem dla SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Podano b��dny protok� SSL `%s', u�ywam domy�lnego (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiego� powodu pomini�ta!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego nie powiod�o si�!\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cfdd4a61..75b07bfe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-5.4.4\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2000-07-28 09:40-03:00\n"
 "Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -2542,14 +2542,14 @@ msgstr "Erro desconhecido do sistema"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (mensagem de registro incompleta)"
 
-#: rfc822.c:76
+#: rfc822.c:78
 #, fuzzy, c-format
-msgid "About to rewrite %s"
+msgid "About to rewrite %.*s...\n"
 msgstr "prestes a entregar para: %s\n"
 
-#: rfc822.c:212
+#: rfc822.c:215
 #, c-format
-msgid "Rewritten version is %s\n"
+msgid "...rewritten version is %.*s.\n"
 msgstr ""
 
 #: rpa.c:118
@@ -3081,24 +3081,24 @@ msgstr ""
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:862
+#: socket.c:860
 #, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Protocolo `%s' inv�lido foi especificado.\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 74baafa6..7c6785dc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2009-06-05 14:53+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -2517,14 +2517,14 @@ msgstr "Неизвестная системная ошибка"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (неполное сообщение журнала)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Будет перезаписан %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Переписанная версия %s\n"
 
 #: rpa.c:118
@@ -3057,26 +3057,26 @@ msgstr "Ошибка проверки сертификата сервера: %s\
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "неизвестная запрашивающая сторона (первые %d символов): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Дескриптор файла вне диапазона SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Указан неверный протокол SSL '%s', используется протокол по умолчанию "
 "(SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Повторная попытка чтения сокета Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Сбой повторного чтения сокета Cygwin!\n"
 
diff --git a/po/sk.po b/po/sk.po
index c40db03c..16832ce1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2003-06-12 15:02+00\n"
 "Last-Translator: Lubos Vitek <lubos_vitek@yahoo.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2486,14 +2486,14 @@ msgstr ""
 msgid "%s (log message incomplete)\n"
 msgstr ""
 
-#: rfc822.c:76
+#: rfc822.c:78
 #, c-format
-msgid "About to rewrite %s"
+msgid "About to rewrite %.*s...\n"
 msgstr ""
 
-#: rfc822.c:212
+#: rfc822.c:215
 #, c-format
-msgid "Rewritten version is %s\n"
+msgid "...rewritten version is %.*s.\n"
 msgstr ""
 
 #: rpa.c:118
@@ -3018,24 +3018,24 @@ msgstr "  SSL prie�inok pre d�vern� certifik�ty: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 3162066d..47953a84 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.3.8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2008-02-29 00:24+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -2517,14 +2517,14 @@ msgstr "Gabim i panjohur sistemi"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (mesazh regjistrimi jo i plotë)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Gati për rishkrimin e %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Versioni i rishkruar është %s\n"
 
 #: rpa.c:118
@@ -3058,26 +3058,26 @@ msgstr "Gabim verifikim dëshmie shërbyesi: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "lëshues i panjohur (%d gërmat e para): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Përshkrues kartele jashtë intervali për SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Treguar protokoll SSL i pavlefshëm '%s', po përdor të parazgjedhurin "
 "(SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Verifikimi i dëshmisë/gjurmës së gishtave pak a shumë u anashkalua!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Riprovë për lexim prej një \"socket\"-i Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Leximi dhe shkrimi prej një \"socket\"-i Cygwin dështuan!\n"
 
diff --git a/po/tr.po b/po/tr.po
index 3069eabe..f59ede65 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2003-10-17 17:27+0200\n"
 "Last-Translator: Engin G�nd�z <engin@ripe.net>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -2572,14 +2572,14 @@ msgstr "Bilinmeyen sistem hatas�"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (kay�t iletisi tam de�il)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "%s'i yeniden yazmak �zereyim"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Yeniden yaz�lan %s\n"
 
 #: rpa.c:118
@@ -3119,26 +3119,26 @@ msgstr "Uyar�: sunucu sertifikas� do�rulamas�: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "bilinmeyen ��karan firma ad� (ilk %d karakter): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Dosya belirteci SSL i�in s�n�rlar d���nda"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Ge�ersiz SSL protokol� '%s' belirtildi, �ntan�ml� olan kullan�l�yor "
 "(SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Sertifika/parmak izi do�rulamas� bir bi�imde atland�!\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin soketinden okuma ba�ar�s�z oldu!\n"
 
diff --git a/po/vi.po b/po/vi.po
index 703c17b2..e8d1e2a5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-22 18:10+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2496,14 +2496,14 @@ msgstr "Gặp lỗi hệ thống không rõ"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (thông điệp ghi lưu không hoàn toàn)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "Sắp ghi lại %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "Phiên bản đã ghi lại là %s\n"
 
 #: rpa.c:118
@@ -3033,25 +3033,25 @@ msgstr "Lỗi thẩm tra chứng nhận máy phục vụ : %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "không biết nhà phát hành (%d ký tự đầu): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "Bộ mô tả tập tin ở ngoại phạm vị SSL"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "Xác định giao thức SSL không hợp lệ « %s » nên dùng mặc định (SSLv23).\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Việc thẩm tra chứng nhận/vân tay bị bỏ qua vì lý do nào.\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "Việc cố lại đọc ổ cắm Cygwin\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Việc cố lại đọc ổ cắm Cygwin bị lỗi.\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 994018c6..bb765b76 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-06 21:17+0200\n"
 "PO-Revision-Date: 2010-03-02 15:32+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -2381,14 +2381,14 @@ msgstr "未知的系统错误"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (日志信息不完整)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
 msgstr "正要重写 %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
 msgstr "重写版本为 %s\n"
 
 #: rpa.c:118
@@ -2913,24 +2913,24 @@ msgstr "服务器证书验证错误: %s\n"
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "未知的发行者　(前 %d 个字符): %s\n"
 
-#: socket.c:846
+#: socket.c:844
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:862
+#: socket.c:860
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:938
+#: socket.c:936
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1016
+#: socket.c:1014
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1019
+#: socket.c:1017
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"