post-release commit for mutt-1.2.5.1.mutt-1-2-5-1-rel

22 files changed, 420 insertions, 334 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a8f79dc..7dae25cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan  1 20:50:42 CET 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* rfc822.c, VERSION: Fix a security hole.
+
 Fri Jul 28 18:41:40 2000  Thomas Roessler  <roessler@guug.de>
 
 	* imap/imap.c, imap/imap_private.h, imap/message.c:
diff --git a/VERSION b/VERSION
index c813fe11..58d8c37e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.5
+1.2.5.1
diff --git a/po/cs.po b/po/cs.po
index e7fe33c8..259e49fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.4i\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
 "PO-Revision-Date: 2000-07-12 11:46+0200\n"
 "Last-Translator: Jiψν Pavlovskύ <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -81,6 +81,7 @@ msgstr "Shodu pro jmennύ vzor nelze nalιzt, pokraθovat?"
 #
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "PoloΎka mailcapu 'compose' vyΎaduje %%s."
 
@@ -110,6 +111,7 @@ msgstr "Pro %s neexistuje poloΎka mailcapu 'compose', vytvαψνm prαzdnύ soubor."
 #
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "PoloΎka mailcapu 'edit' vyΎaduje %%s."
 
@@ -427,8 +429,8 @@ msgstr "Poslat rourou do pψνkazu: "
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Ψadit opaθnμ "
-"(d)at/(o)d/pψν(j)/(v)μc/(p)ro/v(l)αkno/(n)eseψ/veli(k)/(s)kσre?: "
+"Ψadit opaθnμ (d)at/(o)d/pψν(j)/(v)μc/(p)ro/v(l)αkno/(n)eseψ/veli(k)/(s)"
+"kσre?: "
 
 #
 #: commands.c:373
@@ -601,8 +603,8 @@ msgstr "To nedαvα smysl, kdyΎ nechcete zprαvu podepsat."
 #: compose.c:188
 msgid "Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"
 msgstr ""
-"Neznαmύ MIC algoritmus. Platnύmi algoritmy jsou: pgp-md5, pgp-sha1, "
-"pgp-rmd160"
+"Neznαmύ MIC algoritmus. Platnύmi algoritmy jsou: pgp-md5, pgp-sha1, pgp-"
+"rmd160"
 
 #
 #: compose.c:253
@@ -2790,8 +2792,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2819,10 +2821,10 @@ msgstr ""
 #
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2942,6 +2944,7 @@ msgstr "Schrαnka je prαzdnα."
 
 #
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Θtu %s... %d (%d%%)"
 
@@ -2977,6 +2980,7 @@ msgstr ""
 
 #
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Zapisuji zprαvy... %d (%d%%)"
 
diff --git a/po/da.po b/po/da.po
index 18c23ddf..d182677e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,13 +1,13 @@
 # This Danish translation of Mutt was made by people on the 
-# sslug-locale mailing list in the month of March 2000. The 
-# mailing list is archived at http://www.sslug.dk/emailarkiv/locale/
+# sslug-locale mailing-list in the month of March 2000. The 
+# maling-list is archived at http://www.sslug.dk/emailarkiv/locale/
 # 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mutt-1.2.5i \n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
-"PO-Revision-Date: 2000-08-31 21:15+02:00\n"
+"Project-Id-Version: Mutt-1.2.4i \n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
+"PO-Revision-Date: 2000-07-09 10:46+02:00\n"
 "Last-Translator: Byrial Jensen <Byrial@image.dk>, Morten Bo Johansen "
 "<mojo@image.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -73,6 +73,7 @@ msgstr "Kan ikke matche navneskabelon, fortsζt?"
 
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Brug af \"compose\" i mailcap-fil krζver %%s."
 
@@ -97,6 +98,7 @@ msgstr "Ingen \"compose\"-regel for %s i mailcap-fil, opretter en tom fil."
 
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Brug af \"edit\" i mailcap-fil krζver %%s."
 
@@ -359,8 +361,8 @@ msgstr "Overfψr til kommando: "
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Omvendt-sort "
-"(d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)rεd/(u)sort/(s)tr./s(c)ore?: "
+"Omvendt-sort (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)rεd/(u)sort/(s)tr./s(c)"
+"ore?: "
 
 #: commands.c:373
 msgid ""
@@ -575,11 +577,11 @@ msgstr "Indkodning til UTF-8 er ikke muligt endnu"
 
 #: compose.c:775
 msgid "The current attachment won't be converted."
-msgstr "Den aktuelle brevdel vil ikke blive konverteret"
+msgstr "Den aktuelle del vil ikke blive konverteret"
 
 #: compose.c:777
 msgid "The current attachment will be converted."
-msgstr "Den aktuelle brevdel vil blive konverteret"
+msgstr "Den aktuelle del vil blive konverteret"
 
 #: compose.c:806
 msgid "Recoding successful."
@@ -1613,11 +1615,11 @@ msgstr "ret i Cc-listen"
 
 #: keymap_alldefs.h:23
 msgid "edit attachment description"
-msgstr "ret brevdelens beskrivelse"
+msgstr "ret delens beskrivelse"
 
 #: keymap_alldefs.h:24
 msgid "edit attachment transfer-encoding"
-msgstr "ret brevdelens indkodning"
+msgstr "ret delens indkodning"
 
 #: keymap_alldefs.h:25
 msgid "enter a file to save a copy of this message in"
@@ -1693,7 +1695,7 @@ msgstr "send brevet"
 
 #: keymap_alldefs.h:43
 msgid "toggle disposition between inline/attachment"
-msgstr "skift status mellem integreret og bilagt"
+msgstr "skift status mellem intregeret og bilagt"
 
 #: keymap_alldefs.h:44
 msgid "toggle whether to delete file after sending it"
@@ -2322,15 +2324,15 @@ msgstr ""
 "    underforstεet garanti om SALGBARHED eller EGNETHED TIL NOGET BESTEMT\n"
 "    FORMΕL. Se GNU General Public License for yderligere detaljer\n"
 "\n"
-"    Du bψr have modtaget en kopi af GNU General Public License sammen med \n"
-"    dette program; hvis ikke, sε skriv til The Free Software Foundation, Inc., \n"
-"    59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Du skulle have modtaget en kopi af GNU General Public License\n"
+"    sammen med dette program; skriv til Free Software Foundation, Inc.,\n"
+"    675 Mass Ave, Cambridge, MA 02139, USA, hvis det ikke er tilfζldet.\n"
 
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2359,10 +2361,10 @@ msgstr ""
 
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2467,6 +2469,7 @@ msgid "Mailbox is empty."
 msgstr "Brevbakken er tom."
 
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Lζser %s ... %d (%d%%)"
 
@@ -2495,6 +2498,7 @@ msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox ζndret, men ingen ζndrede breve! (rapportιr denne bug)"
 
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skriver breve ... %d (%d%%)"
 
@@ -2831,7 +2835,7 @@ msgstr "fejl: ukendt op %d (rapportιr denne fejl)."
 
 #: pattern.c:959 pattern.c:1088
 msgid "Compiling search pattern..."
-msgstr "Klargψr sψgemψnster..."
+msgstr "Klargψrer sψgemψnster..."
 
 #: pattern.c:973
 msgid "Executing command on matching messages..."
diff --git a/po/de.po b/po/de.po
index 50a04568..c1710939 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.2\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
 "PO-Revision-Date: 2000-07-03 14:44+02:00\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
@@ -69,6 +69,7 @@ msgstr "Namensschema kann nicht erfόllt werden, fortfahren?"
 
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-Eintrag in der Mailcap-Datei erfordert %%s."
 
@@ -94,6 +95,7 @@ msgstr ""
 
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\"-Eintrag in Mailcap erfordert %%s."
 
@@ -357,15 +359,15 @@ msgstr "In Kommando einspeisen: "
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Umgekehrt "
-"(D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)rφίe/Be(w)ert?: "
+"Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)rφίe/Be(w)"
+"ert?: "
 
 #: commands.c:373
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Sortieren "
-"(D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)rφίe/Be(w)ert?: "
+"Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsort/(G)rφίe/Be(w)"
+"ert?: "
 
 #: commands.c:374
 msgid "dfrsotuzc"
@@ -2336,8 +2338,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2350,8 +2352,8 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 "\n"
-"SHA1 Implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 Implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Die Weitergabe und Nutzung als Source sowie in binδrer Form, mit\n"
 "    oder ohne Verδnderungen, ist unter bestimmten Bedingungen erlaubt.\n"
@@ -2367,10 +2369,10 @@ msgstr ""
 
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2395,10 +2397,10 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2476,6 +2478,7 @@ msgid "Mailbox is empty."
 msgstr "Mailbox ist leer."
 
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Lese %s... %d (%d%%)"
 
@@ -2505,6 +2508,7 @@ msgstr ""
 "sync: Mailbox verδndert, aber Nachrichten unverδndert! (bitte Bug melden)"
 
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Schreibe Nachrichten... %d (%d%%)"
 
@@ -3640,7 +3644,8 @@ msgstr "Bezugsnachricht ist nicht verfόgbar."
 #~ "--]\n"
 #~ "\n"
 #~ msgstr ""
-#~ "[-- Fehler: Diese Nachricht verstφίt gegen die PGP/MIME-Spezifikation! --]\n"
+#~ "[-- Fehler: Diese Nachricht verstφίt gegen die PGP/MIME-Spezifikation! "
+#~ "--]\n"
 
 #~ msgid "Saved output of child process to %s.\n"
 #~ msgstr "Ausgabe des Unterprozesses in %s abgespeichert.\n"
diff --git a/po/el.po b/po/el.po
index 1e1ffeff..20ec262c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.1.11i\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
 "PO-Revision-Date: 2000-04-01 12:00+0200\n"
 "Last-Translator: Φάνης Δοκιανάκης <madf@hellug.gr>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -87,6 +87,7 @@ msgstr "Αδυναμία ταιριάσματος του nametemplate, να συνεχίσω;"
 #
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Η καταχώρηση στοιχείων του mailcap χρειάζεται το %%s"
 
@@ -116,6 +117,7 @@ msgstr "Καμμία καταχώρηση mailcap για το %s, δημιουργία κενού αρχείου."
 #
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Η καταχώρηση mailcap Edit χρειάζεται το %%s"
 
@@ -244,8 +246,8 @@ msgstr "Μάσκα αρχείου: "
 #: browser.c:996
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"Ανάστροφη ταξινόμηση κατά (d)ημερομηνία, (a)αλφαβητικά, (z)μέγεθος ή "
-"(n)άκυρο;"
+"Ανάστροφη ταξινόμηση κατά (d)ημερομηνία, (a)αλφαβητικά, (z)μέγεθος ή (n)"
+"άκυρο;"
 
 #
 #: browser.c:997
@@ -2748,8 +2750,8 @@ msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
 "To report a bug, please use the muttbug utility.\n"
 msgstr ""
-"Για να επικοινωνήσετε με τους developers, στείλτε mail στο "
-"<mutt-dev@mutt.org>.\n"
+"Για να επικοινωνήσετε με τους developers, στείλτε mail στο <mutt-dev@mutt."
+"org>.\n"
 "Για να αναφέρετε ένα πρόβλημα χρησιμοποιήσετε το εργαλείο muttbug.\n"
 
 #
@@ -2761,8 +2763,8 @@ msgid ""
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins και άλλοι.\n"
-"Το Mutt έρχεται ΑΠΟΚΛΕΙΣΤΙΚΑ ΧΩΡΙΣ ΕΓΓΥΗΣΗ; για λεπτομέρειες πατήστε `mutt "
-"-vv'.\n"
+"Το Mutt έρχεται ΑΠΟΚΛΕΙΣΤΙΚΑ ΧΩΡΙΣ ΕΓΓΥΗΣΗ; για λεπτομέρειες πατήστε `mutt -"
+"vv'.\n"
 "Το Mutt έιναι ελεύθερο λογισμικό, και ευχαρίστως μπορείτε να το "
 "επαναδιανέμετε\n"
 "υπο ορισμένους όρους; γράψτε `mutt -vv' για λεπτομέρειες.\n"
@@ -2826,8 +2828,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2858,10 +2860,10 @@ msgstr ""
 #
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2903,8 +2905,8 @@ msgstr ""
 "  -F <αρχείο>\tκαθορίστε ένα εναλλακτικό αρχείο muttrc\n"
 "  -H <αρχείο>\tκαθορίστε ένα προσχέδιο από το οποίο θα διαβαστεί η "
 "επικεφαλίδα\n"
-"  -i <αρχείο>\tκαθορίστε ένα αρχείο που το Mutt θα συμπεριλαμβάνει κατά την "
-"\n"
+"  -i <αρχείο>\tκαθορίστε ένα αρχείο που το Mutt θα συμπεριλαμβάνει κατά "
+"την \n"
 "απάντηση\n"
 "  -m <τύπος>\tκαθορίστε ένα τύπο προκαθορισμένου γραμματοκιβωτίου\n"
 "  -n\t\tκάνετε το Mutt να μην διαβάσει το Muttrc του συστήματος\n"
@@ -2982,6 +2984,7 @@ msgstr "Το γραμματοκιβώτιο είναι άδειο."
 
 #
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Ανάγνωση %s... %d (%d%%)"
 
@@ -3018,6 +3021,7 @@ msgstr ""
 
 #
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Εγγραφή μηνυμάτων... %d (%d%%)"
 
@@ -4053,8 +4057,8 @@ msgstr "Δεν βρέθηκαν λίστες συζητήσεων!"
 #: recvcmd.c:776
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Αδυναμία αποκωδικοποίησης όλων των σημειωμένων προσαρτήσεων. "
-"MIME-encapsulate τις άλλες;"
+"Αδυναμία αποκωδικοποίησης όλων των σημειωμένων προσαρτήσεων. MIME-"
+"encapsulate τις άλλες;"
 
 #
 #: remailer.c:480
diff --git a/po/eo.po b/po/eo.po
index 55f3febb..6e7172e0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
 "PO-Revision-Date: 2000-03-30 10:30+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: eo <eo@li.org>\n"
@@ -70,6 +70,7 @@ msgstr "Nomώamblono ne estas plenumebla. Ζu daύrigi?"
 
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\" en Mailcap-dosiero postulas %%s"
 
@@ -96,6 +97,7 @@ msgstr ""
 
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "\"edit\" en Mailcap-dosiero postulas %%s"
 
@@ -358,15 +360,15 @@ msgstr "Filtri per komando: "
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Inversa ordigo laύ "
-"(d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)oentoj?: "
+"Inversa ordigo laύ (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)"
+"rando/(p)oentoj?: "
 
 #: commands.c:373
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Ordigo laύ "
-"(d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)oentoj?: "
+"Ordigo laύ (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)"
+"oentoj?: "
 
 #: commands.c:374
 msgid "dfrsotuzc"
@@ -2331,8 +2333,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2361,10 +2363,10 @@ msgstr ""
 
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2469,6 +2471,7 @@ msgid "Mailbox is empty."
 msgstr "Poώtfako estas malplena."
 
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Legas %s ... %d (%d%%)"
 
@@ -2498,6 +2501,7 @@ msgstr ""
 "sync: mbox modifita, sed mankas modifitaj mesaψoj! (Raportu ζi tiun cimon.)"
 
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skribas mesaψojn ... %d (%d%%)"
 
diff --git a/po/es.po b/po/es.po
index 4087407f..3512c685 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
-"PO-Revision-Date: 2000-09-07 18:24+02:00\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
+"PO-Revision-Date: 2000-04-01 14:19+02:00\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "Language-Team: -\n"
 "MIME-Version: 1.0\n"
@@ -67,6 +67,7 @@ msgstr "No se pudo encontrar el nombre, Ώcontinuar?"
 
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "La entrada \"compose\" en el archivo Mailcap requiere %%s"
 
@@ -92,6 +93,7 @@ msgstr ""
 
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "La entrada \"edit\" en el archivo Mailcap requiere %%s"
 
@@ -1266,16 +1268,18 @@ msgid "[unable to calculate]"
 msgstr "[imposible calcular]"
 
 #: imap/imap_ssl.c:292
+#, fuzzy
 msgid "[invalid date]"
-msgstr "[fecha invαlida]"
+msgstr "%s: valor invαlido"
 
 #: imap/imap_ssl.c:367
 msgid "Server certificate is not yet valid"
-msgstr "El certificado del servidor todavνa no es vαlido"
+msgstr ""
 
 #: imap/imap_ssl.c:374
+#, fuzzy
 msgid "Server certificate has expired"
-msgstr "Este certificado ha expirado"
+msgstr "Este certificado fue producido por:"
 
 #: imap/imap_ssl.c:447
 msgid "This certificate belongs to:"
@@ -1286,18 +1290,19 @@ msgid "This certificate was issued by:"
 msgstr "Este certificado fue producido por:"
 
 #: imap/imap_ssl.c:467
+#, fuzzy
 msgid "This certificate is valid"
-msgstr "Este certificado es vαlido"
+msgstr "Este certificado fue producido por:"
 
 #: imap/imap_ssl.c:468
 #, c-format
 msgid "   from %s"
-msgstr "   de %s"
+msgstr ""
 
 #: imap/imap_ssl.c:470
 #, c-format
 msgid "     to %s"
-msgstr "     a %s"
+msgstr ""
 
 #: imap/imap_ssl.c:476
 #, c-format
@@ -2327,8 +2332,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2341,8 +2346,8 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 "\n"
-"Implementaciσn SHA1 Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"Implementaciσn SHA1 Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribuciσn y uso en forma de cσdigo fuente y binario con o sin\n"
 "    modificaciσn estαn permitidos bajo ciertas condiciones.\n"
@@ -2356,10 +2361,10 @@ msgstr ""
 
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2385,8 +2390,8 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 "uso: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <arch> ] [ -m <tipo> ] [ -f <arch> ]\n"
-"     mutt [ -nx ] [ -e <cmd> ] [ -a <arch> ] [ -F <arch> ] [ -H <arch> ] [ "
-"-i <arch> ] [ -s <asunto> ] [ -b <dir> ] [ -c <dir> ] <dir> [ ... ]\n"
+"     mutt [ -nx ] [ -e <cmd> ] [ -a <arch> ] [ -F <arch> ] [ -H <arch> ] [ -"
+"i <arch> ] [ -s <asunto> ] [ -b <dir> ] [ -c <dir> ] <dir> [ ... ]\n"
 "     mutt [ -n ] [ -e <cmd> ] [ -F <archivo> ] -p\n"
 "     mutt -v[v]\n"
 "\n"
@@ -2465,6 +2470,7 @@ msgid "Mailbox is empty."
 msgstr "El buzσn estα vacνo."
 
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Leyendo %s... %d (%d%%)"
 
@@ -2494,6 +2500,7 @@ msgstr ""
 "sync: buzσn modificado, ‘pero sin mensajes modificados! (reporte este fallo)"
 
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "Guardando mensajes... %d (%d%%)"
 
diff --git a/po/fr.po b/po/fr.po
index 8af6c656..71041f8a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.2.2\n"
-"POT-Creation-Date: 2000-07-28 20:51+0200\n"
+"POT-Creation-Date: 2002-01-01 20:57+0100\n"
 "PO-Revision-Date: 2000-07-03 18:55+0200\n"
 "Last-Translator: Marc Baudoin <babafou@babafou.eu.org>, Vincent Lefevre "
 "<vincent@vinc17.org>\n"
@@ -74,6 +74,7 @@ msgstr "Ne correspond pas au nametemplate, continuer ?"
 
 #. For now, editing requires a file, no piping
 #: attach.c:123
+#, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "L'entrιe compose du fichier mailcap nιcessite %%s"
 
@@ -99,6 +100,7 @@ msgstr "Pas d'entrιe compose pour %s dans mailcap, crιation d'un fichier vide."
 
 #. For now, editing requires a file, no piping
 #: attach.c:250
+#, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "L'entrιe Edit du fichier mailcap nιcessite %%s"
 
@@ -375,8 +377,8 @@ msgstr "Passer ΰ la commande : "
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
-"Tri inv (d)ate/(a)uteur/(r)eηu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)ore ? "
-": "
+"Tri inv (d)ate/(a)uteur/(r)eηu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)"
+"ore ? : "
 
 #: commands.c:373
 msgid ""
@@ -501,8 +503,8 @@ msgid ""
 "(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget "
 "it? "
 msgstr ""
-"(c)hiffrer, (s)igner, (e)n tant que, les (d)eux, select algo (m)ic, (a)nnul "
-"? "
+"(c)hiffrer, (s)igner, (e)n tant que, les (d)eux, select algo (m)ic, (a)"
+"nnul ? "
 
 #: compose.c:138
 msgid "esabmf"
@@ -2364,8 +2366,8 @@ msgid ""
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins et autres.\n"
-"Mutt ne fournit ABSOLUMENT AUCUNE GARANTIE ; pour les dιtails tapez `mutt "
-"-vv'.\n"
+"Mutt ne fournit ABSOLUMENT AUCUNE GARANTIE ; pour les dιtails tapez `mutt -"
+"vv'.\n"
 "Mutt est un logiciel libre, et vous κtes libre de le redistribuer\n"
 "sous certaines conditions ; tapez `mutt -vv' pour les dιtails.\n"
 
@@ -2422,8 +2424,8 @@ msgstr ""
 #: main.c:77
 msgid ""
 "\n"
-"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution and use in source and binary forms, with or without\n"
 "    modification, are permitted under certain conditions.\n"
@@ -2436,8 +2438,8 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 "\n"
-"Implιmentation SHA1 Copyright (C) 1995-1997 Eric A. Young "
-"<eay@cryptsoft.com>\n"
+"Implιmentation SHA1 Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
+"com>\n"
 "\n"
 "    Redistribution et utilisation sous formes source et binaire, avec ou\n"
 "    sans modification, sont autorisιes sous certaines conditions.\n"
@@ -2454,10 +2456,10 @@ msgstr ""
 
 #: main.c:103
 msgid ""
-"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
-"]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ "
-"-i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+"usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"<file> ]\n"
+"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -2482,8 +2484,8 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"usage : mutt [ -nRzZ ] [ -e <cmd> ] [ -F <fich> ] [ -m <type> ] [ -f <fich> "
-"]\n"
+"usage : mutt [ -nRzZ ] [ -e <cmd> ] [ -F <fich> ] [ -m <type> ] [ -f "
+"<fich> ]\n"
 "        mutt [ -nx ] [ -e <cmd> ] [ -a <fich> ] [ -F <fich> ] [ -H <fich> ] "
 "[ -i <fich> ] [ -s <obj> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
 "        mutt [ -n ] [ -e <cmd> ] [ -F <fich> ] -p\n"
@@ -2569,6 +2571,7 @@ msgid "Mailbox is empty."
 msgstr "La boξte aux lettres est vide."
 
 #: mbox.c:129 mbox.c:287
+#, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Lecture de %s... %d (%d%%)"
 
@@ -2597,6 +2600,7 @@ msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync : BAL modifiιe, mais pas de message modifiι ! (signalez ce bug)"
 
 #: mbox.c:793
+#, c-format
 msgid "Writing messages... %d (%d%%)"