~kevin8t8/mutt

344a22aaddf20c23e8bd022fd8e38e269280dc56 — Kevin McCarthy 3 years ago cc7c20b mutt-1-8-rel
automatic post-release commit for mutt-1.8.0
M ChangeLog => ChangeLog +1703 -0
@@ 1,3 1,1706 @@
2017-02-23 08:56 -0800  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (43e312cee971)

	* po/ja.po: Updated Japanese translation.

2017-02-22 15:58 -0800  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (3e1d26df748e)

	* po/nl.po: Updated Dutch translation.

2017-02-22 12:58 -0800  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (4b445c73fc77)

	* po/eo.po: Updated Esperanto translation.

2017-02-22 12:50 -0800  Kevin McCarthy  <kevin@8t8.us>  (5b68a3022b82)

	* UPDATING, doc/manual.xml.head, init.h: Minor touchups to
	documentation and UPDATING file.

2017-02-19 18:51 -0800  Kevin McCarthy  <kevin@8t8.us>  (715c276641c6)

	* doc/manual.xml.head: Mention $XDG_CONFIG_HOME/mutt/ in the manual.

2017-02-19 18:30 -0800  Kevin McCarthy  <kevin@8t8.us>  (1575671b3c60)

	* UPDATING: Reword some of the UPDATING entries.

	Thanks to Matthias Andree for his feedback and suggestions!

2017-02-18 15:15 -0800  Kevin McCarthy  <kevin@8t8.us>  (e4a5d1913e42)

	* UPDATING: Add 1.8.0 entries to the UPDATING file.

2017-02-18 21:30 +0000  Athanasios Douitsis  <aduitsis@gmail.com>  (943b281abfbb)

	* getdomain.c: Prevent null pointer exception for h->ai_canonname

	The getaddrinfo call in line 54 sets &h to a struct addrinfo. If a
	canonical name cannot be found for the node argument of getaddrinfo,
	h->ai_canonname is set to NULL. In that case, the strchr call in
	line 58 can lead to segfault. This behavior was observed on a macos
	sierra while the hostname was 192.168.1.3 (unfortunately this
	happens quite often in macos).

	The fix is simple, just check h->ai_canonname for the NULL value.

2017-02-17 20:02 -0800  Ivan Vilata i Balaguer  <ivan@selidor.net>  (9b7780b48f47)

	* po/ca.po: Updated Catalan translation.

2017-02-16 12:44 -0800  Vsevolod Volkov  <vvv@mutt.org.ua>  (27ee126fb9c5)

	* po/ru.po: Updated Russian translation.

2017-02-16 12:41 -0800  Vsevolod Volkov  <vvv@mutt.org.ua>  (ed569b004aef)

	* po/uk.po: Updated Ukrainian translation.

2017-02-16 11:22 -0800  Morten Bo Johansen  <mjb@spamcop.net>  (20eccc63e008)

	* po/da.po: Updated Danish translation.

2017-02-13 12:26 -0800  Petr Pisar  <petr.pisar@atlas.cz>  (519a8c8cc55c)

	* po/cs.po: Updated Czech translation.

2017-02-12 13:03 -0800  Matthias Andree  <matthias.andree@gmx.de>  (cec61c6926ea)

	* mutt_ssl.c: Show SHA1 fp in interactive cert check menu.

	While here, fix a few compiler warnings about sign mismatch in
	comparison.

2017-02-12 12:24 -0800  Kevin McCarthy  <kevin@8t8.us>  (2350d7d61b34)

	* mutt_ssl.c: Fix potential cert memory leak in
	check_certificate_by_digest().

	Thanks to Matthias Andree's debugging, it appears the cert is not
	freed when PEM_read_X509() encounters EOF. Change the return value
	check to not overwrite cert. It is already updated via the second
	parameter.

2017-02-12 09:59 -0800  Matthias Andree  <matthias.andree@gmx.de>  (48a1f145c269)

	* mutt_ssl.c: Plug memory leak in weed-expired-certs code.

	X509_STORE_add_cert() creates a copy of the certificate we're
	offering, so we need to free our copy afterwards. This isn't
	documented, but from observed behaviour in OpenSSL 1.0.2 and its
	master branch source code.

	Change PEM_read_X509() call to reuse cert to avoid free/reallocation
	overhead.

2017-02-12 09:59 -0800  Kevin McCarthy  <kevin@8t8.us>  (2632bc4f5b20)

	* mutt_ssl.c: Filter expired local certs for OpenSSL verification.

	OpenSSL has trouble establishing the chain and verifying when
	duplicate expired certs are loaded in from $certificate_file. A
	warning about this is mentioned in
	SSL_CTX_load_verify_locations(3SSL).

	Filter out expired certs when loading verify certs. Note that the
	full certicates file is still used for verification in
	check_certificate_by_digest().

2017-02-10 13:01 -0800  Kevin McCarthy  <kevin@8t8.us>  (7c97a8af8718)

	* alias.c, group.c, hash.c, hash.h, headers.c, imap/message.c, init.c,
	mh.c, mx.c, pop.c, thread.c: Change "allow_dups" into a flag at hash
	creation.

	Instead of having an "allow_dups" parameter for hash_insert(), add a
	flag, MUTT_HASH_ALLOW_DUPS, to hash_create().

	Currently ReverseAlias, subj_hash, and thread_hash allow duplicate
	keys. Change those hashes to pass the flag at creation, and remove
	the last parameter from all callers of hash_insert().

2017-02-10 12:56 -0800  Petr Pisar  <petr.pisar@atlas.cz>  (e2b186a92390)

	* po/cs.po: Updated Czech translation.

2017-02-10 12:51 +0100  Vincent Lefevre  <vincent@vinc17.net>  (a4449ebfb5f4)

	* po/fr.po: Updated French translation.

2017-02-08 07:48 -0800  Kevin McCarthy  <kevin@8t8.us>  (d215a36fd8ee)

	* hcache.c: Fix build for bdb.

	Changeset fca7e504ab6a removed #else/#endif around two blocks of
	code that won't compile with bdb enabled. Restore those directives.

	Thanks to Richard Russon for pointing out the problem and saving me
	from having egg all over my face with the 1.8 release!

2017-02-07 19:36 -0800  Kevin McCarthy  <kevin@8t8.us>  (09bb4a62ceb1)

	* hcache.c, hcache.h, imap/imap.c, imap/message.c, imap/util.c, mh.c,
	pop.c: Create function to free header cache data.

	Kyoto Cabinet documents that data from it should be freed via
	kcfree().

	LMDB claims ownership of the data returned, so convert its free
	operation to be a noop and remove the malloc from its fetch
	function.

2017-02-07 19:36 -0800  Kevin McCarthy  <kevin@8t8.us>  (52481ceb6c6e)

	* configure.ac, doc/manual.xml.head, hcache.c, init.h, mutt.h: Add
	Kyoto Cabinet support to the header cache.

	Retain the defaults as they are, although we might switch to Kyoto
	Cabinet for the next major release.

2017-02-04 12:53 -0800  Kevin McCarthy  <kevin@8t8.us>  (fca7e504ab6a)

	* hcache.c: Fixes to the LMDB header cache. (closes #3691)

	Use mdb_txn_abort() to free up readonly/reset transactions, and
	avoid leaking memory.

	Fix hcache_delete() key generation - looks like this was an
	incorrect copy/paste from the bdb code.

	Use dprint, not fprintf, for debugging messages.

	Remove strange blending of enum and bitfield logic for the txn_mode
	state.

	Remove some duplicate code from store/fetch raw.

2017-02-04 12:53 -0800  Kevin McCarthy  <kevin@8t8.us>  (42aa8b19da95)

	* configure.ac, hcache.c: Add LMDB backend support for header cache.
	(see #3691)

	Based on the original from JP Mens:
	https://gist.github.com/jpmens/15969d9d678a3d450e4e

	The following performance patch was manually applied on top of the
	original patch: https://github.com/neomutt/neomutt/commit/7e5380cd4c
	40d119ff83b2cf5f51f2cdb8a95ab3

	A variant of this patch was added to handle larger mailboxes: https:
	//github.com/neomutt/neomutt/commit/6d337642e701b1dde4b5d0812e01c85f
	41ba65ca

	Thanks to all the developers and contributors to this patch, and to
	Fabian Groffen for bundling and posting this to mutt-dev.

2017-01-31 15:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (142a87f0c855)

	* enter.c: Minor fix to ~y completion.

	Make sure the entire ~y is before curpos when enabling completion.

2017-01-31 14:27 -0800  Kevin McCarthy  <kevin@8t8.us>  (82034c72b6da)

	* enter.c, init.c, protos.h: Simplify mutt_label_complete().

	It was derived from mutt_command_complete(), which had more complex
	requirements. For labels, we just need to skip whitespace and
	complete based on the passed in buffer.

	Therefore, we don't need the pos parameter, or to work backwards
	from the end of the buffer.

2017-01-31 14:27 -0800  Kevin McCarthy  <kevin@8t8.us>  (298654f1d70c)

	* enter.c: Permit tab completion of pattern expressions with ~y
	(labels).

	Thanks to David Champion for the original patch. This version is
	slightly different, as I couldn't get the original patch working.
	This version simply scans backward for the first ~, and if it is ~y,
	invokes completion.

2017-01-31 14:27 -0800  Kevin McCarthy  <kevin@8t8.us>  (9ca99f2b1205)

	* enter.c: Fix the mutt_label_complete() pos parameter.

	i is the state->wbuf index, not the end of the buf. It was "working"
	only because the contents of buf past the null were not "space" most
	of the time.

2017-01-29 11:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (ab2f8882633b)

	* copy.c: Fix the x-label update code check location.

	The x-label comparison was outside the "beginning of header" block.

	This meant that it could theoretically match a continuation line.
	Additionally, the continuation lines of x-labels would not be
	stripped, because the comparison was after the ignore variable was
	reset.

	Move the comparison inside the block and before the ignore reset.

2017-01-28 18:48 -0800  Kevin McCarthy  <kevin@8t8.us>  (d0909785d945)

	* curs_main.c, globals.h, headers.c, init.c, main.c, mbox.c, mutt.h,
	mx.c, pop.c, protos.h: Improve the label completion hash table
	usage.

	Move the hash table inside the Context. Hook message
	arrival/deletion to update the label hash.

	Change the label hash to strdup keys.

	Use hash_find_elem when updating the counter, to reduce unnecessary
	add/delete operations.

2017-01-28 18:47 -0800  David Champion  <dgc@bikeshed.us>  (66cc205ea76a)

	* curs_main.c, doc/manual.xml.head, enter.c, globals.h, headers.c,
	init.c, main.c, mutt.h, protos.h: Adds label completion.

	A global label hash is added, to which labels are added as they're
	parsed from a mailbox file or edited manually by the user. Reference
	counts are kept in the hash table so that unused labels are removed
	from available completions. Completion is available in the label
	editor only, but it may be feasible to add for search expressions if
	the preceding text ends with '~y'.

2017-01-28 18:47 -0800  Kevin McCarthy  <kevin@8t8.us>  (51c5e574a082)

	* hash.c, hash.h: Add hash_find_elem to get the hash element.

	This will be used in the following patch for directly manipulating
	the label counter.

2017-01-28 18:47 -0800  David Champion  <dgc@bikeshed.us>  (169b67b5b666)

	* hash.c, hash.h: Add reentrant hash_walk() function for iterating
	down a hash table.

2017-01-28 18:47 -0800  Kevin McCarthy  <kevin@8t8.us>  (95b892b3f856)

	* commands.c, copy.c, curs_main.c, functions.h, headers.c, pager.c:
	Minor fixes to the x-label patch from David.

	Add L10N comment to sort menu. Mark a couple strings for
	localization.

	Use ascii_strncasecmp() for the X-Label header comparison.

	Simplify label_message() using mutt library routines.

	Bind label editing to "Y" instead of "y". "y" is already used in the
	default sample muttrc to display mailboxes.

2017-01-28 18:47 -0800  David Champion  <dgc@bikeshed.us>  (67525605640e)

	* OPS, commands.c, copy.c, copy.h, curs_main.c, doc/manual.xml.head,
	functions.h, headers.c, imap/imap.c, init.h, mh.c, mutt.h, pager.c,
	protos.h, sort.c, sort.h: Adds capability to edit x-labels inside
	mutt, and to sort by label.

2017-01-24 15:33 -0800  Kevin McCarthy  <kevin@8t8.us>  (e4ad1dc9bfbd)

	* doc/manual.xml.head, init.c: Allow "unsubjectrc *" to remove all
	patterns.

	Thanks to Aaron Schrab for the original patch.

2017-01-23 19:01 -0800  David Champion  <dgc@bikeshed.us>  (9e876d64d3c8)

	* doc/manual.xml.head, globals.h, hdrline.c, init.c, init.h, mutt.h,
	muttlib.c: Add subjectrx command to replace matching subjects with
	something else.

	This lets you define regular expressions-replacement pairs for
	subject display. When a Subject: matches the regular expression, the
	replacement value will be displayed instead in the message index.
	Backreferences are supported.

	This is especially nice for simplifying subjects that are overly
	wordy, such as mailing list posts (with [Listname] tags, etc), mail
	from ticketing systems or bug trackers, etc. It lets you reduce
	clutter in your mutt display without altering the messages
	themselves.

2017-01-23 19:01 -0800  David Champion  <dgc@bikeshed.us>  (f05df6b258f3)

	* globals.h, hcache.c, init.c, mutt.h, muttlib.c, protos.h: Abstract
	the SPAM_LIST as a generic REPLACE_LIST

	REPLACE_LIST can be used more generally as a list of pattern match-
	replace settings. SPAM_LIST was a special case of this, so spam
	handling has been been changed to use REPLACE_LIST instead, and
	SPAM_LIST was removed.

	A generic function for performing a REPLACE_LIST replacement has
	been added in mutt_apply_replace().

	Commited by Kevin McCarthy with some buffer overflow fixes in
	mutt_apply_replace().

2017-01-23 18:46 -0800  Kevin McCarthy  <kevin@8t8.us>  (7a8ea1bb09f0)

	* send.c: Improve Reply-to vs From comparison when replying. (closes
	#3909)

	Prior to this patch, if the Reply-to mailbox matched the From
	mailbox, mutt would always use the From address. This was probably
	done to preserve the display name, as the Reply-to address is often
	missing one.

	Unfortunately, there are circumstances where the Reply-to display-
	name has significance, such as in ticket 3909.

	Change mutt so that it only uses the From address if the Reply-To
	has no display-name.

2017-01-19 14:58 -0800  Kevin McCarthy  <kevin@8t8.us>  (b57c695b7923)

	* doc/manual.xml.head, init.h, sidebar.c, sort.h: Fix sidebar
	references to the "new count" to be "unread". (closes #3908)

	%N in $sidebar_format and "new"in $sidebar_sort_method actually use
	the unread message count. Update the documentation to mention that.

	Add an "unread" method to $sidebar_sort_method, but preserve "new"
	for compatibility.

	Change the SORT_COUNT_NEW constant to SORT_UNREAD, so the code is
	also consistent with the meaning.

	Thanks to cri for reporting the problem and suggesting where to fix
	it in the code.

2017-01-17 16:09 -0800  Kevin McCarthy  <kevin@8t8.us>  (a555ada578b8)

	* addrbook.c, alias.c, init.c: Fix several alias hashtable issues.

	Convert to use the strdup keys hash. Addresses can be converted back
	and forth from intl to local forms. This frees and recreates a new
	addr->mailbox string, resulting in the hash table key being a
	dangling pointer.

	Change alias hash table insert/remove to ensure the address is in
	intl form. The alias menu (previously) converted address entries to
	local form when performing a completion. Even with the pointer issue
	fixed, the entries may not be removed from the hash if the intl and
	local forms are different.

	Lastly, there is no reason for the alias menu to manually convert to
	local form before writing the address to the output buffer.
	rfc822_write_address() has a display parameter that will call
	mutt_addr_for_display() instead when set. Change to set the display
	parameter and remove the conversion calls.

	This last change obviates the first two changes, but they are a good
	idea in any case.

2017-01-17 16:09 -0800  Kevin McCarthy  <kevin@8t8.us>  (fc6990144167)

	* hash.c, hash.h, init.c: Add casecmp and strdup_key flags to
	hash_create()

	Aliases and (in the future), X-Label hashes will require a hash that
	strdups the key. Convert the casecmp parameter of hash_create() to a
	flags parameter, and add a flag to strdup the keys.

2017-01-15 10:00 -0800  Kevin McCarthy  <kevin@8t8.us>  (ac1a2af3aff4)

	* mx.c: Improve error handling in mbox magic detection.

	Thanks to Simon Ruderich for pointing out several small issues with
	the previous commit.

2017-01-14 19:18 -0800  David Champion  <dgc@bikeshed.us>  (945a3f4b15c7)

	* mx.c: Allow initial blank lines in local mailboxes.

	Some mailbox-creation tools erroneously append a blank line to a
	file before appending a UNIXv7-format mail message, resulting in
	mailboxes that are intended to be valid "mbox" folders but are not.
	Notably old versions of Mailman do this, making archive files that
	cannot be read by mutt.

	This patch causes mutt to skip leading NLs and CRs when detecting
	magic.

2017-01-10 14:48 -0800  Simon Ruderich  <simon@ruderich.org>  (79306170e367)

	* doc/manual.xml.head, doc/muttrc.man.head: Fix minor documentation
	issues.

	manual.xml: Wrap line for clarity.

	muttrc.man: Remove superfluous spaces in brackets. Add missing error
	object in color command. Sort the prompt object. Add sidebar color
	objects.

2017-01-06 14:37 -0800  Kevin McCarthy  <kevin@8t8.us>  (7c0e7a0769e4)

	* imap/command.c: Convert cmd_parse_search to use the uid hash.
	(closes #3905)

	Replace the linear scan for each result with a hash lookup. This
	should greatly improve performance for large mailboxes.

2017-01-06 14:23 -0800  Kevin McCarthy  <kevin@8t8.us>  (1ad1013cbf5b)

	* imap/imap.c, imap/imap_private.h, imap/message.c: Create a uid hash
	for imap. (see #3905)

	This hash will allow for more efficient UID SEARCH processing,
	replacing a linear scan with a hash lookup.

2017-01-06 14:17 -0800  Kevin McCarthy  <kevin@8t8.us>  (ebb93147aec7)

	* hash.c, hash.h, thread.c: Convert HASH to be indexable by unsigned
	int. (see #3905)

	Convert the HASH to be usable for either string or unsigned int
	keys, so that a uid hash can be added for imap.

	To keep hash-usage code disruption to a minimum, this introduces new
	create/insert/find/delete functions for the int hash, but keeps the
	old function names for string keys.

	This implementation makes the key a union. It may have been a better
	idea to introduce a whole new structure, but this way allows minimum
	changes to and maximum reuse of the existing hash code.

2017-01-04 19:45 -0800  Kevin McCarthy  <kevin@8t8.us>  (4f0a84b954ef)

	* imap/command.c: Fix imap server-side search to call uid2msgno() only
	once. (see #3905)

	After performing a UID SEARCH, the results are parsed in
	cmd_parse_search(). This was accidentally calling uid2msgno() twice.
	Since that function does a linear search, this has a noticable
	impact on large search results.

2017-01-02 18:08 -0800  Kevin McCarthy  <kevin@8t8.us>  (23b02a482bde)

	* curs_main.c, hook.c, mutt.h, pattern.c, protos.h, score.c: Add a
	pattern_cache_t to speed up a few repeated matches.

	Vincent Lefèvre reported experiencing an index display performance
	issue. This occurred with messages containing many recipients. He
	had many index color lines containing ~l. The ~l ended up being run
	over and over on these messages, resulting in a noticable slowdown
	displaying the index.

	This patch adds caching for just a few of the pattern operations
	(~l, ~u, ~p, ~P) that are potentially expensive and also don't have
	arguments. The caching is only enabled for operations repeatedly
	matching against the same message: color, hooks, scoring.

	The caching is fairly targeted, but isn't that invasive or
	complicated.

2016-12-31 19:57 -0800  Kevin McCarthy  <kevin@8t8.us>  (2bc2ec9ac664)

	* crypt-gpgme.c: Canonicalize line endings for GPGME S/MIME
	encryption. (closes #3904)

	This matches the behavior for S/MIME classic mode: OpenSSL converts
	the line endings to cr/lf before encrypting. Although Mutt always
	canonicalizes the line endings before verifying the signature, some
	clients do not do this for encrypted messages.

	Thanks to cooler for the patch!

2016-12-27 15:23 -0800  Kevin McCarthy  <kevin@8t8.us>  (4cb0cd767af2)

	* globals.h, hdrline.c, init.h, status.c: Make to_chars and
	status_chars accept mulitibyte characters. (closes #3024)

	Change Tochars and StChars to use the mbchars_table type introduced
	in the last commit.

2016-12-27 15:23 -0800  Kevin McCarthy  <kevin@8t8.us>  (1d054932abfb)

	* doc/makedoc.c, init.c, init.h, mutt.h: Create mbchar_table type for
	multibyte character arrays. (see #3024)

	This type is to allow multibyte characters in to_chars and
	status_chars while preserving efficient indexing to each character.

	The arrays are tokenized during initialization, and are re-tokenized
	as the values are unset, reset, and set.

2016-12-25 23:31 +0100  Vincent Lefevre  <vincent@vinc17.net>  (1303567a6ad1)

	* doc/manual.xml.head: In the manual, replaced 2 para by example
	(similar to the first example).

2016-12-13 12:19 -0800  David Champion  <dgc@bikeshed.us>  (b112fd7061fb)

	* curs_main.c, init.h, mutt.h: Add option to control whether threads
	uncollapse when new mail arrives.

	Adds $uncollapse_new: when set, the default, a collapsed thread into
	which a new message arrives will be uncollapsed to reveal the new
	message.

2016-12-13 12:02 -0800  Richard Russon  <rich@flatcap.org>  (1f04f9145eb1)

	* OPS: Remove unused OPS

	OP_MAIN_FIRST_MESSAGE and OP_MAIN_LAST_MESSAGE were added to the
	code 19 years ago. They weren't used then; they haven't been used
	since.

2016-12-13 11:16 -0800  Michał Kępień  <mutt@kempniu.pl>  (b985c324932b)

	* mutt_ssl.c: Rework OpenSSL certificate verification to support
	alternative chains. (closes #3903)

	The way Mutt currently verifies SSL certificates using OpenSSL does
	not support alternative chains, which may cause confusion when some
	popular mail providers (e.g. Gmail) are used with specific sets of
	trusted CA certificates.

	Replace the "manual" verification done by mutt in
	check_certificate_by_signer() with SSL_set_verify() using a
	callback. OpenSSL then does the certificate verification, including
	properly looking at alternative chains. The callback still provides
	the opportunity to override using ~/.mutt_certificates or an
	interactive prompt.

2016-12-11 18:56 -0800  David Champion  <dgc@bikeshed.us>  (8a23708d978b)

	* doc/manual.xml.head, init.c, init.h, main.c, system.c: Add
	setenv/unsetenv commands.

	These can be used to add and remove environment variables passed to
	children via mutt_system().

	Commited by Kevin McCarthy with some cleanup.

2016-12-06 19:07 -0800  Kevin McCarthy  <kevin@8t8.us>  (df1d1e379477)

	* doc/manual.xml.head: Move '@' pattern modifier documentation to the
	right section.

	Somehow, the patch got out of date and the documentation shifted to
	another section. Relocate back to the "Pattern Modifier" section.

2016-12-04 16:04 -0800  Kevin McCarthy  <kevin@8t8.us>  (d930e39ec095)

	* merge stable

2016-12-04 16:03 -0800  Kevin McCarthy  <kevin@8t8.us>  (b9d34372a940)

	* .hgsigs: mutt-1.7.2 signed

2016-12-04 16:01 -0800  Kevin McCarthy  <kevin@8t8.us>  (954f9049e4b3)

	* .hgtags: Added tag mutt-1-7-2-rel for changeset 99f5624d1f52

2016-12-04 16:01 -0800  Kevin McCarthy  <kevin@8t8.us>  (99f5624d1f52)

	* ChangeLog, UPDATING, VERSION: automatic post-release commit for
	mutt-1.7.2

2016-12-04 15:41 -0800  Kevin McCarthy  <kevin@8t8.us>  (a17189b58284)

	* crypt-gpgme.c, mutt_ssl.c: merge stable

2016-11-26 00:57 +0100  Vincent Lefevre  <vincent@vinc17.net>  (a0a970530a8b)

	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-gpgme.c: Fix build
	failure with GPGME 1.8: do not steal the gpgme_ prefix.

2016-11-19 19:35 -0800  Kevin McCarthy  <kevin@8t8.us>  (10c4761cea89)

	* mutt_ssl.c: More openssl1.1 fixes: remove uses of X509->name in
	debugging. (closes #3870)

	X509->name was a shortcut for the longer name = X509_NAME_oneline
	(X509_get_subject_name (cert), buf, sizeof (buf)); invocation.
	Change the debugging to print the cert name and chain names in the
	ssl_check_certificate() loop instead.

2016-09-07 20:00 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (2c1d79d3edd5)

	* configure.ac, mutt_ssl.c: Fix openssl 1.1 compilation issues.
	(closes #3870)

	With these changes, Mutt will no longer compile for versions less
	than 0.9.6.

2016-12-03 15:24 -0800  Kevin McCarthy  <kevin@8t8.us>  (d6c10244793f)

	* sidebar.c: Change sidebar_spoolfile coloring to be lower precedence.

	Give sidebar_new and sidebar_flagged higher precedence than
	sidebar_spoolfile, so that new and flagged message colors will show
	up for the spoolfile in the sidebar.

	Thanks to Till Smejkal for the original patch.

2016-11-29 17:48 -0800  Kevin McCarthy  <kevin@8t8.us>  (d72caeecf4af)

	* curs_main.c: Return to pager upon aborting a jump operation. (closes
	#3901)

2016-11-29 17:44 -0800  Kevin McCarthy  <kevin@8t8.us>  (1196c859942e)

	* lib.h, mutt_ssl.c: Add mutt_array_size macro, change
	interactive_check_cert() to use it. (see #3899)

	While I have reservations about the construct, it does make the
	interactive_check_cert() menu->max and part loop less fragile.

2016-11-29 17:44 -0800  Kevin McCarthy  <kevin@8t8.us>  (1a2dc7b21b5b)

	* mutt_ssl.c: Improve openssl interactive_check_cert. (closes #3899)

	Don't use X509_NAME_oneline() with a fixed size buffer, which could
	truncate the string, perhaps leaving off the CN field entirely.
	Instead, work directly off the X509_NAME.

	Rather than use strstr to tokenize it, call
	X509_NAME_get_text_by_NID() with the nid types. Although
	X509_NAME_get_text_by_NID() is "legacy", it is the most directly
	useful for mutt in this simple interactive prompt.

	The function was set up to include the ST and C fields in the
	prompt, but the loop limit was too low. I believe this was an
	oversight, so increase the loop to include those two fields.

2016-11-26 00:57 +0100  Vincent Lefevre  <vincent@vinc17.net>  (84ad86e8b8ab)

	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-gpgme.c: Fix build
	failure with GPGME 1.8: do not steal the gpgme_ prefix.

2016-11-22 03:48 +0100  Vincent Lefevre  <vincent@vinc17.net>  (b22c5d0e299d)

	* mutt_ssl.c: Corrected comment.

2016-11-21 18:03 -0800  Kevin McCarthy  <kevin@8t8.us>  (65f180f2904f)

	* mutt_ssl.c: Revert db13010a2e8d but add a comment. (see #3870)

	X509_NAME_oneline() always NULL-terminates the string, even when it
	has to truncate the data to fit in buf.

2016-11-21 23:10 +0100  Vincent Lefevre  <vincent@vinc17.net>  (db13010a2e8d)

	* mutt_ssl.c: Make sure that the output of X509_NAME_oneline is null-
	terminated.

2016-11-20 16:19 -0800  Kevin McCarthy  <kevin@8t8.us>  (c770d2fa615b)

	* mutt_tunnel.c: Minor resource and error logic cleanup in
	tunnel_socket_open()

	Free the conn->sockdata on failure. conn->fd is not set until the
	bottom, and before it is set, conn->conn_close() will not be called.

	Close the pin pipe if the pout pipe fails.

	Call mutt_perror first on a fork failure. Calling after the close()
	may cause errno to be changed on a close failure.

2016-11-20 16:19 -0800  Kevin McCarthy  <kevin@8t8.us>  (b319ec2dc93a)

	* mutt_tunnel.c: Don't close stderr when opening a tunnel. (closes
	#3726)

	Instead of closing stderr, redirect it to /dev/null in
	tunnel_socket_open(). Otherwise a program can accidentally open a
	file into handle 2 and then unknowingly use that when trying to
	print to stderr.

	Thanks to lotheac for the original patch, which I just modified
	slightly.

2016-11-19 19:35 -0800  Kevin McCarthy  <kevin@8t8.us>  (695243ba6374)

	* mutt_ssl.c: More openssl1.1 fixes: remove uses of X509->name in
	debugging. (closes #3870)

	X509->name was a shortcut for the longer name = X509_NAME_oneline
	(X509_get_subject_name (cert), buf, sizeof (buf)); invocation.
	Change the debugging to print the cert name and chain names in the
	ssl_check_certificate() loop instead.

2016-11-20 01:41 +0100  Vincent Lefevre  <vincent@vinc17.net>  (d14ffd58d976)

	* po/fr.po: Updated French translation.

2016-11-18 15:54 -0800  Kevin McCarthy  <kevin@8t8.us>  (4bed0172c27b)

	* OPS, curs_main.c, functions.h: Fix mark-message translation and
	keybind menu.

	Move the OP_MARK_MESSAGE and hotkey macro from MENU_GENERIC to the
	MENU_MAIN keymap. Putting the macro under generic prevents it from
	overriding a keybinding in the index (even if the function is bound
	to noop). Additionally, the macro can only be executed from the
	index, so it doesn't make sense as a generic keybinding.

	Use the term "hotkey" in both the OPS and km_bind description.

	Mark the km_bind description translatable.

	Add L10N messages for the new translation strings.

2016-11-18 14:20 -0800  Kevin McCarthy  <kevin@8t8.us>  (46194ca48b2f)

	* compress.c: Improve two compress translation messages.

	Change the "Error executing" to "Error running", which is used in
	multiple places elsewhere in mutt. This also removes the unnecessary
	newline.

	Remove the leading space in the "Error compressing" message, and
	change it to match the error message in editmsg.c.

2016-11-18 18:17 +0100  Vincent Lefevre  <vincent@vinc17.net>  (174062d0abed)

	* po/fr.po: Updated French translation.

2016-11-18 17:00 +0100  Vincent Lefevre  <vincent@vinc17.net>  (8fa4965beb62)

	* curs_main.c: Make a string translatable.

2016-11-18 16:59 +0100  Vincent Lefevre  <vincent@vinc17.net>  (c15cacbfabe5)

	* smime.c: Make a string translatable. Add a missing space at the end.

2016-11-18 13:07 +0100  Vincent Lefevre  <vincent@vinc17.net>  (c1befb06b4bd)

	* po/fr.po: Updated French translation (except for 1 string).

2016-11-18 12:32 +0100  Vincent Lefevre  <vincent@vinc17.net>  (211afb39a22a)

	* INSTALL: Updated requirement on the C compiler.

2016-11-17 17:54 -0800  Kevin McCarthy  <kevin@8t8.us>  (fa32396b5e26)

	* init.c: Revert changes made to mutt_find_cfg() in 3c6d322912e3

	The usage of MUTT_VERSION in mutt_find_cfg() was fine before the
	commit: it wasn't using MUTT_VERSION inlined into a string with
	format string substitution.

	Revert to the version of mutt_find_cfg() before that changeset.

2016-11-17 15:57 -0800  David Champion  <dgc@bikeshed.us>  (022b604bc46d)

	* OPS, curs_main.c, doc/manual.xml.head, functions.h, globals.h,
	init.h: Adds <mark-message> binding to create "hotkeys" for
	messages.

	<mark-message>foo<enter> will create a new macro "'foo" which will
	return to the current message by searching for that message's
	message id. The initial character of the macro is defined by
	$mark_macro_prefix, and defaults to "'" for verisimilitude vs. vi.

	Pushed by Kevin McCarthy with a minor fix.

2016-11-17 15:07 -0800  Kevin McCarthy  <kevin@8t8.us>  (3c6d322912e3)

	* commands.c, compose.c, dotlock.c, init.c, muttlib.c, status.c:
	Backout inlining of MUTT_VERSION in 42fee7585fae.

	If MUTT_VERSION contains a %, this will result in problems.

2016-11-16 16:05 -0800  David Champion  <dgc@bikeshed.us>  (91b3449f426b)

	* doc/manual.xml.head, mutt.h, pattern.c: Adds the '@' pattern
	modifier to limit matches to known aliases.

	Example: ~f joe matches messages from joe. @~f joe matches messages
	from any joe who is defined as an alias.

	Pushed by Kevin McCarthy with two minor cosmetic fixes.

2016-11-16 15:43 -0800  David Champion  <dgc@bikeshed.us>  (03aa03293c1d)

	* flags.c, init.h, mh.c, mutt.h: When $flag_safe is set, flagged
	messages cannot be deleted.

	This saves them from bulk operations on threads and tagged messages.
	To remove a flagged message, first unflag it.

2016-11-15 12:04 -0800  Kevin McCarthy  <kevin@8t8.us>  (5382e1e4cee1)

	* muttbug.sh.in: Fix muttbug to check $XDG_CONFIG_HOME.

	Fall back to $HOME/.config if $XDG_CONFIG_HOME is not set.

2016-11-15 12:03 -0800  Kevin McCarthy  <kevin@8t8.us>  (0ef0f4d15f75)

	* init.c: Fix loop terminator in in mutt_find_cfg().

	Keep searching even if home is NULL.

2016-11-14 11:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (c78753f98e34)

	* doc/makedoc-defs.h: Ensure the compressed documentation is always
	built.

	Add USE_COMPRESSED to makedoc-defs.h so any conditional
	documentation will always be built.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (99a3ff6555d9)

	* compress.c: Compress: check mailbox type if possible when appending.

	If an append hook isn't defined, then mutt has to decompress the
	mailbox. In that case, we can check the type of the decompressed
	mailbox instead of defaulting to DefaultMagic.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (cad0051417eb)

	* compress.c, doc/manual.xml.head: Compress: escape single quotes when
	invoking the compress/decompress commands.

	The format strings are placed in single quotes. mutt_system()
	invokes sh, so escape the single quotes using bourne-shell syntax:
	'\''

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (a51f1c8a038a)

	* compress.c: Compress: fix check_mailbox and sync_mailbox.

	Change check_mailbox to delegate to the child_ops->check_mailbox if
	the compressed mailbox has changed. This allows the mailbox to
	properly recover if both the decompressed mailbox and compressed
	file have changed.

	Change sync_mailbox to call check_mailbox before attempting to sync.
	This will prevent overwriting external changes to the compressed
	mailbox.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (0a7054904b5b)

	* compress.c, compress.h, imap/imap.c, mbox.c, mh.c, mutt.h, mx.c,
	mx.h, pop.c, pop.h: Create mx_ops.sync operation. Refactor compress
	to use the mx_ops.sync.

	Change compress.sync_mailbox() to lock the compressed mailbox around
	both the tempfile sync and compress operations. This will prevent
	changes made inbetween the two syncs from being overwritten.

	Thanks to Damien Riegel for his original patch refactoring
	mx_ops.sync, which this patch is partially based upon.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (05f6bd8532ea)

	* compress.c: Compress: pull the lock/unlock operations into the
	open,close,sync operations.

	Some operations, such as open_append and sync, need an exclusive
	lock across a longer period than a single compress/decompress.
	Remove it from the execute_command and pull into the outer callers.
	Store lock information inside compress_info.

	Sync and check_mailbox need more fixes, which will be addressed in
	subsequent patches.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (b1366f49c7b7)

	* compress.c: Compress: safe_fopen() the tempfile, to prevent tempfile
	attacks.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (7c055cc893dc)

	* compress.c: Compress: add delegate calls to open_append and close
	mx_ops functions.

	The open_append and close were partially duplicating mbox
	open_append and close operations internally. Change it to call the
	actual delegate functions instead.

	Inline the open_read() function inside open_mailbox(). Having it
	split improved nothing and just complicated the code (i.e. added
	error-handling checks in open_mailbox() that in reality could not
	fail).

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (d1ff983c9bcb)

	* compress.c, compress.h, mx.c: Compress: fix several logic and memory
	bugs.

	setup_paths leaks memory: realpath is already set in
	mx_open_mailbox()

	restore_paths is unneeded. mx_fastclose_mailbox() will free stuff,
	and nothing is looking at the path once we are closing or aborting.

	Make a copy of the hooks. Otherwise 'unhook *' will leave dangling
	pointers.

	Add compress_info freeing inside mx_fastclose_mailbox(). Only free
	inside compress.c when we want to prevent close() from doing
	anything.

	close_mailbox() didn't preserve ctx->path on error.

	execute_command() didn't return an error if the mutt_system()
	command failed.

	mx_open_mailbox_append() should check mutt_comp_can_append() only
	for the case that the mailbox doesn't exist. When it exists,
	mx_get_magic() has already looked at the file contents before
	checking for matching open_hooks.

	In open_append_mailbox() if no append hook is defined, it should't
	call ci->open() if the mailbox doesn't exist. It should act just
	like append and create a temporary file.

	check_mailbox() needs more work. For now, at least have it properly
	close the mailbox on error.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (c9c120d988a8)

	* commands.c: Compress: remove buffy stats "improvisation".

	Mutt doesn't support polling compressed mailboxes. This code creates
	a false impression and dirties mutt_save_message() in the process. I
	don't like it, so am taking it out.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (290631db373e)

	* compress.c, compress.h, hook.c, mx.c: Compress: prefix external
	functions with "mutt_"

	Also, include compress.h in compress.c so the mx_comp_ops doesn't
	need to be redeclared.

2016-11-13 20:02 -0800  Kevin McCarthy  <kevin@8t8.us>  (ad519d4b356c)

	* Makefile.am, commands.c, compress.c, compress.h, configure.ac,
	contrib/Makefile.am, contrib/sample.muttrc-compress, curs_main.c,
	doc/Muttrc.head, doc/manual.xml.head, doc/muttrc.man.head, hook.c,
	init.h, main.c, mutt.h, mx.c, mx.h, po/POTFILES.in, po/de.po,
	status.c: Compress patch from the neomutt repository.

	With the following changes:
	- po/de.po changes trimmed to just the compress additions.

	- Move the sample muttrc to contrib, and add it to the Makefile.am
	so it is distributed. Remove the sample vimrc.

	- Remove extra fluff from manual.

	Thanks to Roland Rosenfeld for the original patch, and to the
	NeoMutt team for their work cleaning up the patch.

2016-11-13 18:45 -0800  Damien Riegel  <damien.riegel@gmail.com>  (42fee7585fae)

	* commands.c, compose.c, dotlock.c, init.c, muttbug.sh.in, muttlib.c,
	status.c: search muttrc file according to XDG Base Specification
	(closes #3207)

	First of all, the MUTT_VERSION symbol is now concatenated (when
	possible) at compile time.

	Then, the logic to find the config file has been changed a bit to
	remove unnecessary calls to access(), so now each possible locations
	for the config file is only tested once, and it stops as soon as a
	valid one has been found. So instead of:

	 access("/home/dkc/.muttrc-1.7.1", F_OK) = -1 ENOENT (No such file
	or directory) access("/home/dkc/.muttrc", F_OK) = 0
	access("/home/dkc/.muttrc", F_OK) = 0 access("/home/dkc/.muttrc",
	F_OK) = 0 [... Tests for Muttrc ... ] access("/home/dkc/.muttrc",
	F_OK) = 0

	We now have:

	 access("/home/dkc/.muttrc-1.7+13 (f658e517960e)", F_OK) = -1 ENOENT
	(No such file or directory) access("/home/dkc/.muttrc", F_OK) = 0

	It also cleans up the case where -F is passed on the command line
	but points to a non-existent file by moving the error path closer to
	the actual fail condition.

	Finally, it adds partial support for the XDG Base Directory
	Specification. mutt will now try to locate its config at:

	 $XDG_CONFIG_HOME/mutt/muttrc-MUTT_VERSION
	$XDG_CONFIG_HOME/mutt/muttrc.

	If XDG_CONFIG_HOME is not set, it will use '~/.config' as a default.

2016-11-08 12:42 -0800  Kevin McCarthy  <kevin@8t8.us>  (d18482f6641e)

	* mbox.c, mx.c: Move mbox close-append logic inside
	mbox_close_mailbox().

	The mx_fastclose_mailbox() calls mx_ops->close(), which invokes
	mbox_close_mailbox().

	Also, close the ctx->fp inside mbox_close_mailbox(). This way, the
	(to be added) compress logic can call the mx_ops->close() instead of
	"knowing" to close the fp before recompressing.

	mx_fastclose_mailbox() will safe_fclose() the fp again, but I'm
	leaving it there just in case I missed a usage of the fp in some
	other part of the code.

	Thanks to Damien Riegel for the original patch.

2016-11-07 18:10 -0800  Kevin McCarthy  <kevin@8t8.us>  (d0078268768d)

	* recvattach.c: Chain %d->%F->%f in the attachment menu.

	Previously, %d would use %f if there was no description set.

	Place the new %F option in between %d and %f. This way, %d will fall
	back on %F, which will fall back on %f. This allows the standard
	attachment menu to show d_filename.

	This is useful for forwarding attachments or editing draft files
	with attachments. In these cases the actual filename is sanitized
	but the attachment name is preserved in d_filename.

2016-11-07 18:10 -0800  Damien Riegel  <damien.riegel@gmail.com>  (82e566d393cf)

	* OPS, compose.c, functions.h: compose: add operation to rename an
	attachment

	As opposed to rename-file, which actually renames the underlying
	file of the attachment, rename-attachment puts a value in
	d_filename, which is used in the Content-Disposition header.

2016-11-07 18:06 -0800  Damien Riegel  <damien.riegel@gmail.com>  (a9e7402af4de)

	* init.h, recvattach.c: attach_format: add new %F placeholder

	This new placeholder allows to print the attachment name as it will
	be seen on the recipient side.

2016-11-03 15:49 -0700  Kevin McCarthy  <kevin@8t8.us>  (45023e44c92c)

	* mutt.h: Define PATH_MAX, it's missing on the GNU Hurd. (closes
	#3815)

	I believe this patch originally came from Debian.

	Modified based on a suggestion from Fabian Groffen.

2016-11-03 10:17 +0100  Vincent Lefevre  <vincent@vinc17.net>  (ce07aa118214)

	* configure.ac: Fixed issue from changeset 4da647a80c55. (closes
	#3892)

	Shell variables cannot be used in the first argument of
	AC_CHECK_HEADERS.

2016-11-02 18:54 -0700  Kevin McCarthy  <kevin@8t8.us>  (0e0d54b5a384)

	* date.c: Attempt to silence a clang range warning. (closes #3891)

	When TM_YEAR_MAX > INT_MAX, clang complains the comparison is always
	false.

	Note that this is really a compiler bug, which was fixed by gcc 9
	years ago. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12963

	Thanks to Vincent Lefèvre for the suggested fix and the gcc bug
	reference.

2016-11-02 18:27 -0700  Kevin McCarthy  <kevin@8t8.us>  (4da647a80c55)

	* configure.ac: Make ncurses and ncursesw header checking the same.

	Previously, ncurses.h wasn't searched for directly in the include
	directory for ncursesw.

	Also, fix a test in case $withval is empty.

	Thanks to Sylvain Bertrand for the original patch.

2016-10-31 20:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (b45bfce1bb0e)

	* Makefile.am, configure.ac: Add a --disable-doc configuration option.

	This allows mutt to be built without the documentation.

	Thanks to Sylvain Bertrand for the original patch.

2016-10-23 15:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (f46ed1718cb4)

	* attach.c, recvattach.c: Perform charset conversion on text
	attachments when piping. (closes #3773) (see #3886)

	When piping a text attachment, there is no reliable way to know the
	charset used.

	Vincent Lefèvre says: It was decided in the past that when there is
	no information on the charset in a transmission to an external
	command (e.g. as for mail composing), texts are expected to be
	transmitted in the local charset.

	Add a MUTT_CHARSET flag to enable charset conversion on text
	attachments for both when $attach_split is set and unset.

2016-10-23 14:49 -0700  Kevin McCarthy  <kevin@8t8.us>  (688ecc6d5a8d)

	* pager.c: merge stable

2016-10-23 14:46 -0700  Kevin McCarthy  <kevin@8t8.us>  (c6704c7f8e23)

	* pager.c: Fix pager segfault when lineInfo.chunks overflows. (closes
	#3888)

	The reporter had an html attachment with extremely long lines,
	combined with a color pattern of "color body default default ." This
	overflowed the lineInfo.chunks, causing a segfault.

	Abort the body color patterns if this happens.

2016-10-23 13:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (40cf141c7383)

	* merge stable

2016-10-23 13:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (a8203b4463c1)

	* date.c: Prevent an integer overflow in mutt_mktime() (closes #3880)

	Check to make sure the year passed in isn't bigger than can be
	represented using time_t on the platform.

	Also add a (time_t) cast to an intermediate "years * 365"
	calculation to prevent an overflow there.

	Thanks to TAKAHASHI Tamotsu for his patch, and to Vincent Lefèvre
	for his improvement. I merely took their code and commited it.

2016-10-20 10:30 +0200  Vincent Lefevre  <vincent@vinc17.net>  (8e270c698bfb)

	* po/fr.po: Updated French translation.

2016-10-19 13:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (77de473642cb)

	* OPS, curs_main.c, functions.h, protos.h, thread.c: Add root-message
	function to jump to root message in thread.

	This seems like a useful feature that was brought up for discussion
	on mutt-users. Proposed solutions involved collapsing/uncollapsing
	threads, but it's not hard to modify the mutt_parent_message()
	function to return the root instead.

2016-10-17 11:23 -0700  Kevin McCarthy  <kevin@8t8.us>  (1acabd35d9a3)

	* crypt-gpgme.c: merge stable

2016-10-17 11:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (113b73b0b616)

	* crypt-gpgme.c: Actually fix gpgme segfault in
	create_recipient_set().

	Changeset 6e44bfa16096 did not fix the segv. (Sorry, I made the fix
	based off a report on IRC but didn't trigger the segv myself: it was
	caused by an out-of-tree patch).

	The actual problem was that the rset was only resized on a
	successful gpgme_get_key(). However, on error, the array still needs
	to be NULL-terminated before calling free_recipient_set().

	Move the resize so it always takes place. This obviates the need for
	the NULL check added in 6e44bfa16096.

2016-10-16 15:44 -0700  Kevin McCarthy  <kevin@8t8.us>  (18c3db1aa8c4)

	* sidebar.c: Change sidebar to only match $folder prefix on a
	$sidebar_divider_char. (closes #3887)

	The reporter had a $spoolfile of ~/Mailbox and a $folder of ~/Mail.
	The sidebar was truncating the spoolfile to "ox" because it only
	looked at a substring prefix match.

2016-10-16 15:14 -0700  Kevin McCarthy  <kevin@8t8.us>  (7e174b2fcbe1)

	* merge stable

2016-10-16 15:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (783dce6dfcd4)

	* sidebar.c: Use mutt_strlen and mutt_strncmp in sidebar.c.

	This prevents a segv if folder is unset.

2016-10-16 14:17 -0700  Kevin McCarthy  <kevin@8t8.us>  (023181b27fb6)

	* crypt-gpgme.c: merge stable

2016-10-16 14:16 -0700  Kevin McCarthy  <kevin@8t8.us>  (6e44bfa16096)

	* crypt-gpgme.c: Fix gpgme segfault in create_recipient_set().

	If gpgme_get_key() errors on the first key, the rset will not be
	allocated yet. Attempting to null-terminate (and then free) the
	array causes a segfault.

2016-10-15 14:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (2a6bfdb9f869)

	* url.c: Allow IPv6 literal addresses in URLs. (closes #3681)

	RFCs 2732 and 3986 specify a literal IPv6 address be surrounded by
	"[]".

	This patch removes the "[]" delimiters when parsing the URL, but
	adds them back in url_ciss_tostring() if the host name contains a
	':'.

	Thanks to Evgeni Golov for the original patch.

2016-10-12 18:10 -0700  Kevin McCarthy  <kevin@8t8.us>  (a3e35631b503)

	* init.h, sendlib.c: Handle presence of '--' delimiter in $sendmail.
	(closes #3168)

	If the delimiter exists, additional sendmail flags will be inserted
	before the delimiter. Any arguments after the delimiter will be
	preserved as recipients.

2016-10-11 19:42 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (7c0995a61268)

	* crypt-gpgme.c: Fix GPGME signature zero timestamp and locale
	awareness issues. (closes #3882)

	GPGME signature information has two minor problems.

	[-- Begin signature information --]
	*BAD* signature from: Name <user@example.com> aka: Name
	<user@example.org> created: Thu Jan 1 09:00:00 1970 [-- End
	signature information --]

	First, the created timestamp is incorrect when the message is not
	verified successfully.

	Second, as the code itself has some "TODO" comments, "aka" and
	"created" lines are not properly-aligned when LC_MESSAGES !=
	English.

2016-10-10 18:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (33d16ccba4cf)

	* pop_auth.c: Add a few explanatory comments to pop_auth_sasl(). (see
	#3862)

2016-10-10 16:33 -0700    <g1pi@libero.it>  (a9764761b692)

	* pop_auth.c: Fix POP3 SASL authentication mechanism DIGEST-MD5.
	(closes #3862)

	sasl_client_step() returns SASL_OK after the fourth step: server
	auth confirmation. However, the protocol requires the client send
	one more blank line to the server, to which the server then replies
	with "+OK". See https://tools.ietf.org/html/rfc5034#section-6.

	The code currently only sends a final response if sasl_client_step
	returns data to send. Change it to always send a final client
	message after the SASL_OK.

2016-10-08 13:24 -0700  Kevin McCarthy  <kevin@8t8.us>  (4bcc3a12cc4d)

	* po/cs.po: merge stable

2016-10-08 12:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (58f4b38312bf)

	* .hgsigs: mutt-1.7.1 signed

2016-10-08 12:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (e8d9ae6f41d3)

	* .hgtags: Added tag mutt-1-7-1-rel for changeset 0ce5f9bff1fd

2016-10-08 12:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (0ce5f9bff1fd)

	* ChangeLog, UPDATING, VERSION, po/bg.po, po/ca.po, po/cs.po,
	po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po,
	po/eu.po, po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po,
	po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po,
	po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po,
	po/zh_CN.po, po/zh_TW.po: automatic post-release commit for
	mutt-1.7.1

2016-10-06 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (323e3d6e5e4c)

	* imap/imap.c: Mark IMAP fast-trash'ed messages as read before
	copying. (see #3860)

	Regular copying/saving messages in mutt via a UID COPY first calls
	imap_sync_message(). However that function is designed to sync all
	flags (including deleted), and so isn't useful for the fast-trash
	code.

	As an easier solution, instead add a UID STORE to set \\Seen for the
	same msgset as the trashed messages.

2016-10-05 15:04 -0700  Petr Pisar  <petr.pisar@atlas.cz>  (227211e0e84c)

	* po/cs.po: Updated Czech translation.

2016-10-04 11:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (8262503d1991)

	* muttlib.c: merge stable

2016-10-04 11:13 -0700  Kevin McCarthy  <kevin@8t8.us>  (5c5848dfa4ea)

	* muttlib.c: Preserve forwarded attachment names in d_filename.

	When forwarding an attachment with an non-ascii name,
	mutt_copy_body() mangles the filename when calling mutt_adv_mktemp.
	Preserve the original attachment filename in d_filename.

	Remove the double copy of b->filename, which is a memory leak.

2016-10-01 16:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (8963e77577ad)

	* crypt-gpgme.c: Ensure signatures exist when verifying
	multipart/signed emails. (closes #3881).

	TAKAHASHI Tamotsu reported that when gpg2 isn't in PATH, the
	gpgme_op_verify() won't return an error, but instead will return a
	result with no signatures.

	verify_one() was only returning an error if a signature actually
	failed, so in this case the function was defaulting to returning
	success.

	Other callers of gpgme_op_verify() check to make sure the
	result->signatures exist before processing signatures. Add a check
	for verify_one() too.

2016-10-01 13:58 -0700  Kevin McCarthy  <kevin@8t8.us>  (e0c0a2820b8b)

	* url.c: RFC2047-decode mailto url headers after RFC2822 parsing.
	(closes #3879)

	Commit 55819a7e6169 performed the RFC2047 decode before the parsing.
	This works okay for headers such as subject, but for others such as
	address fields could lead to parsing errors.

	Change to perform a decode on envelope headers after all the calls
	to mutt_parse_rfc822_line(), using the same list of fields as
	mutt_read_rfc822_header().

	Change the do_2047 parameter of mutt_read_rfc822_line() to true, so
	that user headers are decoded if needed.

2016-09-27 18:15 -0700  Kevin McCarthy  <kevin@8t8.us>  (55819a7e6169)

	* url.c: RFC2047-decode mailto header values. (closes #3879)

	RFC 6068 specifies that the header values (with the exception of
	body) may contain RFC 2047-encoded values.

2016-09-25 13:26 -0700  Kevin McCarthy  <kevin@8t8.us>  (efb8c7808715)

	* merge stable

2016-09-25 13:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (586dad383893)

	* parse.c: Reset invalid parsed received dates to 0. (closes #3878)

	The actual problem in the ticket would be solved by d3f31cf9239e
	(see #3798). However there is still the bug that Mutt considers a
	(hdr->received != 0) to be set and usable, despite not checking the
	return value of mutt_parse_date().

	Change mutt_read_rfc822_header() to unset an invalid received value
	back to 0. We don't do this inside mutt_read_rfc822_line() because
	that would cause the next received line to be parsed.

2016-09-23 16:07 -0700  Kevin McCarthy  <kevin@8t8.us>  (ca8a3451b707)

	* pager.c: Clear pager position when toggling headers.

	It doesn't make sense to try to preserve the pager position when
	toggling headers: the purpose of toggling headers is to see the
	headers in full or weeded state. So, reset the position back to the
	top.

2016-09-22 14:07 -0700  Kevin McCarthy  <kevin@8t8.us>  (87911ba95dae)

	* curs_lib.c, keymap.c: Don't abort the menu editor on sigwinch.
	(closes #3875)

	getch() will return ERR on sigwinch when timeout() is called with a
	positive value. mutt_getch() will therefore return ch==-2 for both a
	timeout and a sigwinch in this case.

	The imap code in km_dokey() exits out of the ImapKeepalive loop for
	a SigWinch, and was skipping past the check for MENU_EDITOR and
	tmp.ch==-2. Move this check below the gotkey: label so the
	ImapKeepalive loop behaves the same as the Timeout code.

	Thanks to nicop for reporting the problem and for the initial patch!

2016-09-21 18:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (f2ae8a2d6e1b)

	* merge stable

2016-09-21 18:10 -0700  Antonio Radici  <antonio@dyne.org>  (ee0fe5834195)

	* po/de.po, po/es.po, po/it.po: Mark some gpgme pgp menu keybinding
	translations as fuzzy. (closes #3874)

	Some translations for crypt-gpgme.c are marked as fuzzy but the
	keybindings attached to these translations are not, this creates
	confusions for the users who see the english message but have the
	keybindings for a message in their own language available.

	As long as the translations are fuzzy, the keybindings should stay
	fuzzy.

2016-09-21 17:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (ccd543466b9f)

	* merge stable

2016-09-21 22:51 +0200  Kevin McCarthy  <kevin@8t8.us>  (9f6e08ba6ff3)

	* mx.c: Check for NULL mx_ops in mx.c

	Eike Rathke reported this happening when in an IMAP index view the
	underlying connection was terminated, ctx->mx_ops was NULL and thus
	accessing ctx->mx_ops->check segfaulted.

	Thanks also to Eike Rathke for the initial patch, for which I
	expanded the checks to other functions.

2016-09-20 15:51 -0700  Antonio Radici  <antonio@dyne.org>  (405cbc43c3ac)

	* crypt-gpgme.c: Use body color for gpgme output. (closes #3872)

	When switching from pgp_* commands to crypt_use_gpgme=yes, Peter
	Colberg noticed that the output was colored 'brightyellow'.

	The issue is that crypt-gpgme.c uses state_attach_puts in various
	places where it should use state_puts to maintain compatibility with
	the previous behavior in pgp.c.

2016-09-20 14:01 -0700  Kevin McCarthy  <kevin@8t8.us>  (c41562a8118b)

	* crypt-gpgme.c: merge stable

2016-09-20 13:58 -0700  Antonio Radici  <antonio@dyne.org>  (8ed017079800)

	* crypt-gpgme.c: Fix gpgme segfault when querying candidates with a
	'+' in the address. (closes #3873)

	list_to_pattern() was not allocating enough space for the '+' to
	'%2B' transformation.

2016-09-07 20:00 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (821022f6c78c)

	* configure.ac, mutt_ssl.c: Fix openssl 1.1 compilation issues.
	(closes #3870)

	With these changes, Mutt will no longer compile for versions less
	than 0.9.6.

2016-09-07 19:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (a60f7d09c386)

	* doc/manual.xml.head, init.h: Add unsidebar_whitelist command.

	This pairs with the sidebar_whitelist command, and operates like the
	other "un..." list commands.

2016-09-07 18:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (485ac2438e0f)

	* doc/manual.xml.head, init.h: merge stable

2016-09-07 18:54 -0700  Kevin McCarthy  <kevin@8t8.us>  (a431c7618def)

	* doc/manual.xml.head, init.h: Fix sidebar documentation a bit.
	(closes #3859)

	Sidebar_whitelist is a command, not a variable. Also add a blurb
	about what it does.

	Fix the sort order for $sidebar_divider_char and
	$sidebar_delim_chars.

2016-09-05 19:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (3ae51b075826)

	* merge stable

2016-09-05 18:50 -0700  Kevin McCarthy  <kevin@8t8.us>  (cd127a968399)

	* contrib/Makefile.am: Add missing sidebar contrib sample files to
	dist tarball.

	I previously added the files, but neglected to add them to the
	contrib/Makefile.am file.

	Thanks to isdtor for pointing out the problem and for the original
	patch.

2016-09-05 12:44 -0700  Kevin McCarthy  <kevin@8t8.us>  (2b9689daf902)

	* merge stable

2016-09-05 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (bb25613ce8a4)

	* getdomain.c: Stub out getdnsdomainname() unless HAVE_GETADDRINFO.

	It seems unlikely there are systems without it (given that this
	mistake has been in since 1.6.0), but for correctness we should stub
	out the function for those without it.

2016-09-05 12:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (90c1b756d87d)

	* configure.ac: Autoconf: always check for getaddrinfo().

	The getdnsdomainname() function introduced in 1.6.0 uses
	getaddrinfo().

	Pull the dependency checks for libnsl, libsocket, and getaddrinfo()
	outside of the "need_socket" block, so they are always checked for.

2016-09-04 18:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (8d7f4bea8820)

	* merge stable

2016-09-04 18:50 -0700  Guilhem Moulin  <guilhem@guilhem.org>  (b082bcd5d5e2)

	* pgppubring.c: Fix pgpring reporting of DSA and Elgamal key lengths.
	(closes #3867)

	Patch provided by Guilhem Moulin from an original idea of Fabrizio
	Tarizzo.

	The key length is always the length of the first MPI for RSA, DSA,
	and Elgamal.

2016-09-03 16:19 -0700  Kevin McCarthy  <kevin@8t8.us>  (a9757cff92da)

	* postpone.c: Preserve message-id and mft headers for recalled
	messages. (closes #3081)

	Git patch creates a patch series mailbox, including the Message-ID.
	Using this as draft files was removing the Message-ID, and thus
	breaking the threaded structure.

	The second part of the ticket has already been addressed by
	95a2230ef889 (for ticket 3653).

	Thanks to Chris Webb for the original patch.

2016-09-02 19:33 -0700  Kevin McCarthy  <kevin@8t8.us>  (7a53de8c9251)

	* doc/manual.xml.head: merge stable

2016-09-02 19:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (ba5d900a90db)

	* doc/manual.xml.head, pattern.c: Disable ~X when message scoring.
	(closes #3861)

	mutt_score_message() purposely passes a NULL context to
	mutt_pattern_exec(). The idea was to block slow patterns, and the
	scoring documentation notes this by saying:

	 "For efficiency reasons, patterns which scan information not
	available in the index, such as ~b, ~B or ~h, may not be used"

	~X needs the context to parse the messages (during message scoring
	at least), and thus isn't suitable for message scoring either.

	Block ~X from being used when the context is NULL. Add ~X to the
	list of patterns noted as unusable in the message scoring
	documentation.

2016-09-02 16:24 -0700  Kevin McCarthy  <kevin@8t8.us>  (95e9357ca697)

	* browser.c: merge stable

2016-09-02 16:20 -0700  Kevin McCarthy  <kevin@8t8.us>  (eef1e8abc46f)

	* browser.c: Increase date buffer size for $folder_format. (closes
	#3863)

	The buffer size of 16 was sufficient to hold the %d format, but not
	for using %D. Change to use a SHORT_STRING.

	Thanks to Ian Zimmerman for the original patch, and to Antonio
	Radici for forwarding it on to us.

2016-08-30 18:43 -0700  David Champion  <dgc@bikeshed.us>  (efccbd9bc6f6)

	* mutt_ssl.c: Redraw screen after an SSL cert prompt

2016-08-30 16:30 -0700  David Champion  <dgc@bikeshed.us>  (121fa0badf9e)

	* muttlib.c, send.c: Moves mutt_copy_list to muttlib.c, where it
	belongs.

2016-08-30 16:11 -0700  David Champion  <dgc@bikeshed.us>  (ab403fd7e600)

	* sort.h: Update a confusing and obsolete comment.

	This 2004 comment in sort.h predicted what has recently come to
	pass, so I'm reframing it just to document for future devs what's
	going on with this oddball flag.

2016-08-23 13:32 +0200  Vincent Lefevre  <vincent@vinc17.net>  (768b430f3dca)

	* mbyte.c: Filter out zero width no-break space (U+FEFF).

2016-08-22 20:34 -0700  Kevin McCarthy  <kevin@8t8.us>  (d500c2fd861d)

	* edit.c, send.c: Add missing include <locale.h> to send.c and edit.c.

2016-08-22 20:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (0ae083fb719c)

	* doc/manual.xml.head, edit.c, globals.h, init.h, send.c: Add
	$attribution_locale configuration variable.

	$attribution_locale replaces the just removed $locale, but is only
	used for customizing the LC_TIME locale used for dates in
	$attribution.

	This could be useful in conjunction with folder or send-hooks for
	recipients in different locales.

2016-08-22 20:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (d1ddea6099cd)

	* browser.c, crypt-gpgme.c, crypt.c, globals.h, hdrline.c, init.h,
	main.c, pgpkey.c: Remove the $locale configuration variable.

	$locale was only used to set the LC_TIME locale. Unfortunately, Mutt
	previously defaulted to using "C". This overrode the user's locale
	setting and forced them to re-specify their locale inside their
	.muttrc.

	Remove $locale and instead use the locale specified by the
	environment. Mutt still allows "C locale" dates by using a leading
	"!" in $date_format, ${}, etc.

	Another use of $locale was to customize attribution dates using
	hooks. The next commit will introduce $attribution_locale, which can
	be used for this instead.

	Thanks to Derek Martin for the original patch!

2016-08-17 20:17 -0700  Kevin McCarthy  <kevin@8t8.us>  (328e1a32034b)

	* sys_socket.h: merge default into stable

2016-08-17 20:14 -0700  Kevin McCarthy  <kevin@8t8.us>  (e5fcfc5f9c2e)

	* .hgsigs: mutt-1.7.0 signed

2016-08-17 20:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (be1a70b1c080)

	* .hgtags: Added tag mutt-1-7-rel for changeset a4e83f60e42f

2016-08-17 20:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (a4e83f60e42f)

	* ChangeLog, UPDATING, VERSION, po/bg.po, po/ca.po, po/cs.po,
	po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po,
	po/eu.po, po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po,
	po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po,
	po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po,
	po/zh_CN.po, po/zh_TW.po: automatic post-release commit for
	mutt-1.7.0

2016-11-26 00:57 +0100  Vincent Lefevre  <vincent@vinc17.net>  (a0a970530a8b)

	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-gpgme.c: Fix build

M VERSION => VERSION +1 -1
@@ 1,1 1,1 @@
1.7.2
1.8.0

M po/bg.po => po/bg.po +873 -746
@@ 9,7 9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mutt 1.5.5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-08 12:54-0700\n"
"POT-Creation-Date: 2017-02-24 10:48-0800\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1251\n"
"Content-Transfer-Encoding: 8bit\n"


@@ 24,12 24,12 @@ msgstr "
msgid "Password for %s@%s: "
msgstr "������ �� %s@%s: "

#: addrbook.c:37 browser.c:46 pager.c:1553 postpone.c:41 query.c:48
#: addrbook.c:37 browser.c:46 pager.c:1560 postpone.c:41 query.c:48
#: recvattach.c:53
msgid "Exit"
msgstr "�����"

#: addrbook.c:38 curs_main.c:487 pager.c:1560 postpone.c:42
#: addrbook.c:38 curs_main.c:487 pager.c:1567 postpone.c:42
msgid "Del"
msgstr "����."



@@ 41,8 41,8 @@ msgstr "
msgid "Select"
msgstr "�����"

#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:4023 curs_main.c:493
#: mutt_ssl.c:1084 mutt_ssl_gnutls.c:1003 pager.c:1656 pgpkey.c:523
#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:4026 curs_main.c:493
#: mutt_ssl.c:1082 mutt_ssl_gnutls.c:1003 pager.c:1663 pgpkey.c:522
#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:440
msgid "Help"
msgstr "�����"


@@ 73,7 73,7 @@ msgstr ""
msgid "Address: "
msgstr "�����:"

#: alias.c:307 send.c:206
#: alias.c:307 send.c:207
#, c-format
msgid "Error: '%s' is a bad IDN."
msgstr "������: '%s' � ��������� IDN."


@@ 87,8 87,8 @@ msgstr "
msgid "[%s = %s] Accept?"
msgstr "[%s = %s] �����?"

#: alias.c:347 recvattach.c:441 recvattach.c:467 recvattach.c:480
#: recvattach.c:493 recvattach.c:523
#: alias.c:347 recvattach.c:457 recvattach.c:483 recvattach.c:496
#: recvattach.c:509 recvattach.c:539
msgid "Save to file: "
msgstr "����� ��� ����:"



@@ 106,7 106,7 @@ msgstr "
msgid "Error seeking in alias file"
msgstr "������ ��� ����������� �� �����"

#: attach.c:113 attach.c:245 attach.c:400 attach.c:925
#: attach.c:113 attach.c:245 attach.c:400 attach.c:927
msgid "Can't match nametemplate, continue?"
msgstr "���� ������ � ���� ���. ������� �� �� ����������?"



@@ 115,8 115,8 @@ msgstr "
msgid "Mailcap compose entry requires %%s"
msgstr "������� \"compose\" � mailcap ������� %%s"

#: attach.c:134 attach.c:266 commands.c:223 compose.c:1208 curs_lib.c:204
#: curs_lib.c:723
#: attach.c:134 attach.c:266 commands.c:223 compose.c:1233 compress.c:444
#: curs_lib.c:205 curs_lib.c:724
#, c-format
msgid "Error running \"%s\"!"
msgstr "������ ��� ������������ �� \"%s\"!"


@@ 182,16 182,16 @@ msgstr "-- 
msgid "---Attachment: %s"
msgstr "-- ����������"

#: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1363
#: pgpkey.c:572 pgpkey.c:761
#: attach.c:633 attach.c:665 attach.c:960 attach.c:1018 handler.c:1363
#: pgpkey.c:571 pgpkey.c:760
msgid "Can't create filter"
msgstr "������ ��� ����������� �� ������"

#: attach.c:797
#: attach.c:799
msgid "Write fault!"
msgstr "������ ��� �����!"

#: attach.c:1039
#: attach.c:1041
msgid "I don't know how to print that!"
msgstr "���������� �����������!"



@@ 203,101 203,101 @@ msgstr "
msgid "Mask"
msgstr "�����"

#: browser.c:425 browser.c:1091
#: browser.c:426 browser.c:1092
#, c-format
msgid "%s is not a directory."
msgstr "%s �� � ����������."

#: browser.c:573
#: browser.c:574
#, c-format
msgid "Mailboxes [%d]"
msgstr "�������� ����� [%d]"

#: browser.c:580
#: browser.c:581
#, c-format
msgid "Subscribed [%s], File mask: %s"
msgstr "�������� [%s], ������� �����: %s"

#: browser.c:584
#: browser.c:585
#, c-format
msgid "Directory [%s], File mask: %s"
msgstr "���������� [%s], ������� �����: %s"

#: browser.c:596
#: browser.c:597
msgid "Can't attach a directory!"
msgstr "�� ���� �� ��������� ����������!"

#: browser.c:735 browser.c:1159 browser.c:1257
#: browser.c:736 browser.c:1160 browser.c:1258
msgid "No files match the file mask"
msgstr "���� �������, ���������� �� �������"

#: browser.c:939
#: browser.c:940
msgid "Create is only supported for IMAP mailboxes"
msgstr "���� IMAP �������� ����� ����� �� ����� ���������"

#: browser.c:963
#: browser.c:964
#, fuzzy
msgid "Rename is only supported for IMAP mailboxes"
msgstr "���� IMAP �������� ����� ����� �� ����� ���������"

#: browser.c:986
#: browser.c:987
msgid "Delete is only supported for IMAP mailboxes"
msgstr "���� IMAP �������� ����� ����� �� ����� ���������"

#: browser.c:996
#: browser.c:997
#, fuzzy
msgid "Cannot delete root folder"
msgstr "�������� �� ���� �� ���� ��������"

#: browser.c:999
#: browser.c:1000
#, c-format
msgid "Really delete mailbox \"%s\"?"
msgstr "������������ �� ������� �� �������� ���������� ����� \"%s\"?"

#: browser.c:1015
#: browser.c:1016
msgid "Mailbox deleted."
msgstr "���������� ����� � �������."

#: browser.c:1021
#: browser.c:1022
msgid "Mailbox not deleted."
msgstr "���������� ����� �� � �������."

#: browser.c:1040
#: browser.c:1041
msgid "Chdir to: "
msgstr "����� �� ������������: "

#: browser.c:1079 browser.c:1152
#: browser.c:1080 browser.c:1153
msgid "Error scanning directory."
msgstr "������ ��� ������ �� ������������."

#: browser.c:1103
#: browser.c:1104
msgid "File Mask: "
msgstr "������� �����: "

#: browser.c:1175
#: browser.c:1176
msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
msgstr ""
"������� ���������� �� ����(d), ������� ���(a), ������(z) ��� ��� "
"����������(n)?"

#: browser.c:1176
#: browser.c:1177
msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
msgstr ""
"���������� �� ����(d), ������� ���(a), ������(z) ��� ��� ����������(n)?"

#: browser.c:1177
#: browser.c:1178
msgid "dazn"
msgstr "dazn"

#: browser.c:1244
#: browser.c:1245
msgid "New file name: "
msgstr "���� ��� �� �����: "

#: browser.c:1275
#: browser.c:1276
msgid "Can't view a directory"
msgstr "������������ �� ���� �� ���� ��������"

#: browser.c:1292
#: browser.c:1293
msgid "Error trying to view file"
msgstr "������ ��� ����������� �� �����"



@@ 347,11 347,11 @@ msgstr "mono: 
msgid "%s: no such attribute"
msgstr "%s: ���� ����� �������"

#: color.c:736 hook.c:69 hook.c:77 keymap.c:921
#: color.c:736 hook.c:73 hook.c:81 init.c:1860 init.c:1935 keymap.c:921
msgid "too few arguments"
msgstr "������������ ���������"

#: color.c:745 hook.c:83
#: color.c:745 hook.c:87
msgid "too many arguments"
msgstr "������ ����� ���������"



@@ 363,7 363,7 @@ msgstr "
msgid "Verify PGP signature?"
msgstr "������� �� �� ���������� ����������� �� PGP-�������?"

#: commands.c:115 mbox.c:864
#: commands.c:115 mbox.c:873
msgid "Could not create temporary file!"
msgstr "���������� ����������� �� �������� ����!"



@@ 486,92 486,92 @@ msgstr "
msgid "Messages could not be printed"
msgstr "������� �� �� ����������"

#: commands.c:536
#. L10N: The following three are the sort/reverse sort prompts.
#. * Capital letters must match the order of the characters in the third
#. * string.
#.
#: commands.c:540
#, 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(p)am?: "
msgid "Rev-Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
msgstr ""
"������� ���������� ��: ���� �� ���������(d)/��(f)/���� �� ����������(r)/"
"����(s)/���������(o)/�����(t)/��� ����������(u)/������(z)/�������(c)?: "

#: commands.c:537
#: commands.c:541
#, 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)am?: "
msgid "Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
msgstr ""
"���������� ��: ���� �� ���������(d)/��(f)/���� �� ����������(r)/����(s)/"
"���������(o)/�����(t)/��� ����������(u)/������(z)/�������(c)?: "

#: commands.c:538
#: commands.c:542
#, fuzzy
msgid "dfrsotuzcp"
msgid "dfrsotuzcpl"
msgstr "dfrsotuzc"

#: commands.c:595
#: commands.c:603
msgid "Shell command: "
msgstr "��� �������: "

#: commands.c:742
#: commands.c:750
#, c-format
msgid "Decode-save%s to mailbox"
msgstr "���������� � ����� ��%s � �������� �����"

#: commands.c:743
#: commands.c:751
#, c-format
msgid "Decode-copy%s to mailbox"
msgstr "���������� � �������� ��%s � �������� �����"

#: commands.c:744
#: commands.c:752
#, c-format
msgid "Decrypt-save%s to mailbox"
msgstr "����������� � ����� ��%s � �������� �����"

#: commands.c:745
#: commands.c:753
#, c-format
msgid "Decrypt-copy%s to mailbox"
msgstr "����������� � ����� ��%s � �������� �����"

#: commands.c:746
#: commands.c:754
#, c-format
msgid "Save%s to mailbox"
msgstr "����� ��%s � �������� �����"

#: commands.c:746
#: commands.c:754
#, c-format
msgid "Copy%s to mailbox"
msgstr "�������� ��%s � �������� �����"

#: commands.c:747
#: commands.c:755
msgid " tagged"
msgstr " ��������"

#: commands.c:820
#: commands.c:828
#, c-format
msgid "Copying to %s..."
msgstr "��������� �� ����� � %s..."

#: commands.c:936
#: commands.c:944
#, c-format
msgid "Convert to %s upon sending?"
msgstr "������� �� �� �� ������������ �� %s ��� ���������?"

#: commands.c:946
#: commands.c:954
#, c-format
msgid "Content-Type changed to %s."
msgstr "Content-Type � �������� �� %s."

#: commands.c:951
#: commands.c:959
#, c-format
msgid "Character set changed to %s; %s."
msgstr "�������� ������� � ��������� �� %s; %s."

#: commands.c:953
#: commands.c:961
msgid "not converting"
msgstr "�� � ������������"

#: commands.c:953
#: commands.c:961
msgid "converting"
msgstr "������������"



@@ 674,7 674,7 @@ msgstr "
msgid "You may not delete the only attachment."
msgstr "�� ���� �� �������� ������������ ���� �� �������."

#: compose.c:614 send.c:1681
#: compose.c:614 send.c:1665
#, c-format
msgid "Bad IDN in \"%s\": '%s'"
msgstr "��� IDN � \"%s\": '%s'"


@@ 729,66 729,127 @@ msgstr "
msgid "Save a copy of this message?"
msgstr "������� �� �� �������� ����� �� ���� �����?"

#: compose.c:1027
#: compose.c:1034
#, fuzzy
msgid "Send attachment with name: "
msgstr "������� ������������ ���� �����"

#: compose.c:1052
msgid "Rename to: "
msgstr "������������ �: "

#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
#: compose.c:1034 editmsg.c:96 editmsg.c:121 sendlib.c:872
#: compose.c:1059 editmsg.c:96 editmsg.c:121 sendlib.c:872
#, c-format
msgid "Can't stat %s: %s"
msgstr "������ ��� �������� �� %s: %s"

#: compose.c:1061
#: compose.c:1086
msgid "New file: "
msgstr "��� ����: "

#: compose.c:1074
#: compose.c:1099
msgid "Content-Type is of the form base/sub"
msgstr "������ Content-Type ��� ������� �����-���/������"

#: compose.c:1080
#: compose.c:1105
#, c-format
msgid "Unknown Content-Type %s"
msgstr "�������� Content-Type %s"

#: compose.c:1093
#: compose.c:1118
#, c-format
msgid "Can't create file %s"
msgstr "������ ��� ��������� �� ����� %s"

#: compose.c:1101
#: compose.c:1126
msgid "What we have here is a failure to make an attachment"
msgstr "������ ��� ��������� �� ������������"

#: compose.c:1162
#: compose.c:1187
msgid "Postpone this message?"
msgstr "������� �� �� �������� ���������?"

#: compose.c:1226
#: compose.c:1251
msgid "Write message to mailbox"
msgstr "����� �� ������� � �������� �����"

#: compose.c:1229
#: compose.c:1254
#, c-format
msgid "Writing message to %s ..."
msgstr "��������� �� ������� � %s ..."

#: compose.c:1238
#: compose.c:1263
msgid "Message written."
msgstr "������� � ��������."

#: compose.c:1252
#: compose.c:1277
#, fuzzy
msgid "S/MIME already selected. Clear & continue ? "
msgstr "S/MIME-��������� ���� � �������. Clear & continue? "

#: compose.c:1285
#: compose.c:1310
#, fuzzy
msgid "PGP already selected. Clear & continue ? "
msgstr "PGP-��������� ���� � �������. Clear & continue? "

#: compress.c:481 compress.c:551 compress.c:706 compress.c:895 mbox.c:847
msgid "Unable to lock mailbox!"
msgstr "������ ��� ���������� �� ���������� �����!"

#: compress.c:485 compress.c:558 compress.c:710
#, c-format
msgid "Decompressing %s"
msgstr ""

#: compress.c:494
msgid "Can't identify the contents of the compressed file"
msgstr ""

#: compress.c:501 compress.c:579
#, c-format
msgid "Can't find mailbox ops for mailbox type %d"
msgstr ""

#: compress.c:540 compress.c:834
#, c-format
msgid "Cannot append without an append-hook or close-hook : %s"
msgstr ""

#: compress.c:561
#, fuzzy, c-format
msgid "Compress command failed: %s"
msgstr "������ ��� ���������� �� ��������� \"preconnect\""

#: compress.c:572
msgid "Unsupported mailbox type for appending."
msgstr ""

#: compress.c:648
#, fuzzy, c-format
msgid "Compressed-appending to %s..."
msgstr "��������� �� ����� � %s..."

#: compress.c:653
#, fuzzy, c-format
msgid "Compressing %s..."
msgstr "��������� �� ����� � %s..."

#: compress.c:660 editmsg.c:210
#, c-format
msgid "Error. Preserving temporary file: %s"
msgstr "������. ��������� �� ��������� ����: %s"

#: compress.c:885
msgid "Can't sync a compressed file without a close-hook"
msgstr ""

#: compress.c:907
#, fuzzy, c-format
msgid "Compressing %s"
msgstr "��������� �� ����� � %s..."

#: crypt-gpgme.c:393
#, fuzzy, c-format
msgid "error creating gpgme context: %s\n"


@@ 804,7 865,7 @@ msgstr ""
msgid "error creating gpgme data object: %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:489 crypt-gpgme.c:507 crypt-gpgme.c:1538 crypt-gpgme.c:2248
#: crypt-gpgme.c:489 crypt-gpgme.c:507 crypt-gpgme.c:1543 crypt-gpgme.c:2258
#, fuzzy, c-format
msgid "error allocating data object: %s\n"
msgstr "������ � ������� ���: %s"


@@ 819,46 880,46 @@ msgstr "
msgid "error reading data object: %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:573 crypt-gpgme.c:3637 pgpkey.c:560 pgpkey.c:741
#: crypt-gpgme.c:573 crypt-gpgme.c:3640 pgpkey.c:559 pgpkey.c:740
msgid "Can't create temporary file"
msgstr "������ ��� ��������� �� �������� ����"

#: crypt-gpgme.c:683
#: crypt-gpgme.c:681
#, fuzzy, c-format
msgid "error adding recipient `%s': %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:723
#: crypt-gpgme.c:721
#, c-format
msgid "secret key `%s' not found: %s\n"
msgstr ""

#: crypt-gpgme.c:733
#: crypt-gpgme.c:731
#, c-format
msgid "ambiguous specification of secret key `%s'\n"
msgstr ""

#: crypt-gpgme.c:745
#: crypt-gpgme.c:743
#, c-format
msgid "error setting secret key `%s': %s\n"
msgstr ""

#: crypt-gpgme.c:762
#: crypt-gpgme.c:760
#, fuzzy, c-format
msgid "error setting PKA signature notation: %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:818
#: crypt-gpgme.c:816
#, fuzzy, c-format
msgid "error encrypting data: %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:937
#: crypt-gpgme.c:933
#, fuzzy, c-format
msgid "error signing data: %s\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:948
#: crypt-gpgme.c:944
msgid "$pgp_sign_as unset and no default key specified in ~/.gnupg/gpg.conf"
msgstr ""



@@ 909,7 970,7 @@ msgid "PKA verified signer's address is: "
msgstr ""

#. L10N: DOTFILL
#: crypt-gpgme.c:1264 crypt-gpgme.c:3468
#: crypt-gpgme.c:1264 crypt-gpgme.c:3474
#, fuzzy
msgid "Fingerprint: "
msgstr "������� ���������: %s"


@@ 930,7 991,7 @@ msgid ""
"above\n"
msgstr ""

#: crypt-gpgme.c:1370
#: crypt-gpgme.c:1365 crypt-gpgme.c:1370
msgid "aka: "
msgstr ""



@@ 938,54 999,54 @@ msgstr ""
msgid "KeyID "
msgstr ""

#: crypt-gpgme.c:1390
#: crypt-gpgme.c:1389 crypt-gpgme.c:1394
#, fuzzy
msgid "created: "
msgstr "������� �� �� ��������� %s?"

#: crypt-gpgme.c:1462
#: crypt-gpgme.c:1467
#, c-format
msgid "Error getting key information for KeyID %s: %s\n"
msgstr ""

#: crypt-gpgme.c:1469 crypt-gpgme.c:1484
#: crypt-gpgme.c:1474 crypt-gpgme.c:1489
msgid "Good signature from:"
msgstr ""

#: crypt-gpgme.c:1476
#: crypt-gpgme.c:1481
msgid "*BAD* signature from:"
msgstr ""

#: crypt-gpgme.c:1492
#: crypt-gpgme.c:1497
msgid "Problem signature from:"
msgstr ""

#. L10N:
#. This is trying to match the width of the
#. "Problem signature from:" translation just above.
#: crypt-gpgme.c:1499
#: crypt-gpgme.c:1504
msgid "               expires: "
msgstr ""

#: crypt-gpgme.c:1546 crypt-gpgme.c:1764 crypt-gpgme.c:2465
#: crypt-gpgme.c:1551 crypt-gpgme.c:1774 crypt-gpgme.c:2475
msgid "[-- Begin signature information --]\n"
msgstr ""

#: crypt-gpgme.c:1558
#: crypt-gpgme.c:1563
#, fuzzy, c-format
msgid "Error: verification failed: %s\n"
msgstr "������ � ��������� ���: %s\n"

#: crypt-gpgme.c:1607
#: crypt-gpgme.c:1617
#, c-format
msgid "*** Begin Notation (signature by: %s) ***\n"
msgstr ""

#: crypt-gpgme.c:1629
#: crypt-gpgme.c:1639
msgid "*** End Notation ***\n"
msgstr ""

#: crypt-gpgme.c:1637 crypt-gpgme.c:1777 crypt-gpgme.c:2478
#: crypt-gpgme.c:1647 crypt-gpgme.c:1787 crypt-gpgme.c:2488
#, fuzzy
msgid ""
"[-- End signature information --]\n"


@@ 994,28 1055,28 @@ msgstr ""
"\n"
"[-- ���� �� ����������� ����� --]\n"

#: crypt-gpgme.c:1732
#: crypt-gpgme.c:1742
#, fuzzy, c-format
msgid ""
"[-- Error: decryption failed: %s --]\n"
"\n"
msgstr "[-- ������: �� ���� �� ���� �������� �������� ����! --]\n"

#: crypt-gpgme.c:2255
#: crypt-gpgme.c:2265
#, fuzzy
msgid "Error extracting key data!\n"
msgstr "������ � ������� ���: %s"

#: crypt-gpgme.c:2441
#: crypt-gpgme.c:2451
#, c-format
msgid "Error: decryption/verification failed: %s\n"
msgstr ""

#: crypt-gpgme.c:2486
#: crypt-gpgme.c:2496
msgid "Error: copy data failed\n"
msgstr ""

#: crypt-gpgme.c:2507 pgp.c:519
#: crypt-gpgme.c:2517 pgp.c:519
msgid ""
"[-- BEGIN PGP MESSAGE --]\n"
"\n"


@@ 1023,11 1084,11 @@ msgstr ""
"[-- ������ �� PGP-����� --]\n"
"\n"

#: crypt-gpgme.c:2509 pgp.c:521
#: crypt-gpgme.c:2519 pgp.c:521
msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
msgstr "[-- ������ �� ���� � �������� PGP-���� --]\n"

#: crypt-gpgme.c:2512 pgp.c:523
#: crypt-gpgme.c:2522 pgp.c:523
msgid ""
"[-- BEGIN PGP SIGNED MESSAGE --]\n"
"\n"


@@ 1035,19 1096,19 @@ msgstr ""
"[-- ������ �� PGP-��������� ����� --]\n"
"\n"

#: crypt-gpgme.c:2539 pgp.c:566
#: crypt-gpgme.c:2549 pgp.c:566
msgid "[-- END PGP MESSAGE --]\n"
msgstr "[-- ���� �� PGP-������� --]\n"

#: crypt-gpgme.c:2541 pgp.c:573
#: crypt-gpgme.c:2551 pgp.c:573
msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
msgstr "[-- ���� �� ����� � ��������� PGP-���� --]\n"

#: crypt-gpgme.c:2543 pgp.c:575
#: crypt-gpgme.c:2553 pgp.c:575
msgid "[-- END PGP SIGNED MESSAGE --]\n"
msgstr "[-- ���� �� PGP-����������� ����� --]\n"

#: crypt-gpgme.c:2566 pgp.c:608
#: crypt-gpgme.c:2576 pgp.c:608
msgid ""
"[-- Error: could not find beginning of PGP message! --]\n"
"\n"


@@ 1055,11 1116,11 @@ msgstr ""
"[-- ������: �������� �� PGP-������� �� ���� �� ���� ��������! --]\n"
"\n"

#: crypt-gpgme.c:2597 crypt-gpgme.c:2670 pgp.c:1091
#: crypt-gpgme.c:2607 crypt-gpgme.c:2680 pgp.c:1091
msgid "[-- Error: could not create temporary file! --]\n"
msgstr "[-- ������: �� ���� �� ���� �������� �������� ����! --]\n"

#: crypt-gpgme.c:2609
#: crypt-gpgme.c:2619
#, fuzzy
msgid ""
"[-- The following data is PGP/MIME signed and encrypted --]\n"


@@ 1068,7 1129,7 @@ msgstr ""
"[-- �������� ����� �� ��������� � PGP/MIME --]\n"
"\n"

#: crypt-gpgme.c:2610 pgp.c:1100
#: crypt-gpgme.c:2620 pgp.c:1100
msgid ""
"[-- The following data is PGP/MIME encrypted --]\n"
"\n"


@@ 1076,62 1137,62 @@ msgstr ""
"[-- �������� ����� �� ��������� � PGP/MIME --]\n"
"\n"

#: crypt-gpgme.c:2632
#: crypt-gpgme.c:2642
#, fuzzy
msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
msgstr "[-- ���� �� ����������� � PGP/MIME ����� --]\n"

#: crypt-gpgme.c:2633 pgp.c:1120
#: crypt-gpgme.c:2643 pgp.c:1120
msgid "[-- End of PGP/MIME encrypted data --]\n"
msgstr "[-- ���� �� ����������� � PGP/MIME ����� --]\n"

#: crypt-gpgme.c:2638 pgp.c:570 pgp.c:1125
#: crypt-gpgme.c:2648 pgp.c:570 pgp.c:1125
#, fuzzy
msgid "PGP message successfully decrypted."
msgstr "PGP-�������� � ��������� �������."

#: crypt-gpgme.c:2642 pgp.c:505 pgp.c:568 pgp.c:1129
#: crypt-gpgme.c:2652 pgp.c:505 pgp.c:568 pgp.c:1129
#, fuzzy
msgid "Could not decrypt PGP message"
msgstr "������� �� ���� �� ���� ��������."

#: crypt-gpgme.c:2682
#: crypt-gpgme.c:2692
#, fuzzy
msgid ""
"[-- The following data is S/MIME signed --]\n"
"\n"
msgstr "[-- �������� ����� �� ��������� ��� S/MIME --]\n"

#: crypt-gpgme.c:2683
#: crypt-gpgme.c:2693
#, fuzzy
msgid ""
"[-- The following data is S/MIME encrypted --]\n"
"\n"
msgstr "[-- �������� ����� �� ��������� ��� S/MIME --]\n"

#: crypt-gpgme.c:2713
#: crypt-gpgme.c:2723
#, fuzzy
msgid "[-- End of S/MIME signed data --]\n"
msgstr ""
"\n"
"[-- ���� �� ����������� ��� S/MIME ����� --]\n"

#: crypt-gpgme.c:2714
#: crypt-gpgme.c:2724
#, fuzzy
msgid "[-- End of S/MIME encrypted data --]\n"
msgstr ""
"\n"
"[-- ���� �� ����������� ��� S/MIME ����� --]\n"

#: crypt-gpgme.c:3299
#: crypt-gpgme.c:3308
msgid "[Can't display this user ID (unknown encoding)]"
msgstr ""

#: crypt-gpgme.c:3301
#: crypt-gpgme.c:3310
msgid "[Can't display this user ID (invalid encoding)]"
msgstr ""

#: crypt-gpgme.c:3306
#: crypt-gpgme.c:3315
msgid "[Can't display this user ID (invalid DN)]"
msgstr ""



@@ 1139,163 1200,163 @@ msgstr ""
#. Fill dots to make the DOTFILL entries the same length.
#. In English, msgid "Fingerprint: " is the longest entry for this menu.
#. Your language may vary.
#: crypt-gpgme.c:3389
#: crypt-gpgme.c:3395
msgid " aka ......: "
msgstr ""

#: crypt-gpgme.c:3389
#: crypt-gpgme.c:3395
msgid "Name ......: "
msgstr ""

#: crypt-gpgme.c:3392 crypt-gpgme.c:3539
#: crypt-gpgme.c:3398 crypt-gpgme.c:3545
#, fuzzy
msgid "[Invalid]"
msgstr "���������   "

#. L10N: DOTFILL
#: crypt-gpgme.c:3413 crypt-gpgme.c:3564
#: crypt-gpgme.c:3419 crypt-gpgme.c:3570
#, fuzzy, c-format
msgid "Valid From : %s\n"
msgstr "��������� �����: %s"

#. L10N: DOTFILL
#: crypt-gpgme.c:3427 crypt-gpgme.c:3578
#: crypt-gpgme.c:3433 crypt-gpgme.c:3584
#, fuzzy, c-format
msgid "Valid To ..: %s\n"
msgstr "��������� �����: %s"

#. L10N: DOTFILL
#: crypt-gpgme.c:3441 crypt-gpgme.c:3592
#: crypt-gpgme.c:3447 crypt-gpgme.c:3598
#, c-format
msgid "Key Type ..: %s, %lu bit %s\n"
msgstr ""

#. L10N: DOTFILL
#: crypt-gpgme.c:3444 crypt-gpgme.c:3595
#: crypt-gpgme.c:3450 crypt-gpgme.c:3601
#, c-format
msgid "Key Usage .: "
msgstr ""

#: crypt-gpgme.c:3449 crypt-gpgme.c:3600
#: crypt-gpgme.c:3455 crypt-gpgme.c:3606
#, fuzzy
msgid "encryption"
msgstr "���������"

#: crypt-gpgme.c:3450 crypt-gpgme.c:3455 crypt-gpgme.c:3460 crypt-gpgme.c:3601
#: crypt-gpgme.c:3606 crypt-gpgme.c:3611
#: crypt-gpgme.c:3456 crypt-gpgme.c:3461 crypt-gpgme.c:3466 crypt-gpgme.c:3607
#: crypt-gpgme.c:3612 crypt-gpgme.c:3617
msgid ", "
msgstr ""

#: crypt-gpgme.c:3454 crypt-gpgme.c:3605
#: crypt-gpgme.c:3460 crypt-gpgme.c:3611
msgid "signing"
msgstr ""

#: crypt-gpgme.c:3459 crypt-gpgme.c:3610
#: crypt-gpgme.c:3465 crypt-gpgme.c:3616
#, fuzzy
msgid "certification"
msgstr "������������ � �������"

#. L10N: DOTFILL
#: crypt-gpgme.c:3501
#: crypt-gpgme.c:3507
#, c-format
msgid "Serial-No .: 0x%s\n"
msgstr ""

#. L10N: DOTFILL
#: crypt-gpgme.c:3510
#: crypt-gpgme.c:3516
#, c-format
msgid "Issued By .: "
msgstr ""

#. L10N: DOTFILL
#: crypt-gpgme.c:3530
#: crypt-gpgme.c:3536
#, fuzzy, c-format
msgid "Subkey ....: 0x%s"
msgstr "������ �������������: 0x%s"

#: crypt-gpgme.c:3534
#: crypt-gpgme.c:3540
#, fuzzy
msgid "[Revoked]"
msgstr "��������   "

#: crypt-gpgme.c:3544
#: crypt-gpgme.c:3550
#, fuzzy
msgid "[Expired]"
msgstr "�������   "

#: crypt-gpgme.c:3549
#: crypt-gpgme.c:3555
msgid "[Disabled]"
msgstr ""

#: crypt-gpgme.c:3640
#: crypt-gpgme.c:3643
#, fuzzy
msgid "Collecting data..."
msgstr "��������� � %s..."

#: crypt-gpgme.c:3666
#: crypt-gpgme.c:3669
#, fuzzy, c-format
msgid "Error finding issuer key: %s\n"
msgstr "������ ��� ��������� ��� �������: %s"

#: crypt-gpgme.c:3676
#: crypt-gpgme.c:3679
#, fuzzy
msgid "Error: certification chain too long - stopping here\n"
msgstr "������ � ��������� ���: %s\n"

#: crypt-gpgme.c:3687 pgpkey.c:582
#: crypt-gpgme.c:3690 pgpkey.c:581
#, c-format
msgid "Key ID: 0x%s"
msgstr "������ �������������: 0x%s"

#: crypt-gpgme.c:3770
#: crypt-gpgme.c:3773
#, fuzzy, c-format
msgid "gpgme_new failed: %s"
msgstr "��������� SSL: %s"

#: crypt-gpgme.c:3809 crypt-gpgme.c:3884
#: crypt-gpgme.c:3812 crypt-gpgme.c:3887
#, c-format
msgid "gpgme_op_keylist_start failed: %s"
msgstr ""

#: crypt-gpgme.c:3871 crypt-gpgme.c:3915
#: crypt-gpgme.c:3874 crypt-gpgme.c:3918
#, c-format
msgid "gpgme_op_keylist_next failed: %s"
msgstr ""

#: crypt-gpgme.c:3986
#: crypt-gpgme.c:3989
#, fuzzy
msgid "All matching keys are marked expired/revoked."
msgstr "������ ��������� ������� �� ��������, ��������� ��� ������������."

#: crypt-gpgme.c:4015 mutt_ssl.c:1082 mutt_ssl_gnutls.c:1001 pgpkey.c:516
#: crypt-gpgme.c:4018 mutt_ssl.c:1080 mutt_ssl_gnutls.c:1001 pgpkey.c:515
#: smime.c:435
msgid "Exit  "
msgstr "�����"

#: crypt-gpgme.c:4017 pgpkey.c:518 smime.c:437
#: crypt-gpgme.c:4020 pgpkey.c:517 smime.c:437
msgid "Select  "
msgstr "����� "

#: crypt-gpgme.c:4020 pgpkey.c:521
#: crypt-gpgme.c:4023 pgpkey.c:520
msgid "Check key  "
msgstr "�������� �� ����  "

#: crypt-gpgme.c:4036
#: crypt-gpgme.c:4039
#, fuzzy
msgid "PGP and S/MIME keys matching"
msgstr "PGP �������, ��������� � \"%s\"."

#: crypt-gpgme.c:4038
#: crypt-gpgme.c:4041
#, fuzzy
msgid "PGP keys matching"
msgstr "PGP �������, ��������� � \"%s\"."

#: crypt-gpgme.c:4040
#: crypt-gpgme.c:4043
#, fuzzy
msgid "S/MIME keys matching"
msgstr "S/MIME �����������, ��������� � \"%s\"."

#: crypt-gpgme.c:4042
#: crypt-gpgme.c:4045
#, fuzzy
msgid "keys matching"
msgstr "PGP �������, ��������� � \"%s\"."


@@ 1304,65 1365,65 @@ msgstr "PGP 
#. %1$s is one of the previous four entries.
#. %2$s is an address.
#. e.g. "S/MIME keys matching <me@mutt.org>."
#: crypt-gpgme.c:4049
#: crypt-gpgme.c:4052
#, c-format
msgid "%s <%s>."
msgstr ""

#. L10N:
#. e.g. 'S/MIME keys matching "Michael Elkins".'
#: crypt-gpgme.c:4053
#: crypt-gpgme.c:4056
#, c-format
msgid "%s \"%s\"."
msgstr ""

#: crypt-gpgme.c:4080 pgpkey.c:602
#: crypt-gpgme.c:4083 pgpkey.c:601
msgid "This key can't be used: expired/disabled/revoked."
msgstr ""
"���� ���� �� ���� �� ���� ���������, ������ � �������, ����������� ��� "
"��������."

#: crypt-gpgme.c:4094 pgpkey.c:614 smime.c:467
#: crypt-gpgme.c:4097 pgpkey.c:613 smime.c:467
msgid "ID is expired/disabled/revoked."
msgstr "���� ������������� � �������, ����������� ��� ��������."

#: crypt-gpgme.c:4102 pgpkey.c:618 smime.c:470
#: crypt-gpgme.c:4105 pgpkey.c:617 smime.c:470
msgid "ID has undefined validity."
msgstr "���� ������������� � � ������������ ���������."

#: crypt-gpgme.c:4105 pgpkey.c:621
#: crypt-gpgme.c:4108 pgpkey.c:620
msgid "ID is not valid."
msgstr "���� ������������� �� �� � �������."

#: crypt-gpgme.c:4108 pgpkey.c:624
#: crypt-gpgme.c:4111 pgpkey.c:623
msgid "ID is only marginally valid."
msgstr "���� ������������� � � ���������� ���������."

#: crypt-gpgme.c:4117 pgpkey.c:628 smime.c:477
#: crypt-gpgme.c:4120 pgpkey.c:627 smime.c:477
#, c-format
msgid "%s Do you really want to use the key?"
msgstr "%s ������������ �� ������ �� ���������� ���� ����?"

#: crypt-gpgme.c:4178 crypt-gpgme.c:4312 pgpkey.c:839 pgpkey.c:966
#: crypt-gpgme.c:4181 crypt-gpgme.c:4315 pgpkey.c:838 pgpkey.c:965
#, c-format
msgid "Looking for keys matching \"%s\"..."
msgstr "������� �� �������, ���������� �� \"%s\"..."

#: crypt-gpgme.c:4467 pgp.c:1304
#: crypt-gpgme.c:4470 pgp.c:1304
#, c-format
msgid "Use keyID = \"%s\" for %s?"
msgstr "������� �� ���������� �������� ������������� \"%s\" �� %s?"

#: crypt-gpgme.c:4525 pgp.c:1353 smime.c:796 smime.c:902
#: crypt-gpgme.c:4528 pgp.c:1353 smime.c:796 smime.c:902
#, c-format
msgid "Enter keyID for %s: "
msgstr "�������� ������ ������������� �� %s: "

#: crypt-gpgme.c:4602 pgpkey.c:726
#: crypt-gpgme.c:4605 pgpkey.c:725
msgid "Please enter the key ID: "
msgstr "����, �������� �������� �������������: "

#: crypt-gpgme.c:4615
#: crypt-gpgme.c:4618
#, fuzzy, c-format
msgid "Error exporting key: %s\n"
msgstr "������ � ������� ���: %s"


@@ 1371,20 1432,20 @@ msgstr "
#. MIME description for exported (attached) keys.
#. You can translate this entry to a non-ASCII string (it will be encoded),
#. but it may be safer to keep it untranslated.
#: crypt-gpgme.c:4635
#: crypt-gpgme.c:4638
#, fuzzy, c-format
msgid "PGP Key 0x%s."
msgstr "PGP ���� %s."

#: crypt-gpgme.c:4677
#: crypt-gpgme.c:4680
msgid "GPGME: OpenPGP protocol not available"
msgstr ""

#: crypt-gpgme.c:4685
#: crypt-gpgme.c:4688
msgid "GPGME: CMS protocol not available"
msgstr ""

#: crypt-gpgme.c:4722
#: crypt-gpgme.c:4725
#, fuzzy
msgid "S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? "
msgstr ""


@@ 1394,21 1455,21 @@ msgstr ""
#. 'clear'.  Please use a corresponding letter in your language.
#. Alternatively, you may duplicate the letter 'c' is translated to.
#. This comment also applies to the five following letter sequences.
#: crypt-gpgme.c:4727
#: crypt-gpgme.c:4730
msgid "sapfco"
msgstr ""

#: crypt-gpgme.c:4732
#: crypt-gpgme.c:4735
#, fuzzy
msgid "PGP (s)ign, sign (a)s, s/(m)ime, (c)lear, or (o)ppenc mode off? "
msgstr ""
"PGP ���������(e), ������(s), ������ ����(a), � �����(b) ��� ��� ���(f)?"

#: crypt-gpgme.c:4733
#: crypt-gpgme.c:4736
msgid "samfco"
msgstr ""

#: crypt-gpgme.c:4745
#: crypt-gpgme.c:4748
#, fuzzy
msgid ""
"S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp, (c)lear, or (o)ppenc "


@@ 1416,12 1477,12 @@ msgid ""
msgstr ""
"PGP ���������(e), ������(s), ������ ����(a), � �����(b) ��� ��� ���(f)?"

#: crypt-gpgme.c:4746
#: crypt-gpgme.c:4749
#, fuzzy
msgid "esabpfco"
msgstr "eswabf"

#: crypt-gpgme.c:4751
#: crypt-gpgme.c:4754
#, fuzzy
msgid ""
"PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime, (c)lear, or (o)ppenc "


@@ 1429,93 1490,93 @@ msgid ""
msgstr ""
"PGP ���������(e), ������(s), ������ ����(a), � �����(b) ��� ��� ���(f)?"

#: crypt-gpgme.c:4752
#: crypt-gpgme.c:4755
#, fuzzy
msgid "esabmfco"
msgstr "eswabf"

#: crypt-gpgme.c:4763
#: crypt-gpgme.c:4766
#, fuzzy
msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear? "
msgstr ""
"PGP ���������(e), ������(s), ������ ����(a), � �����(b) ��� ��� ���(f)?"

#: crypt-gpgme.c:4764
#: crypt-gpgme.c:4767
#, fuzzy
msgid "esabpfc"
msgstr "eswabf"

#: crypt-gpgme.c:4769
#: crypt-gpgme.c:4772
#, fuzzy
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear? "
msgstr ""
"PGP ���������(e), ������(s), ������ ����(a), � �����(b) ��� ��� ���(f)?"

#: crypt-gpgme.c:4770
#: crypt-gpgme.c:4773
#, fuzzy
msgid "esabmfc"
msgstr "eswabf"

#: crypt-gpgme.c:4795 pgp.c:1818 smime.c:2222 smime.c:2237
#: crypt-gpgme.c:4798 pgp.c:1818 smime.c:2222 smime.c:2237
msgid "Sign as: "
msgstr "������ ����: "

#: crypt-gpgme.c:4930
#: crypt-gpgme.c:4933
msgid "Failed to verify sender"
msgstr ""

#: crypt-gpgme.c:4933
#: crypt-gpgme.c:4936
#, fuzzy
msgid "Failed to figure out sender"
msgstr "������ ��� �������� �� ����� �� ������ �� ���������� ����������."

#: crypt.c:68
#: crypt.c:67
#, c-format
msgid " (current time: %c)"
msgstr " (������ �����: %c)"

#: crypt.c:74
#: crypt.c:72
#, c-format
msgid "[-- %s output follows%s --]\n"
msgstr "[-- %s ������ ����������%s) --]\n"

#: crypt.c:89
#: crypt.c:87
msgid "Passphrase(s) forgotten."
msgstr "�������� �� ���������."

#: crypt.c:152
#: crypt.c:150
msgid "Inline PGP can't be used with attachments.  Revert to PGP/MIME?"
msgstr ""

#: crypt.c:154
#: crypt.c:152
msgid "Mail not sent: inline PGP can't be used with attachments."
msgstr ""

#: crypt.c:161 cryptglue.c:110 pgpkey.c:564 pgpkey.c:754
#: crypt.c:159 cryptglue.c:110 pgpkey.c:563 pgpkey.c:753
msgid "Invoking PGP..."
msgstr "���������� �� PGP..."

#: crypt.c:170
#: crypt.c:168
msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
msgstr ""

#: crypt.c:172 send.c:1609
#: crypt.c:170 send.c:1593
msgid "Mail not sent."
msgstr "������� �� � ���������."

#: crypt.c:485
#: crypt.c:483
msgid "S/MIME messages with no hints on content are unsupported."
msgstr "S/MIME ����� ��� �������� �� ������������ �� �� �� ���������."

#: crypt.c:705 crypt.c:749
#: crypt.c:703 crypt.c:747
msgid "Trying to extract PGP keys...\n"
msgstr "���� �� ��������� �� PGP �������...\n"

#: crypt.c:729 crypt.c:769
#: crypt.c:727 crypt.c:767
msgid "Trying to extract S/MIME certificates...\n"
msgstr "���� �� ��������� �� S/MIME �����������...\n"

#: crypt.c:916
#: crypt.c:914
#, c-format
msgid ""
"[-- Error: Unknown multipart/signed protocol %s! --]\n"


@@ 1524,7 1585,7 @@ msgstr ""
"[-- ������: �������� multipart/signed �������� %s! --]\n"
"\n"

#: crypt.c:950
#: crypt.c:948
msgid ""
"[-- Error: Inconsistent multipart/signed structure! --]\n"
"\n"


@@ 1532,7 1593,7 @@ msgstr ""
"[-- ������: ������������� multipart/signed ���������! --]\n"
"\n"

#: crypt.c:989
#: crypt.c:987
#, c-format
msgid ""
"[-- Warning: We can't verify %s/%s signatures. --]\n"


@@ 1541,7 1602,7 @@ msgstr ""
"[-- ��������������: %s/%s-������� �� ����� �� ����� �����������. --]\n"
"\n"

#: crypt.c:1001
#: crypt.c:999
msgid ""
"[-- The following data is signed --]\n"
"\n"


@@ 1549,7 1610,7 @@ msgstr ""
"[-- �������� ����� �� ��������� --]\n"
"\n"

#: crypt.c:1007
#: crypt.c:1005
msgid ""
"[-- Warning: Can't find any signatures. --]\n"
"\n"


@@ 1557,7 1618,7 @@ msgstr ""
"[-- ��������������: �� ����� �� ����� �������� �������. --]\n"
"\n"

#: crypt.c:1013
#: crypt.c:1011
msgid ""
"\n"
"[-- End of signed data --]\n"


@@ 1574,27 1635,27 @@ msgstr ""
msgid "Invoking S/MIME..."
msgstr "���������� �� PGP..."

#: curs_lib.c:218
#: curs_lib.c:219
msgid "yes"
msgstr "yes"

#: curs_lib.c:219
#: curs_lib.c:220
msgid "no"
msgstr "no"

#: curs_lib.c:326
#: curs_lib.c:327
msgid "Exit Mutt?"
msgstr "������� �� �� ��������� mutt?"

#: curs_lib.c:675 mutt_socket.c:577 mutt_ssl.c:426
#: curs_lib.c:676 mutt_socket.c:577 mutt_ssl.c:500
msgid "unknown error"
msgstr "��������� ������"

#: curs_lib.c:695
#: curs_lib.c:696
msgid "Press any key to continue..."
msgstr "��������� ����� ������..."

#: curs_lib.c:740
#: curs_lib.c:741
msgid " ('?' for list): "
msgstr " (�����������'?' �� ����� �� ������): "



@@ 1606,11 1667,11 @@ msgstr "
msgid "There are no messages."
msgstr "���� �����."

#: curs_main.c:59 mx.c:1130 pager.c:54 recvattach.c:43
#: curs_main.c:59 mx.c:1117 pager.c:54 recvattach.c:43
msgid "Mailbox is read-only."
msgstr "���� �������� ����� � ���� �� ������."

#: curs_main.c:60 pager.c:55 recvattach.c:925
#: curs_main.c:60 pager.c:55 recvattach.c:943
msgid "Function not permitted in attach-message mode."
msgstr "���� ������� �� ���� �� �� ������� ��� ��������� �� �����."



@@ 1649,7 1710,7 @@ msgstr "
msgid "Mail"
msgstr "����"

#: curs_main.c:491 pager.c:1561
#: curs_main.c:491 pager.c:1568
msgid "Reply"
msgstr "�������"



@@ 1683,218 1744,263 @@ msgstr "
msgid "Jump to message: "
msgstr "���� ��� ����� �����: "

#: curs_main.c:838
#: curs_main.c:845
msgid "Argument must be a message number."
msgstr "���������� ������ �� ���� ����� �� �����."

#: curs_main.c:870
#: curs_main.c:877
msgid "That message is not visible."
msgstr "���� ����� �� � ������."

#: curs_main.c:873
#: curs_main.c:880
msgid "Invalid message number."
msgstr "������ ����� �� �����."

#. L10N: CHECK_ACL
#: curs_main.c:887 curs_main.c:2004 pager.c:2450
#: curs_main.c:894 curs_main.c:2018 pager.c:2457
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "���� ������������ �����."

#: curs_main.c:890
#: curs_main.c:897
msgid "Delete messages matching: "
msgstr "��������� �� ����� �� ������: "

#: curs_main.c:912
#: curs_main.c:919
msgid "No limit pattern is in effect."
msgstr "���� ������� ������������� ������."

#. L10N: ask for a limit to apply
#: curs_main.c:917
#: curs_main.c:924
#, c-format
msgid "Limit: %s"
msgstr "������������: %s"

#: curs_main.c:927
#: curs_main.c:934
msgid "Limit to messages matching: "
msgstr "������������ �� �������, ���������� ��: "

#: curs_main.c:949
#: curs_main.c:956
msgid "To view all messages, limit to \"all\"."
msgstr ""

#: curs_main.c:961 pager.c:1997
#: curs_main.c:968 pager.c:2004
msgid "Quit Mutt?"
msgstr "������� �� �� ��������� mutt?"

#: curs_main.c:1051
#: curs_main.c:1058
msgid "Tag messages matching: "
msgstr "��������� �� �������, ���������� ��: "

#. L10N: CHECK_ACL
#: curs_main.c:1061 curs_main.c:2304 pager.c:2765
#: curs_main.c:1068 curs_main.c:2376 pager.c:2772
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "���� ������������ �����."

#: curs_main.c:1063
#: curs_main.c:1070
msgid "Undelete messages matching: "
msgstr "�������������� �� �������, ���������� ��: "

#: curs_main.c:1071
#: curs_main.c:1078
msgid "Untag messages matching: "
msgstr "���������� �� ������������ �� �������, ���������� ��: "

#: curs_main.c:1097
#: curs_main.c:1104
#, fuzzy
msgid "Logged out of IMAP servers."
msgstr "��������� �� �������� ��� IMAP ������..."

#: curs_main.c:1182
#: curs_main.c:1189
msgid "Open mailbox in read-only mode"
msgstr "�������� �� ���������� ����� ���� �� ������"

#: curs_main.c:1184
#: curs_main.c:1191
msgid "Open mailbox"
msgstr "�������� �� �������� �����"

#: curs_main.c:1194
#: curs_main.c:1201
#, fuzzy
msgid "No mailboxes have new mail"
msgstr "���� �������� ����� � ���� �����."

#: curs_main.c:1231 mx.c:487 mx.c:580
#: curs_main.c:1238 mx.c:516 mx.c:605
#, c-format
msgid "%s is not a mailbox."
msgstr "%s �� � �������� �����."

#: curs_main.c:1334
#: curs_main.c:1346
msgid "Exit Mutt without saving?"
msgstr "������� �� �� ��������� Mutt ��� �� �������� ���������?"

#: curs_main.c:1352 curs_main.c:1388 curs_main.c:1846 curs_main.c:1878
#: flags.c:301 thread.c:1028 thread.c:1083 thread.c:1138
#: curs_main.c:1364 curs_main.c:1400 curs_main.c:1860 curs_main.c:1892
#: flags.c:302 thread.c:1025 thread.c:1081 thread.c:1148
msgid "Threading is not enabled."
msgstr "����������� �� ����� �� � ��������."

#: curs_main.c:1364
#: curs_main.c:1376
msgid "Thread broken"
msgstr ""

#: curs_main.c:1375
#: curs_main.c:1387
msgid "Thread cannot be broken, message is not part of a thread"
msgstr ""

#. L10N: CHECK_ACL
#: curs_main.c:1385
#: curs_main.c:1397
msgid "Cannot link threads"
msgstr ""

#: curs_main.c:1390
#: curs_main.c:1402
msgid "No Message-ID: header available to link thread"
msgstr ""

#: curs_main.c:1392
#: curs_main.c:1404
#, fuzzy
msgid "First, please tag a message to be linked here"
msgstr "������� ������� ���� ������� �� ��-����� ���������"

#: curs_main.c:1404
#: curs_main.c:1416
msgid "Threads linked"
msgstr ""

#: curs_main.c:1407
#: curs_main.c:1419
msgid "No thread linked"
msgstr ""

#: curs_main.c:1443 curs_main.c:1468
#: curs_main.c:1455 curs_main.c:1480
msgid "You are on the last message."
msgstr "���� � ���������� �����."

#: curs_main.c:1450 curs_main.c:1494
#: curs_main.c:1462 curs_main.c:1506
msgid "No undeleted messages."
msgstr "���� ������������ �����."

#: curs_main.c:1487 curs_main.c:1511
#: curs_main.c:1499 curs_main.c:1523
msgid "You are on the first message."
msgstr "���� � ������� �����."

#: curs_main.c:1586 menu.c:773 pager.c:2115 pattern.c:1494
#: curs_main.c:1598 menu.c:773 pager.c:2122 pattern.c:1575
msgid "Search wrapped to top."
msgstr "��������� � ��������� ������."

#: curs_main.c:1595 pager.c:2137 pattern.c:1505
#: curs_main.c:1607 pager.c:2144 pattern.c:1586
msgid "Search wrapped to bottom."
msgstr "��������� � ��������� ������."

#: curs_main.c:1639
#: curs_main.c:1651
#, fuzzy
msgid "No new messages in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: curs_main.c:1641
#: curs_main.c:1653
#, fuzzy
msgid "No new messages."
msgstr "���� ���� �����."

#: curs_main.c:1646
#: curs_main.c:1658
#, fuzzy
msgid "No unread messages in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: curs_main.c:1648
#: curs_main.c:1660
#, fuzzy
msgid "No unread messages."
msgstr "���� ����������� �����"

#. L10N: CHECK_ACL
#: curs_main.c:1666
#: curs_main.c:1678
#, fuzzy
msgid "Cannot flag message"
msgstr "������� �����"

#. L10N: CHECK_ACL
#: curs_main.c:1704 pager.c:2728
#: curs_main.c:1716 pager.c:2735
msgid "Cannot toggle new"
msgstr ""

#: curs_main.c:1781
#: curs_main.c:1793
msgid "No more threads."
msgstr "���� ������ �����."

#: curs_main.c:1783
#: curs_main.c:1795
msgid "You are on the first thread."
msgstr "���� � ������� �����."

#: curs_main.c:1864
#: curs_main.c:1878
msgid "Thread contains unread messages."
msgstr "������� ������� ����������� �����."

#. L10N: CHECK_ACL
#: curs_main.c:1960 pager.c:2417
#: curs_main.c:1974 pager.c:2424
#, fuzzy
msgid "Cannot delete message"
msgstr "���� ������������ �����."

#. L10N: CHECK_ACL
#: curs_main.c:2046
#: curs_main.c:2060
#, fuzzy
msgid "Cannot edit message"
msgstr "���������� ����� �� �����"

#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
#: curs_main.c:2106 pager.c:2823
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "���������� ����� � �����������."

#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated.  Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
#: curs_main.c:2112 pager.c:2826
#, fuzzy
msgid "No labels changed."
msgstr "���������� ����� � �����������."

#. L10N: CHECK_ACL
#: curs_main.c:2178
#: curs_main.c:2212
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "���� ��� ������������ ����� � �������"

#. L10N: This is the prompt for <mark-message>.  Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
#: curs_main.c:2248
#, fuzzy
msgid "Enter macro stroke: "
msgstr "�������� ������ �������������: "

#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
#: curs_main.c:2256
#, fuzzy
msgid "message hotkey"
msgstr "������� � �������� ���� �������."

#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro.  %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
#: curs_main.c:2261
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "������� � ����������."

#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
#: curs_main.c:2269
#, fuzzy
msgid "No message ID to macro."
msgstr "� ���� ����� ���� �����."

#. L10N: CHECK_ACL
#: curs_main.c:2274 pager.c:2748
#: curs_main.c:2346 pager.c:2755
#, fuzzy
msgid "Cannot undelete message"
msgstr "���� ������������ �����."

#: edit.c:41
#: edit.c:42
#, fuzzy
msgid ""
"~~\t\tinsert a line beginning with a single ~\n"


@@ 1928,7 2034,7 @@ msgstr ""
"~?\t\t���� �����\n"
".\t\t���� �� ��� �������� ���� �� �������\n"

#: edit.c:52
#: edit.c:53
#, fuzzy
msgid ""
"~q\t\twrite file and quit editor\n"


@@ 1962,20 2068,20 @@ msgstr ""
"~?\t\t���� �����\n"
".\t\t���� �� ��� �������� ���� �� �������\n"

#: edit.c:187
#: edit.c:190
#, c-format
msgid "%d: invalid message number.\n"
msgstr "%d: ��������� ����� �� �����.\n"

#: edit.c:329
#: edit.c:332
msgid "(End message with a . on a line by itself)\n"
msgstr "(�� ���� �� ������� �������� . ���� ��������� ������ �� ����)\n"

#: edit.c:388
#: edit.c:391
msgid "No mailbox.\n"
msgstr "���� �������� �����.\n"

#: edit.c:392
#: edit.c:395
msgid "Message contains:\n"
msgstr "������� �������:\n"



@@ 1984,24 2090,24 @@ msgstr "
#. not IN the middle of the content.
#. So it doesn't mean "(message will continue)"
#. but means "(press any key to continue using mutt)".
#: edit.c:401 edit.c:458
#: edit.c:404 edit.c:461
msgid "(continue)\n"
msgstr "(��-�������)\n"

#: edit.c:414
#: edit.c:417
msgid "missing filename.\n"
msgstr "������ ��� �� ����.\n"

#: edit.c:434
#: edit.c:437
msgid "No lines in message.\n"
msgstr "� ������� ���� ������.\n"

#: edit.c:451
#: edit.c:454
#, c-format
msgid "Bad IDN in %s: '%s'\n"
msgstr "��� IDN � %s: '%s'\n"

#: edit.c:469
#: edit.c:472
#, c-format
msgid "%s: unknown editor command (~? for help)\n"
msgstr "%s: ��������� ������� �� ���������  (�����������~? �� �����)\n"


@@ 2040,16 2146,11 @@ msgstr "
msgid "Can't append to folder: %s"
msgstr "������ ��� ���������� �� ����� ��� ���������� �����: %s"

#: editmsg.c:210
#, c-format
msgid "Error. Preserving temporary file: %s"
msgstr "������. ��������� �� ��������� ����: %s"

#: flags.c:345
#: flags.c:346
msgid "Set flag"
msgstr "��������� �� ����������"

#: flags.c:345
#: flags.c:346
msgid "Clear flag"
msgstr "��������� �� ����������"



@@ 2165,7 2266,7 @@ msgstr " (
msgid "(need 'view-attachments' bound to key!)"
msgstr "('view-attachments' ���� �������� ����������!)"

#: headers.c:185
#: headers.c:186
#, c-format
msgid "%s: unable to attach file"
msgstr "%s: ������ ��� ����������� �� ����"


@@ 2208,30 2309,34 @@ msgstr "
msgid "Bad history file format (line %d)"
msgstr ""

#: hook.c:93
#: hook.c:97
msgid "current mailbox shortcut '^' is unset"
msgstr ""

#: hook.c:104
#: hook.c:108
msgid "mailbox shortcut expanded to empty regexp"
msgstr ""

#: hook.c:267
#: hook.c:119
msgid "badly formatted command string"
msgstr ""

#: hook.c:279
#, c-format
msgid "unhook: Can't do unhook * from within a hook."
msgstr "unhook: �� ���� �� ��������� unhook * �� hook."

#: hook.c:279
#: hook.c:291
#, c-format
msgid "unhook: unknown hook type: %s"
msgstr "unhook: �������� hook ���: %s"

#: hook.c:285
#: hook.c:297
#, c-format
msgid "unhook: Can't delete a %s from within a %s."
msgstr "unhook: �� ���� �� �������� %s �� %s."

#: imap/auth.c:108 pop_auth.c:413 smtp.c:557
#: imap/auth.c:108 pop_auth.c:425 smtp.c:557
msgid "No authenticators available"
msgstr "���� ������� ��������������."



@@ 2263,11 2368,11 @@ msgstr "
msgid "LOGIN disabled on this server."
msgstr "LOGIN � �������� �� ���� ������."

#: imap/auth_login.c:47 pop_auth.c:246
#: imap/auth_login.c:47 pop_auth.c:258
msgid "Logging in..."
msgstr "���������..."

#: imap/auth_login.c:70 pop_auth.c:289
#: imap/auth_login.c:70 pop_auth.c:301
msgid "Login failed."
msgstr "��������� ���������."



@@ 2276,11 2381,11 @@ msgstr "
msgid "Authenticating (%s)..."
msgstr "�������������� (%s)..."

#: imap/auth_sasl.c:228 pop_auth.c:168
#: imap/auth_sasl.c:228 pop_auth.c:180
msgid "SASL authentication failed."
msgstr "��������� SASL �������������."

#: imap/browse.c:59 imap/imap.c:569
#: imap/browse.c:59 imap/imap.c:571
#, c-format
msgid "%s is an invalid IMAP path"
msgstr "%s �� � ������� IMAP ������"


@@ 2339,138 2444,138 @@ msgstr "
msgid "Closing connection to %s..."
msgstr "��������� �� �������� ��� %s..."

#: imap/imap.c:309
#: imap/imap.c:311
msgid "This IMAP server is ancient. Mutt does not work with it."
msgstr "���� IMAP-������ � �������. Mutt ���� �� ������ � ����."

#: imap/imap.c:434 pop_lib.c:295 smtp.c:466
#: imap/imap.c:436 pop_lib.c:295 smtp.c:466
msgid "Secure connection with TLS?"
msgstr "������� �� �� ���������� ������� ������ � TLS?"

#: imap/imap.c:443 pop_lib.c:315 smtp.c:478
#: imap/imap.c:445 pop_lib.c:315 smtp.c:478
msgid "Could not negotiate TLS connection"
msgstr "�� ���� �� ���� ���������� TSL ������"

#: imap/imap.c:459 pop_lib.c:336
#: imap/imap.c:461 pop_lib.c:336
msgid "Encrypted connection unavailable"
msgstr ""

#: imap/imap.c:602
#: imap/imap.c:604
#, c-format
msgid "Selecting %s..."
msgstr "�������� �� %s..."

#: imap/imap.c:757
#: imap/imap.c:759
msgid "Error opening mailbox"
msgstr "������ ��� �������� �� ���������� �����!"

#: imap/imap.c:808 imap/imap.c:2147 imap/message.c:877 muttlib.c:1568
#: imap/imap.c:810 imap/imap.c:2160 imap/message.c:895 muttlib.c:1683
#, c-format
msgid "Create %s?"
msgstr "������� �� �� ��������� %s?"

#: imap/imap.c:1201
#: imap/imap.c:1203
msgid "Expunge failed"
msgstr "��������� ����������"

#: imap/imap.c:1213
#: imap/imap.c:1215
#, c-format
msgid "Marking %d messages deleted..."
msgstr "��������� �� %d ��������� �� ���������..."

#: imap/imap.c:1245
#: imap/imap.c:1247
#, fuzzy, c-format
msgid "Saving changed messages... [%d/%d]"
msgstr "����� �� ������������ �� �������... [%d/%d]"

#: imap/imap.c:1300
#: imap/imap.c:1303
msgid "Error saving flags. Close anyway?"
msgstr ""

#: imap/imap.c:1308
#: imap/imap.c:1311
#, fuzzy
msgid "Error saving flags"
msgstr "������ ��� ��������� �� �������!"

#: imap/imap.c:1331
#: imap/imap.c:1334
msgid "Expunging messages from server..."
msgstr "���������� �� ����������� �� �������..."

#: imap/imap.c:1336
#: imap/imap.c:1339
msgid "imap_sync_mailbox: EXPUNGE failed"
msgstr "imap_sync_mailbo: ��������� EXPUNGE"

#: imap/imap.c:1805
#: imap/imap.c:1810
#, c-format
msgid "Header search without header name: %s"
msgstr ""

#: imap/imap.c:1876
#: imap/imap.c:1881
msgid "Bad mailbox name"
msgstr "��������� ��� �� ���������� �����"

#: imap/imap.c:1900
#: imap/imap.c:1905
#, c-format
msgid "Subscribing to %s..."
msgstr "��������� �� %s..."

#: imap/imap.c:1902
#: imap/imap.c:1907
#, fuzzy, c-format
msgid "Unsubscribing from %s..."
msgstr "��������� �� %s..."

#: imap/imap.c:1912
#: imap/imap.c:1917
#, fuzzy, c-format
msgid "Subscribed to %s"
msgstr "��������� �� %s..."

#: imap/imap.c:1914
#: imap/imap.c:1919
#, fuzzy, c-format
msgid "Unsubscribed from %s"
msgstr "��������� �� %s..."

#: imap/imap.c:2132 imap/message.c:841
#: imap/imap.c:2145 imap/message.c:859
#, c-format
msgid "Copying %d messages to %s..."
msgstr "�������� �� %d ��������� � %s..."

#: imap/message.c:98
#: imap/message.c:115
msgid "Unable to fetch headers from this IMAP server version."
msgstr ""
"������ ��� ���������� �� ���������� ����� �� ���� ������ �� IMAP-�������."

#: imap/message.c:108
#: imap/message.c:125
#, c-format
msgid "Could not create temporary file %s"
msgstr "���������� ����������� �� �������� ���� %s"

#. L10N:
#. Comparing the cached data with the IMAP server's data
#: imap/message.c:142
#: imap/message.c:159
#, fuzzy
msgid "Evaluating cache..."
msgstr "��������� �� ���������� �����... [%d/%d]"

#: imap/message.c:232 pop.c:281
#: imap/message.c:249 pop.c:281
#, fuzzy
msgid "Fetching message headers..."
msgstr "��������� �� ���������� �����... [%d/%d]"

#: imap/message.c:444 imap/message.c:501 pop.c:573
#: imap/message.c:462 imap/message.c:519 pop.c:573
msgid "Fetching message..."
msgstr "��������� �� �����..."

#: imap/message.c:490 pop.c:568
#: imap/message.c:508 pop.c:568
msgid "The message index is incorrect. Try reopening the mailbox."
msgstr ""
"��������� ������ �� �����. �������� �� �������� ������ ���������� �����."

#: imap/message.c:660
#: imap/message.c:678
#, fuzzy
msgid "Uploading message..."
msgstr "��������� �� ����� �� ������� ..."

#: imap/message.c:845
#: imap/message.c:863
#, c-format
msgid "Copying message %d to %s..."
msgstr "�������� �� %d-�� ��������� � %s..."


@@ 2479,203 2584,208 @@ msgstr "
msgid "Continue?"
msgstr "������� �� �� ����������?"

#: init.c:60 init.c:1768 pager.c:53
#: init.c:60 init.c:2044 pager.c:53
#, c-format
msgid "Not available in this menu."
msgstr "��������� �� � �������� �� ���� ����."

#: init.c:468
#: init.c:470
#, c-format
msgid "Bad regexp: %s"
msgstr ""

#: init.c:525
#: init.c:527
#, c-format
msgid "Not enough subexpressions for spam template"
msgid "Not enough subexpressions for template"
msgstr ""

#: init.c:715
#: init.c:770 init.c:778 init.c:799
#, fuzzy
msgid "not enough arguments"
msgstr "������������ ���������"

#: init.c:860
#, fuzzy
msgid "spam: no matching pattern"
msgstr "������� �����, ���������� �� ������"

#: init.c:717
#: init.c:862
#, fuzzy
msgid "nospam: no matching pattern"
msgstr "�������� ������������ �� �����, ���������� �� ������"

#: init.c:861
#: init.c:1006
#, c-format
msgid "%sgroup: missing -rx or -addr."
msgstr ""

#: init.c:879
#: init.c:1024
#, fuzzy, c-format
msgid "%sgroup: warning: bad IDN '%s'.\n"
msgstr "��������������: ��� IDN '%s' � ���������� '%s'.\n"

#: init.c:1094
#: init.c:1239
#, fuzzy
msgid "attachments: no disposition"
msgstr "������� ���������� �� ������������"

#: init.c:1132
#: init.c:1277
#, fuzzy
msgid "attachments: invalid disposition"
msgstr "������� ���������� �� ������������"

#: init.c:1146
#: init.c:1291
#, fuzzy
msgid "unattachments: no disposition"
msgstr "������� ���������� �� ������������"

#: init.c:1169
#: init.c:1314
msgid "unattachments: invalid disposition"
msgstr ""

#: init.c:1296
#: init.c:1441
msgid "alias: no address"
msgstr "alias: ���� �����"

#: init.c:1344
#: init.c:1489
#, c-format
msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
msgstr "��������������: ��� IDN '%s' � ���������� '%s'.\n"

#: init.c:1432
#: init.c:1577
msgid "invalid header field"
msgstr "��������� �������� ����"

#: init.c:1485
#: init.c:1630
#, c-format
msgid "%s: unknown sorting method"
msgstr "%s: �������� ����� �� ���������"

#: init.c:1592
#: init.c:1741
#, c-format
msgid "mutt_restore_default(%s): error in regexp: %s\n"
msgstr "mutt_restore_default(%s): ������ � ���������� �����: %s\n"

#: init.c:1745 init.c:1858
#: init.c:1899 init.c:2092
#, c-format
msgid "%s is unset"
msgstr "%s � ��������"

#: init.c:2021 init.c:2137
#, c-format
msgid "%s: unknown variable"
msgstr "%s: ��������� ����������"

#: init.c:1754
#: init.c:2030
#, c-format
msgid "prefix is illegal with reset"
msgstr "���� ������� �� � ������� � \"reset\""

#: init.c:1760
#: init.c:2036
#, c-format
msgid "value is illegal with reset"
msgstr "���� �������� �� � ������� � \"reset\""

#: init.c:1796 init.c:1808
#: init.c:2072 init.c:2084
#, c-format
msgid "Usage: set variable=yes|no"
msgstr ""

#: init.c:1816
#: init.c:2092
#, c-format
msgid "%s is set"
msgstr "%s � �������"

#: init.c:1816
#, c-format
msgid "%s is unset"
msgstr "%s � ��������"

#: init.c:1919
#: init.c:2203
#, fuzzy, c-format
msgid "Invalid value for option %s: \"%s\""
msgstr "��������� ��� �� ������: %s"

#: init.c:2056
#: init.c:2345
#, c-format
msgid "%s: invalid mailbox type"
msgstr "%s: ��������� ��� �� ���������� �����"

#: init.c:2087
#: init.c:2376
#, fuzzy, c-format
msgid "%s: invalid value (%s)"
msgstr "%s: ��������� ��������"

#: init.c:2088
#: init.c:2377
msgid "format error"
msgstr ""

#: init.c:2088
#: init.c:2377
msgid "number overflow"
msgstr ""

#: init.c:2148
#: init.c:2437
#, c-format
msgid "%s: invalid value"
msgstr "%s: ��������� ��������"

#: init.c:2192
#: init.c:2481
#, c-format
msgid "%s: Unknown type."
msgstr "%s: �������� ���."

#: init.c:2219
#: init.c:2508
#, c-format
msgid "%s: unknown type"
msgstr "%s: �������� ���"

#: init.c:2287
#: init.c:2576
#, c-format
msgid "Error in %s, line %d: %s"
msgstr "������ � %s, ��� %d: %s"

#: init.c:2310
#: init.c:2599
#, c-format
msgid "source: errors in %s"
msgstr "source: ������ � %s"

#: init.c:2311
#: init.c:2600
#, fuzzy, c-format
msgid "source: reading aborted due to too many errors in %s"
msgstr "source: ���������� � ���������� ������ ������ ����� ������ � %s"

#: init.c:2325
#: init.c:2614
#, c-format
msgid "source: error at %s"
msgstr "source: ������ ��� %s"

#: init.c:2330
#: init.c:2619
msgid "source: too many arguments"
msgstr "source: ������ ����� ���������"

#: init.c:2384
#: init.c:2673
#, c-format
msgid "%s: unknown command"
msgstr "%s: ��������� �������"

#: init.c:2872
#: init.c:3166
#, c-format
msgid "Error in command line: %s\n"
msgstr "������ � ��������� ���: %s\n"

#: init.c:2951
#: init.c:3287
msgid "unable to determine home directory"
msgstr "������� �� ���������� �� ���� �� ���� ��������"

#: init.c:2959
#: init.c:3295
msgid "unable to determine username"
msgstr "��������������� �� ��� �� ���� �� ���� ����������"

#: init.c:2985
#: init.c:3321
#, fuzzy
msgid "unable to determine nodename via uname()"
msgstr "��������������� �� ��� �� ���� �� ���� ����������"

#: init.c:3229
#: init.c:3562
msgid "-group: no group name"
msgstr ""

#: init.c:3239
#: init.c:3572
#, fuzzy
msgid "out of arguments"
msgstr "������������ ���������"


@@ 2813,7 2923,7 @@ msgid ""
"02110-1301, USA.\n"
msgstr ""

#: main.c:119
#: main.c:121
msgid ""
"usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
"       mutt [<options>] [-Ex] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "


@@ 2827,7 2937,7 @@ msgid ""
"       mutt -v[v]\n"
msgstr ""

#: main.c:128
#: main.c:130
msgid ""
"options:\n"
"  -A <alias>\texpand the given alias\n"


@@ 2838,11 2948,11 @@ msgid ""
"  -D\t\tprint the value of all variables to stdout"
msgstr ""

#: main.c:137
#: main.c:139
msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
msgstr ""

#: main.c:140
#: main.c:142
#, fuzzy
msgid ""
"  -E\t\tedit the draft (-H) or include (-i) file\n"


@@ 2891,7 3001,7 @@ msgstr ""
"�� ���������� ��� ���� ������\n"
"  -h\t\t������� ���� �����"

#: main.c:150
#: main.c:152
#, fuzzy
msgid ""
"  -Q <variable>\tquery a configuration variable\n"


@@ 2940,7 3050,7 @@ msgstr ""
"�� ���������� ��� ���� ������\n"
"  -h\t\t������� ���� �����"

#: main.c:231
#: main.c:233
msgid ""
"\n"
"Compile options:"


@@ 2948,64 3058,64 @@ msgstr ""
"\n"
"����� ��� ����������:"

#: main.c:541
#: main.c:549
msgid "Error initializing terminal."
msgstr "������ ��� ������������� �� ���������."

#: main.c:679
#: main.c:697
#, fuzzy, c-format
msgid "Error: value '%s' is invalid for -d.\n"
msgstr "������: '%s' � ��������� IDN."

#: main.c:682
#: main.c:700
#, c-format
msgid "Debugging at level %d.\n"
msgstr "Debugging �� ���� %d.\n"

#: main.c:684
#: main.c:702
msgid "DEBUG was not defined during compilation.  Ignored.\n"
msgstr "������� DEBUG �� � � ���������� ��� ���������� � � ����������.\n"

#: main.c:862
#: main.c:880
#, c-format
msgid "%s does not exist. Create it?"
msgstr "%s �� ����������. �� ���� �� ��������?"

#: main.c:866
#: main.c:884
#, c-format
msgid "Can't create %s: %s."
msgstr "������ ��� ��������� �� %s: %s."

#: main.c:906
#: main.c:924
msgid "Failed to parse mailto: link\n"
msgstr ""

#: main.c:918
#: main.c:936
msgid "No recipients specified.\n"
msgstr "�� �� ������� ����������.\n"

#: main.c:944
#: main.c:962
msgid "Cannot use -E flag with stdin\n"
msgstr ""

#: main.c:1097
#: main.c:1115
#, c-format
msgid "%s: unable to attach file.\n"
msgstr "%s: ������ ��� ��������� �� �����.\n"

#: main.c:1178
#: main.c:1196
msgid "No mailbox with new mail."
msgstr "���� �������� ����� � ���� �����."

#: main.c:1187
#: main.c:1205
msgid "No incoming mailboxes defined."
msgstr "�� �� ���������� ������ �������� �����."

#: main.c:1215
#: main.c:1233
msgid "Mailbox is empty."
msgstr "���������� ����� � ������."

#: mbox.c:120 mbox.c:271 mh.c:1255 mx.c:598
#: mbox.c:120 mbox.c:271 mh.c:1258 mx.c:625
#, c-format
msgid "Reading %s..."
msgstr "��������� �� %s..."


@@ 3019,48 3129,44 @@ msgstr "
msgid "Couldn't lock %s\n"
msgstr "���������� ���������� �� %s\n"

#: mbox.c:493 mbox.c:508
#: mbox.c:501 mbox.c:516
msgid "Can't write message"
msgstr "���������� ����� �� �����"

#: mbox.c:748
#: mbox.c:756
msgid "Mailbox was corrupted!"
msgstr "���������� ����� � ���������!"

#: mbox.c:829 mbox.c:1089
#: mbox.c:838 mbox.c:1098
msgid "Fatal error!  Could not reopen mailbox!"
msgstr ""
"����������� ������! ������ ��� ���������� �������� �� ���������� �����!"

#: mbox.c:838
msgid "Unable to lock mailbox!"
msgstr "������ ��� ���������� �� ���������� �����!"

#: mbox.c:881
#: mbox.c:890
msgid "sync: mbox modified, but no modified messages! (report this bug)"
msgstr ""
"sync: ���������� ����� � ���������, �� ���� ��������� �����! (����, �������� "
"�� ���� ������)"

#: mbox.c:905 mh.c:1889 mx.c:675
#: mbox.c:914 mh.c:1892 mx.c:707
#, c-format
msgid "Writing %s..."
msgstr "����� �� %s..."

#: mbox.c:1040
#: mbox.c:1049
msgid "Committing changes..."
msgstr "����������� �� ���������..."

#: mbox.c:1075
#: mbox.c:1084
#, c-format
msgid "Write failed!  Saved partial mailbox to %s"
msgstr "������ ��� �����! ���������� ����� � �������� �������� � %s"

#: mbox.c:1137
#: mbox.c:1153
msgid "Could not reopen mailbox!"
msgstr "������ ��� ���������� �������� �� ���������� �����!"

#: mbox.c:1164
#: mbox.c:1180
msgid "Reopening mailbox..."
msgstr "�������� �������� �� ���������� �����..."



@@ 3101,15 3207,15 @@ msgstr "
msgid "You are on the first entry."
msgstr "���� � ������� �����."

#: menu.c:747 pager.c:2159 pattern.c:1433
#: menu.c:747 pager.c:2166 pattern.c:1514
msgid "Search for: "
msgstr "�������: "

#: menu.c:747 pager.c:2159 pattern.c:1433
#: menu.c:747 pager.c:2166 pattern.c:1514
msgid "Reverse search for: "
msgstr "������� �������: "

#: menu.c:791 pager.c:2112 pager.c:2134 pager.c:2254 pattern.c:1548
#: menu.c:791 pager.c:2119 pager.c:2141 pager.c:2261 pattern.c:1629
msgid "Not found."
msgstr "���� ��������� �� ���������."



@@ 3129,17 3235,17 @@ msgstr "
msgid "Tagging is not supported."
msgstr "����������� �� �� ��������."

#: mh.c:1235
#: mh.c:1238
#, fuzzy, c-format
msgid "Scanning %s..."
msgstr "�������� �� %s..."

#: mh.c:1558 mh.c:1641
#: mh.c:1561 mh.c:1644
#, fuzzy
msgid "Could not flush message to disk"
msgstr "������� �� ���� �� ���� ���������."

#: mh.c:1603
#: mh.c:1606
#, fuzzy
msgid "_maildir_commit_message(): unable to set time on file"
msgstr ""


@@ 3209,21 3315,21 @@ msgstr "
msgid "Could not connect to %s (%s)."
msgstr "������ ��� ��������� � %s (%s)"

#: mutt_ssl.c:226
#: mutt_ssl.c:278
msgid "Failed to find enough entropy on your system"
msgstr "������������ �������� � ���������"

#: mutt_ssl.c:250
#: mutt_ssl.c:302
#, c-format
msgid "Filling entropy pool: %s...\n"
msgstr "�������� �� �������� �� ���������� �� �������� �������: %s...\n"

#: mutt_ssl.c:258
#: mutt_ssl.c:310
#, c-format
msgid "%s has insecure permissions!"
msgstr "%s ��� ��������� ����� �� ������!"

#: mutt_ssl.c:277
#: mutt_ssl.c:329
#, fuzzy
msgid "SSL disabled due to the lack of entropy"
msgstr "SSL � �������� ������ ����� �� ���������� ��������"


@@ 3232,129 3338,129 @@ msgstr "SSL 
#. *       function SSL_CTX_new().  In this case it returned NULL: an
#. *       error condition.
#.
#: mutt_ssl.c:344
#: mutt_ssl.c:396
#, fuzzy
msgid "Unable to create SSL context"
msgstr "������: �� ���� �� ���� ��������� ������� OpenSSL ������!"

#: mutt_ssl.c:420
#: mutt_ssl.c:494
msgid "I/O error"
msgstr "������-������� ������"

#: mutt_ssl.c:429
#: mutt_ssl.c:503
#, c-format
msgid "SSL failed: %s"
msgstr "��������� SSL: %s"

#: mutt_ssl.c:438 mutt_ssl_gnutls.c:1079 mutt_ssl_gnutls.c:1114
#: mutt_ssl_gnutls.c:1124
msgid "Unable to get certificate from peer"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#. L10N:
#. %1$s is version (e.g. "TLSv1.2")
#. %2$s is cipher_version (e.g. "TLSv1/SSLv3")
#. %3$s is cipher_name (e.g. "ECDHE-RSA-AES128-GCM-SHA256")
#: mutt_ssl.c:450
#: mutt_ssl.c:513
#, fuzzy, c-format
msgid "%s connection using %s (%s)"
msgstr "SSL ������, ���������� %s (%s)"

#: mutt_ssl.c:576
#: mutt_ssl.c:640
msgid "Unknown"
msgstr "����������"

#: mutt_ssl.c:601 mutt_ssl_gnutls.c:598
#: mutt_ssl.c:653 mutt_ssl_gnutls.c:598
#, c-format
msgid "[unable to calculate]"
msgstr "[������ ��� ����������]"

#: mutt_ssl.c:619 mutt_ssl_gnutls.c:621
#: mutt_ssl.c:671 mutt_ssl_gnutls.c:621
msgid "[invalid date]"
msgstr "[��������� ����]"

#: mutt_ssl.c:747
#: mutt_ssl.c:745
msgid "Server certificate is not yet valid"
msgstr "������������ �� ������� ��� ��� �� � �������"

#: mutt_ssl.c:754
#: mutt_ssl.c:752
msgid "Server certificate has expired"
msgstr "������������ �� ������� � �������"

#: mutt_ssl.c:876
#: mutt_ssl.c:874
#, fuzzy
msgid "cannot get certificate subject"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: mutt_ssl.c:886 mutt_ssl.c:895
#: mutt_ssl.c:884 mutt_ssl.c:893
#, fuzzy
msgid "cannot get certificate common name"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: mutt_ssl.c:909
#: mutt_ssl.c:907
#, fuzzy, c-format
msgid "certificate owner does not match hostname %s"
msgstr "������������ �� S/MIME ����������� �� ������� � �������� �� �������."

#: mutt_ssl.c:950
#: mutt_ssl.c:972
#, fuzzy, c-format
msgid "Certificate host check failed: %s"
msgstr "������������ � �������"

#: mutt_ssl.c:1028 mutt_ssl_gnutls.c:860
#: mutt_ssl.c:1031 mutt_ssl_gnutls.c:860
msgid "This certificate belongs to:"
msgstr "���� ���������� ���������� ��:"

#: mutt_ssl.c:1041 mutt_ssl_gnutls.c:899
#: mutt_ssl.c:1039 mutt_ssl_gnutls.c:899
msgid "This certificate was issued by:"
msgstr "���� ���������� � ������� ��:"

#: mutt_ssl.c:1052 mutt_ssl_gnutls.c:938
#: mutt_ssl.c:1047 mutt_ssl_gnutls.c:938
#, c-format
msgid "This certificate is valid"
msgstr "���� ���������� � �������"

#: mutt_ssl.c:1053 mutt_ssl_gnutls.c:941
#: mutt_ssl.c:1048 mutt_ssl_gnutls.c:941
#, c-format
msgid "   from %s"
msgstr "   �� %s"

#: mutt_ssl.c:1055 mutt_ssl_gnutls.c:945
#: mutt_ssl.c:1050 mutt_ssl_gnutls.c:945
#, c-format
msgid "     to %s"
msgstr "    �� %s"

#: mutt_ssl.c:1061
#, c-format
msgid "Fingerprint: %s"
#: mutt_ssl.c:1056 mutt_ssl_gnutls.c:950
#, fuzzy, c-format
msgid "SHA1 Fingerprint: %s"
msgstr "������� ���������: %s"

#: mutt_ssl.c:1059 mutt_ssl_gnutls.c:953
#, fuzzy, c-format
msgid "MD5 Fingerprint: %s"
msgstr "������� ���������: %s"

#: mutt_ssl.c:1064 mutt_ssl_gnutls.c:982
#: mutt_ssl.c:1062 mutt_ssl_gnutls.c:982
#, c-format
msgid "SSL Certificate check (certificate %d of %d in chain)"
msgstr ""

#: mutt_ssl.c:1072 mutt_ssl_gnutls.c:991
#: mutt_ssl.c:1070 mutt_ssl_gnutls.c:991
msgid "(r)eject, accept (o)nce, (a)ccept always"
msgstr "����������(r), ���������� ��������(o), �������� ������(a)"

#: mutt_ssl.c:1073 mutt_ssl_gnutls.c:992
#: mutt_ssl.c:1071 mutt_ssl_gnutls.c:992
msgid "roa"
msgstr "roa"

#: mutt_ssl.c:1077 mutt_ssl_gnutls.c:996
#: mutt_ssl.c:1075 mutt_ssl_gnutls.c:996
msgid "(r)eject, accept (o)nce"
msgstr "����������(r), ���������� ��������(o)"

#: mutt_ssl.c:1078 mutt_ssl_gnutls.c:997
#: mutt_ssl.c:1076 mutt_ssl_gnutls.c:997
msgid "ro"
msgstr "ro"

#: mutt_ssl.c:1109 mutt_ssl_gnutls.c:1046
#: mutt_ssl.c:1107 mutt_ssl_gnutls.c:1046
msgid "Warning: Couldn't save certificate"
msgstr "��������������: ������������ �� ���� �� ���� �������"

#: mutt_ssl.c:1114 mutt_ssl_gnutls.c:1051
#: mutt_ssl.c:1112 mutt_ssl_gnutls.c:1051
msgid "Certificate saved"
msgstr "������������ � �������"



@@ 3388,16 3494,6 @@ msgstr ""
msgid "Warning: Server certificate was signed using an insecure algorithm"
msgstr ""

#: mutt_ssl_gnutls.c:950
#, fuzzy, c-format
msgid "SHA1 Fingerprint: %s"
msgstr "������� ���������: %s"

#: mutt_ssl_gnutls.c:953
#, fuzzy, c-format
msgid "MD5 Fingerprint: %s"
msgstr "������� ���������: %s"

#: mutt_ssl_gnutls.c:958
#, fuzzy
msgid "WARNING: Server certificate is not yet valid"


@@ 3422,6 3518,10 @@ msgstr ""
msgid "WARNING: Signer of server certificate is not a CA"
msgstr "������������ �� ������� ��� ��� �� � �������"

#: mutt_ssl_gnutls.c:1079 mutt_ssl_gnutls.c:1114 mutt_ssl_gnutls.c:1124
msgid "Unable to get certificate from peer"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: mutt_ssl_gnutls.c:1085
#, c-format
msgid "Certificate verification error (%s)"


@@ 3432,17 3532,17 @@ msgstr ""
msgid "Certificate is not X.509"
msgstr "������������ � �������"

#: mutt_tunnel.c:72
#: mutt_tunnel.c:73
#, fuzzy, c-format
msgid "Connecting with \"%s\"..."
msgstr "��������� � %s..."

#: mutt_tunnel.c:139
#: mutt_tunnel.c:149
#, c-format
msgid "Tunnel to %s returned error %d (%s)"
msgstr ""

#: mutt_tunnel.c:157 mutt_tunnel.c:173
#: mutt_tunnel.c:167 mutt_tunnel.c:183
#, fuzzy, c-format
msgid "Tunnel error talking to %s: %s"
msgstr "������ � ������������� � %s (%s)"


@@ 3450,184 3550,179 @@ msgstr "
#. L10N:
#. Means "The path you specified as the destination file is a directory."
#. See the msgid "Save to file: " (alias.c, recvattach.c)
#: muttlib.c:979
#: muttlib.c:1002
msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
msgstr ""
"������ � ����������. ������� �� �� �������� � ���? [(y) ��, (n) ��, (a) "
"������]"

#: muttlib.c:979
#: muttlib.c:1002
msgid "yna"
msgstr "yna"

#. L10N:
#. Means "The path you specified as the destination file is a directory."
#. See the msgid "Save to file: " (alias.c, recvattach.c)
#: muttlib.c:998
#: muttlib.c:1021
msgid "File is a directory, save under it?"
msgstr "������ � ����������. ������� �� �� �������� � ���?"

#: muttlib.c:1002
#: muttlib.c:1025
msgid "File under directory: "
msgstr "���� � ���� ����������: "

#: muttlib.c:1011
#: muttlib.c:1034
msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
msgstr "������ ����������. ��������(o), ��������(a) ��� �����(c)?"

#: muttlib.c:1011
#: muttlib.c:1034
msgid "oac"
msgstr "oac"

#: muttlib.c:1534
#: muttlib.c:1649
msgid "Can't save message to POP mailbox."
msgstr "����� �� ����� �� POP ������ �� � ��������."

#: muttlib.c:1543
#: muttlib.c:1658
#, c-format
msgid "Append messages to %s?"
msgstr "������� �� �� �������� ������� ��� %s?"

#: muttlib.c:1555
#: muttlib.c:1670
#, c-format
msgid "%s is not a mailbox!"
msgstr "%s �� � �������� �����!"

#: mx.c:143
#: mx.c:151
#, c-format
msgid "Lock count exceeded, remove lock for %s?"
msgstr ""
"�������� � ����������� ���� �����������. ������� �� �� ���������� "
"������������ �� %s?"

#: mx.c:155
#: mx.c:163
#, c-format
msgid "Can't dotlock %s.\n"
msgstr "���������� dot-���������� �� %s.\n"

#: mx.c:211
#: mx.c:219
msgid "Timeout exceeded while attempting fcntl lock!"
msgstr "fcntl ���������� �� � �������� � ������������ ����� (timeout)!"

#: mx.c:217
#: mx.c:225
#, c-format
msgid "Waiting for fcntl lock... %d"
msgstr "������ �� fcntl ����������... %d"

#: mx.c:244
#: mx.c:252
msgid "Timeout exceeded while attempting flock lock!"
msgstr "flock ���������� �� � �������� � ������������ ����� (timeout)!"

#: mx.c:251
#: mx.c:259
#, c-format
msgid "Waiting for flock attempt... %d"
msgstr "������ �� flock ����������... %d"

#: mx.c:707
#, c-format
msgid "Could not synchronize mailbox %s!"
msgstr "������ ��� ��������������� �� %s!"

#: mx.c:742
#: mx.c:739
#, fuzzy
msgid "message(s) not deleted"
msgstr "��������� �� %d ��������� �� ���������..."

#: mx.c:775
#: mx.c:772
#, fuzzy
msgid "Can't open trash folder"
msgstr "������ ��� ���������� �� ����� ��� ���������� �����: %s"

#: mx.c:844
#: mx.c:830
#, c-format
msgid "Move read messages to %s?"
msgstr "������� �� �� ���������� ����������� ����� � %s?"

#: mx.c:860 mx.c:1146
#: mx.c:846 mx.c:1133
#, c-format
msgid "Purge %d deleted message?"
msgstr "������� �� �� �������� %d-�� ���������� �� ��������� �����?"

#: mx.c:860 mx.c:1146
#: mx.c:846 mx.c:1133
#, c-format
msgid "Purge %d deleted messages?"
msgstr "������� �� �� ��������  %d ���������� �� ��������� �����?"

#: mx.c:881
#: mx.c:867
#, c-format
msgid "Moving read messages to %s..."
msgstr "����������� �� ����������� ����� � %s..."

#: mx.c:942 mx.c:1137
#: mx.c:928 mx.c:1124
msgid "Mailbox is unchanged."
msgstr "���������� ����� � �����������."

#: mx.c:995
#: mx.c:981
#, c-format
msgid "%d kept, %d moved, %d deleted."
msgstr "��������: %d; ����������: %d; �������: %d"

#: mx.c:998 mx.c:1198
#: mx.c:984 mx.c:1185
#, c-format
msgid "%d kept, %d deleted."
msgstr "��������: %d; �������: %d"

#: mx.c:1121
#: mx.c:1108
#, c-format
msgid " Press '%s' to toggle write"
msgstr "��������� '%s' �� ���������/���������� �� ������ �� �����"

#: mx.c:1123
#: mx.c:1110
msgid "Use 'toggle-write' to re-enable write!"
msgstr "����������� 'toggle-write' �� ������������ �� ������ �� �����!"

#: mx.c:1125
#: mx.c:1112
#, c-format
msgid "Mailbox is marked unwritable. %s"
msgstr "���������� ����� � ���� �� ������. %s"

#: mx.c:1192
#: mx.c:1179
msgid "Mailbox checkpointed."
msgstr "���������� ����� � ����������."

#: mx.c:1367
#: mx.c:1354
#, fuzzy
msgid "Integer overflow -- can't allocate memory."
msgstr "Integer overflow -- ���������� �� ����� � ����������."

#: pager.c:1554
#: pager.c:1561
msgid "PrevPg"
msgstr "����. ���."

#: pager.c:1555
#: pager.c:1562
msgid "NextPg"
msgstr "�����. ���."

#: pager.c:1559
#: pager.c:1566
msgid "View Attachm."
msgstr "����������"

#: pager.c:1562
#: pager.c:1569
msgid "Next"
msgstr "��������"

#: pager.c:2013 pager.c:2044 pager.c:2076 pager.c:2352
#: pager.c:2020 pager.c:2051 pager.c:2083 pager.c:2359
msgid "Bottom of message is shown."
msgstr "���� � ����� �� �������."

#: pager.c:2029 pager.c:2051 pager.c:2058 pager.c:2065
#: pager.c:2036 pager.c:2058 pager.c:2065 pager.c:2072
msgid "Top of message is shown."
msgstr "���� � �������� �� �������."

#: pager.c:2290
#: pager.c:2297
msgid "Help is currently being shown."
msgstr "������� ���� � ��������."

#: pager.c:2319
#: pager.c:2326
msgid "No more quoted text."
msgstr "���� ������ ������� �����."

#: pager.c:2332
#: pager.c:2339
msgid "No more unquoted text after quoted text."
msgstr "���� ������ ��������� ����� ���� ���������."



@@ 3660,76 3755,76 @@ msgstr "
msgid "Invalid relative date: %s"
msgstr "��������� ����: %s"

#: pattern.c:813 pattern.c:965
#: pattern.c:818 pattern.c:977
#, c-format
msgid "error in pattern at: %s"
msgstr "������ � ������� ���: %s"

#: pattern.c:839
#: pattern.c:845
#, fuzzy, c-format
msgid "missing pattern: %s"
msgstr "������ ���������"

#: pattern.c:849
#: pattern.c:855
#, fuzzy, c-format
msgid "mismatched brackets: %s"
msgstr "����������� ��������� �����: %s"

#: pattern.c:905
#: pattern.c:915
#, fuzzy, c-format
msgid "%c: invalid pattern modifier"
msgstr "%c: ��������� �������"

#: pattern.c:911
#: pattern.c:921
#, c-format
msgid "%c: not supported in this mode"
msgstr "%c: �� �� �������� � ���� �����"

#: pattern.c:924
#: pattern.c:934
#, c-format
msgid "missing parameter"
msgstr "������ ���������"

#: pattern.c:940
#: pattern.c:950
#, c-format
msgid "mismatched parenthesis: %s"
msgstr "����������� ��������� �����: %s"

#: pattern.c:972
#: pattern.c:984
msgid "empty pattern"
msgstr "������ ������"

#: pattern.c:1229
#: pattern.c:1310
#, c-format
msgid "error: unknown op %d (report this error)."
msgstr "������: �������� �������� %d (����, �������� �� ���� ������)."

#: pattern.c:1312 pattern.c:1454
#: pattern.c:1393 pattern.c:1535
msgid "Compiling search pattern..."
msgstr "����������� �� ������� �� �������..."

#: pattern.c:1333
#: pattern.c:1414
msgid "Executing command on matching messages..."
msgstr "����������� �� ������� ����� �������..."

#: pattern.c:1402
#: pattern.c:1483
msgid "No messages matched criteria."
msgstr "���� �����, ���������� �� ���� ��������."

#: pattern.c:1484
#: pattern.c:1565
#, fuzzy
msgid "Searching..."
msgstr "���������..."

#: pattern.c:1497
#: pattern.c:1578
msgid "Search hit bottom without finding match"
msgstr "��������� �������� �� ����, ��� �� ���� �������� ����������"

#: pattern.c:1508
#: pattern.c:1589
msgid "Search hit top without finding match"
msgstr "��������� �������� �� ��������, ��� �� ���� �������� ����������"

#: pattern.c:1540
#: pattern.c:1621
msgid "Search interrupted."
msgstr "��������� � ����������."



@@ 3860,25 3955,25 @@ msgstr "eswabf"
msgid "Fetching PGP key..."
msgstr "���������� �� PGP ����..."

#: pgpkey.c:492
#: pgpkey.c:491
msgid "All matching keys are expired, revoked, or disabled."
msgstr "������ ��������� ������� �� ��������, ��������� ��� ������������."

#: pgpkey.c:533
#: pgpkey.c:532
#, c-format
msgid "PGP keys matching <%s>."
msgstr "PGP �������, ��������� � <%s>."

#: pgpkey.c:535
#: pgpkey.c:534
#, c-format
msgid "PGP keys matching \"%s\"."
msgstr "PGP �������, ��������� � \"%s\"."

#: pgpkey.c:554 pgpkey.c:747
#: pgpkey.c:553 pgpkey.c:746
msgid "Can't open /dev/null"
msgstr "������ ��� �������� �� /dev/null"

#: pgpkey.c:779
#: pgpkey.c:778
#, c-format
msgid "PGP Key %s."
msgstr "PGP ���� %s."


@@ 3903,7 3998,7 @@ msgid "%d messages have been lost. Try reopening the mailbox."
msgstr ""
"��������� ������ �� �����. �������� �� �������� ������ ���������� �����."

#: pop.c:411 pop.c:807
#: pop.c:411 pop.c:809
#, c-format
msgid "%s is an invalid POP path"
msgstr "%s �� � ������� POP ������"


@@ 3916,62 4011,62 @@ msgstr "
msgid "Can't write message to temporary file!"
msgstr "������ ��� ����� �� ������� ��� �������� ����"

#: pop.c:684
#: pop.c:686
#, fuzzy
msgid "Marking messages deleted..."
msgstr "��������� �� %d ��������� �� ���������..."

#: pop.c:762 pop.c:827
#: pop.c:764 pop.c:829
msgid "Checking for new messages..."
msgstr "�������� �� ���� �����..."

#: pop.c:791
#: pop.c:793
msgid "POP host is not defined."
msgstr "POP ������ �� � ���������."

#: pop.c:855
#: pop.c:857
msgid "No new mail in POP mailbox."
msgstr "���� ���� ����� � ���� POP �������� �����."

#: pop.c:862
#: pop.c:864
msgid "Delete messages from server?"
msgstr "������� �� �� �������� ������� �� �������?"

#: pop.c:864
#: pop.c:866
#, c-format
msgid "Reading new messages (%d bytes)..."
msgstr "��������� �� ������ ����� (%d �����)..."

#: pop.c:906
#: pop.c:908
msgid "Error while writing mailbox!"
msgstr "������ ��� ��������� �� ���������� �����!"

#: pop.c:910
#: pop.c:912
#, c-format
msgid "%s [%d of %d messages read]"
msgstr "%s [%d �� %d ����� �� ���������]"

#: pop.c:933 pop_lib.c:378
#: pop.c:935 pop_lib.c:378
msgid "Server closed connection!"
msgstr "�������� ������� ��������!"

#: pop_auth.c:79
#: pop_auth.c:83
msgid "Authenticating (SASL)..."
msgstr "�������������� (SASL)..."

#: pop_auth.c:203
#: pop_auth.c:215
msgid "POP timestamp is invalid!"
msgstr ""

#: pop_auth.c:208
#: pop_auth.c:220
msgid "Authenticating (APOP)..."
msgstr "�������������� (APOP)..."

#: pop_auth.c:231
#: pop_auth.c:243
msgid "APOP authentication failed."
msgstr "��������� APOP �������������."

#: pop_auth.c:266
#: pop_auth.c:278
#, c-format
msgid "Command USER is not supported by server."
msgstr "�������� �� �������� ��������� USER."


@@ 4019,12 4114,12 @@ msgstr "
msgid "Illegal S/MIME header"
msgstr "��������� S/MIME �������� ����"

#: postpone.c:586
#: postpone.c:595
#, fuzzy
msgid "Decrypting message..."
msgstr "��������� �� �����..."

#: postpone.c:594
#: postpone.c:603
msgid "Decryption failed."
msgstr "��������� ������������."



@@ 4070,72 4165,72 @@ msgstr "Pipe"
msgid "Print"
msgstr "�����������"

#: recvattach.c:485
#: recvattach.c:501
msgid "Saving..."
msgstr "���������..."

#: recvattach.c:488 recvattach.c:579
#: recvattach.c:504 recvattach.c:595
msgid "Attachment saved."
msgstr "������������ � �������� �� �����."

#: recvattach.c:591
#: recvattach.c:607
#, c-format
msgid "WARNING!  You are about to overwrite %s, continue?"
msgstr "��������������! �� ��� ��� �� ����������� %s, �������� ��?"

#: recvattach.c:609
#: recvattach.c:625
msgid "Attachment filtered."
msgstr "������������ � ����������."

#: recvattach.c:676
#: recvattach.c:694
msgid "Filter through: "
msgstr "���������� ����: "

#: recvattach.c:676
#: recvattach.c:694
msgid "Pipe to: "
msgstr "��������� �� (pipe): "

#: recvattach.c:711
#: recvattach.c:729
#, fuzzy, c-format
msgid "I don't know how to print %s attachments!"
msgstr "�� � ���������� ������� �� ����������� �� %s ����������!"

#: recvattach.c:776
#: recvattach.c:794
msgid "Print tagged attachment(s)?"
msgstr "������� �� �� ���������� ����������� ����������?"

#: recvattach.c:776
#: recvattach.c:794
msgid "Print attachment?"
msgstr "������� �� �� ���������� ������������?"

#: recvattach.c:1010
#: recvattach.c:1028
msgid "Can't decrypt encrypted message!"
msgstr "������ ��� ������������� �� ��������� �����!"

#: recvattach.c:1022
#: recvattach.c:1040
msgid "Attachments"
msgstr "����������"

#: recvattach.c:1058
#: recvattach.c:1076
#, fuzzy
msgid "There are no subparts to show!"
msgstr "���� ��������, ����� �� ����� ��������!."

#: recvattach.c:1119
#: recvattach.c:1137
msgid "Can't delete attachment from POP server."
msgstr "������ ��� ����������� �� ���������� �� POP �������."

#: recvattach.c:1127
#: recvattach.c:1145
msgid "Deletion of attachments from encrypted messages is unsupported."
msgstr "����������� �� ���������� �� ��������� ����� �� �� ��������."

#: recvattach.c:1133
#: recvattach.c:1151
#, fuzzy
msgid ""
"Deletion of attachments from signed messages may invalidate the signature."
msgstr "����������� �� ���������� �� ��������� ����� �� �� ��������."

#: recvattach.c:1150 recvattach.c:1167
#: recvattach.c:1168 recvattach.c:1185
msgid "Only deletion of multipart attachments is supported."
msgstr "�������� �� ���� ��������� �� ���������� �� �������� �����."



@@ 4179,7 4274,7 @@ msgstr "
msgid "Can't find any tagged messages."
msgstr "���� ��������� �����."

#: recvcmd.c:773 send.c:740
#: recvcmd.c:773 send.c:724
msgid "No mailing lists found!"
msgstr "���� mailing list-���!"



@@ 4281,105 4376,105 @@ msgstr "score: 
msgid "Error: score: invalid number"
msgstr ""

#: send.c:251
#: send.c:252
msgid "No subject, abort?"
msgstr "������� ���� ����, ������� �� �� ���������� �����������?"

#: send.c:253
#: send.c:254
msgid "No subject, aborting."
msgstr "���������� ������ ����� �� ����."

#. L10N:
#. Asks whether the user respects the reply-to header.
#. If she says no, mutt will reply to the from header's address instead.
#: send.c:503
#: send.c:487
#, c-format
msgid "Reply to %s%s?"
msgstr "������� �� �� ���������� �� %s%s?"

#: send.c:537
#: send.c:521
#, c-format
msgid "Follow-up to %s%s?"
msgstr "������� �� �� ���������� �� %s%s?"

#: send.c:715
#: send.c:699
msgid "No tagged messages are visible!"
msgstr "����� �� ����������� ����� �� � ������!"

#: send.c:766
#: send.c:750
msgid "Include message in reply?"
msgstr "������� �� �� ��������� ������� ��� ��������?"

#: send.c:771
#: send.c:755
msgid "Including quoted message..."
msgstr "���������� �� �������� �����..."

#: send.c:781
#: send.c:765
msgid "Could not include all requested messages!"
msgstr "�� ������ �������� ����� ����� �� ����� ���������!"

#: send.c:795
#: send.c:779
msgid "Forward as attachment?"
msgstr "������� �� �� �� ���������� ���� ����������?"

#: send.c:799
#: send.c:783
msgid "Preparing forwarded message..."
msgstr "���������� �� ����������..."

#: send.c:1176
#: send.c:1160
msgid "Recall postponed message?"
msgstr "������� �� �� ����������� �������?"

#: send.c:1426
#: send.c:1410
msgid "Edit forwarded message?"
msgstr "������� �� �� ����������� ������� ����� ����������?"

#: send.c:1475
#: send.c:1459
msgid "Abort unmodified message?"
msgstr "������� �� �� �������� ������������� �����?"

#: send.c:1477
#: send.c:1461
msgid "Aborted unmodified message."
msgstr "������������� ����� � �������."

#: send.c:1658
#: send.c:1642
msgid "Message postponed."
msgstr "������� � �������� ���� �������."

#: send.c:1669
#: send.c:1653
msgid "No recipients are specified!"
msgstr "�� �� ������� ����������!"

#: send.c:1674
#: send.c:1658
msgid "No recipients were specified."
msgstr "�� �� ������� ����������."

#: send.c:1690
#: send.c:1674
msgid "No subject, abort sending?"
msgstr "������ ���� �� �������. ������� �� �� ���������� �����������?"

#: send.c:1694
#: send.c:1678
msgid "No subject specified."
msgstr "������ ����."

#: send.c:1756 smtp.c:188
#: send.c:1740 smtp.c:188
msgid "Sending message..."
msgstr "��������� �� �������..."

#: send.c:1789
#: send.c:1773
#, fuzzy
msgid "Save attachments in Fcc?"
msgstr "������� ������������ ���� �����"

#: send.c:1899
#: send.c:1883
msgid "Could not send the message."
msgstr "������� �� ���� �� ���� ���������."

#: send.c:1904
#: send.c:1888
msgid "Mail sent."
msgstr "������� � ��������o."

#: send.c:1904
#: send.c:1888
msgid "Sending in background."
msgstr "��������� �� ����� ���."



@@ 4402,20 4497,20 @@ msgstr "%s 
msgid "Could not open %s"
msgstr "������ ��� �������� �� %s"

#: sendlib.c:2360
#: sendlib.c:2362
msgid "$sendmail must be set in order to send mail."
msgstr ""

#: sendlib.c:2431
#: sendlib.c:2454
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "������ %d (%s) ��� ��������� �� �������."

#: sendlib.c:2437
#: sendlib.c:2460
msgid "Output of the delivery process"
msgstr "�������� ������:"

#: sendlib.c:2611
#: sendlib.c:2635
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "��� IDN %s ������ ������� �� �������� ��������� ���� ����������."


@@ 4491,6 4586,11 @@ msgstr "
msgid "Error: unable to create OpenSSL subprocess!"
msgstr "������: �� ���� �� ���� ��������� ������� OpenSSL ������!"

#: smime.c:1231
#, fuzzy
msgid "Label for certificate: "
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: smime.c:1321
#, fuzzy
msgid "no certfile"


@@ 4673,28 4773,33 @@ msgstr "
msgid "SASL authentication failed"
msgstr "��������� SASL �������������."

#: sort.c:265
#: sort.c:297
msgid "Sorting mailbox..."
msgstr "���������� �� ���������� �����..."

#: sort.c:302
#: sort.c:334
msgid "Could not find sorting function! [report this bug]"
msgstr ""
"�� ���� �� ���� �������� ������� �� ����������! (����, �������� �� ���� "
"������)"

#: status.c:105
#: status.c:111
msgid "(no mailbox)"
msgstr "(���� �������� �����)"

#: thread.c:1095
msgid "Parent message is not visible in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: thread.c:1101
msgid "Parent message is not available."
msgstr "������������ ����� �� � �������."

#: thread.c:1107
#, fuzzy
msgid "Root message is not visible in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: thread.c:1109
msgid "Parent message is not visible in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: ../keymap_alldefs.h:5
msgid "null operation"
msgstr "������ �������"


@@ 4851,287 4956,288 @@ msgid "save this message to send later"
msgstr "������� ������� ���� ������� �� ��-����� ���������"

#: ../keymap_alldefs.h:43
#, fuzzy
msgid "send attachment with a different name"
msgstr "������� ���������� �� ������������"

#: ../keymap_alldefs.h:44
msgid "rename/move an attached file"
msgstr "������� ����� ��� ����������� �� ����������"

#: ../keymap_alldefs.h:44
#: ../keymap_alldefs.h:45
msgid "send the message"
msgstr "������� �������"

#: ../keymap_alldefs.h:45
#: ../keymap_alldefs.h:46
msgid "toggle disposition between inline/attachment"
msgstr "���������� ����� ������� � ������� ��� �������� ����"

#: ../keymap_alldefs.h:46
#: ../keymap_alldefs.h:47
msgid "toggle whether to delete file after sending it"
msgstr ""
"���������� ����� ����� �� ��������� ��� ��������� �� ����� ���� ���������"

#: ../keymap_alldefs.h:47
#: ../keymap_alldefs.h:48
msgid "update an attachment's encoding info"
msgstr "����������� ������������ �� �������� �� ������������"

#: ../keymap_alldefs.h:48
#: ../keymap_alldefs.h:49
msgid "write the message to a folder"
msgstr "������� ������� � �������� �����"

#: ../keymap_alldefs.h:49
#: ../keymap_alldefs.h:50
msgid "copy a message to a file/mailbox"
msgstr "������ ����� ��� ����/�������� �����"

#: ../keymap_alldefs.h:50
#: ../keymap_alldefs.h:51
msgid "create an alias from a message sender"
msgstr "������ �������� �� ������� � ��������� �����"

#: ../keymap_alldefs.h:51
#: ../keymap_alldefs.h:52
msgid "move entry to bottom of screen"
msgstr "��������� ������ ��� ������ ���� �� ������"

#: ../keymap_alldefs.h:52
#: ../keymap_alldefs.h:53
msgid "move entry to middle of screen"
msgstr "��������� ������ ��� ������� �� ������"

#: ../keymap_alldefs.h:53