automatic post-release commit for mutt-1.3.18mutt-1-3-18-rel

26 files changed, 3294 insertions, 2387 deletions

diff --git a/ChangeLog b/ChangeLog
index 50cd1ff0..1cd17261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,148 @@
+Tue May  1 21:24:41 2001  Thomas Roessler  <roessler@guug.de>
+
+	* pgp.c: #568:  Out-of-band reporting for traditional signed+encrypted
+	messages.
+
+Thu Apr 26 15:52:34 2001  Thomas Roessler  <roessler@guug.de>
+
+	* configure.in: Replace tabs by spaces.
+
+	* BEWARE, Makefile.am:
+	Add a word of warning concerning the case problems.
+
+	* imap/command.c, imap/imap.c, imap/message.c, imap/util.c, imap/browse.c, parse.c, pattern.c, pgp.c, pgpkey.c, postpone.c, recvattach.c, remailer.c, rfc1524.c, rfc2047.c, send.c, sendlib.c, url.c, account.c, addrbook.c, alias.c, ascii.c, ascii.h, attach.c, charset.c, color.c, commands.c, copy.c, edit.c, handler.c, headers.c, init.c, keymap.c, Makefile.am, mutt.h, muttlib.c, mutt_ssl_nss.c, mx.c:
+	Add ascii_strcasecmp() and ascii_strncasecmp() functions which do
+	locale-independent and case-insensitive string comparisons.  Needed
+	for mutt to work in iso-8859-9 environments, where tolower('I') !=
+	'i'.
+
+Wed Apr 25 22:08:41 2001  Thomas Roessler  <roessler@guug.de>
+
+	* globals.h, init.h, mutt.h, parse.c, protos.h, send.c, sendlib.c, thread.c, url.c:
+	Implement RFC 2822's idea of the In-Reply-To header.  In particular,
+	we have to drop the $in_reply_to configuration variable.  Also, the
+	change in the specification makes some changes to the threading code
+	reasonable.
+
+	* parse.c: Use RFC 2822's interpretation of two-digit years.
+
+	* charset.c: Kluge around some problems with iso-8859-9 locales.
+
+Tue Apr 24 11:21:22 2001  Thomas Roessler  <roessler@guug.de>
+
+	* commands.c:
+	When the character set is changed, ask whether or not mutt should
+	convert.
+
+Thu Apr 19 09:39:49 2001  Thomas Roessler  <roessler@guug.de>
+
+	* compose.c:
+	Don't try to select the secret key from the public key ring.
+
+Wed Apr 18 15:12:50 2001  Thomas Roessler  <roessler@guug.de>
+
+	* sendlib.c:
+	Fix a segmentation fault.  Bug reported by Björn Jacke and analyzed
+	by Lars Hecking.
+
+Fri Apr 13 23:20:15 2001  Thomas Roessler  <roessler@guug.de>
+
+	* enter.c: Fix KEY_ENTER.  From EGE.
+
+	* build-release, README: Introducing trithemius.gnupg.org.
+
+Wed Apr 11 23:42:59 2001  Thomas Roessler  <roessler@guug.de>
+
+	* hook.c:
+	Avoid excessive unhooking from within hooks.  Problem noted by
+	Eugene Lee <eugene@anime.net> on mutt-users.
+
+	* doc/Makefile.in:
+	Don't rely on GNU make's implicit rules for shell scripts.  Noted by
+	EGE.
+
+Mon Apr  9 16:10:59 2001  Thomas Roessler  <roessler@guug.de>
+
+	* INSTALL: Fix the documentation of --enable-locale-fix.  From EGE.
+
+	* enter.c, keymap.c:
+	Entering multibyte characters.  From Edmund Grimley Evans.
+
+	* send.c: Avoid a crash.  patch-1.3.17.tlr.pgpflags_fault.1.
+
+Thu Apr  5 23:23:37 2001  Thomas Roessler  <roessler@guug.de>
+
+	* po/it.po: update
+
+	* po/tr.po: update.
+
+	* init.h: Fix a minor typo in the documentation.
+
+Wed Apr  4 23:29:29 2001  Thomas Roessler  <roessler@guug.de>
+
+	* send.c:
+	Fix pgp_replyencrypt and friends for group-replies to several tagged
+	messages.  Noted by Werner Koch.
+
+Tue Apr  3 19:26:55 2001  Thomas Roessler  <roessler@guug.de>
+
+	* pgpkey.c: More PGP key selection changes:  Clean up the key selection
+	mechanism.  I'd appreciate if some of you could review the logic.
+
+	* pgpkey.c: Fixes for the previous patch.
+
+	* pgpkey.c:
+	Add an error message in case keys can be found, but none are valid.
+
+	* init.h: Write "mail folder" instead of "folder" in the description of
+	$postponed.  If people believe they understand it better that way,
+	fine with me.  (Debian #89195.)
+
+	* doc/manual.sgml.head: Fix a typo.  Debian #90400.
+
+	* po/sv.po: update.
+
+	* url.c:
+	Permit for passwords which contain '@'.  From Felix von Leitner
+	<leitner@fefe.de>.
+
+	* mutt_socket.c:
+	Set the close on exec bit for IMAP sockets.  From Jason Gunthorpe
+	<jgg@wakko.deltatee.com>.  #536, Debian #92651.
+
+Mon Apr  2 13:02:56 2001  Thomas Roessler  <roessler@guug.de>
+
+	* pop.c:
+	Fix a buffer overrun.  Noted by Gordon Sadler <gbsadler1@lcisp.com>;
+	#530.
+
+	* imap/Makefile.am: Fix dependencies.  From Lars Hecking.
+
+Fri Mar 30 08:53:12 2001  Thomas Roessler  <roessler@guug.de>
+
+	* imap/Makefile.am: Add a rule for ../types.h.
+
+Thu Mar 29 11:23:05 2001  Thomas Roessler  <roessler@guug.de>
+
+	* pgp.c: Adding a dprint statement.
+
+Wed Mar 28 14:59:52 2001  Thomas Roessler  <roessler@guug.de>
+
+	* pgp.c, pgp.h:
+	Add some more PGP good signature checks, so we can detect whether or
+	not an encrypted+signed message is OK.
+
+	* main.c: fix some of the copyright messages.
+
+	* gnupgparse.c, pgpkey.c, pgplib.c, pgplib.h, pgppacket.c:
+	Make mutt compatible with GnuPG's latest features.  As requested by
+	Werner Koch.
+
+	* po/tr.po, po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, po/sv.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/it.po, po/ja.po, po/ko.po, po/es.po, po/fr.po, po/gl.po, po/id.po, po/eo.po, po/el.po, po/de.po, po/da.po, po/cs.po, reldate.h, VERSION, ChangeLog:
+	automatic post-release commit for mutt-1.3.17
+
+	* po/pl.po: update.
+
 Wed Mar 28 12:00:38 2001  Thomas Roessler  <roessler@guug.de>
 
 	* po/pl.po: update.
diff --git a/VERSION b/VERSION
index ef40e4d0..9181bf79 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.17
+1.3.18
diff --git a/po/cs.po b/po/cs.po
index 26929a55..d757c42c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.11i\n"
-"POT-Creation-Date: 2001-03-28 15:10+0200\n"
+"POT-Creation-Date: 2001-05-01 23:31+0200\n"
 "PO-Revision-Date: 2000-04-03 22:20+0200\n"
 "Last-Translator: Jiří Pavlovský <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "Volba"
 #
 #. __STRCAT_CHECKED__
 #: addrbook.c:33 browser.c:43 compose.c:92 curs_main.c:380 mutt_ssl.c:617
-#: pager.c:1460 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
+#: pager.c:1460 pgpkey.c:517 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Nápověda"
 
@@ -335,12 +335,12 @@ msgid "%s: no such attribute"
 msgstr "Atribut %s není definován."
 
 #
-#: color.c:690 hook.c:62 hook.c:70 keymap.c:697
+#: color.c:690 hook.c:64 hook.c:72 keymap.c:697
 msgid "too few arguments"
 msgstr "příliš málo argumentů"
 
 #
-#: color.c:699 hook.c:76
+#: color.c:699 hook.c:78
 msgid "too many arguments"
 msgstr "příliš mnoho argumentů"
 
@@ -356,7 +356,7 @@ msgid "Verify PGP signature?"
 msgstr "Ověřit PGP podpis?"
 
 #
-#: commands.c:105 pgp.c:1657 pgpkey.c:491 postpone.c:517
+#: commands.c:105 pgp.c:1678 pgpkey.c:559 postpone.c:517
 msgid "Invoking PGP..."
 msgstr "Spouštím PGP..."
 
@@ -543,17 +543,30 @@ msgstr " označené"
 msgid "Copying to %s..."
 msgstr "Kopíruji do %s..."
 
+#: commands.c:823
+#, c-format
+msgid "Convert to %s upon sending?"
+msgstr ""
+
 #
-#: commands.c:822
+#: commands.c:831
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "Připojuji se k %s..."
 
-#: commands.c:824
+#: commands.c:833
 #, fuzzy, c-format
-msgid "Character set changed to %s."
+msgid "Character set changed to %s; %s."
 msgstr "Znaková sada %s není známa."
 
+#: commands.c:835
+msgid "not converting"
+msgstr ""
+
+#: commands.c:835
+msgid "converting"
+msgstr ""
+
 #
 #: compose.c:40
 msgid "There are no attachments."
@@ -777,7 +790,7 @@ msgid "Exit Mutt?"
 msgstr "Ukončit Mutt?"
 
 #
-#: curs_lib.c:326 mutt_socket.c:404
+#: curs_lib.c:326 mutt_socket.c:406
 msgid "unknown error"
 msgstr "neznámá chyba"
 
@@ -970,12 +983,12 @@ msgid "You are on the first message."
 msgstr "Jste na první zprávě."
 
 #
-#: curs_main.c:1217 pattern.c:1283
+#: curs_main.c:1217 pattern.c:1287
 msgid "Search wrapped to top."
 msgstr "Hledání pokračuje od začátku."
 
 #
-#: curs_main.c:1226 pattern.c:1294
+#: curs_main.c:1226 pattern.c:1298
 msgid "Search wrapped to bottom."
 msgstr "Hledání pokračuje od konce."
 
@@ -1005,7 +1018,7 @@ msgid "You are on the first thread."
 msgstr "Jste na prvním vláknu."
 
 #
-#: curs_main.c:1444 curs_main.c:1475 flags.c:250 thread.c:653 thread.c:704
+#: curs_main.c:1444 curs_main.c:1475 flags.c:250 thread.c:676 thread.c:727
 msgid "Threading is not enabled."
 msgstr "Vlákna nejsou podporována."
 
@@ -1326,12 +1339,21 @@ msgstr ""
 msgid "Help for %s"
 msgstr "Nápověda pro %s"
 
+#: hook.c:243
+msgid "unhook: Can't do unhook * from within a hook."
+msgstr ""
+
 #
-#: hook.c:246
+#: hook.c:255
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook hook %s není znám"
 
+#: hook.c:261
+#, c-format
+msgid "unhook: Can't delete a %s from within a %s."
+msgstr ""
+
 #: imap/auth_anon.c:39
 msgid "Authenticating (anonymous)..."
 msgstr "Ověřuji (anonymně)..."
@@ -2653,8 +2675,9 @@ msgstr ""
 
 #
 #: main.c:45
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2000 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2001 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
@@ -2670,13 +2693,13 @@ msgstr ""
 #: main.c:51
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
-"Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
-"Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-"Copyright (C) 2000      Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
+"Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2001 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1998-2001 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2001 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+"Copyright (C) 2000-2001 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
 "Lots of others not mentioned here contributed lots of code,\n"
 "fixes, and suggestions.\n"
@@ -2962,7 +2985,7 @@ msgid "You are on the first entry."
 msgstr "Jste na první položce."
 
 #
-#: menu.c:702 pattern.c:1229
+#: menu.c:702 pattern.c:1233
 msgid "Search for: "
 msgstr "Vyhledat: "
 
@@ -2972,12 +2995,12 @@ msgid "Reverse search for: "
 msgstr "Vyhledat obráceným směrem: "
 
 #
-#: menu.c:713 pattern.c:1262
+#: menu.c:713 pattern.c:1266
 msgid "No search pattern."
 msgstr "Není žádný vzor k vyhledání."
 
 #
-#: menu.c:743 pager.c:1840 pager.c:1856 pager.c:1944 pattern.c:1327
+#: menu.c:743 pager.c:1840 pager.c:1856 pager.c:1944 pattern.c:1331
 msgid "Not found."
 msgstr "Nenalezeno."
 
@@ -3041,35 +3064,35 @@ msgstr "%s není schránkou!"
 msgid "Append messages to %s?"
 msgstr "Připojit zprávy do %s?"
 
-#: mutt_socket.c:201
+#: mutt_socket.c:202
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:237
+#: mutt_socket.c:238
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "příkaz před spojením selhal"
 
 #
-#: mutt_socket.c:331 mutt_socket.c:371
+#: mutt_socket.c:332 mutt_socket.c:373
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "Kopíruji do %s..."
 
 #
-#: mutt_socket.c:336 mutt_socket.c:375
+#: mutt_socket.c:337 mutt_socket.c:377
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Adresu počítače %s nelze nalézt."
 
 #
-#: mutt_socket.c:340 mutt_socket.c:380
+#: mutt_socket.c:341 mutt_socket.c:382
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Připojuji se k %s..."
 
 #
-#: mutt_socket.c:403
+#: mutt_socket.c:405
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "%s nelze otevřít"
@@ -3177,7 +3200,7 @@ msgid "ro"
 msgstr "ot"
 
 #
-#: mutt_ssl.c:615 pgpkey.c:442
+#: mutt_ssl.c:615 pgpkey.c:510
 msgid "Exit  "
 msgstr "Ukončit  "
 
@@ -3453,32 +3476,32 @@ msgid "error: unknown op %d (report this error)."
 msgstr "chyba: neznámý operand %d (ohlaste tuto chybu)."
 
 #
-#: pattern.c:1119 pattern.c:1248
+#: pattern.c:1123 pattern.c:1252
 msgid "Compiling search pattern..."
 msgstr "Překládám vzor k vyhledání..."
 
 #
-#: pattern.c:1133
+#: pattern.c:1137
 msgid "Executing command on matching messages..."
 msgstr "Spouštím příkaz pro shodující se zprávy... "
 
 #
-#: pattern.c:1196
+#: pattern.c:1200
 msgid "No messages matched criteria."
 msgstr "Žádná ze zpráv nesplňuje daná kritéria."
 
 #
-#: pattern.c:1286
+#: pattern.c:1290
 msgid "Search hit bottom without finding match"
 msgstr "Při vyhledávání bylo dosaženo konce bez nalezení shody."
 
 #
-#: pattern.c:1297
+#: pattern.c:1301
 msgid "Search hit top without finding match"
 msgstr "Při vyhledávání bylo dosaženo začátku bez nalezení shody."
 
 #
-#: pattern.c:1319
+#: pattern.c:1323
 msgid "Search interrupted."
 msgstr "Hledání bylo přerušeno."
 
@@ -3499,12 +3522,12 @@ msgid "[-- PGP output follows (current time: %c) --]\n"
 msgstr "[-- následuje výstup PGP (aktuální čas: "
 
 #
-#: pgp.c:283
+#: pgp.c:352
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Chyba: nelze spustit PGP proces! --]\n"
 
 #
-#: pgp.c:312
+#: pgp.c:387
 msgid ""
 "\n"
 "[-- End of PGP output --]\n"
@@ -3515,7 +3538,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:318
+#: pgp.c:393
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3524,12 +3547,12 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:320
+#: pgp.c:395
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[--ZAČÁTEK VEŘEJNÉHO KLÍČE PGP --]\n"
 
 #
-#: pgp.c:322
+#: pgp.c:397
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3538,7 +3561,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:423
+#: pgp.c:438
 msgid ""
 "\n"
 "[-- END PGP MESSAGE --]\n"
@@ -3547,12 +3570,12 @@ msgstr ""
 "[-- KONEC PGP ZPRÁVY --]\n"
 
 #
-#: pgp.c:425
+#: pgp.c:440
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- KONEC VEŘEJNÉHO KLÍČE PGP --]\n"
 
 #
-#: pgp.c:427
+#: pgp.c:442
 msgid ""
 "\n"
 "[-- END PGP SIGNED MESSAGE --]\n"
@@ -3561,7 +3584,7 @@ msgstr ""
 "[-- KONEC PODEPSANÉ PGP ZPRÁVY --]\n"
 
 #
-#: pgp.c:442
+#: pgp.c:457
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3570,7 +3593,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:710 pgp.c:1001
+#: pgp.c:728 pgp.c:1020
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3578,7 +3601,7 @@ msgstr ""
 "[-- Konec výstupu PGP --]\n"
 "\n"
 
-#: pgp.c:758
+#: pgp.c:776
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3586,7 +3609,7 @@ msgstr ""
 "[-- Chyba: Chybná struktura zprávy typu multipart/signed! --]\n"
 "\n"
 
-#: pgp.c:766
+#: pgp.c:784
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3595,7 +3618,7 @@ msgstr ""
 "[-- Chyba: 'multipart/signed' protokol %s není znám! --]\n"
 "\n"
 
-#: pgp.c:790
+#: pgp.c:808
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3606,7 +3629,7 @@ msgstr ""
 
 #
 #. Now display the signed body
-#: pgp.c:800
+#: pgp.c:818
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3614,7 +3637,7 @@ msgstr ""
 "[-- Následují podepsaná data --]\n"
 "\n"
 
-#: pgp.c:806
+#: pgp.c:824
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3623,7 +3646,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:812
+#: pgp.c:830
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -3632,12 +3655,12 @@ msgstr ""
 "[-- Konec podepsaných dat --]\n"
 
 #
-#: pgp.c:912
+#: pgp.c:930
 msgid "Internal error. Inform <roessler@guug.de>."
 msgstr "Vnitřní chyba. Informujte <roessler@guug.de>."
 
 #
-#: pgp.c:972
+#: pgp.c:990
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3646,7 +3669,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:1065
+#: pgp.c:1086
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3655,12 +3678,12 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:1078
+#: pgp.c:1099
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Chyba: dočasný soubor nelze vytvořit! --]\n"
 
 #
-#: pgp.c:1087
+#: pgp.c:1108
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3669,7 +3692,7 @@ msgstr ""
 "\n"
 
 #
-#: pgp.c:1105
+#: pgp.c:1126
 msgid ""
 "\n"
 "[-- End of PGP/MIME encrypted data --]\n"
@@ -3678,28 +3701,28 @@ msgstr ""
 "[-- Konec dat zašifrovaných ve formátu PGP/MIME --]\n"
 
 #
-#: pgp.c:1185
+#: pgp.c:1206
 msgid "Can't open PGP subprocess!"
 msgstr "PGP proces nelze spustit!"
 
 #
-#: pgp.c:1312
+#: pgp.c:1333
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Použít ID klíče = \"%s\" pro %s?"
 
 #
-#: pgp.c:1339
+#: pgp.c:1360
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Zadejte ID klíče pro %s: "
 
-#: pgp.c:1547
+#: pgp.c:1568
 msgid "Can't invoke PGP"
 msgstr "PGP nelze spustit."
 
 #
-#: pgp.c:1651
+#: pgp.c:1672
 msgid "Create an application/pgp message?"
 msgstr "vytvořit zprávu typu 'application/pgp'?"
 
@@ -3708,93 +3731,103 @@ msgstr "vytvořit zprávu typu 'application/pgp'?"
 msgid "Fetching PGP key..."
 msgstr "Získávám PGP klíč..."
 
+#: pgpkey.c:486
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Klíč nelze použít: vypršela jeho platnost, nebo byl zakázán či stažen."
+
 #
 #. __STRCAT_CHECKED__
-#: pgpkey.c:444
+#: pgpkey.c:512
 msgid "Select  "
 msgstr "Zvolit "
 
 #
 #. __STRCAT_CHECKED__
-#: pgpkey.c:447
+#: pgpkey.c:515
 msgid "Check key  "
 msgstr "Kontrolovat klíč  "
 
 #
-#: pgpkey.c:460
+#: pgpkey.c:528
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "klíče PGP vyhovující <%s>."
 
 #
-#: pgpkey.c:462
+#: pgpkey.c:530
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "klíče PGP vyhovující \"%s\"."
 
 #
-#: pgpkey.c:481 pgpkey.c:675
+#: pgpkey.c:549 pgpkey.c:741
 msgid "Can't open /dev/null"
 msgstr "Nelze otevřít /dev/null"
 
 #
-#: pgpkey.c:487 pgpkey.c:669
+#: pgpkey.c:555 pgpkey.c:735
 msgid "Can't create temporary file"
 msgstr "Dočasný soubor nelze vytvořit."
 
 #
-#: pgpkey.c:498 pgpkey.c:689
+#: pgpkey.c:566 pgpkey.c:755
 msgid "Can't create filter"
 msgstr "Filtr nelze vytvořit"
 
 #
-#: pgpkey.c:508
+#: pgpkey.c:576
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "ID klíče: 0x%s"
 
-#: pgpkey.c:534
+#: pgpkey.c:596
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Klíč nelze použít: vypršela jeho platnost, nebo byl zakázán či stažen."
 
+#: pgpkey.c:608
+#, fuzzy
+msgid "This ID is expired/disabled/revoked"
+msgstr "Klíč nelze použít: vypršela jeho platnost, nebo byl zakázán či stažen."
+
 #
-#: pgpkey.c:548
+#: pgpkey.c:612
 msgid "This ID's trust level is undefined."
 msgstr "Důvěryhodnost tohoto ID není definována."
 
 #
-#: pgpkey.c:551
+#: pgpkey.c:615
 msgid "This ID is not trusted."
 msgstr "Toto ID není důvěryhodné."
 
 #
-#: pgpkey.c:554
+#: pgpkey.c:618
 msgid "This ID is only marginally trusted."
 msgstr "Důvěryhodnost tohoto ID je pouze částečná."
 
 #
-#: pgpkey.c:558
-#, c-format
-msgid "%s Do you really want to use it?"
+#: pgpkey.c:622
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
 msgstr "%s Opravdu jej chcete použít?"
 
 #
-#: pgpkey.c:654
+#: pgpkey.c:720
 msgid "Please enter the key ID: "
 msgstr "Zadejte ID klíče: "
 
 #
-#: pgpkey.c:682
+#: pgpkey.c:748
 msgid "Invoking pgp..."
 msgstr "Spouštím PGP..."
 
 #
-#: pgpkey.c:707
+#: pgpkey.c:773
 #, c-format
 msgid "PGP Key %s."
 msgstr "Klíč PGP %s."
 
-#: pgpkey.c:754 pgpkey.c:870
+#: pgpkey.c:835 pgpkey.c:953
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Hledám klíče vyhovující \"%s\"..."
@@ -4109,7 +4142,7 @@ msgid "Can't find any tagged messages."
 msgstr "Žádná zpráva není označena."
 
 #
-#: recvcmd.c:699 send.c:666
+#: recvcmd.c:699 send.c:685
 msgid "No mailing lists found!"
 msgstr "Žádné diskusní skupiny nebyly nalezeny!"
 
@@ -4246,7 +4279,7 @@ msgstr "Odepsat %s%s?"
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:641
+#: send.c:660
 msgid "No tagged messages are visible!"
 msgstr "Žádná označená zpráva není viditelná!"
 
@@ -4280,67 +4313,67 @@ msgstr "Připravuji přeposílanou zprávu..."
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:1040
+#: send.c:1080
 msgid "Recall postponed message?"
 msgstr "Vrátit se k odloženým zprávám?"
 
 #
-#: send.c:1270
+#: send.c:1308
 msgid "Abort unmodified message?"
 msgstr "Zahodit nezměněnou zprávu?"
 
 #
-#: send.c:1272
+#: send.c:1310
 msgid "Aborted unmodified message."
 msgstr "Nezměněná zpráva byla zahozena."
 
 #
 #. abort
-#: send.c:1313
+#: send.c:1351
 msgid "Mail not sent."
 msgstr "Zpráva nebyla odeslána."
 
 #
-#: send.c:1339
+#: send.c:1377
 msgid "Message postponed."
 msgstr "Zpráva byla odložena."
 
 #
-#: send.c:1348
+#: send.c:1386
 msgid "No recipients are specified!"
 msgstr "Nejsou zadáni příjemci!"
 
 #
-#: send.c:1353
+#: send.c:1391
 msgid "No recipients were specified."
 msgstr "Nebyli zadání příjemci."
 
 #
-#: send.c:1359
+#: send.c:1397
 msgid "No subject, abort sending?"
 msgstr "Žádná věc, zrušit odeslání?"
 
 #
-#: send.c:1363
+#: send.c:1401
 msgid "No subject specified."
 msgstr "Věc nebyla zadána."
 
 #
-#: send.c:1410
+#: send.c:1448
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
 #
-#: send.c:1537
+#: send.c:1575
 msgid "Could not send the message."
 msgstr "Zprávu nelze odeslat."
 
 #
-#: send.c:1542
+#: send.c:1580
 msgid "Mail sent."
 msgstr "Zpráva odeslána."
 
-#: send.c:1542
+#: send.c:1580
 msgid "Sending in background."
 msgstr "Zasílám na pozadí."
 
@@ -4362,12 +4395,12 @@ msgid "Could not open %s"
 msgstr "%s nelze otevřít"
 
 #
-#: sendlib.c:1981
+#: sendlib.c:1994
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Chyba při zasílání zprávy, potomek ukončen %d (%s)."
 
-#: sendlib.c:1987
+#: sendlib.c:2000
 msgid "Output of the delivery process"
 msgstr "Výstup doručovacího programu"
 
@@ -4405,12 +4438,12 @@ msgid "(no mailbox)"
 msgstr "(žádná schránka)"
 
 #
-#: thread.c:714
+#: thread.c:737
 msgid "Parent message is not visible in limited view"
 msgstr "Rodičovská zpráva není v omezeném zobrazení viditelná.."
 
 #
-#: thread.c:719
+#: thread.c:742
 msgid "Parent message is not available."
 msgstr "Rodičovská zpráva není dostupná."
 
diff --git a/po/da.po b/po/da.po
index 61e7239a..0fc0d7be 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.3.12i \n"
-"POT-Creation-Date: 2001-03-28 15:10+0200\n"
+"POT-Creation-Date: 2001-05-01 23:31+0200\n"
 "PO-Revision-Date: 2000-11-27 23:48+01:00\n"
 "Last-Translator: Byrial Jensen <byrial@image.dk>, Morten Bo Johansen "
 "<mojo@image.dk> \n"
@@ -36,7 +36,7 @@ msgstr "Vćlg"
 
 #. __STRCAT_CHECKED__
 #: addrbook.c:33 browser.c:43 compose.c:92 curs_main.c:380 mutt_ssl.c:617
-#: pager.c:1460 pgpkey.c:449 postpone.c:40 query.c:48 recvattach.c:61
+#: pager.c:1460 pgpkey.c:517 postpone.c:40 query.c:48 recvattach.c:61
 msgid "Help"
 msgstr "Hjćlp"
 
@@ -280,11 +280,11 @@ msgstr "mono: for fĺ parametre."
 msgid "%s: no such attribute"
 msgstr "%s: ukendt attribut"
 
-#: color.c:690 hook.c:62 hook.c:70 keymap.c:697
+#: color.c:690 hook.c:64 hook.c:72 keymap.c:697
 msgid "too few arguments"
 msgstr "for fĺ parametre."
 
-#: color.c:699 hook.c:76
+#: color.c:699 hook.c:78
 msgid "too many arguments"
 msgstr "for mange parametre."
 
@@ -297,7 +297,7 @@ msgstr "standard-farver er ikke understřttet."
 msgid "Verify PGP signature?"
 msgstr "Efterprřv PGP-underskrift?"
 
-#: commands.c:105 pgp.c:1657 pgpkey.c:491 postpone.c:517
+#: commands.c:105 pgp.c:1678 pgpkey.c:559 postpone.c:517
 msgid "Invoking PGP..."
 msgstr "Starter PGP ..."
 
@@ -446,16 +446,29 @@ msgstr " udvalgte"
 msgid "Copying to %s..."
 msgstr "Kopierer til %s..."
 
-#: commands.c:822
+#: commands.c:823
+#, c-format
+msgid "Convert to %s upon sending?"
+msgstr ""
+
+#: commands.c:831
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "\"Content-Type\" ćndret til %s."
 
-#: commands.c:824
-#, c-format
-msgid "Character set changed to %s."
+#: commands.c:833
+#, fuzzy, c-format
+msgid "Character set changed to %s; %s."
 msgstr "Tegnsćt ćndret til %s."
 
+#: commands.c:835
+msgid "not converting"
+msgstr ""
+
+#: commands.c:835
+msgid "converting"
+msgstr ""
+
 #: compose.c:40
 msgid "There are no attachments."
 msgstr "Der er ingen bilag."
@@ -639,7 +652,7 @@ msgstr "nej"
 msgid "Exit Mutt?"
 msgstr "Afslut Mutt řjeblikkeligt?"
 
-#: curs_lib.c:326 mutt_socket.c:404
+#: curs_lib.c:326 mutt_socket.c:406
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -794,11 +807,11 @@ msgstr "Alle breve har slette-markering."
 msgid "You are on the first message."
 msgstr "Du er ved fřrste brev."
 
-#: curs_main.c:1217 pattern.c:1283
+#: curs_main.c:1217 pattern.c:1287
 msgid "Search wrapped to top."
 msgstr "Sřgning fortsat fra top."
 
-#: curs_main.c:1226 pattern.c:1294
+#: curs_main.c:1226 pattern.c:1298
 msgid "Search wrapped to bottom."
 msgstr "Sřgning fortsat fra bund."
 
@@ -822,7 +835,7 @@ msgstr "Ikke flere trĺde."
 msgid "You are on the first thread."
 msgstr "Du er ved den fřrste trĺd."
 
-#: curs_main.c:1444 curs_main.c:1475 flags.c:250 thread.c:653 thread.c:704
+#: curs_main.c:1444 curs_main.c:1475 flags.c:250 thread.c:676 thread.c:727
 msgid "Threading is not enabled."
 msgstr "Trĺdning er ikke i brug."
 
@@ -1096,11 +1109,20 @@ msgstr ""
 msgid "Help for %s"
 msgstr "Hjćlp for %s"
 
-#: hook.c:246
+#: hook.c:243
+msgid "unhook: Can't do unhook * from within a hook."
+msgstr ""
+
+#: hook.c:255
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: ukendt hooktype: %s"
 
+#: hook.c:261
+#, c-format
+msgid "unhook: Can't delete a %s from within a %s."
+msgstr ""
+
 #: imap/auth_anon.c:39
 msgid "Authenticating (anonymous)..."
 msgstr "Godkender (anonym)..."
@@ -2180,8 +2202,9 @@ msgstr ""
 "Brug venligst flea(1)-vćrktřjet, hvis du vil rapportere en bug.\n"
 
 #: main.c:45
+#, fuzzy
 msgid ""
-"Copyright (C) 1996-2000 Michael R. Elkins and others.\n"