Release-commit for 0.94.17.mutt-0-94-17i-rel

8 files changed, 399 insertions, 257 deletions

diff --git a/ChangeLog b/ChangeLog
index 04d7c44c..6e5c2cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,150 @@
+Wed Nov 18 22:57:03 1998  Thomas Roessler  <roessler@guug.de>
+
+	* sendlib.c, protos.h, pgp.c, parse.c, lib.c, compose.c:
+	This patch simplifies the generation of content type parameters
+	significantly by introducing a funciton mutt_set_parameter().
+	Additionally, we re-use code from parse.c for parsing user-input
+	content type headers on the compose screen.
+
+	* compose.c: Remove some uuencode-related debris.
+
+	* recvattach.c:
+	Remove some code which crept in from the external character set patch.
+
+	* recvattach.c:
+	Make optional formats work while processing $attach_format.
+
+	* mh.c: Remove bogus re-sorting code from the maildir check routine.
+
+	* mutt.h:
+	Include <unistd.h>, so SEEK_SET is defined on some systems which
+	don't do so in <stdlib.h>.
+
+Tue Nov 17 13:23:26 1998  Thomas Roessler  <roessler@guug.de>
+
+	* po/uk.po, po/ru.po, po/it.po, po/es.po:
+	Checkpoint commit, containing quite a few fuzzy translations.
+
+	* po/de.po: Update some messages.
+
+	* m4/Makefile.am.in, m4/README, m4/gettext.m4, m4/lcmessage.m4, m4/progtest.m4, prepare, configure.in, Makefile.am:
+	Configuration fixes from Lars Hecking, with some more fixes and
+	modifications from myself.  With some luck, you don't need a gettext
+	installation any more.
+
+	* sendlib.c:
+	Fix the base64 encoder.  The current code would produce slightly
+	unpredictible output which leads to bad signatures.
+
+	* postpone.c, pgp.c, parse.c, pager.c:
+	Fix a search coloring related bug.
+
+Mon Nov 16 11:44:42 1998  Thomas Roessler  <roessler@guug.de>
+
+	* protos.h: Drop ci_attach - it doesn't exist.  Noted by Byrial Jensen.
+
+Sun Nov 15 09:53:23 1998  Thomas Roessler  <roessler@guug.de>
+
+	* parse.c: Stupid typo.
+
+	* protos.h, parse.c, attach.c: My version of Byrial's parse_part patch.
+
+	* recvattach.c, protos.h, mutt.h, copy.c, compose.c:
+	I can elaborate a little more on the last paragraph. It is deletion
+	of the top level part direct under a message/rfc822 part which
+	gives problems because the headers of the message/rfc822 part have
+	to be changed in this case. It is hard to tell exactly how many
+	bytes and lines will be removed and added in this case.
+
+	If we can refrain from deletion of such parts and thus only allow
+	deletion of parts direct under a multipart part, then it is
+	relative easy always to make correct Content-Length: and Lines:
+	headers in the copy. (The correctness of the Lines count is
+	dependent of the correctness of the initial value, though).
+
+	(From: Byrial Jensen)
+
+	* doc/manual.sgml.in:
+	Correcting Vikas' E-Mail address in the credits section.
+
+Sat Nov 14 08:24:56 1998  Thomas Roessler  <roessler@guug.de>
+
+	* doc/manual.sgml.in: Update Byrial's e-mail address.
+
+	* copy.c:
+	Simplify the new attachment deletion code not to require an extra
+	temporary file.  (From: Byrial Jensen <byrial@image.dk>)
+
+	* help.c, handler.c: Type cast nit from Gero Treuner.
+
+Fri Nov 13 18:31:06 1998  Thomas Roessler  <roessler@guug.de>
+
+	* imap.c:
+	Currently, Mutt won't use a default folder if just the IMAP server is
+	specified.  In fact, if the folder isn't specified, it will core-dump.
+
+	The attached patch will use INBOX as the IMAP folder name if none is
+	specified, eliminating the core-dump.
+
+	(From: Aaron Schrab <aaron+mutt@schrab.com>)
+
+Thu Nov 12 21:52:01 1998  Thomas Roessler  <roessler@guug.de>
+
+	* mutt.h, copy.c: Byrial's latest attachment deletion patch.
+
+	* mutt.h, lib.c, handler.c: Introduce a state_printf() function.
+
+Wed Nov 11 21:18:08 1998  Thomas Roessler  <roessler@guug.de>
+
+	* po/it.po: New it.po from Marco.
+
+	* snprintf.c: Don't use the mutt_str* functions in this module.
+
+	* strcasecmp.c:
+	the s/str.*cmp/mutt_str.*cmp/ replacement should not have taken
+	place here.
+
+Tue Nov 10 22:21:51 1998  Thomas Roessler  <roessler@guug.de>
+
+	* dotlock.c: Don't use mutt_strsomething in the dotlocking code.
+
+	* send.c: Fix the $metoo option's behaviour.
+
+	* thread.c, strcasecmp.c, status.c, sort.c, socket.c,
+	snprintf.c, sendlib.c, send.c, score.c, rfc822.c, rfc2047.c,
+	rfc1524.c, recvattach.c, query.c, protos.h, postpone.c,
+	pop.c, pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.c,
+	pattern.c, parse.c, pager.c, mx.c, mh.c, menu.c, mbox.c,
+	main.c, lib.c, keymap.c, init.c, imap.c, hook.c, history.c,
+	help.c, headers.c, hdrline.c, hash.c, handler.c,
+	gnupgparse.c, getdomain.c, from.c, enter.c, edit.c,
+	dotlock.c, curs_lib.c, copy.c, compose.c, complete.c,
+	commands.c, color.c, charset.c, buffy.c, browser.c,
+	attach.c, alias.c, addrbook.c: Introduce or rewrite
+	mutt_{str*cmp,strlen} and use them all over the place.  If
+	there are still segmentation faults due to missing NONULLs
+	over, they are gone now.
+
+	* main.c: Add a "pseudo-credit" to the extended copyright notice.
+
+	* po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, reldate.h, VERSION, ChangeLog:
+	Releasing 0.94.16.
+
+	* sendlib.c, mx.h, mx.c, mbox.c, init.c, copy.c, commands.c, buffy.c, attach.c:
+	Experimental support for the so-called "kendra" mail folder format.
+	This seems to be used on OS/2 and is, actually, a slibhtly modified
+	version of the MMDF format.
+
+	* parse.c:
+	Do some sanity checking when reading attachment.  This fix should
+	catch bad attachments.
+
+	* edit.c:
+	Fix a possible buffer overflow.  (This seems to be the one noticed
+	by Pavel Gulchouck <gul@lucky.net>.)
+
+	* compose.c: Wrong fix from Vikas.  Undo it.  (Noted by Byrial.)
+
 Tue Nov 10 21:02:27 1998  Thomas Roessler  <roessler@guug.de>
 
 	* sendlib.c, mx.h, mx.c, mbox.c, init.c, copy.c, commands.c, buffy.c, attach.c:
diff --git a/VERSION b/VERSION
index 970a4aec..8062bf7a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.94.16
+0.94.17
diff --git a/po/de.po b/po/de.po
index 25d26d93..218394ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-17 12:54+0100\n"
+"POT-Creation-Date: 1998-11-19 00:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Name: "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Eintragen?"
 
-#: alias.c:255 recvattach.c:285 recvattach.c:340
+#: alias.c:255 recvattach.c:345 recvattach.c:400
 msgid "Save to file: "
 msgstr "Speichern in Datei: "
 
@@ -108,7 +108,7 @@ msgstr "Undefinierter MIME-Typ, kann Anhang nicht anzeigen."
 msgid "Cannot create filter"
 msgstr "Kann Filter nicht erzeugen."
 
-#: attach.c:638 recvattach.c:315
+#: attach.c:638 recvattach.c:375
 msgid "Attachment saved."
 msgstr "Anhang gespeichert."
 
@@ -264,11 +264,11 @@ msgstr "Konnte Temporärdatei nicht anzeigen!"
 msgid "Command: "
 msgstr "Kommando: "
 
-#: commands.c:243 recvattach.c:618
+#: commands.c:243 recvattach.c:678
 msgid "Bounce message to: "
 msgstr "Nachricht weiterleiten an: "
 
-#: commands.c:245 recvattach.c:620
+#: commands.c:245 recvattach.c:680
 msgid "Bounce tagged messages to: "
 msgstr "Markierte Nachrichten weiterleiten an: "
 
@@ -488,63 +488,59 @@ msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!"
 msgid "Unable to attach!"
 msgstr "Kann nicht anhängen!"
 
-#: compose.c:751 compose.c:765
+#: compose.c:760
 msgid "Invalid encoding."
 msgstr "Ungültige Codierung."
 
-#: compose.c:756
-msgid "This encoding is deprecated.  Really use it?"
-msgstr "Diese Codierung sollte nicht genutzt werden.  Trotzdem setzen?"
-
-#: compose.c:780
+#: compose.c:775
 msgid "Save a copy of this message?"
 msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
 
-#: compose.c:825
+#: compose.c:820
 msgid "Rename to: "
 msgstr "Umbenennen in: "
 
-#: compose.c:830
+#: compose.c:825
 #, c-format
 msgid "Can't stat: %s"
 msgstr "Kann Verzeichniseintrag für Datei nicht lesen: %s"
 
-#: compose.c:857
+#: compose.c:852
 msgid "New file: "
 msgstr "Neue Datei: "
 
-#: compose.c:870
+#: compose.c:865
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ist von der Form Basis/Untertyp."
 
-#: compose.c:876
+#: compose.c:871
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Unbekannter Content-Type %s."
 
-#: compose.c:889
+#: compose.c:884
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kann Datei %s nicht anlegen."
 
-#: compose.c:897
+#: compose.c:892
 msgid "What we have here is a failure to make an attachment"
 msgstr "Anhang kann nicht erzeugt werden."
 
-#: compose.c:959
+#: compose.c:954
 msgid "Postpone this message?"
 msgstr "Nachricht zurückstellen?"
 
-#: compose.c:1011
+#: compose.c:1006
 msgid "Write message to mailbox"
 msgstr "Schreibe Nachricht in Mailbox."
 
-#: compose.c:1015
+#: compose.c:1010
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Schreibe Nachricht nach %s ..."
 
-#: compose.c:1026
+#: compose.c:1021
 msgid "Message written."
 msgstr "Nachricht geschrieben."
 
@@ -1023,7 +1019,7 @@ msgstr "Anmeldung gescheitert..."
 msgid "Selecting %s..."
 msgstr "Wähle %s aus..."
 
-#: imap.c:1084 lib.c:1154
+#: imap.c:1084 lib.c:1177
 #, c-format
 msgid "Create %s?"
 msgstr "%s erstellen?"
@@ -1862,24 +1858,24 @@ msgstr "Erzeuge dechiffrierte Kopie"
 msgid "Out of memory!"
 msgstr "Kein Speicher!"
 
-#: lib.c:741
+#: lib.c:764
 msgid "File is a directory, save under it?"
 msgstr "Datei ist ein Verzeichnis, darin abspeichern?"
 
-#: lib.c:746
+#: lib.c:769
 msgid "File under directory: "
 msgstr "Datei in diesem Verzeichnis: "
 
-#: lib.c:757
+#: lib.c:780
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: lib.c:1130
+#: lib.c:1153
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ist keine Mailbox"
 
-#: lib.c:1136
+#: lib.c:1159
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Nachricht an %s anhängen?"
@@ -2469,16 +2465,16 @@ msgstr ""
 "\n"
 "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
 
-#: pgp.c:1072
+#: pgp.c:1071
 msgid "Can't open PGP subprocess!"
 msgstr "Kann PGP-Subprozeß nicht erzeugen!"
 
-#: pgp.c:1206
+#: pgp.c:1195
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Benutze KeyID = \"%s\" für %s?"
 
-#: pgp.c:1212
+#: pgp.c:1201
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "KeyID für %s: "
@@ -2717,71 +2713,71 @@ msgstr "Filtern"
 msgid "Print"
 msgstr "Drucke"
 
-#: recvattach.c:312
+#: recvattach.c:372
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: recvattach.c:373
+#: recvattach.c:433
 msgid "Attachment saved"
 msgstr "Anhang gespeichert"
 
-#: recvattach.c:385
+#: recvattach.c:445
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "WARNUNG!  Datei %s existiert, überschreiben?"
 
-#: recvattach.c:403
+#: recvattach.c:463
 msgid "Attachment filtered."
 msgstr "Anhang gefiltert."
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Filter through: "
 msgstr "Filtere durch: "
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Pipe to: "
 msgstr "Übergebe an (pipe): "
 
-#: recvattach.c:504
+#: recvattach.c:564
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Kann %s Anhänge nicht drucken."
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print tagged attachment(s)?"
 msgstr "Drucke markierte Anhänge?"
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print attachment?"
 msgstr "Drucke Anhang?"
 
-#: recvattach.c:595
+#: recvattach.c:655
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Sie können nur message/rfc822-Anhänge erneut versenden."
 
-#: recvattach.c:631
+#: recvattach.c:691
 #, c-format
 msgid "Bounce messages to %s...?"
 msgstr "Nachrichten an %s... erneut versenden?"
 
-#: recvattach.c:632
+#: recvattach.c:692
 #, c-format
 msgid "Bounce message to %s...?"
 msgstr "Nachricht an %s... erneut versenden?"
 
-#: recvattach.c:857
+#: recvattach.c:917
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: recvattach.c:914
+#: recvattach.c:974
 msgid "Deletion of attachments from PGP messages is unsupported."
 msgstr "Kann keine Anhänge aus PGP-Nachrichten löschen."
 
-#: recvattach.c:934 recvattach.c:951
+#: recvattach.c:994 recvattach.c:1011
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Kann nur aus mehrteiligen Anhängen löschen."
 
-#: recvattach.c:1001
+#: recvattach.c:1061
 msgid "This operation is not currently supported for PGP messages."
 msgstr "Diese Funktion wird nicht für PGP-Nachrichten unterstützt."
 
@@ -2909,22 +2905,22 @@ msgstr ""
 msgid "%s no longer exists!"
 msgstr "%s existiert nicht mehr!"
 
-#: sendlib.c:775
+#: sendlib.c:777
 #, c-format
 msgid "Could not open %s"
 msgstr "Konnte %s nicht öffnen."
 
-#: sendlib.c:1703
+#: sendlib.c:1690
 #, c-format
 msgid "Error sending message, child exited %d (%s).\n"
 msgstr "Fehler %d beim Versand der Nachricht (%s).\n"
 
-#: sendlib.c:1705
+#: sendlib.c:1692
 #, c-format
 msgid "Saved output of child process to %s.\n"
 msgstr "Ausgabe des Unterprozesses in %s abgespeichert.\n"
 
-#: sendlib.c:1709
+#: sendlib.c:1696
 msgid "Error sending message."
 msgstr "Fehler beim Versand der Nachricht."
 
@@ -2950,6 +2946,9 @@ msgstr ""
 msgid "(no mailbox)"
 msgstr "(keine Mailbox)"
 
+#~ msgid "This encoding is deprecated.  Really use it?"
+#~ msgstr "Diese Codierung sollte nicht genutzt werden.  Trotzdem setzen?"
+
 #~ msgid "Confused when attempting to delete attachment, h & m can't be NULL"
 #~ msgstr "Interner Fehler."
 
diff --git a/po/es.po b/po/es.po
index a85ac66d..6545fe24 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt\n"
-"POT-Creation-Date: 1998-11-17 12:54+0100\n"
+"POT-Creation-Date: 1998-11-19 00:08+0100\n"
 "PO-Revision-Date: 1998-10-29 19:25+0100\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 
@@ -49,7 +49,7 @@ msgstr "Nombre: "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] ¿Aceptar?"
 
-#: alias.c:255 recvattach.c:285 recvattach.c:340
+#: alias.c:255 recvattach.c:345 recvattach.c:400
 msgid "Save to file: "
 msgstr "Guardar en archivo: "
 
@@ -103,7 +103,7 @@ msgstr "Tipo MIME no definido.  No se puede mostrar el archivo adjunto."
 msgid "Cannot create filter"
 msgstr "No se pudo crear el filtro"
 
-#: attach.c:638 recvattach.c:315
+#: attach.c:638 recvattach.c:375
 msgid "Attachment saved."
 msgstr "Archivo adjunto guardado."
 
@@ -259,11 +259,11 @@ msgstr "¡No se pudo crear el archivo temporal!"
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:243 recvattach.c:618
+#: commands.c:243 recvattach.c:678
 msgid "Bounce message to: "
 msgstr "Rebotar mensaje a: "
 
-#: commands.c:245 recvattach.c:620
+#: commands.c:245 recvattach.c:680
 msgid "Bounce tagged messages to: "
 msgstr "Rebotar mensajes marcados a: "
 
@@ -479,63 +479,59 @@ msgstr "Marque el mensaje que quiere adjuntar."
 msgid "Unable to attach!"
 msgstr "¡Imposible adjuntar!"
 
-#: compose.c:751 compose.c:765
+#: compose.c:760
 msgid "Invalid encoding."
 msgstr "La codificación no es válida."
 
-#: compose.c:756
-msgid "This encoding is deprecated.  Really use it?"
-msgstr "Este tipo de codificación es viejo. ¿Realmente lo quiere usar?"
-
-#: compose.c:780
+#: compose.c:775
 msgid "Save a copy of this message?"
 msgstr "¿Guardar una copia de este mensaje?"
 
-#: compose.c:825
+#: compose.c:820
 msgid "Rename to: "
 msgstr "Renombrar a: "
 
-#: compose.c:830
+#: compose.c:825
 #, c-format
 msgid "Can't stat: %s"
 msgstr "No se pudo probar: %s"
 
-#: compose.c:857
+#: compose.c:852
 msgid "New file: "
 msgstr "Archivo nuevo: "
 
-#: compose.c:870
+#: compose.c:865
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type tiene la forma base/subtipo"
 
-#: compose.c:876
+#: compose.c:871
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconocido"
 
-#: compose.c:889
+#: compose.c:884
 #, c-format
 msgid "Can't create file %s"
 msgstr "No se pudo creal el archivo %s"
 
-#: compose.c:897
+#: compose.c:892
 msgid "What we have here is a failure to make an attachment"
 msgstr "No se pudo producir el archivo a adjuntar"
 
-#: compose.c:959
+#: compose.c:954
 msgid "Postpone this message?"
 msgstr "¿Posponer el mensaje?"
 
-#: compose.c:1011
+#: compose.c:1006
 msgid "Write message to mailbox"
 msgstr "Guardar mensaje en el buzón"
 
-#: compose.c:1015
+#: compose.c:1010
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Guardando mensaje en %s ..."
 
-#: compose.c:1026
+#: compose.c:1021
 msgid "Message written."
 msgstr "Mensaje guardado."
 
@@ -1008,7 +1004,7 @@ msgstr "Entrando..."
 msgid "Selecting %s..."
 msgstr "Seleccionando %s..."
 
-#: imap.c:1084 lib.c:1154
+#: imap.c:1084 lib.c:1177
 #, c-format
 msgid "Create %s?"
 msgstr "¿Crear %s?"
@@ -1847,24 +1843,24 @@ msgstr "crear copia decriptada"
 msgid "Out of memory!"
 msgstr "¡Se acabó la memoria!"
 
-#: lib.c:741
+#: lib.c:764
 msgid "File is a directory, save under it?"
 msgstr "Archivo es un directorio, ¿guardar adentro?"
 
-#: lib.c:746
+#: lib.c:769
 msgid "File under directory: "
 msgstr "Archivo en el directorio: "
 
-#: lib.c:757
+#: lib.c:780
 msgid "File exists, overwrite?"
 msgstr "Archivo existe, ¿sobreescribir?"
 
-#: lib.c:1130
+#: lib.c:1153
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "¡%s no es un buzón!"
 
-#: lib.c:1136
+#: lib.c:1159
 #, c-format
 msgid "Append messages to %s?"
 msgstr "¿Agregar mensajes a %s?"
@@ -2455,16 +2451,16 @@ msgstr ""
 "\n"
 "[-- Fin de datos encriptados con PGP/MIME --]\n"
 
-#: pgp.c:1072
+#: pgp.c:1071
 msgid "Can't open PGP subprocess!"
 msgstr "¡No se pudo abrir subproceso PGP!"
 
-#: pgp.c:1206
+#: pgp.c:1195
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "¿Usar keyID = \"%s\" para %s?"
 
-#: pgp.c:1212
+#: pgp.c:1201
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entre keyID para %s: "
@@ -2703,71 +2699,71 @@ msgstr "Redirigir"
 msgid "Print"
 msgstr "Imprimir"
 
-#: recvattach.c:312
+#: recvattach.c:372
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: recvattach.c:373
+#: recvattach.c:433
 msgid "Attachment saved"
 msgstr "Archivo adjunto guardado"
 
-#: recvattach.c:385
+#: recvattach.c:445
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "¡Atención!  Esta a punto de sobreescribir %s, ¿continuar?"
 
-#: recvattach.c:403
+#: recvattach.c:463
 msgid "Attachment filtered."
 msgstr "Archivo adjunto filtrado."
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Filter through: "
 msgstr "Filtrar a través de: "
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Pipe to: "
 msgstr "Redirigir a: "
 
-#: recvattach.c:504
+#: recvattach.c:564
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "¡No sé cómo imprimir archivos adjuntos %s!"
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print tagged attachment(s)?"
 msgstr "¿Imprimir archivo(s) adjunto(s) marcado(s)?"
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print attachment?"
 msgstr "¿Imprimir archivo adjunto?"
 
-#: recvattach.c:595
+#: recvattach.c:655
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Solo puede rebotar partes tipo message/rfc822."
 
-#: recvattach.c:631
+#: recvattach.c:691
 #, c-format
 msgid "Bounce messages to %s...?"
 msgstr "¿Rebotar mensajes a %s...?"
 
-#: recvattach.c:632
+#: recvattach.c:692
 #, c-format
 msgid "Bounce message to %s...?"
 msgstr "¿Rebotar mensaje a %s...?"
 
-#: recvattach.c:857
+#: recvattach.c:917
 msgid "Attachments"
 msgstr "Archivos adjuntos"
 
-#: recvattach.c:914
+#: recvattach.c:974
 msgid "Deletion of attachments from PGP messages is unsupported."
 msgstr "Suprimir archivos adjuntos de mensajes PGP no es soportado."
 
-#: recvattach.c:934 recvattach.c:951
+#: recvattach.c:994 recvattach.c:1011
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Suprimir sólo es soportado con archivos adjuntos tipo multiparte."
 
-#: recvattach.c:1001
+#: recvattach.c:1061
 msgid "This operation is not currently supported for PGP messages."
 msgstr "Esta operación al momento no es soportada en mensajes PGP."
 
@@ -2895,22 +2891,22 @@ msgstr "El parámetro límite no fue encontrado. [reporte este error]"
 msgid "%s no longer exists!"
 msgstr "¡%s ya no existe!"
 
-#: sendlib.c:775
+#: sendlib.c:777
 #, c-format
 msgid "Could not open %s"
 msgstr "No se pudo abrir %s"
 
-#: sendlib.c:1703
+#: sendlib.c:1690
 #, c-format
 msgid "Error sending message, child exited %d (%s).\n"
 msgstr "Error al mandar mensaje, %d (%s).\n"
 
-#: sendlib.c:1705
+#: sendlib.c:1692
 #, c-format
 msgid "Saved output of child process to %s.\n"
 msgstr "Salida del subproceso guardada en %s.\n"
 
-#: sendlib.c:1709
+#: sendlib.c:1696
 msgid "Error sending message."
 msgstr "Error al mandar el mensaje."
 
@@ -2936,6 +2932,9 @@ msgstr "¡No se pudo encontrar la función para ordenar! [reporte este error]"
 msgid "(no mailbox)"
 msgstr "(ningún buzón)"
 
+#~ msgid "This encoding is deprecated.  Really use it?"
+#~ msgstr "Este tipo de codificación es viejo. ¿Realmente lo quiere usar?"
+
 #~ msgid "Confused when attempting to delete attachment, h & m can't be NULL"
 #~ msgstr "Error interno al suprimir archivo adjunto."
 
diff --git a/po/it.po b/po/it.po
index 78c7d54c..0f51bbaa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt-0.93i\n"
-"POT-Creation-Date: 1998-11-17 12:54+0100\n"
+"POT-Creation-Date: 1998-11-19 00:08+0100\n"
 "PO-Revision-Date: 1998-11-11 15:50+01:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: none\n"
@@ -59,7 +59,7 @@ msgstr "Nome della persona: "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Va bene?"
 
-#: alias.c:255 recvattach.c:285 recvattach.c:340
+#: alias.c:255 recvattach.c:345 recvattach.c:400
 msgid "Save to file: "
 msgstr "Salva nel file: "
 
@@ -114,7 +114,7 @@ msgstr "Tipo MIME non definito.  Impossibile visualizzare l'allegato."
 msgid "Cannot create filter"
 msgstr "Impossibile creare il filtro"
 
-#: attach.c:638 recvattach.c:315
+#: attach.c:638 recvattach.c:375
 msgid "Attachment saved."
 msgstr "Allegato salvato."
 
@@ -270,11 +270,11 @@ msgstr "Impossibile creare il file temporaneo!"
 msgid "Command: "
 msgstr "Comando: "
 
-#: commands.c:243 recvattach.c:618
+#: commands.c:243 recvattach.c:678
 msgid "Bounce message to: "
 msgstr "Rimbalza il messaggio a: "
 
-#: commands.c:245 recvattach.c:620
+#: commands.c:245 recvattach.c:680
 msgid "Bounce tagged messages to: "
 msgstr "Rimbalza i messaggi a: "
 
@@ -492,63 +492,59 @@ msgstr "Segna i messaggi che vuoi allegare!"
 msgid "Unable to attach!"
 msgstr "Impossibile allegare!"
 
-#: compose.c:751 compose.c:765
+#: compose.c:760
 msgid "Invalid encoding."
 msgstr "Codifica non valida."
 
-#: compose.c:756
-msgid "This encoding is deprecated.  Really use it?"
-msgstr "Questa codifica è sconsigliata.  Vuoi usarla davvero?"
-
-#: compose.c:780
+#: compose.c:775
 msgid "Save a copy of this message?"
 msgstr "Salvo una copia di questo messaggio?"
 
-#: compose.c:825
+#: compose.c:820
 msgid "Rename to: "
 msgstr "Rinomina in: "
 
-#: compose.c:830
+#: compose.c:825
 #, c-format
 msgid "Can't stat: %s"
 msgstr "Non riesco a fare stat: %s"
 
-#: compose.c:857
+#: compose.c:852
 msgid "New file: "
 msgstr "Nuovo file: "
 
-#: compose.c:870
+#: compose.c:865
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type non è nella forma base/sub"
 
-#: compose.c:876
+#: compose.c:871
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s sconosciuto"
 
-#: compose.c:889
+#: compose.c:884
 #, c-format
 msgid "Can't create file %s"
 msgstr "Impossibile creare il file %s"
 
-#: compose.c:897
+#: compose.c:892
 msgid "What we have here is a failure to make an attachment"
 msgstr "Quel che abbiamo qui è l'impossibilità di fare un allegato"
 
-#: compose.c:959
+#: compose.c:954
 msgid "Postpone this message?"
 msgstr "Rimando a dopo questo messaggio?"
 
-#: compose.c:1011
+#: compose.c:1006
 msgid "Write message to mailbox"
 msgstr "Salva il messaggio nella mailbox"
 
-#: compose.c:1015
+#: compose.c:1010
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Scrivo il messaggio in %s ..."
 
-#: compose.c:1026
+#: compose.c:1021
 msgid "Message written."
 msgstr "Messaggio scritto."
 
@@ -1028,7 +1024,7 @@ msgstr "Login fallito."
 msgid "Selecting %s..."
 msgstr "Seleziono %s..."
 
-#: imap.c:1084 lib.c:1154
+#: imap.c:1084 lib.c:1177
 #, c-format
 msgid "Create %s?"
 msgstr "Creo %s?"
@@ -1867,24 +1863,24 @@ msgstr "fai una copia decodificata"
 msgid "Out of memory!"
 msgstr "Memoria esaurita!"
 
-#: lib.c:741
+#: lib.c:764
 msgid "File is a directory, save under it?"
 msgstr "Il file è una directory, salvo lì dentro?"
 
-#: lib.c:746
+#: lib.c:769
 msgid "File under directory: "
 msgstr "File nella directory: "
 
-#: lib.c:757
+#: lib.c:780
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, lo sovrascrivo?"
 
-#: lib.c:1130
+#: lib.c:1153
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s non è una mailbox!"
 
-#: lib.c:1136
+#: lib.c:1159
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Accodo i messaggi a %s?"
@@ -2500,16 +2496,16 @@ msgstr ""
 "\n"
 "[-- Fine dei dati crittografati con PGP/MIME  --]\n"
 
-#: pgp.c:1072
+#: pgp.c:1071
 msgid "Can't open PGP subprocess!"
 msgstr "Impossibile aprire il sottoprocesso PGP!"
 
-#: pgp.c:1206
+#: pgp.c:1195
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Uso il keyID \"%s\" per %s?"
 
-#: pgp.c:1212
+#: pgp.c:1201
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Inserisci il keyID per %s: "
@@ -2748,71 +2744,71 @@ msgstr "Pipe"
 msgid "Print"
 msgstr "Stampa"
 
-#: recvattach.c:312
+#: recvattach.c:372
 msgid "Saving..."
 msgstr "Salvo..."
 
-#: recvattach.c:373
+#: recvattach.c:433
 msgid "Attachment saved"
 msgstr "Allegato salvato"
 
-#: recvattach.c:385
+#: recvattach.c:445
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "ATTENZIONE!  Stai per sovrascrivere %s, continuo?"
 
-#: recvattach.c:403
+#: recvattach.c:463
 msgid "Attachment filtered."
 msgstr "Allegato filtrato."
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Filter through: "
 msgstr "Filtra attraverso: "
 
-#: recvattach.c:469
+#: recvattach.c:529
 msgid "Pipe to: "
 msgstr "Manda con una pipe a: "
 
-#: recvattach.c:504
+#: recvattach.c:564
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Non so come stampare %s allegati!"
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print tagged attachment(s)?"
 msgstr "Stampo gli allegati segnati?"
 
-#: recvattach.c:567
+#: recvattach.c:627
 msgid "Print attachment?"
 msgstr "Stampo l'allegato?"
 
-#: recvattach.c:595
+#: recvattach.c:655
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Puoi rimbalzare solo parti message/rfc822."
 
-#: recvattach.c:631
+#: recvattach.c:691
 #, c-format
 msgid "Bounce messages to %s...?"
 msgstr "Rimbalzo i messaggi a %s...?"
 
-#: recvattach.c:632
+#: recvattach.c:692
 #, c-format
 msgid "Bounce message to %s...?"
 msgstr "Rimbalzo il messaggio a %s...?"
 
-#: recvattach.c:857
+#: recvattach.c:917
 msgid "Attachments"
 msgstr "Allegati"
 
-#: recvattach.c:914
+#: recvattach.c:974
 msgid "Deletion of attachments from PGP messages is unsupported."
 msgstr "La cancellazione degli allegati da messaggi PGP non è gestita."
 
-#: recvattach.c:934 recvattach.c:951
+#: recvattach.c:994 recvattach.c:1011
 msgid "Only deletion of multipart attachments is supported."
 msgstr "È gestita solo la cancellazione degli allegati multiparte."
 
-#: recvattach.c:1001
+#: recvattach.c:1061
 msgid "This operation is not currently supported for PGP messages."
 msgstr "Questa operazione attualmente non è gestita per i messaggi PGP."
 
@@ -2940,23 +2936,23 @@ msgstr "No boundary parameter found! [segnala questo errore]"
 msgid "%s no longer exists!"
 msgstr "%s non esiste più!"
 
-#: sendlib.c:775
+#: sendlib.c:777
 #, c-format
 msgid "Could not open %s"
 msgstr "Impossibile aprire %s"
 
-#: sendlib.c:1703
+#: sendlib.c:1690
 #, c-format
 msgid "Error sending message, child exited %d (%s).\n"
 msgstr ""
 "Errore nella spedizione del messaggio, il figlio è uscito con %d (%s).\n"
 
-#: sendlib.c:1705
+#: sendlib.c:1692
 #, c-format
 msgid "Saved output of child process to %s.\n"
 msgstr "Output del processo figlio salvato in %s.\n"
 
-#: sendlib.c:1709
+#: sendlib.c:1696
 msgid "Error sending message."
 msgstr "Errore nella spedizione del messaggio."
 
@@ -2981,3 +2977,6 @@ msgstr "Could not find sorting function! [segnala questo bug]"
 #: status.c:102
 msgid "(no mailbox)"
 msgstr "(nessuna mailbox)"
+
+#~ msgid "This encoding is deprecated.  Really use it?"
+#~ msgstr "Questa codifica è sconsigliata.  Vuoi usarla davvero?"
diff --git a/po/ru.po b/po/ru.po
index 58139a99..a5ff246d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 1998-11-17 12:54+0100\n"
+"POT-Creation-Date: 1998-11-19 00:08+0100\n"
 "PO-Revision-Date: 1998-10-15 07:51+0300\n"
 "Last-Translator: Andrej N. Gritsenko <andrej@lucky.net>\n"
 "Language-Team: Mutt-dev <mutt-dev@mutt.org>\n"
@@ -56,7 +56,7 @@ msgstr "ðÏÌÎÏÅ ÉÍÑ: "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] ÷ÅÒÎÏ?"
 
-#: alias.c:255 recvattach.c:285 recvattach.c:340
+#: alias.c:255 recvattach.c:345 recvattach.c:400
 msgid "Save to file: "
 msgstr "úÁÐÉÓÁÔØ × ÆÁÊÌ: "
 
@@ -108,7 +108,7 @@ msgstr "ôÉÐ MIME ÎÅ ÏÐÒÅÄÅÌ£Î. ðÒÉÓÏÅÄÉÎÅÎÉÅ ÎÅ ÏÔÏÂÒÁÖÁÅÍÏ."
 msgid "Cannot create filter"
 msgstr "îÅÌØÚÑ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
 
-#: attach.c:638 recvattach.c:315
+#: attach.c:638 recvattach.c:375
 msgid "Attachment saved."
 msgstr "ðÒÉÓÏÅÄÉÎÅÎÉÅ ÓÏÈÒÁÎÅÎÏ."
 
@@ -264,12 +264,12 @@ msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
 msgid "Command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: commands.c:243 recvattach.c:618
+#: commands.c:243 recvattach.c:678
 #, fuzzy
 msgid "Bounce message to: "
 msgstr "ðÅÒÅÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ë: "
 
-#: commands.c:245 recvattach.c:620
+#: commands.c:245 recvattach.c:680
 #, fuzzy
 msgid "Bounce tagged messages to: "
 msgstr "ðÅÒÅÐÒÁ×ÉÔØ ÏÔÍÅÞÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ Ë: "
@@ -485,63 +485,59 @@ msgstr "ïÔÍÅÔØÔÅ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÐÒÉÓÏÅÄÉÎÅÎÉÑ!"
 msgid "Unable to attach!"
 msgstr "îÅÌØÚÑ ÐÒÉÓÏÅÄÉÎÉÔØ!"
 
-#: compose.c:751 compose.c:765
+#: compose.c:760
 msgid "Invalid encoding."
 msgstr "îÅÐÏÎÑÔÎÁÑ ËÏÄÉÒÏ×ËÁ."
 
-#: compose.c:756
-msgid "This encoding is deprecated.  Really use it?"
-msgstr "üÔÁ ËÏÄÉÒÏ×ËÁ ÕÓÔÁÒÅÌÁ. éÓÐÏÌØÚÏ×ÁÔØ Å£?"
-
-#: compose.c:780
+#: compose.c:775
 msgid "Save a copy of this message?"
 msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ?"
 
-#: compose.c:825
+#: compose.c:820
 msgid "Rename to: "
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ×: "
 
-#: compose.c:830
+#: compose.c:825
 #, c-format