automatic post-release commit for mutt-1.5.21mutt-1-5-21-rel

31 files changed, 19841 insertions, 18335 deletions

diff --git a/ChangeLog b/ChangeLog
index a7b430a4..c328e377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,258 @@
+2010-09-15 10:05 -0700  Michael Elkins  <me@mutt.org>  (54e3139a0362)
+
+	* safe_asprintf.c: suppress check_sec errors
+
+2010-09-13 17:25 -0700  Michael Elkins  <me@mutt.org>  (20b2d496349f)
+
+	* init.h: make $mail_check_recent set by default
+
+2010-09-13 19:00 +0100  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (fea3860ff672)
+
+	* imap/command.c: Restore the previous behaviour of checking for new
+	messages in imap folders when mail_check_recent is set.
+
+2010-09-12 19:54 -0700  Michael Elkins  <me@mutt.org>  (a51df78218e8)
+
+	* buffy.c, buffy.h, imap/command.c, init.h, mbox.c, mutt.h: add
+	$mail_check_recent boolean to control whether Mutt will notify about
+	all new mail, or just new mail received since the last visit to a
+	mailbox
+
+	closes #3271
+
+	partly addresses #3310
+
+	* smime.c: fix crash when index contains 0 keys
+
+2010-09-11 07:34 -0700  Michael Elkins  <me@mutt.org>  (0f962f1a6bbb)
+
+	* send.c: Allow setting message security in send2-hook
+
+	This patch delays checking the message security options until after
+	the user has an initial chance to edit the message. This allows the
+	security options to be set in a send2-hook when using $edit_headers.
+	Without this patch, the user has no way of automatically setting
+	security based on recipients since the to/cc prompts are bypassed.
+
+	The other change in behavior is if the user happened to use a
+	send2-hook to see if the message had security applied *prior* to
+	editing the message, that no longer works.
+
+	* keymap.c, keymap.h, main.c: support for ncurses extension allowing
+	binding to function keys with modifiers
+
+	* keymap.c: allow octal codes with more than three digits
+
+	* crypt-gpgme.c, mime.h, pgp.c, recvattach.c, sendlib.c: add DISPNONE
+	to mean no preferred Content-Disposition; make pgp-signature parts
+	DISPNONE for multipart/signed
+
+	* recvcmd.c: fix problem with reply-hook not working when a
+	message/rfc822 attachment is selected
+
+	* rfc2047.c: more lenient RFC2047 decoding: accept illegal spaces and
+	bare question marks in encoded words
+
+	* curs_main.c, mx.c: fix crash when new mail is received during IMAP
+	IDLE
+
+	closes #3335
+
+2010-08-25 00:30 +0100  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (5302767aa6aa)
+
+	* rfc2047.c: Use mutt_substrdup in rfc2047_decode_word
+
+2010-08-24 16:40 -0700  Michael Elkins  <me@mutt.org>  (92b02f77e780)
+
+	* rfc2047.c: detect failure to decode word and copy raw string
+	instead; avoids calling strlen() on uninitialized memory
+
+	closes #2923
+
+2010-08-24 18:39 +0100  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (ebd4beafe5eb)
+
+	* mutt_ssl.c: Fix typo.
+
+	* browser.c, hook.c, init.c, menu.c, mutt_ssl_gnutls.c, pager.c: Do
+	not call regfree if regcomp fails. The content of the regex_t
+	structure is undefined in this case.
+
+	* curs_lib.c, mutt_ssl_gnutls.c: use REGCOMP() macro
+
+2010-08-24 10:03 -0700  Michael Elkins  <me@mutt.org>  (5d59c8b737ba)
+
+	* init.c: add REG_ICASE accidentally removed in changeset 1a35f096c8cb
+
+	* muttlib.c: do not print debug message on ENOENT
+
+2010-08-14 09:18 -0700  Michael Elkins  <me@mutt.org>  (04fd8ddea579)
+
+	* url.c: avoid c99 syntax for backwards compat
+
+2010-08-06 21:52 +0200  Matthias Andree  <matthias.andree@gmx.de>  (24a7b1aa2e55)
+
+	* buffy.c: Fix comparison signedness warnings.
+
+2010-08-12 16:04 -0700  Michael Elkins  <me@mutt.org>  (ced5d3dca974)
+
+	* imap/util.c: Fix bug in imap_keepalive() which erroneously free
+	Context when the IMAP connection is shut down by the server.
+
+	Closes #3410
+
+	* url.c: url_parse_mailto should return 0 on success
+
+	fix memory leak errors when unable to parse mailto: URL
+
+	closes #3441
+
+	* mh.c: always update message body size when parsing a maildir message
+
+	* safe_asprintf.c: call va_end() even when vasprintf returns <0
+
+2010-08-09 20:48 -0700  Michael Elkins  <me@mutt.org>  (6572e8bcd723)
+
+	* Makefile.am, imap/message.c, lib.c, lib.h, safe_asprintf.c: rename
+	mutt_sprintf() to safe_asprintf() to match the GNU extension that
+	performs a similar task
+
+2010-08-09 10:27 -0700  Vincent Lefevre  <vincent@vinc17.org>  (e86ee9991dc3)
+
+	* postpone.c: In postpone.c, function mutt_num_postponed, the old
+	{{{OldPostponed}}} is never freed.
+
+	closes #3442
+
+2010-08-09 09:38 -0700  Michael Elkins  <me@mutt.org>  (8051fc8b631c)
+
+	* send.c: clear the real name when $reverse_realname is unset and a
+	match is hit so that $realname can be set in a reply- or send-hook
+
+	closes #3427
+
+	* doc/manual.xml.head: fix example of mailto: use on the command line
+
+	* pager.c: fix buffer underrun when processing ANSI escape sequences
+
+	closes #3371
+
+2010-08-08 12:29 -0700  Michael Elkins  <me@mutt.org>  (4dcf19c58139)
+
+	* doc/manual.xml.head, doc/mutt.man: document support for mailto: URLs
+	on the command line
+
+	closes #3400
+
+	* imap/message.c: avoid error when the user has requested many extra
+	headers via IMAP
+
+	closes #3435
+
+	* lib.c, lib.h: add a malloc+sprintf combo function
+
+2010-08-08 10:21 -0700  Fabian Groffen  <grobian@gentoo.org>  (d4d703e21cdd)
+
+	* pattern.c: fix crash in limit when user enters invalid regexp
+
+	closes #3417
+
+2010-08-07 06:44 -0700  Michael Elkins  <me@mutt.org>  (cc881d855f05)
+
+	* mutt_ssl.c: Fix comparison signedness warnings
+
+	* pop_lib.c: add comment about safety of cast
+
+2010-08-06 21:58 +0200  Matthias Andree  <matthias.andree@gmx.de>  (55f50b2db1f8)
+
+	* pop_lib.c: Fix comparison signedness warning.
+
+	* status.c: Fix signedness warning.
+
+	* .hgignore: Ignore backup files ending in a tilde character.
+
+	* url.c: Fix comparison signedness warnings.
+
+	* gnupgparse.c, pop_auth.c: Fix comparison signedness warnings.
+
+	* lib.h: Resolve if/else empty body ambiguity/warnings when compiling
+	without DEBUG.
+
+2010-08-06 17:08 -0700  Michael Elkins  <me@mutt.org>  (5b15d4d96277)
+
+	* configure.ac, init.c, protos.h: detect availablity of 'long long'
+
+	cast time_t to 'long long' prior to bitshifting since it can be a
+	float value according to POSIX.1-2008
+
+	closes #3439
+
+2010-08-06 21:22 +0200  Matthias Andree  <matthias.andree@gmx.de>  (bf13863e682e)
+
+	* md5.c: Drop declaration for unused argv/argc parameters.
+
+	Fixes GCC warning with -Wextra.
+
+2010-08-06 13:11 -0700  Michael Elkins  <me@mutt.org>  (998ca956b41b)
+
+	* init.c, muttlib.c: use a 64-bit random value in temporary filenames.
+
+	closes #3158
+
+	* browser.c: avoid using C99 bool
+
+	* browser.c, init.h: add %D format string to $folder_format to expand
+	the time based on $date_format.
+
+	properly set the locale for LC_TIME prior to calling strftime()
+	closes #1734 closes #3406
+
+	* mutt_ssl.c: fix compiler warning about wrong type for
+	SslSessionCerts
+
+2010-08-06 09:58 +0200  Matthias Andree  <matthias.andree@gmx.de>  (473fbe29f626)
+
+	* mutt_ssl.c: Unbreak X.509 SubjAltName checks,
+
+	regression in 6016:dc09812e63a3 that calls strlen on an SSL sk
+	rather than its string payload.
+
+	closes #3426
+
+2010-08-06 07:12 -0700  Michael Elkins  <me@mutt.org>  (4ae33a8a1391)
+
+	* configure.ac: properly set _XOPEN_SOURCE to 600 (POSIX.1-2004) when
+	detecting th wc*() functions
+
+	closes #3341
+
+2010-08-05 21:57 -0700  Michael Elkins  <me@mutt.org>  (bc5fb152e2ba)
+
+	* mbox.c: when parsing From_ lines in mmdf/mbox, the TZ should be
+	computed based on the time in the string rather than the current
+	time, otherwise DST issues cause the computed time to be wrong.
+
+	closes #2177
+
+	* thread.c: explanatory comments
+
+2010-08-05 17:03 -0700  andreas  <andreas.amann@tyndall.ie>  (0666d9588eac)
+
+	* curs_main.c, functions.h: do not leave pager when changing sort
+	order.
+
+	closes #2143
+
+2010-08-05 16:47 -0700  Michael Elkins  <me@mutt.org>  (57d4b3839172)
+
+	* curs_main.c: do not leave pager when using read-thread and read-
+	subthread
+
+	closes #2137
+
+2010-08-04 17:04 -0700  Petr PГ­saЕ™  <petr.pisar@atlas.cz>  (59ca5d7b1656)
+
+	* ChangeLog, po/cs.po: Updated Czech translation
+
 2010-08-04 06:37 -0700  Vincent Lefevre  <vincent@vinc17.org>  (a7f05f29d9bc)
 
 	* po/fr.po: updated French translation
diff --git a/VERSION b/VERSION
index a7ccabdb..07a45d78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.20
+1.5.21
diff --git a/po/bg.po b/po/bg.po
index 3fd7f1d0..525e53b0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-14 11:53-0700\n"
+"POT-Creation-Date: 2010-09-15 10:09-0700\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:161
+#: account.c:163
 #, c-format
 msgid "Username at %s: "
 msgstr "Потребителско име на %s: "
 
-#: account.c:220
+#: account.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Парола за %s@%s: "
 
-#: addrbook.c:37 browser.c:45 pager.c:1502 postpone.c:41 query.c:48
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48
 #: recvattach.c:53
 msgid "Exit"
 msgstr "Изход"
 
-#: addrbook.c:38 curs_main.c:406 pager.c:1509 postpone.c:42
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42
 msgid "Del"
 msgstr "Изтр."
 
@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "Избор"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3829 curs_main.c:412
-#: mutt_ssl.c:895 mutt_ssl_gnutls.c:875 pager.c:1601 pgpkey.c:522
-#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412
+#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425
 msgid "Help"
 msgstr "Помощ"
 
@@ -88,8 +88,8 @@ msgstr "Име:"
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Запис?"
 
-#: alias.c:347 recvattach.c:431 recvattach.c:457 recvattach.c:470
-#: recvattach.c:483 recvattach.c:513
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522
 msgid "Save to file: "
 msgstr "Запис във файл:"
 
@@ -117,8 +117,8 @@ msgstr "Няма шаблон с това име. Желаете ли да продължите?"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Записът \"compose\" в mailcap изисква %%s"
 
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
-#: curs_lib.c:544
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180
+#: curs_lib.c:548
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Грешка при изпълнението на \"%s\"!"
@@ -198,113 +198,113 @@ msgstr "Грешка при запис!"
 msgid "I don't know how to print that!"
 msgstr "Невъзможно отпечатване!"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Chdir"
 msgstr "Директория"
 
-#: browser.c:47
+#: browser.c:48
 msgid "Mask"
 msgstr "Маска"
 
-#: browser.c:383 browser.c:1038
+#: browser.c:400 browser.c:1055
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s не е директория."
 
-#: browser.c:522
+#: browser.c:539
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Пощенски кутии [%d]"
 
-#: browser.c:529
+#: browser.c:546
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Абониран [%s], Файлова маска: %s"
 
-#: browser.c:533
+#: browser.c:550
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Директория [%s], Файлова маска: %s"
 
-#: browser.c:545
+#: browser.c:562
 msgid "Can't attach a directory!"
 msgstr "Не може да прилагате директория!"
 
-#: browser.c:684 browser.c:1107 browser.c:1205
+#: browser.c:701 browser.c:1123 browser.c:1221
 msgid "No files match the file mask"
 msgstr "Няма файлове, отговарящи на маската"
 
-#: browser.c:888
+#: browser.c:905
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Само IMAP пощенски кутии могат да бъдат създавани"
 
-#: browser.c:912
+#: browser.c:929
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Само IMAP пощенски кутии могат да бъдат създавани"
 
-#: browser.c:935
+#: browser.c:952
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Само IMAP пощенски кутии могат да бъдат изтривани"
 
-#: browser.c:945
+#: browser.c:962
 #, fuzzy
 msgid "Cannot delete root folder"
 msgstr "Филтърът не може да бъде създаден"
 
-#: browser.c:948
+#: browser.c:965
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Действително ли желаете да изтриете пощенската кутия \"%s\"?"
 
-#: browser.c:962
+#: browser.c:979
 msgid "Mailbox deleted."
 msgstr "Пощенската кутия е изтрита."
 
-#: browser.c:968
+#: browser.c:985
 msgid "Mailbox not deleted."
 msgstr "Пощенската кутия не е изтрита."
 
-#: browser.c:987
+#: browser.c:1004
 msgid "Chdir to: "
 msgstr "Смяна на директорията: "
 
-#: browser.c:1026 browser.c:1100
+#: browser.c:1043 browser.c:1116
 msgid "Error scanning directory."
 msgstr "Грешка при четене на директорията."
 
-#: browser.c:1050
+#: browser.c:1067
 msgid "File Mask: "
 msgstr "Файлова маска: "
 
-#: browser.c:1123
+#: browser.c:1139
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Обратно подреждане по дата(d), азбучен ред(a), размер(z) или без подреждане"
 "(n)?"
 
-#: browser.c:1124
+#: browser.c:1140
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Подреждане по дата(d), азбучен ред(a), размер(z) или без подреждане(n)?"
 
-#: browser.c:1125
+#: browser.c:1141
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1192
+#: browser.c:1208
 msgid "New file name: "
 msgstr "Ново име за файла: "
 
-#: browser.c:1223
+#: browser.c:1239
 msgid "Can't view a directory"
 msgstr "Директорията не може да бъде показана"
 
-#: browser.c:1240
+#: browser.c:1256
 msgid "Error trying to view file"
 msgstr "Грешка при показването на файла"
 
-#: buffy.c:459
+#: buffy.c:486
 msgid "New mail in "
 msgstr "Нови писма в "
 
@@ -350,7 +350,7 @@ msgstr "mono: недостатъчно аргументи"
 msgid "%s: no such attribute"
 msgstr "%s: няма такъв атрибут"
 
-#: color.c:705 hook.c:69 hook.c:77 keymap.c:776
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902
 msgid "too few arguments"
 msgstr "недостатъчно аргументи"
 
@@ -367,7 +367,7 @@ msgstr "стандартните цветове не се поддържат"
 msgid "Verify PGP signature?"
 msgstr "Желаете ли да потвърдите истинността на PGP-подписа?"
 
-#: commands.c:115 mbox.c:772
+#: commands.c:115 mbox.c:787
 msgid "Could not create temporary file!"
 msgstr "Невъзможно създаването на временен файл!"
 
@@ -403,95 +403,95 @@ msgstr "PGP-подписът е потвърден успешно."
 msgid "PGP signature could NOT be verified."
 msgstr "PGP-подписът НЕ е потвърден успешно."
 
-#: commands.c:230
+#: commands.c:231
 msgid "Command: "
 msgstr "Команда: "
 
-#: commands.c:255
+#: commands.c:256
 #, fuzzy
 msgid "Warning: message has no From: header"
 msgstr "скок към родителското писмо в нишката"
 
-#: commands.c:273 recvcmd.c:171
+#: commands.c:274 recvcmd.c:171
 msgid "Bounce message to: "
 msgstr "Препращане на писмото към: "
 
-#: commands.c:275 recvcmd.c:173
+#: commands.c:276 recvcmd.c:173
 msgid "Bounce tagged messages to: "
 msgstr "Препращане на маркираните писма към: "
 
-#: commands.c:290 recvcmd.c:182
+#: commands.c:291 recvcmd.c:182
 msgid "Error parsing address!"
 msgstr "Грешка при разчитане на адресът!"
 
-#: commands.c:298 recvcmd.c:190
+#: commands.c:299 recvcmd.c:190
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "Лош IDN: '%s'"
 
-#: commands.c:309 recvcmd.c:204
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Препращане на писмото към %s"
 
-#: commands.c:309 recvcmd.c:204
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Препращане на писмото към %s"
 
-#: commands.c:325 recvcmd.c:220
+#: commands.c:326 recvcmd.c:220
 msgid "Message not bounced."
 msgstr "Писмото не е препратено."
 
-#: commands.c:325 recvcmd.c:220
+#: commands.c:326 recvcmd.c:220
 msgid "Messages not bounced."
 msgstr "Писмата не са препратени."
 
-#: commands.c:335 recvcmd.c:239
+#: commands.c:336 recvcmd.c:239
 msgid "Message bounced."
 msgstr "Писмото е препратено."
 
-#: commands.c:335 recvcmd.c:239
+#: commands.c:336 recvcmd.c:239
 msgid "Messages bounced."
 msgstr "Писмата са препратени."
 
-#: commands.c:412 commands.c:446 commands.c:463
+#: commands.c:413 commands.c:447 commands.c:464
 msgid "Can't create filter process"
 msgstr "Грешка при създаването на филтър"
 
-#: commands.c:492
+#: commands.c:493
 msgid "Pipe to command: "
 msgstr "Изпращане към команда (pipe): "
 
-#: commands.c:509
+#: commands.c:510
 msgid "No printing command has been defined."
 msgstr "Не е дефинирана команда за отпечатване"
 
-#: commands.c:514
+#: commands.c:515
 msgid "Print message?"
 msgstr "Желаете ли да отпечатате писмото?"
 
-#: commands.c:514
+#: commands.c:515
 msgid "Print tagged messages?"
 msgstr "Желаете ли да отпечатате маркираните писма?"
 
-#: commands.c:523
+#: commands.c:524
 msgid "Message printed"
 msgstr "Писмото е отпечатано"
 
-#: commands.c:523
+#: commands.c:524
 msgid "Messages printed"
 msgstr "Писмата са отпечатани"
 
-#: commands.c:525
+#: commands.c:526
 msgid "Message could not be printed"
 msgstr "Писмото не е отпечатано"
 
-#: commands.c:526
+#: commands.c:527
 msgid "Messages could not be printed"
 msgstr "Писмата не са отпечатани"
 
-#: commands.c:535
+#: commands.c:536
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -500,7 +500,7 @@ msgstr ""
 "Обратно подреждане по: дата на изпращане(d)/от(f)/дата на получаване(r)/тема"
 "(s)/получател(o)/нишка(t)/без подреждане(u)/размер(z)/важност(c)?: "
 
-#: commands.c:536
+#: commands.c:537
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -509,74 +509,74 @@ msgstr ""
 "Подреждане по: дата на изпращане(d)/от(f)/дата на получаване(r)/тема(s)/"
 "получател(o)/нишка(t)/без подреждане(u)/размер(z)/важност(c)?: "
 
-#: commands.c:537
+#: commands.c:538
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
-#: commands.c:594
+#: commands.c:595
 msgid "Shell command: "
 msgstr "Шел команда: "
 
-#: commands.c:737
+#: commands.c:738
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Декодиране и запис на%s в пощенска кутия"
 
-#: commands.c:738
+#: commands.c:739
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Декодиране и копиране на%s в пощенска кутия"
 
-#: commands.c:739
+#: commands.c:740
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Дешифриране и запис на%s в пощенска кутия"
 
-#: commands.c:740
+#: commands.c:741
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Дешифриране и запис на%s в пощенска кутия"
 
-#: commands.c:741
+#: commands.c:742
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Запис на%s в пощенска кутия"
 
-#: commands.c:741
+#: commands.c:742
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Копиране на%s в пощенска кутия"
 
-#: commands.c:742
+#: commands.c:743
 msgid " tagged"
 msgstr " маркиран"
 
-#: commands.c:815
+#: commands.c:816
 #, c-format
 msgid "Copying to %s..."
 msgstr "Създаване на копие в %s..."
 
-#: commands.c:931
+#: commands.c:932
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Желаете ли да го конвертирате до %s при изпращане?"
 
-#: commands.c:941
+#: commands.c:942
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type е променен на %s."
 
-#: commands.c:946
+#: commands.c:947
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Кодовата таблица е променена на %s; %s."
 
-#: commands.c:948
+#: commands.c:949
 msgid "not converting"
 msgstr "не е конвертирано"
 
-#: commands.c:948
+#: commands.c:949
 msgid "converting"
 msgstr "конвертирано"
 
@@ -592,7 +592,7 @@ msgstr "Изпращане"
 msgid "Abort"
 msgstr "Отказ"
 
-#: compose.c:94 compose.c:667
+#: compose.c:94 compose.c:664
 msgid "Attach file"
 msgstr "Прилагане на файл"
 
@@ -600,170 +600,179 @@ msgstr "Прилагане на файл"
 msgid "Descrip"
 msgstr "Описание"
 
-#: compose.c:132
+#: compose.c:119
+#, fuzzy
+msgid "Not supported"
+msgstr "Маркирането не се поддържа."
+
+#: compose.c:124
 msgid "Sign, Encrypt"
 msgstr "Подпис, Шифроване"
 
-#: compose.c:134
+#: compose.c:126
 msgid "Encrypt"
 msgstr "Шифроване"
 
-#: compose.c:136
+#: compose.c:128
 msgid "Sign"
 msgstr "Подпис"
 
-#: compose.c:138
-msgid "Clear"
-msgstr "Обикновен текст"
+#: compose.c:130
+msgid "None"
+msgstr ""
 
-#: compose.c:145
+#: compose.c:137
 #, fuzzy
-msgid " (inline)"
+msgid " (inline PGP)"
 msgstr "(по-нататък)\n"
 
-#: compose.c:147
+#: compose.c:139
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:155 compose.c:159
+#: compose.c:143
+msgid " (S/MIME)"
+msgstr ""
+
+#: compose.c:152 compose.c:156
 msgid " sign as: "
 msgstr " подпис като: "
 
-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156
 msgid "<default>"
 msgstr "<по подразбиране>"
 
-#: compose.c:167
+#: compose.c:164
 msgid "Encrypt with: "
 msgstr "Шифроване c: "
 
-#: compose.c:221
+#: compose.c:218
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] вече не съществува!"
 
-#: compose.c:229
+#: compose.c:226
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] е променено. Желаете ли да опресните кодирането?"
 
-#: compose.c:272
+#: compose.c:269
 msgid "-- Attachments"
 msgstr "-- Приложения"
 
-#: compose.c:302
+#: compose.c:299
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Предупреждение: '%s' е невалиден IDN."
 
-#: compose.c:325
+#: compose.c:322
 msgid "You may not delete the only attachment."
 msgstr "Не може да изтриете единствената част на писмото."
 
-#: compose.c:600 send.c:1591
+#: compose.c:597 send.c:1586
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Лош IDN в \"%s\": '%s'"
 
-#: compose.c:683
+#: compose.c:680
 msgid "Attaching selected files..."
 msgstr "Прилагане на избраните файлове..."
 
-#: compose.c:695
+#: compose.c:692
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Прилагането на %s е невъзможно!"
 
-#: compose.c:714
+#: compose.c:711
 msgid "Open mailbox to attach message from"
 msgstr "Отваряне на пощенска кутия, от която да бъде приложено писмо"
 
-#: compose.c:752
+#: compose.c:749
 msgid "No messages in that folder."
 msgstr "В тази кутия няма писма."
 
-#: compose.c:761
+#: compose.c:758
 msgid "Tag the messages you want to attach!"
 msgstr "Маркирайте писмата, които искате да приложите!"
 
-#: compose.c:793
+#: compose.c:790
 msgid "Unable to attach!"
 msgstr "Прилагането е невъзможно!"
 
-#: compose.c:844
+#: compose.c:841
 msgid "Recoding only affects text attachments."
 msgstr "Промяната на кодирането засяга само текстовите приложения."
 
-#: compose.c:849
+#: compose.c:846
 msgid "The current attachment won't be converted."
 msgstr "Това приложение няма да бъде прекодирано."
 
-#: compose.c:851
+#: compose.c:848
 msgid "The current attachment will be converted."
 msgstr "Това приложение ще бъде прекодирано."
 
-#: compose.c:926
+#: compose.c:923
 msgid "Invalid encoding."
 msgstr "Избрано е невалидно кодиране."
 
-#: compose.c:952
+#: compose.c:949
 msgid "Save a copy of this message?"
 msgstr "Желаете ли да запазите копие от това писмо?"
 
-#: compose.c:1008
+#: compose.c:1005
 msgid "Rename to: "
 msgstr "Преименуване в: "
 
-#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:858
+#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Грешка при отваряне на %s: %s"
 
-#: compose.c:1040
+#: compose.c:1037
 msgid "New file: "
 msgstr "Нов файл: "
 
-#: compose.c:1053
+#: compose.c:1050
 msgid "Content-Type is of the form base/sub"
 msgstr "Полето Content-Type има формата базов-тип/подтип"
 
-#: compose.c:1059
+#: compose.c:1056
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Непознат Content-Type %s"
 
-#: compose.c:1072
+#: compose.c:1069
 #, c-format
 msgid "Can't create file %s"
 msgstr "Грешка при създаване на файла %s"
 
-#: compose.c:1080
+#: compose.c:1077
 msgid "What we have here is a failure to make an attachment"
 msgstr "Грешка при създаване на приложението"
 
-#: compose.c:1141
+#: compose.c:1138
 msgid "Postpone this message?"
 msgstr "Желаете ли да запишете черновата?"
 
-#: compose.c:1200
+#: compose.c:1197
 msgid "Write message to mailbox"
 msgstr "Запис на писмото в пощенска кутия"
 
-#: compose.c:1203
+#: compose.c:1200
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Записване на писмото в %s ..."
 
-#: compose.c:1212
+#: compose.c:1209
 msgid "Message written."
 msgstr "Писмото е записано."
 
-#: compose.c:1224
+#: compose.c:1221
 #, fuzzy
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME-шифроване вече е избрано. Clear & continue? "
 
-#: compose.c:1250
+#: compose.c:1247
 #, fuzzy
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP-шифроване вече е избрано. Clear & continue? "
@@ -879,7 +888,7 @@ msgstr ""
 msgid "PKA verified signer's address is: "
 msgstr ""
 
-#: crypt-gpgme.c:1185 crypt-gpgme.c:3296
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Пръстов отпечатък: %s"
@@ -1016,7 +1025,7 @@ msgstr "[-- КРАЙ НА БЛОКА С ПУБЛИЧНИЯ PGP-КЛЮЧ --]\n"
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- КРАЙ НА PGP-ПОДПИСАНОТО ПИСМО --]\n"