~kevin8t8/mutt

a49b20d93017bdfe3fb82be2060293295be261bc — Kevin McCarthy 3 years ago be1be42 mutt-1-7-rel
automatic post-release commit for mutt-1.7.0
M ChangeLog => ChangeLog +1433 -0
@@ 1,3 1,1436 @@
2016-08-17 18:07 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (c513c311026f)

	* po/ja.po: Updated Japanese translation.

2016-08-15 10:17 -0700  Morten Bo Johansen  <morten.bo.johansen@gmail.com>  (83d0f5383325)

	* po/da.po: Updated Danish translation.

2016-08-15 09:15 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (f02122b5eeeb)

	* po/eo.po: Updated Esperanto translation.

2016-08-15 09:09 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (7e54c1fe55b4)

	* po/nl.po: Updated Dutch translation.

2016-08-10 09:29 -0700  Ivan Vilata i Balaguer  <ivan@selidor.net>  (2de6949a0f08)

	* po/ca.po: Updated Catalan translation.

2016-08-10 02:20 +0200  Vincent Lefevre  <vincent@vinc17.net>  (53b4b412dd79)

	* po/fr.po: Updated French translation.

2016-08-09 14:34 -0700  Vsevolod Volkov  <vvv@mutt.org.ua>  (8847b913432a)

	* po/ru.po: Updated Russian translation.

2016-08-09 14:32 -0700  Vsevolod Volkov  <vvv@mutt.org.ua>  (08251fb01f90)

	* po/uk.po: Updated Ukrainian translation.

2016-08-08 13:13 -0700  Kevin McCarthy  <kevin@8t8.us>  (7abc19ad2d10)

	* curs_main.c, pager.c, protos.h: Clear pager position upon returning
	to the index menu.

	This fixes a bug where opening a message sometimes shows it scrolled
	down.

	The easiest way to trigger this is to open a long message in a
	mailbox with no new messages, scroll down, hit <next-new-then-
	unread> and then reopen the message. The pager will "remember" the
	position and scroll down. If you simply exit the message and re-
	enter it, the position is not saved.

	More annoyingly, once in a very great while I will open a new
	message and have the message scrolled down partway. I believe this
	is due to OldHdr happening to point to the same address as the
	Header of the new message.

	This is somewhat easily triggered on a mailbox with one message,
	which you open, scroll down in, hit <next-new-then-unread> to exit,
	and then delete/sync. In another mutt instance, copy the same
	messsage back to the mailbox, then open the message in the original
	mutt instance. At least some of the time, the OldHdr pointer matches
	the new message, and so it opens scrolled down.

	This patch solves the problem by clearing the pager position once
	all redirections through the index menu are done.

2016-08-06 23:35 +0200  Vincent Lefevre  <vincent@vinc17.net>  (15c4c16bed07)

	* po/fr.po: Updated French translation.

2016-08-05 14:33 -0700  Kevin McCarthy  <kevin@8t8.us>  (108ad5dcf194)

	* rfc2047.c: Remove nonsensical size check in mutt_choose_charset()

	The charsets parameter is being tokenized by the : delimeter.

	The checks against ENCWORD_LEN_MAX and ENCWORD_LEN_MIN make no
	sense, and appear to be the result of a large merge a very long time
	ago (changeset cb27682966d5).

	I can only guess where this check was supposed to be, but it
	certainly doesn't belong here.

2016-08-05 13:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (a39c8bdca361)

	* rfc2047.c: Fix memory leak in mutt_choose_charset().

2016-08-05 13:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (1ef5734f6593)

	* mh.c: Fix memleak in mh_read_dir() when sequence parsing fails.

2016-08-05 11:02 -0700  Kevin McCarthy  <kevin@8t8.us>  (f6b5f533f9ce)

	* COPYRIGHT, buffy.c, getdomain.c, globals.h, init.c, init.h, main.c,
	sidebar.c: Update copyright notices.

2016-08-02 19:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (f9a4023b86ad)

	* pop.c: Explicitly NULL unimplemented pop mx_ops functions.

	The struct initialization already does this for unlisted fields, but
	I'd rather be explicit about unimplemented operations.

2016-08-02 19:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (01541185e6f4)

	* mx.c: Use the ctx->mx_ops instead of calling mx_get_ops()

	With mx_open_mailbox_append() setting the ctx->mx_ops, all contexts
	should have mx_ops set.

	Remove calls to mx_get_ops() and instead directly use ctx->mx_ops.

2016-08-01 18:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (e778db6e693c)

	* mailbox.h, mh.c, mx.c: Use a different flag in
	mx_open_mailbox_append() when mailbox doesn't exist.

	The previous commit re-used MUTT_NEWFOLDER, but the meaning of that
	flag is slightly different: it causes mbox to use fopen with mode
	"w", and is used only for the case of a brand-new mktemp-generated
	mbox.

	Setting it for other non-existing mbox files leads to a race
	condition between the stat and the fopen/lock, and so could end up
	truncating an existing mailbox created in-between!

	Create a different flag, MUTT_APPENDNEW to notify the open_append()
	functions that the mailbox doesn't exist. Change maildir and mh to
	check for that flag to create their directory structures.

2016-08-01 15:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (2b9d6165b8b7)

	* imap/imap.c, imap/imap.h, mbox.c, mh.c, mutt.h, mx.c, pop.c: Convert
	mx_open_mailbox_append() to use ctx->mx_ops.

	Set the flag MUTT_NEWFOLDER to signal Maildir and MH to create the
	directory structure.

	Distribute the "open append" code to mbox, mh, and imap/imap.c.

	Set pop's mx_ops handler to NULL to signal it is not supported.

2016-07-31 18:42 -0700  Kevin McCarthy  <kevin@8t8.us>  (3834da0c024e)

	* mbox.c, mx.c: Move fflush and fsync to the mbox and mmdf commit_msg
	functions.

	The case statement in mx_commit_message() was previously distributed
	to the various ops->commit_msg() handlers, but the fflush and fsync
	were not.

2016-07-30 11:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (27b77b5c97cf)

	* browser.c, browser.h, imap/browse.c, imap/imap.h, init.h: Add unread
	and total message count format strings to $folder_format.

	%n will show the unread message count in the mailbox. %m will show
	total message count. Except for %n with IMAP, these both require
	$mail_check_stats to be set, which puts these counts inside BUFFY.

	Since the imap_mboxcache is never fresher than the value in BUFFY,
	remove the special imap_mailbox_state() call. Instead, just update
	from the current Context for all mailboxes.

	Remove the logic that overrode the %N format string to show unread
	count for IMAP mailboxes. If they want to see unread count, they
	will have to change the $folder_format.

	Although it doesn't look possible to reuse browser_state.entry
	slots, change the OP_DELETE_MAILBOX to memset(0) the deleted slot.
	Then, we can change to logic in add_folder() so it doesn't need to
	zero-out unset values.

2016-07-25 12:25 -0700  Richard Russon  <rich@flatcap.org>  (4f4c258ab95c)

	* imap/command.c: Fix imap buffy msg_count overwrite issue.

	The sidebar updates the buffy->msg_count with the context. This can
	cause it to become out of sync with the imap_mboxcache.

	If the imap_buffy doesn't request MESSAGES, don't overwrite the
	buffy->msg_count with a stale value.

2016-07-22 14:55 -0700  Kevin McCarthy  <kevin@8t8.us>  (7b9763564598)

	* buffy.c, mx.c: Convert buffy_mbox_check() and trash_append() to use
	local context.

	buffy_mbox_check() was leaking the dynamically allocated context.
	Rather than add a call to free, just convert it to use a local
	variable.

	Make the same change to trash_append(), which doesn't need the
	dynamically allocated context either.

2016-07-21 14:00 -0700  Kevin McCarthy  <kevin@8t8.us>  (81ecc31f8197)

	* mx.c: Fix memleak in the new trash folder code.

	Free the context in opened in trash_append()

2016-07-21 12:49 +0200  Vincent Lefevre  <vincent@vinc17.net>  (2d1279b26e22)

	* po/fr.po: Updated French translation.

2016-07-20 16:29 -0700  Kevin McCarthy  <kevin@8t8.us>  (89b266256a85)

	* mbyte.c, mbyte.h, pager.c: Filter directional markers that corrupt
	the screen. (closes #3854)

	Thanks to Vincent Lefèvre for working on these utf-8 screen display
	issues.

2016-07-19 18:56 -0700  Anton Lindqvist  <anton.lindqvist@gmail.com>  (69bbe4da959f)

	* curs_lib.c: Fix arithmetic exception due to menu->pagelen being
	negative.

	Resizing the terminal window down to two lines when in an empty
	mailbox causes mutt to crash due to division by zero since menu->max
	equals 0 and menu->pagelen < 0 in status.c:205.

	Fixing the problem at this specific line felt wrong since I did
	notice menu->pagelen being negative. The pagelen is inherited from
	the rows calculation in mutt_reflow_windows. Since the number of
	lines can potentially be smaller than the accumulated number of rows
	acquired by the status, help and message window, make sure the
	calculation does not turn negative.

2016-07-17 19:31 -0700  Kevin McCarthy  <kevin@8t8.us>  (f1d5a884ffed)

	* imap/imap.c, imap/imap.h, mutt.h, mx.c: Add imap-fast-trash patch.

	This is based on the patch by Paul Miller.

	Modifications are:

	* Create a new flag, MUTT_TRASH for imap_make_msg_set(), rather than
	use MUTT_EXPIRED.

	* Change imap_make_msg_set(MUTT_TRASH) to only look at
	hdrs[n]->deleted && !hdrs[n]->purge, behaving like MUTT_TAG, rather
	than looking at the HEADER_DATA.

	* Reimplement imap_fast_trash() based on imap_copy_message(). It
	looks the old version was too, but it lacked handling of TRYCREATE
	and also queued the UID COPY but didn't exec it. (Presumably this
	happened in the subsequent sync).

	* Move the Context magic and mx_is_imap() checks outside of
	imap_fast_trash()

2016-07-17 19:31 -0700  Kevin McCarthy  <kevin@8t8.us>  (280f9b195192)

	* OPS, curs_main.c, functions.h, pager.c: Add purge-message patch.

	This is based on the patch by Cedric Duval. Modifications are:

	* Use the exising M_PURGE flag from the trash folder patch, rather
	than adding a separate flag.

	* Undelete operations are already handled by the trash folder patch.

2016-07-17 19:31 -0700  Kevin McCarthy  <kevin@8t8.us>  (20499921a4e5)

	* commands.c, curs_main.c, editmsg.c, flags.c, globals.h,
	imap/message.c, init.h, mbox.c, mutt.h, mx.c, pager.c, pattern.c,
	postpone.c: Add the trash folder patch.

	This is based on the trash folder patch by Cedric Duval.
	Modifications to the original patch are:

	* Use a flag called M_PURGE instead of M_APPENDED. The same flag is
	then used in the following "purge" patch instead of adding a
	different flag.

	* Removed the counter in context. The existing context->deleted is
	all that's needed.

	* Removed the "auto unset M_PURGE" when M_DELETED is unset inside
	_mutt_set_flag(), although this is convenient, it easily leads to
	header->purge not being reset in a few situations.

	* Reset purge flag along with the deleted flag if $delete is
	answered no.

	* Set M_PURGE on an edited message. (edit_one_message())

	* Preserve purge flag in mutt_reopen_mailbox()

	* Turn off OPTCONFIRMAPPEND when saving to the trash, rather than
	hardcoding it off in mutt_save_confirm(). That way, normal save to
	the folder will respect the option.

2016-07-16 14:04 -0700  Will Fiveash  <will.fiveash@oracle.com>  (b2cb7a38c1ed)

	* mutt_sasl.c: Fix memory leak in mutt_sasl_cb_pass.

	SASL doesn't free the sasl_secret_t, so this was leaking. Instead,
	keep our own pointer to it, and safe_realloc() each time.

	sasl_secret_t doesn't need the data field null terminated, so memcpy
	the password over.

2016-07-12 18:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (488f91a85115)

	* muttlib.c, sendlib.c: Fix BODY->d_filename memory leaks.

	mutt_message_to_7bit() and transform_to_7bit() were overwriting
	d_filename without freeing the previous value.

	mutt_free_body() was not freeing the d_filename pointer.

2016-07-12 17:46 -0700  Kevin McCarthy  <kevin@8t8.us>  (b4de6941bbb9)

	* muttlib.c, sendlib.c: Fix BODY->charset memory leaks.

	mutt_get_content_info() was directly setting charset without freeing
	the previous value.

	mutt_free_body() was not freeing the charset.

2016-07-11 18:36 -0700  Kevin McCarthy  <kevin@8t8.us>  (9378d21fc7fe)

	* curs_lib.c, main.c: Initialize mutt windows even in batch mode.
	(closes #3853)

	mutt_select_fcc() calls mutt_addr_hook() -> mutt_make_string() which
	refers to MuttIndexWindow->cols when calling mutt_FormatString(). In
	batch mode, MuttIndexWindow hasn't been initialized, leading to a
	segfault.

	This might be the only overlap, but it seems wiser to just
	initialize the mutt windows in case there are other references (now
	or in the future) when processing format strings in batch mode.

2016-07-08 19:08 -0700  rich burridge  <rich.burridge@oracle.com>  (89ae904a6b30)

	* Makefile.am: Fix conststrings compiler version string generation.
	(closes #3852)

	The Makefile.am tries compiler flags -v, --version, and -V but
	neglected to filter error messages if these flags aren't recognized.

2016-07-08 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (ec4c113a3d2b)

	* sidebar.c: Change sidebar highlighted mailbox behavior.

	Delay selecting the highlighted mailbox until prepare_mailbox(), to
	avoid a hidden mailbox being selected during the Buffy list
	population (in mutt_sb_notify_mailbox()).

	Change update_entries_visibility() to not automatically make the
	highlighted mailbox visible.

	Change prepare_sidebar() to (re)set the highlighted mailbox when the
	current highlighted mailbox is hidden.

2016-07-08 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (5fb53b95afa7)

	* sidebar.c: Fix sidebar pagedown/up when mailboxes on the end are
	hidden.

	The pageup/pagedown code was setting the highlighted mailbox to the
	top and bottom index without checking if those were hidden.

2016-07-08 18:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (4dc1831fd6d7)

	* imap/message.c: Don't overwrite imap_status->uidnext with a lower
	value. (closes #3771)

	imap_read_headers() updates the idata and imap_status uidnext after
	reading through all the new headers.

	The idata is updated properly (only if its uidnext is below
	maxuid+1), but the imap_status was always being set to maxuid.

	This causes a problem with new mail checking if the most recent
	messages are deleted. Then the uidnext will be greater than maxuid+1
	in the mailbox, and if there are any other unread messages it will
	*always* report new mail even if $mail_check_recent is set.

2016-07-07 12:00 -0700  Kevin McCarthy  <kevin@8t8.us>  (6f2fe8f32dab)

	* sidebar.c: Fix the sidebar TopIndex and BotIndex when
	$sidebar_new_mail_only is set.

	When set, some of the entries can be hidden, so a simple division by
	page_size to find the correct top/bottom isn't correct.

	Instead, manually partition into groups of page_size visible entries
	and set top and bottom based on the interval around the highlighted
	entry.

2016-07-07 09:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (5229c7fbc37e)

	* mbyte.c, pager.c: Filter soft hypen from pager and headers. (closes
	#3848)

	Add U+00AD SOFT HYPHEN to the filtered characters in headers and the
	pager. In some terminals and situations it causes major display
	problems.

2016-07-06 12:31 -0700  Richard Russon  <rich@flatcap.org>  (81e9c352e5d7)

	* sidebar.c: Fix sidebar crash for non-existent mailbox

	If you <change-folder> to a non-existent mailbox, there will be no
	Context.

2016-07-06 10:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (88793198dfcb)

	* po/fr.po: merge stable

2016-07-02 12:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (bf1c73de2b7c)

	* doc/manual.xml.head, init.h: Fix the documented sort methods for
	sidebar_sort_method.

	Remove references to unused "date" and "size", and add "flagged".

2016-07-02 12:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (20089a780e8e)

	* init.c, init.h: Add R_SIDEBAR to redraw sidebar when its settings
	change.

	Add to the sidebar settings that control formatting of the sidebar.

2016-07-02 12:24 -0700  Kevin McCarthy  <kevin@8t8.us>  (d404059a7619)

	* sidebar.c: Fix sidebar "unsorted" order to match Buffy list order.

	Since the previous commit decoupled the sidebar from the Buffy list,
	we can now restore the order to match the buffy list when
	sidebar_sort_method is set (back) to "unsorted".

2016-07-02 12:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (b05c170b4c91)

	* buffy.h, sidebar.c: Decouple the sidebar from the Buffy list.

	Change the sidebar to use an array of SBENTRY* instead. Move the
	"is_hidden" into SBENTRY. Remove the added "prev" pointer from
	BUFFY.

	This way, sorting the sidebar doesn't affect the BUFFY list order,
	and we don't need elements inside BUFFY just for the sidebar
	presentation.

	Fix sidebar-next for the case where the mailboxes are unsorted and
	$sidebar_new_mail_only is set. Change sorting not to clump hidden
	mailboxes at the bottom, instead simply skip over hidden mailboxes
	in sidebar-next/prev.

2016-07-01 13:39 -0700  Kevin McCarthy  <kevin@8t8.us>  (c62f5cd3c8e4)

	* send.c: merge stable

2016-06-30 12:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (6b147a411f68)

	* doc/makedoc-defs.h: Fix missing sidebar documentation links. (closes
	#3847)

	USE_SIDEBAR needed to be set in doc/makedoc-defs.h so that the
	sidebar option documentation is generated whether mutt is configured
	with the sidebar or not.

2016-06-29 18:58 -0700  Kevin McCarthy  <kevin@8t8.us>  (4b6829229176)

	* m4/gssapi.m4: Fix cppflags and muttlibs duplication with --with-gss.

	When krb5-config was found, MUTT_AM_PATH_GSSAPI included CFLAGS in
	GSSAPI_CFLAGS and MUTTLIBS in GSSAPI_LIBS. However, configure.ac
	afterwards sets: CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
	MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" This caused the flags and libs to
	be duplicated.

2016-06-29 18:58 -0700  Kevin McCarthy  <kevin@8t8.us>  (c84aa0d62ce3)

	* configure.ac: Include ncurses tinfo library if found.

	Thanks to Fabian Groffen for reporting this issue and providing a
	couple possible patches. From Fabian's report:

	 For some time now, ncurses can be built in a mode where the low
	level terminfo functionality lives in a separate lib called
	libtinfo. Because some people do, this means Mutt needs to include
	this library in that case to avoid linking errors [...]

2016-06-29 12:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (b62483975c94)

	* init.h: Clarify oppenc option documention. (closes #3846)

	Rephrase the option description to try and make it clearer what the
	option does, and how to enable/disable it within a message.

2016-06-28 16:06 -0700  Kevin McCarthy  <kevin@8t8.us>  (2baed7154180)

	* init.h, sidebar.c, sort.h: Remove unused SORT_DESC.

	This came over with the sidebar patch, but I believe is only used by
	the notmuch extension.

2016-06-28 15:59 -0700  Fahri Cihan Demirci  <fcdemirci@fastmail.fm>  (5bac9dacae1d)

	* contrib/sample.muttrc-sidebar: Remove $sidebar_refresh_time from
	Sample Sidebar Config

	The $sidebar_refresh_time option was removed with the changeset
	1f840760e6e0. Remove it from the sample sidebar configuration as
	well, so that anyone using that file in its entirety won't have to
	deal with "unknown variable" errors.

2016-06-23 12:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (b45c8ec1e54c)

	* buffy.c, buffy.h, curs_main.c, imap/imap.c, main.c, mutt.h, mx.c,
	pop.c, sidebar.c, sidebar.h: Change sidebar to consistently use
	realpath for context and buffy comparison.

	The original sidebar patch contained a half-implemented attempt to
	use realpath() mailbox paths for comparison. (Presumably so the open
	mailbox remains highlighted despite symlink issues).

	Add realpath to the Context, and set it when opening a mailbox.
	Remove sidebar ifdef for the buffy member, and always set it there
	too.

	Change the sidebar to use the realpath for comparison everywhere.

	mutt_buffy_check() is using stat device and inode for comparison.
	Perhaps this can be changed to use realpath instead, but that's
	beyond the scope of this patch.

2016-06-22 09:20 -0700  Kevin McCarthy  <kevin@8t8.us>  (c8613259dc38)

	* sidebar.c: Change sidebar next/prev-new to look at buffy->new too.

	Look at new in addition to msg_unread count, to account for when
	$mail_check_stats is unset or when the sidebar only shows the %n
	status flag.

2016-06-20 20:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (3d87b0521a45)

	* doc/manual.xml.head, init.h: Add documentation to the "New Mail
	Detection" section of the manual.

	Mention the behavior change with $mail_check_recent.

	Add a section about $mail_check_stats.

2016-06-20 10:11 +0200  Vincent Lefevre  <vincent@vinc17.net>  (069c7a655ad5)

	* po/fr.po: Updated French translation.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (91af19866bbd)

	* imap/imap.c, imap/imap.h, imap/imap_private.h, mbox.c, mh.c, mutt.h,
	mx.c, mx.h: add commit_msg to struct mx_ops

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (28688fee52a5)

	* mbox.c, mx.c, mx.h: add mmdf_commit_message function

	Move MMDF operations that were done in mx_commit_message to a
	dedicated mmdf_commit_message function.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (4c6539a88f0a)

	* mbox.c, mx.c, mx.h: add mbox_commit_message function

	Move mbox operations that were done in mx_commit_message to a
	dedicated mbox_commit_message function.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (16bfe31ef8b3)

	* imap/imap.h, imap/message.c, mx.c: add imap_commit_message function

	Move IMAP operations that were done in mx_commit_message to a
	dedicated imap_commit_message function.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (37140981e746)

	* mh.c, mx.c, mx.h: add maildir_commit_message function

	This commit adds a maildir_commit_message with a prototype
	consistent with other kind of mailboxes, to simplify upcoming
	refactoring.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (93d4169b0886)

	* mh.c, mx.c, mx.h: prepend maildir_commit_message function name with
	an underscore

	Basically, rename maildir_commit_message to _maildir_commit_message.
	This commit is preparatory to make the maildir_commit_message symbol
	available for further use.

	Symbols starting with underscore should be avoided but this one is
	long enough to prevent collision.

2016-06-18 13:36 -0700  Damien Riegel  <damien.riegel@gmail.com>  (e5d87ebe0f5b)

	* mh.c, mx.c, mx.h: remove unused HEADER parameter in
	mh_commit_message

	mh_commit_message is only called in one place with the header
	parameter set to NULL. To make the commit function consistent with
	other mailboxes, which only takes ctx and msg as parameters, remove
	this unused parameter.

2016-06-18 12:41 -0700  Damien Riegel  <damien.riegel@gmail.com>  (ce2e5caf4339)

	* imap/imap.c, imap/imap_private.h, imap/message.c, mbox.c, mh.c,
	mutt.h, mx.c, pop.c: add close_msg to struct mx_ops

2016-06-18 12:41 -0700  Damien Riegel  <damien.riegel@gmail.com>  (4bab14a24dbe)

	* mailbox.h, mx.c: Remove magic member in MESSAGE structure

	The "magic" was copied from the context to the message structure to
	be able to determine which close function had to be called in
	mx_close_message. Now that this function is context aware, there is
	no need to store the magic in the MESSAGE structure and it can be
	safely removed.

2016-06-18 12:41 -0700  Damien Riegel  <damien.riegel@gmail.com>  (3ec6c133641c)

	* attach.c, commands.c, copy.c, editmsg.c, mailbox.h, mh.c, mx.c,
	parse.c, pattern.c, pop.c, postpone.c, recvattach.c, sendlib.c: pass
	context in mx_close_message

	The mx_close_message is one of the few mx_* functions that don't
	have a context as parameter. To make them more consistent, pass the
	context.

2016-06-17 19:01 -0700  Damien Riegel  <damien.riegel@gmail.com>  (70eb7e0dbb58)

	* imap/imap.c, imap/imap.h, imap/imap_private.h, imap/message.c,
	mbox.c, mh.c, mutt.h, mx.c, pop.c, pop.h: Add open_msg to struct
	mx_ops

	Add the callback to open an existing message to struct mx_ops. For
	mbox, mmdf, maildir, and mh, the code was implemented directly into
	mx_open_message, so it is moved in their respective source files.
	For imap and pop, there were already <mailbox>_fetch_message
	functions, but their argument order has been changed to pass the
	context as a first argument.

2016-06-17 10:33 -0700  Olaf Hering  <olaf@aepfle.de>  (d83239fd794a)

	* browser.c, browser.h: folder_file: remove struct stat

	Add and use new flag to indicate the folder is on local filesystem.
	Add and use new gid, uid and nlink member. Use existing ->mode
	member instead of stat->st_mode. Use existing ->size member instead
	of stat->st_size. Use existing ->mtime member instead of
	stat->st_mtime. Remove struct stat, the used values were already
	duplicated in the struct. This reduces memory usage.

2016-06-17 10:33 -0700  Olaf Hering  <olaf@aepfle.de>  (8e671bbe094d)

	* regex.c: Add real prototype for re_match_2_internal in regex.c

	Fixes compilation warning with -Wunprototyped-calls

2016-06-17 10:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (5817d3d93b7a)

	* buffy.c, buffy.h, mh.c, mx.h: Combine the basic and extended buffy
	functions.

	Add a check_stats parameter to the mbox, maildir, and mh buffy
	functions. Use that parameter to determine whether to also count
	total, new, and flagged messages.

	This makes the functions a bit more complicated, but improves
	efficiency (for maildir and mh).

	Also includes the following cleanup/fixes:
	* Move the orig-value counter reset to the beginnining of the loop,
	(before tmp->new is set to 0).

	* Change trashed maildir messages to not be counted in msg_count

	* Remove an incorrect setting of mailbox->new based on msg_count in
	maildir. (I missed this one for 1f840760e6e0)

	* Change mbox to use the context->mtime for stats_last_checked,
	removing a race condition.

	* Fix mh to actually count the messages in order to generate
	msg_count. mh_sequences only covers the range of messages with some
	sort of flag.

2016-06-15 11:09 +0200  Vincent Lefevre  <vincent@vinc17.net>  (c29c521eec0a)

	* po/fr.po: Updated French translation.

2016-06-14 13:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (5ad82360c6ea)

	* imap/imap.c: Reset buffy->new for the current mailbox in IMAP.

	1f840760e6e0 moved the buffy->new reset inside the STATUS processor.
	Since the current mailbox is not STATUS'ed, it needs to be reset in
	imap_buffy_check().

	Thanks to Aaron Schrab for reporting this issue (and for helping
	test tip).

2016-06-12 13:49 -0700  Kevin McCarthy  <kevin@8t8.us>  (f447c67f511b)

	* OPS.MIX, OPS.SIDEBAR: Fix the case of messages in OPS.MIX and
	OPS.SIDEBAR

	Thanks to Vincent Lefèvre for spotting the discrepancy.

2016-06-07 15:02 -0700  Kevin McCarthy  <kevin@8t8.us>  (1f840760e6e0)

	* buffy.c, buffy.h, contrib/sample.muttrc-sidebar,
	doc/manual.xml.head, globals.h, imap/command.c, imap/imap.c,
	imap/imap.h, init.h, mailbox.h, mbox.c, mh.c, mutt.h, mx.c, mx.h,
	sidebar.c, sidebar.h: Make extended buffy independent of the
	sidebar.

	Add new boolean option $mail_check_stats (default off) and
	$mail_check_stats_interval. The first turns extended buffy on. The
	second sets the amount of time in between extended buffy checks
	(defaulting to 60 seconds).

	Remove the option $sidebar_refresh_time.

	Change mutt_buffy_check() to only notify the sidebar to redraw if a
	mailbox buffy value changes.

	Remove the #ifdefs around the extended buffy functions. The next
	patch will merge these functions with the basic functions and pass a
	parameter instead.

	Imap is a special case, because it sends out the status in one
	batch. Change this to perform the comparisons inside
	cmd_parse_status() and flag the sidebar there. It was previously
	directly assigning the status counters (unsigned int) to the
	buffy->new (short). Change this to assign 1/0.

2016-06-08 14:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (4be8b077c81f)

	* doc/manual.xml.head, init.h: Change the default for sidebar_format
	to use %n.

	The next series of patches is going to create a new option,
	$mail_check_stats defaulting off. When off, the extended buffy which
	calculates total/new/flagged messages won't be run. To help reduce
	"sidebar is broken" bug reports, this changes the default format to
	something not requiring extended buffy.

	The previous default is documented in the option and preserved in
	the sample sidebar muttrc in contrib.

2016-06-08 13:16 -0700  Kevin McCarthy  <kevin@8t8.us>  (594137a8ea12)

	* init.h, sidebar.c: Add sidebar_format flag '%n' to display 'N' on
	new mail.

2016-06-11 17:59 +0200  Vincent Lefevre  <vincent@vinc17.net>  (123e36398eea)

	* po/fr.po: Updated French translation.

2016-06-09 12:06 -0700  Richard Russon  <rich@flatcap.org>  (93c4ae03689e)

	* compose.c: Fix alignment in the compose menu.

	Several of the compose-panel labels didn't use the TITLE_FMT to
	align themselves. This causes formatting problems when the width is
	changed, e.g. by the NNTP patch.

2016-06-08 13:28 +0200  Vincent Lefevre  <vincent@vinc17.net>  (1fad3bfd4aab)

	* Makefile.am: Corrected OPS.SIDEBAR filename in EXTRA_DIST.

2016-06-07 13:40 -0700  Richard Russon  <rich@flatcap.org>  (fc33b34d637b)

	* sidebar.c: Setting $sidebar_width to more than 128 would cause bad
	things to happen.

	First, give the users more than enough space. Second, don't pad out
	short strings beyond the buffer

	--- sidebar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5
	deletions(-)

2016-06-07 13:27 -0700  Kevin McCarthy  <kevin@8t8.us>  (9937540dab42)

	* commands.c, hdrline.c, pager.c, protos.h, status.c: Fix columns used
	for $status_format and $pager_format in the pager.

	The code was hardcoding use of MuttIndexWindow->cols in
	mutt_make_string_info() and MuttStatusWindow->cols in
	menu_status_line().

	Add a parameter to mutt_make_info_string(). Change
	menu_status_line() to use menu->statuswin->cols, falling back to
	MuttStatusWindow if no menu is passed in.

	Set menu->statuswin appropriately inside pager.c.

	Thanks to Richard Russon for tracking down this problem, and for the
	initial patch.

2016-06-05 18:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (5270cd795043)

	* doc/makedoc.c: Add warning in makedoc for unexpected prefices. (see
	#3845)

	In case other types get renamed again in the future, add a warning
	message to makedoc.c.

2016-06-05 18:05 -0700  Kevin McCarthy  <kevin@8t8.us>  (91608dca6f12)

	* mx.c: Fix sidebar buffy stats updating on mailbox close.

	Move the mutt_sb_set_buffystats() call from mx_fastclose_mailbox()
	to the bottom of mx_close_mailbox(). Append-only mailboxes don't
	have msgcount set, so fastclose was the wrong place to be doing
	these updates.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (8e342d73159b)

	* buffy.c, mh.c: Start to fix sidebar buffy modifications.

	The extended buffy for mh had incorrect placement of the loop
	brackets. The counters weren't being incremented in the loop.

	Fix extended buffy for maildir to count a maildir message as new if
	it doesn't have the info delimeter.

	Remove shortcircuits added to the basic buffy stating there is new
	mail when (msg_unread > 0). This is not necessarily true, depending
	on $mail_check_recent.

	Note: the extended buffy still needs more fixes, which will be done
	when it is refactored into its own option.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (5d117fd810a9)

	* sidebar.c: Various fixes to the sidebar logic.

	Use strfcpy instead of strncpy. The current logic could write past
	the end of the buffer.

	Don't mess with BUFFY next pointers during removal. The
	mutt_parse_mailboxes() is fine, but this is still not something that
	should be done inside sidebar.c.

	On removal, set next->prev since we can.

	Fix unmailboxes logic:
	  * only fix the prev pointers once.
	  * if we unmailbox the open mailbox, set it to NULL.

	Lastly, flag a redraw on mailboxes/unmailboxes.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (b542812c262e)

	* buffy.c, curs_main.c, main.c, menu.c, mx.c, pager.c, sidebar.c,
	sidebar.h: Add "mutt_" prefix to global sidebar functions.

	Also, remove unused sb_init declaration.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (cb23ed20d035)

	* doc/manual.xml.head, init.h: Clean up the sidebar manual.

	Remove the introduction section. It's a nice effort, but reads more
	like a tutorial than something that belongs in section 2. Will
	probably put in on the website instead.

	Remove references to a "patch", neomutt, and the history.

	Remove the sample muttrc from the manual.

	Fix validation errors for the documentation.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (517d4f0debab)

	* sidebar.c: Re-indent and style sidebar.c.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (39639dc7e9e7)

	* sidebar.c: Fix sidebar check_sec.sh warnings.

	Use safe_malloc, FREE, and the safe_strcat functions.

2016-06-04 11:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (08f9ba9efab9)

	* Makefile.am, buffy.c, configure.ac, curs_main.c, flags.c, globals.h,
	keymap.c, menu.c, mutt_menu.h, pager.c, sidebar.c: Sidebar clean up:
	building and drawing logic.

	Fix the autoconf/makefile.am changes to be consistent.

	Create a global SidebarNeedsRedraw to indicate a redraw is needed,
	instead of putting sb_draw() everywhere in the code.

	Create a menu_redraw_sidebar() function and use the REDRAW_SIDEBAR
	flag instead of piggy-backing it inside the index loop.

	Fix curs_main.c and pager.c to be a bit cleaner by using the global
	and REDRAW_SIDEBAR.

	Start to clean up some of the buffy code, but this needs to
	refactored and fixed.

2016-06-04 11:31 -0700  Richard Russon  <rich@flatcap.org>  (8ad6090903db)

	* Makefile.am, OPS.SIDEBAR, buffy.c, buffy.h, color.c, configure.ac,
	contrib/sample.muttrc-sidebar, contrib/sample.vimrc-sidebar,
	curs_main.c, doc/manual.xml.head, flags.c, functions.h, globals.h,
	imap/command.c, imap/imap.c, init.c, init.h, keymap.c, mailbox.h,
	main.c, mbox.c, menu.c, mh.c, mutt.h, mutt_curses.h, mutt_menu.h,
	mx.c, mx.h, pager.c, sidebar.c, sidebar.h, sort.h: Add neomutt
	version of sidebar patch. (closes #3829)

	This is the patch from neomutt; branch 'devel/win-sidebar'; commit
	c796fa85f9cacefb69b8f7d8545fc9ba71674180 with the following changes:

	 - move the sample muttrc and vimrc to contrib.
	  - remove the README.sidebar.
	  - empty out the PATCHES file.

2016-05-31 13:20 -0700  Kevin McCarthy  <kevin@8t8.us>  (52f48b083cc0)

	* doc/makedoc.c: Fix documentation for DT_MAGIC types. (closes #3845)

	With the rename of M_ to MUTT_, the documentation generator in
	makedoc.c needed to be adjusted for the new prefix size.

	Thanks to Damien Riegel for the suggested fix.

2016-05-26 14:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (cd316a555bd7)

	* copy.h, group.h, mailbox.h, mutt.h, mutt_curses.h, pager.h: Fix
	header file indentation after M_ prefix renaming.

	The use of tabs caused misalignment of various macro definitions.

2016-05-26 14:05 -0700  Damien Riegel  <damien@riegel.io>  (2821e77c1a54)

	* imap/imap.c, imap/imap.h, mbox.c, mh.c, mutt.h, mx.c, mx.h, pop.c,
	pop.h: add check operation to struct mx_ops

	In mx_check_mailbox switch case, we simply call
	<mailbox>_check_mailbox, so this operation can be move into the
	mx_ops structure pretty easily.

	This commit adds a mandatory "check" operation to struct mx_ops and
	change all mailboxes to use it. Check functions are made static as
	they are only used in their respective source files now.

2016-05-26 14:05 -0700  Damien Riegel  <damien@riegel.io>  (a28ed1c725c6)

	* curs_main.c, mailbox.h, mx.c: mx_check_mailbox: remove lock argument
	in function call

	This function is only called in one place with lock = 0. Basically,
	all code under if (lock) is dead code, so we can remove it, making
	the function simpler to factorize.

2016-05-26 14:05 -0700  Damien Riegel  <damien@riegel.io>  (0ae29df8a81a)

	* imap/imap.c, imap/imap.h, mx.c: add function
	imap_check_mailbox_reopen

	In mx_check_mailbox, imap mailbox is the only function with a
	different prototype: it has an extra force argument.

	In order to move the check operation to the mx_ops structure, we
	need that all mailboxes have the same prototype. To do so, a new
	function imap_check_mailbox_reopen is added.

2016-05-25 15:58 -0700  Kevin McCarthy  <kevin@8t8.us>  (261939e71d80)

	* mx.c: Add a TODO to mx_open_new_message() to use mx_ops in the
	future.

	We can't use it until mx_open_mailbox_append() is converted to set
	mx_ops.

2016-05-25 15:53 -0700  Damien Riegel  <damien@riegel.io>  (63cb99b46c34)

	* imap/imap.c, mailbox.h, mbox.c, mh.c, mutt.h, mx.c, mx.h: add
	open_new_msg operation to struct mx_ops

	The code was already using a function pointer to do this operation.
	This commit moves this function pointer to the mx_ops structure and
	the open_new_message functions to their respective source files if
	it needs to.

2016-05-24 12:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (79c379cb0c21)

	* keymap.c: merge stable

2016-05-12 12:41 -0700  Damien Riegel  <damien.riegel@gmail.com>  (ae203b2c56a6)

	* imap/imap.c, imap/imap.h, mbox.c, mh.c, mutt.h, mx.c, mx.h, pop.c,
	pop.h: Start decoupling mailbox operations.

	Introduce a dedicated structure for mailbox operations: struct
	mx_ops. Move the open and close operations into that structure.

	Assign this structure to the context in mx_open_mailbox. This is
	currently based on the "magic" for the mailbox type, but may be
	refactored in the future.

	Add a stub mbox_close_mailbox function. This function does nothing,
	the main purpose is to introduce a mx_ops structure for mbox, so its
	usage is similar to mh/imap/pop. We reuse the name that was made
	available by the previous commmit. Note that the actual closing of
	the descriptor is done in mx.c.

	To be more consistent with other mailboxes, introduce functions
	mh_open_mailbox and maildir_open_mailbox, and create a dedicated
	structure for mmdf.

2016-05-12 12:41 -0700  Damien Riegel  <damien.riegel@gmail.com>  (6356f1068fe2)

	* mbox.c, mx.c, mx.h: rename mbox_close_mailbox to
	mx_close_mailbox_append and move it

	mbox_close_mailbox was used as the counterpart of
	mx_open_mailbox_append. To make things clearer, rename it
	mx_close_mailbox_append.

	As it is only used in mx.c, move it there and make it static.

2016-05-10 09:42 -0700  Kevin McCarthy  <kevin@8t8.us>  (391492f27fef)

	* doc/manual.xml.head, filter.c: Set COLUMNS to MuttIndexWindow->cols
	in mutt_create_filter_fd. (closes #3837)

	This allows filters to automatically (or via a command line
	argument) adjust to the width of the pager/index. This is even more
	important with the sidebar, since the width of the pager is smaller
	than the terminal width.

	Thanks to Vincent Lefèvre for his helpful information and
	suggestions, and to Richard Russon for the initial patches.

2016-05-09 14:06 -0700  Kevin McCarthy  <kevin@8t8.us>  (d18cd04e3f5a)

	* Makefile.am, getdomain.c, mutt_sasl.c, mutt_socket.c, mutt_tunnel.c,
	sys_socket.h: Back out wrapper sys_socket.h workaround
	(23334e967dd7)

	After renaming all internal macros from M_* to MUTT_*, the
	sys_socket.h workaround is no longer necessary.

2016-05-09 14:06 -0700  Derek Martin  <code@pizzashack.org>  (59b77d5c73e0)

	* account.c, account.h, addrbook.c, alias.c, attach.c, browser.c,
	buffy.c, buffy.h, charset.c, charset.h, color.c, commands.c,
	compose.c, copy.c, copy.h, crypt-gpgme.c, crypt.c, curs_lib.c,
	curs_main.c, doc/makedoc.c, editmsg.c, enter.c, flags.c,
	functions.h, group.h, handler.c, hcache.c, hcache.h, hdrline.c,
	help.c, hook.c, imap/browse.c, imap/command.c, imap/imap.c,
	imap/imap_private.h, imap/message.c, imap/util.c, init.c, init.h,
	keymap.c, lib.c, lib.h, mailbox.h, main.c, mbox.c, menu.c, mh.c,
	mutt.h, mutt_curses.h, mutt_menu.h, mutt_sasl.c, mutt_socket.c,
	mutt_socket.h, mutt_ssl.c, mutt_ssl_gnutls.c, muttlib.c, mx.c, mx.h,
	pager.c, pager.h, parse.c, pattern.c, pgp.c, pgpinvoke.c, pgpkey.c,
	pop.c, pop_auth.c, pop_lib.c, postpone.c, protos.h, query.c,
	recvattach.c, recvcmd.c, remailer.c, rfc1524.c, rfc2047.c,
	rfc2231.c, rfc3676.c, score.c, send.c, sendlib.c, smime.c, smtp.c,
	status.c, system.c, thread.c: Change M_* symbols to MUTT_*

	Changeset 23334e967dd7 created a workaround for a namespace conflict
	with Solaris and derivatives. After some discussion, the team
	decided it would be best to move away from using the "M_" prefix for
	macros.

	This patch was automatically generated by running: perl -wpi -e
	's/\bM_(\w+)\b/MUTT_$1/g' `find . -name '*.[ch]' -print` with the
	exception that sys_socket.h was exempted. (That file will be backed
	out subsequent to this commit.)

	Thanks to Andras Salamon for supplying the perl script used to make
	this change.

2016-05-03 13:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (b74dfb9fa901)

	* mbyte.c, pager.c: Skip bidi markers in the pager and index. (closes
	#3827)

	Curses and slang don't support them, so there's little point in
	showing them or attempting to somehow deal with them.

	This patch adds filtering in the pager, and changes the filtering
	added in 6e0aca94cdb0 for the index to completely skip the marker.

2016-05-03 09:46 -0700  Kevin McCarthy  <kevin@8t8.us>  (9dfe211355b6)

	* curs_lib.c: Change mutt_window_getyx() to accept NULL *y/*x params.

	Thanks to Vincent Lefèvre for suggesting this nice cleanup.
	Previously, _mutt_get_field() was employing an ugly hack to avoid an
	unused var warning.

2016-04-30 14:39 -0700  Kevin McCarthy  <kevin@8t8.us>  (fb68199318ae)

	* po/fr.po: merge stable

2016-04-30 13:05 -0700  Kevin McCarthy  <kevin@8t8.us>  (e1cec1a958e9)

	* pager.c: Fix pager mini-index drawing when $pager_index_lines = 1
	and $status_on_top.

	When $pager_index_lines is 1, there is room for the index status
	line, but not for any actual index entries. The index redraw part
	was always calling menu_redraw_current() which doesn't actually
	check if there is room for the current row.

	This bug only shows up with $status_on_top, due to the order things
	are redrawn.

2016-04-30 10:50 -0700  Kevin McCarthy  <kevin@8t8.us>  (d0746905cb3f)

	* pager.c: Fix pager layout when $status_on_top with no mini-index.
	(closes #3836)

	The pager_window->row_offset should only be adjusted when we have a
	mini-index.

	Pull common window initialization above, and adjust only when the
	mini-index is enabled. The pager_window rows and row_offset code
	could be further consolidated (since the status line is always a
	height of one), but I think the code reads a bit more clearly when
	the adjustments are explicitly stated.

2016-04-29 18:00 -0700  Kevin McCarthy  <kevin@8t8.us>  (e369be9d490b)

	* pager.c: Remove newline insertion from pager. (closes #3835)

	The window patches commited now manually move to the next line, so
	there is no need to insert newlines for that purpose.

	The newlines also goof windows placed to the right of the pager, as
	is the case for the (currently external) sidebar-on-the-right
	functionality.

	Thanks to Richard Russon for the original patch and help testing the
	revised patch.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (efa6f7910c94)

	* addrbook.c, browser.c, compose.c, crypt-gpgme.c, hdrline.c,
	muttlib.c, pgpinvoke.c, pgpkey.c, protos.h, query.c, recvattach.c,
	remailer.c, smime.c, status.c: Add cols parameter to
	mutt_FormatString()

	Continuing with the conversion to using windows for screen drawing,
	mutt_FormatString() was directly using COLS for right justification
	and similar formatting. Instead pass in a parameter, cols.

	This change involved seeding the parameter through callback
	functions too, as many of them call mutt_FormatString() back.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (04f1846c56c1)

	* buffy.c, commands.c, flags.c, handler.c, help.c, init.c, keymap.c,
	mutt_curses.h, muttlib.c, recvattach.c, recvcmd.c, sendlib.c: Fix
	remaining direct usages of COLS/LINES to use mutt window functions.

	Most of these were just message update/clearing.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (9f9bcde2d0ff)

	* remailer.c: Change remailer to use mutt windows.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (8ad6164d9fe4)

	* edit.c: Modify the built-in editor to use windows.

	This only involved changing to use the MuttMessageWindow.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (0989f9d01b5c)

	* compose.c: Modify the compose screen to use windows.

	The header field positions enum is now started at 0: the windows
	compute the relative positioning as needed. A small improvement from
	this is that the headers now align with the top: there isn't a gap
	if $help is turned off.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (fd3fe386c24a)

	* copy.c, mutt_curses.h, pager.c, rfc3676.c: Modify the pager to use
	windows.

	The pager view is somewhat complex, due to the "mini-index" and the
	positioning of the index_status vs pager_status changes depending on
	$status_on_top as well as $pager_index_lines and $help.

	To make things simpler, it creates four "pager windows":
	index_status_window, index_window, pager_status_window,
	pager_window.

	mutt_term_width() is renamed to mutt_window_wrap_cols() and a
	mutt_window_t parameter passed in.

	Also, the pager drawing loop calling display_line() has a
	mutt_window_move() added to move to the beginning of the next line
	each time. This is in case the pager_window isn't flush with the
	left side of the terminal.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (4e20ab8ebf42)

	* curs_main.c: Modify the index to use windows.

	Change the index screen to use MuttIndexWindow and MuttStatusWindow.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (1b8abb069c37)

	* curs_lib.c, edit.c, enter.c, protos.h: Modify enter.c routines to
	use windows.

	This modifies the mutt_enter_string() functions to use
	MuttMessageWindow.

	Thanks to Richard Russon for pointing out slang doesn't support
	getcurx.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (47e9732b3a3c)

	* curs_lib.c: Modify the curs_lib.c to use windows.

	This changes some of the "prompting" routines to use the
	MuttMessageWindow.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (48676eb3e400)

	* menu.c, mutt_curses.h, mutt_menu.h: Modify the menu code to use
	windows.

	Change menu.c to use the mutt_window_t structures and functions. The
	index/stats/help/message window pointers are stored inside the
	menu_t. This is useful for the pager, where the "index" we want to
	use is a mini-index.

2016-04-27 17:56 -0700  Kevin McCarthy  <kevin@8t8.us>  (ac4f746e614f)

	* curs_lib.c, init.c, init.h, main.c, mutt_curses.h, resize.c: Add
	window structures to use for screen layout.

	This is a series of 11 patches, centralizing Mutt screen drawing
	inside windows (mutt_window_t structures).

	Currently, the screen drawing and cursor positioning logic is
	distributed all over the code, resulting in many files having the
	same logic of where the help, status, message windows are.
	Additionally, the code directly uses move and mvadd*/mvprint*
	functions, which means if the layouts are changed, the row/column
	computation logic needs to be changed all over the place.

	The patch creates a (very simple) mutt_window_t structure and
	functions for moving, addch/str/printw, along with clearing the
	line. The windows keep track of where they are on the screen,
	allowing the Mutt code to simply position elements relative to the
	window.

	During curses initalization, and when the window is resized, the
	window sizes and positions and recomputed. Also, a new option flags,
	R_REFLOW is added for options that need to force a reflow when they
	are changed.

	Thanks to Richard Russon for pointing out the slang compilation
	issue.

2016-04-27 13:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (8083387557d9)

	* merge stable

2016-04-14 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (9a9c515e09d3)

	* muttlib.c: Fix soft-padding available columns computation.

	If arrow_cursor is set, it's possible that COLS < offset. Compute
	avail_cols, floored at 0, and use that instead.

2016-04-14 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (ca1af57e1855)

	* muttlib.c: Fix right justify buffer-truncated pad calculation in
	mutt_FormatString()

	Vincent Lefèvre noted that the computation had implementation
	defined behavior and was potentially incorrect.

	Change to make sure the subtraction won't lead to a wrap-around, and
	set pad to 0 in that case.

2016-04-14 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (92bbc02fdf9c)

	* muttlib.c: Pre-space softfill multi-column padding.

	Similar to the previous patch, this deals with multi-column padding
	characters and soft-fill. This will add spacing so the padding and
	content after padding aligns with the right side.

	You can see the effect by setting set index_format="%s %*我[ooooo]"
	and resizing the terminal. The right hand side will be jagged
	without the patch.

2016-04-14 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (fef5b5ed0f44)

	* muttlib.c: Add spacing to truncated multi-column characters when
	using soft-fill.

	First, fix the left-hand side column truncation calculation: "col +
	pad*pw -offset" pad = (COLS - col - wid) / pw, so this becomes "col
	+ COLS - col - wid - offset" => "COLS - wid - offset"

	The problem is that pad was calculated *before* the right side was
	mutt_wstr_trunc() truncated, which may adjust wid! We want that
	calculation, with correct values, so instead just use the final
	reduction directly. (Note, the reduction ignores integer truncation,
	but pad shouldn't be used here in any case, because it's negative:
	there is no padding occuring).

	Second, when the left-hand side is truncated, multi-column
	characters may get chopped in the middle. Truncated characters are
	not included in the wlen and col values returned. Add spaces until
	the number of columns lines up (checking to make sure we don't run
	out of space too).

2016-04-11 12:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (eb94f64ad81a)

	* mutt_ssl.c: Add null-terminator to BIO_get_mem_data() output.

	It turns out the output isn't necessarily null-terminated.

2016-04-11 21:17 +0200  Vincent Lefevre  <vincent@vinc17.net>  (46f37be4afef)

	* po/fr.po: Updated French translation.

2016-04-11 11:55 -0700  Kevin McCarthy  <kevin@8t8.us>  (0b66f6fd3d44)

	* mutt_ssl.c: Add an error message and debugging if SSL_CTX_new()
	fails. (closes #3831)

	Generate a mutt_error(). Add a debugging function
	ssl_dprint_err_stack() to dprint the ssl error stack.

2016-04-11 11:28 +0200  Vincent Lefevre  <vincent@vinc17.net>  (78aa3a1db632)

	* po/fr.po: Updated French translation.

2016-04-10 19:10 -0700  Kevin McCarthy  <kevin@8t8.us>  (00c0c155d992)

	* mutt_ssl.c: Check for SSL_CTX_new returning NULL in ssl_sock_open().
	(closes #3831)

	Thanks to Yuan Kang and the security researchers at Columbia
	University and the University of Virginia for reporting the bug.

2016-04-10 18:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (5464329344cd)

	* merge stable

2016-04-10 14:14 -0700  Kevin McCarthy  <kevin@8t8.us>  (685b9dfba297)

	* imap/browse.c: Add error message string for imap_mailbox_rename() on
	root folder.

	This was fixed just before 1.6.0, but due to the string freeze,
	could not add an error message.

2016-04-08 18:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (b8240918eded)

	* rfc2047.c: Fix potential memory leak in rfc2047_encode. (closes
	#3825)

	If convert_string() has nonreversible characters, the allocated
	output buffer would be overwritten (and not freed) in
	rfc2047_encode().

	Thanks to Richard Russon for the bug report and initial patch, and
	to TAKAHASHI Tamotsu for the analysis and revised fix suggestion.

2016-04-08 15:27 -0700  Kevin McCarthy  <kevin@8t8.us>  (180a90d05ed4)

	* pager.c: Fix pager.c format_line() to use size_t for mbrtowc()
	retvals.

	While fixing up the error checking for mbrtowc(), I noticed the uses
	in pager.c format_line() were assigning the retval to an int.

	The cleanup for this was a little tricky, because it was making use
	of possible negative values for (k1 - k). The backspace detection
	loop condition was a bit heavy, so this patch first pulled the
	initialization and first call above, and put the second call inside
	the loop.

	Note that k1 previously included k, but this patch changes it to be
	just the retval of mbrtowc. This means the second mbrtowc()
	arguments are changed to include k, as is the ch increment at the
	bottom of the loop.

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

	* alias.c, curs_lib.c, help.c, pager.c: Reset mbstate for other
	mbrtowc() calls returning -1

	Continue the cleanup started in changesets c8c76a6a1e61 and
	a3450fd50d11. In those changesets, a bug was occurring due to the
	mbstate not being reset when mbrtowc() returned -1.

	This patch fixes other callers of mbrtowc() to reset mbstate when it
	returns -1.


2016-07-06 10:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (88793198dfcb)

	* po/fr.po: merge stable

2016-07-06 10:41 -0700  Kevin McCarthy  <kevin@8t8.us>  (88030069f94d)

	* .hgsigs: mutt-1.6.2 signed

2016-07-06 10:40 -0700  Kevin McCarthy  <kevin@8t8.us>  (592270259a8e)

	* .hgtags: Added tag mutt-1-6-2-rel for changeset 7ccd4417bd70

2016-07-06 10:40 -0700  Kevin McCarthy  <kevin@8t8.us>  (7ccd4417bd70)

	* 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.6.2

2016-07-01 13:33 -0700  Kevin McCarthy  <kevin@8t8.us>  (7e817890913c)

	* send.c: Check $pgp_autoinline and $pgp_replyinline if oppenc is set.

M UPDATING => UPDATING +26 -0
@@ 4,6 4,32 @@ mutt. Please read this file carefully when upgrading your installation.
The keys used are:
  !: modified feature, -: deleted feature, +: new feature

1.7.0 (2016-08-18):

  ! Improved alignment when using multi-column characters with
    soft-fill (%*X) and right-justified (%>X) format strings.
  + The COLUMNS environment variable will be set to the width of the
    pager when invoking display filters.  This can be used in
    copiousoutput mailcap entries to allow their output to match the
    pager width.
  + The sidebar patch has been merged.  Please watch for airborne
    bovine.  See the documentation for all the options, or simply
    enable it with 'set sidebar_visible'.
  + $mail_check_stats and $mail_check_stats_interval control whether,
    and how often, to scan for unread, flagged, and total message
    counts when checking for new mail in mailboxes.  These statistics
    can be displayed in the sidebar and browser.
  + $trash, when set, specifies the path of the folder where mails
    marked for deletion will be moved, instead of being irremediably
    purged.
  + The <purge-message> function can be used to delete an entry and
    bypass the trash folder.
  + $folder_format has new format strings %m and %n, to display
    total and unread message counts for mailboxes.  Note that
    $mail_check_stats should be enabled to use these.
  ! When browsing IMAP, %N will now display 'N', instead of the unread
    message count.  Please use %n to display unread messages.

1.6.2 (2016-07-06):

  ! Bug fix release.  No features were modified or added.

M VERSION => VERSION +1 -1
@@ 1,1 1,1 @@
1.6.2
1.7.0

M po/bg.po => po/bg.po +712 -633
@@ 9,7 9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mutt 1.5.5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-06 10:39-0700\n"
"POT-Creation-Date: 2016-08-17 20:11-0700\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1251\n"
"Content-Transfer-Encoding: 8bit\n"


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

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

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

#: addrbook.c:39 curs_main.c:483 postpone.c:43
#: addrbook.c:39 curs_main.c:488 postpone.c:43
msgid "Undel"
msgstr "�����."



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

#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:4022 curs_main.c:488
#: mutt_ssl.c:1049 mutt_ssl_gnutls.c:1003 pager.c:1631 pgpkey.c:522
#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:439
#: 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
#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:440
msgid "Help"
msgstr "�����"



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

#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
#: recvattach.c:492 recvattach.c:522
#: alias.c:347 recvattach.c:441 recvattach.c:467 recvattach.c:480
#: recvattach.c:493 recvattach.c:523
msgid "Save to file: "
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:1207 curs_lib.c:196
#: curs_lib.c:569
#: attach.c:134 attach.c:266 commands.c:223 compose.c:1208 curs_lib.c:204
#: curs_lib.c:723
#, c-format
msgid "Error running \"%s\"!"
msgstr "������ ��� ������������ �� \"%s\"!"


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

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



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

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

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

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

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

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

#: browser.c:701 browser.c:1123 browser.c:1221
#: browser.c:735 browser.c:1159 browser.c:1257
msgid "No files match the file mask"
msgstr "���� �������, ���������� �� �������"

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

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

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

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

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

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

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

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

#: browser.c:1043 browser.c:1116
#: browser.c:1079 browser.c:1152
msgid "Error scanning directory."
msgstr "������ ��� ������ �� ������������."

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

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

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

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

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

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

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

#: buffy.c:504
#: buffy.c:607
msgid "New mail in "
msgstr "���� ����� � "

#: color.c:328
#: color.c:339
#, c-format
msgid "%s: color not supported by term"
msgstr "%s: ���������� �� �������� �������"

#: color.c:334
#: color.c:345
#, c-format
msgid "%s: no such color"
msgstr "%s: ���� ����� ����"

#: color.c:398 color.c:604 color.c:615
#: color.c:409 color.c:615 color.c:626
#, c-format
msgid "%s: no such object"
msgstr "%s: ���� ����� �����"

#: color.c:411
#: color.c:422
#, fuzzy, c-format
msgid "%s: command valid only for index, body, header objects"
msgstr "%s: ��������� � ������� ���� �� �������� �����"

#: color.c:419
#: color.c:430
#, c-format
msgid "%s: too few arguments"
msgstr "%s: ������������ ���������"

#: color.c:592
#: color.c:603
msgid "Missing arguments."
msgstr "�������� ���������."

#: color.c:631 color.c:642
#: color.c:642 color.c:653
msgid "color: too few arguments"
msgstr "color: ������������ ���������"

#: color.c:665
#: color.c:676
msgid "mono: too few arguments"
msgstr "mono: ������������ ���������"

#: color.c:685
#: color.c:696
#, c-format
msgid "%s: no such attribute"
msgstr "%s: ���� ����� �������"

#: color.c:725 hook.c:69 hook.c:77 keymap.c:921
#: color.c:736 hook.c:69 hook.c:77 keymap.c:921
msgid "too few arguments"
msgstr "������������ ���������"

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

#: color.c:750
#: color.c:761
msgid "default colors not supported"
msgstr "������������ ������� �� �� ���������"



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

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



@@ 513,65 513,65 @@ msgstr "dfrsotuzc"
msgid "Shell command: "
msgstr "��� �������: "

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

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

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

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

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

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

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

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

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

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

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

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

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



@@ 583,11 583,11 @@ msgstr "
msgid "Send"
msgstr "���������"

#: compose.c:90 remailer.c:481
#: compose.c:90 remailer.c:484
msgid "Abort"
msgstr "�����"

#: compose.c:94 compose.c:685
#: compose.c:94 compose.c:686
msgid "Attach file"
msgstr "��������� �� ����"



@@ 634,7 634,8 @@ msgid " (OppEnc mode)"
msgstr ""

#: compose.c:153 compose.c:157
msgid " sign as: "
#, fuzzy
msgid "sign as: "
msgstr " ������ ����: "

#: compose.c:153 compose.c:157


@@ 645,140 646,145 @@ msgstr "<
msgid "Encrypt with: "
msgstr "��������� c: "

#: compose.c:218
#. L10N: "Mix" refers to the MixMaster chain for anonymous email
#: compose.c:179
msgid "Mix: "
msgstr ""

#: compose.c:219
#, c-format
msgid "%s [#%d] no longer exists!"
msgstr "%s [#%d] ���� �� ����������!"

#: compose.c:226
#: compose.c:227
#, c-format
msgid "%s [#%d] modified. Update encoding?"
msgstr "%s [#%d] � ���������. ������� �� �� ��������� ����������?"

#: compose.c:269
#: compose.c:270
msgid "-- Attachments"
msgstr "-- ����������"

#: compose.c:297
#: compose.c:298
#, c-format
msgid "Warning: '%s' is a bad IDN."
msgstr "��������������: '%s' � ��������� IDN."

#: compose.c:320
#: compose.c:321
msgid "You may not delete the only attachment."
msgstr "�� ���� �� �������� ������������ ���� �� �������."

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

#: compose.c:701
#: compose.c:702
msgid "Attaching selected files..."
msgstr "��������� �� ��������� �������..."

#: compose.c:713
#: compose.c:714
#, c-format
msgid "Unable to attach %s!"
msgstr "����������� �� %s � ����������!"

#: compose.c:732
#: compose.c:733
msgid "Open mailbox to attach message from"
msgstr "�������� �� �������� �����, �� ����� �� ���� ��������� �����"

#: compose.c:762
#: compose.c:763
#, fuzzy, c-format
msgid "Unable to open mailbox %s"
msgstr "������ ��� ���������� �� ���������� �����!"

#: compose.c:770
#: compose.c:771
msgid "No messages in that folder."
msgstr "� ���� ����� ���� �����."

#: compose.c:779
#: compose.c:780
msgid "Tag the messages you want to attach!"
msgstr "���������� �������, ����� ������ �� ���������!"

#: compose.c:811
#: compose.c:812
msgid "Unable to attach!"
msgstr "����������� � ����������!"

#: compose.c:862
#: compose.c:863
msgid "Recoding only affects text attachments."
msgstr "��������� �� ���������� ������ ���� ���������� ����������."

#: compose.c:867
#: compose.c:868
msgid "The current attachment won't be converted."
msgstr "���� ���������� ���� �� ���� �����������."

#: compose.c:869
#: compose.c:870
msgid "The current attachment will be converted."
msgstr "���� ���������� �� ���� �����������."

#: compose.c:944
#: compose.c:945
msgid "Invalid encoding."
msgstr "������� � ��������� ��������."

#: compose.c:970
#: compose.c:971
msgid "Save a copy of this message?"
msgstr "������� �� �� �������� ����� �� ���� �����?"

#: compose.c:1026
#: compose.c:1027
msgid "Rename to: "
msgstr "������������ �: "

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

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

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

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

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

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

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

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

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

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

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

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


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

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



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

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


@@ 1117,15 1123,15 @@ msgstr ""
"\n"
"[-- ���� �� ����������� ��� S/MIME ����� --]\n"

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

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

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



@@ 1133,163 1139,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:3388
#: crypt-gpgme.c:3389
msgid " aka ......: "
msgstr ""

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

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

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

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

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

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

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

#: crypt-gpgme.c:3449 crypt-gpgme.c:3454 crypt-gpgme.c:3459 crypt-gpgme.c:3600
#: crypt-gpgme.c:3605 crypt-gpgme.c:3610
#: crypt-gpgme.c:3450 crypt-gpgme.c:3455 crypt-gpgme.c:3460 crypt-gpgme.c:3601
#: crypt-gpgme.c:3606 crypt-gpgme.c:3611
msgid ", "
msgstr ""

#: crypt-gpgme.c:3453 crypt-gpgme.c:3604
#: crypt-gpgme.c:3454 crypt-gpgme.c:3605
msgid "signing"
msgstr ""

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ 1298,65 1304,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:4048
#: crypt-gpgme.c:4049
#, c-format
msgid "%s <%s>."
msgstr ""

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

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

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

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

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

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

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

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

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

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

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

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


@@ 1365,20 1371,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:4634
#: crypt-gpgme.c:4635
#, fuzzy, c-format
msgid "PGP Key 0x%s."
msgstr "PGP ���� %s."

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

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

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


@@ 1388,21 1394,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:4726
#: crypt-gpgme.c:4727
msgid "sapfco"
msgstr ""

#: crypt-gpgme.c:4731
#: crypt-gpgme.c:4732
#, 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:4732
#: crypt-gpgme.c:4733
msgid "samfco"
msgstr ""

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


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

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

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


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

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

#: crypt-gpgme.c:4762
#: crypt-gpgme.c:4763
#, 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:4763
#: crypt-gpgme.c:4764
#, fuzzy
msgid "esabpfc"
msgstr "eswabf"

#: crypt-gpgme.c:4768
#: crypt-gpgme.c:4769
#, 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:4769
#: crypt-gpgme.c:4770
#, fuzzy
msgid "esabmfc"
msgstr "eswabf"

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

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

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


@@ 1485,7 1491,7 @@ msgstr ""
msgid "Mail not sent: inline PGP can't be used with attachments."
msgstr ""

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



@@ 1568,322 1574,322 @@ msgstr ""
msgid "Invoking S/MIME..."
msgstr "���������� �� PGP..."

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

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

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

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

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

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

#: curs_main.c:52 curs_main.c:694 curs_main.c:724
#: curs_main.c:57 curs_main.c:709 curs_main.c:739
msgid "No mailbox is open."
msgstr "���� �������� �������� �����."

#: curs_main.c:53
#: curs_main.c:58
msgid "There are no messages."
msgstr "���� �����."

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

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

#: curs_main.c:56
#: curs_main.c:61
msgid "No visible messages."
msgstr "���� ������ �����."

#. L10N: %s is one of the CHECK_ACL entries below.
#: curs_main.c:97 pager.c:83
#: curs_main.c:102 pager.c:86
#, c-format
msgid "%s: Operation not permitted by ACL"
msgstr ""

#: curs_main.c:327
#: curs_main.c:332
msgid "Cannot toggle write on a readonly mailbox!"
msgstr ""
"������� �� ���������� �� ����� �������� ����� �� ���� �� ���� ��������!"

#: curs_main.c:334
#: curs_main.c:339
msgid "Changes to folder will be written on folder exit."
msgstr "��������� � ���� �������� ����� �� ����� �������� ��� ����������� �."

#: curs_main.c:339
#: curs_main.c:344
msgid "Changes to folder will not be written."
msgstr "��������� � ���� �������� ����� ���� �� ����� ��������."

#: curs_main.c:481
#: curs_main.c:486
msgid "Quit"
msgstr "�����"

#: curs_main.c:484 recvattach.c:54
#: curs_main.c:489 recvattach.c:54
msgid "Save"
msgstr "�����"

#: curs_main.c:485 query.c:49
#: curs_main.c:490 query.c:49
msgid "Mail"
msgstr "����"

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

#: curs_main.c:487
#: curs_main.c:492
msgid "Group"
msgstr "����. ���."

#: curs_main.c:571
#: curs_main.c:574
msgid "Mailbox was externally modified.  Flags may be wrong."
msgstr ""
"���������� ����� � ��������� �� ����� ��������. ������������ ���� �� �� "
"��������."

#: curs_main.c:574
#: curs_main.c:577
msgid "New mail in this mailbox."
msgstr "���� ����� � ���� �������� �����."

#: curs_main.c:578
#: curs_main.c:581
msgid "Mailbox was externally modified."
msgstr "���������� ����� � ��������� �� ����� ��������."

#: curs_main.c:700
#: curs_main.c:715
msgid "No tagged messages."
msgstr "���� ��������� �����."

#: curs_main.c:731 menu.c:907
#: curs_main.c:746 menu.c:928
msgid "Nothing to do."
msgstr "���� ����� �� �� �����."

#: curs_main.c:817
#: curs_main.c:832
msgid "Jump to message: "
msgstr "���� ��� ����� �����: "

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

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

#: curs_main.c:858
#: curs_main.c:873
msgid "Invalid message number."
msgstr "������ ����� �� �����."

#. L10N: CHECK_ACL
#: curs_main.c:872 curs_main.c:1970 pager.c:2390
#: curs_main.c:887 curs_main.c:2004 pager.c:2450
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "���� ������������ �����."

#: curs_main.c:875
#: curs_main.c:890
msgid "Delete messages matching: "
msgstr "��������� �� ����� �� ������: "

#: curs_main.c:897
#: curs_main.c:912
msgid "No limit pattern is in effect."
msgstr "���� ������� ������������� ������."

#. L10N: ask for a limit to apply
#: curs_main.c:902
#: curs_main.c:917
#, c-format
msgid "Limit: %s"
msgstr "������������: %s"

#: curs_main.c:912
#: curs_main.c:927
msgid "Limit to messages matching: "
msgstr "������������ �� �������, ���������� ��: "

#: curs_main.c:934
#: curs_main.c:949
msgid "To view all messages, limit to \"all\"."
msgstr ""

#: curs_main.c:946 pager.c:1939
#: curs_main.c:961 pager.c:1997
msgid "Quit Mutt?"
msgstr "������� �� �� ��������� mutt?"

#: curs_main.c:1036
#: curs_main.c:1051
msgid "Tag messages matching: "
msgstr "��������� �� �������, ���������� ��: "

#. L10N: CHECK_ACL
#: curs_main.c:1046 curs_main.c:2268 pager.c:2704
#: curs_main.c:1061 curs_main.c:2304 pager.c:2765
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "���� ������������ �����."

#: curs_main.c:1048
#: curs_main.c:1063
msgid "Undelete messages matching: "
msgstr "�������������� �� �������, ���������� ��: "

#: curs_main.c:1056
#: curs_main.c:1071
msgid "Untag messages matching: "
msgstr "���������� �� ������������ �� �������, ���������� ��: "

#: curs_main.c:1082
#: curs_main.c:1097
#, fuzzy
msgid "Logged out of IMAP servers."
msgstr "��������� �� �������� ��� IMAP ������..."

#: curs_main.c:1164
#: curs_main.c:1182
msgid "Open mailbox in read-only mode"
msgstr "�������� �� ���������� ����� ���� �� ������"

#: curs_main.c:1166
#: curs_main.c:1184
msgid "Open mailbox"
msgstr "�������� �� �������� �����"

#: curs_main.c:1176
#: curs_main.c:1194
#, fuzzy
msgid "No mailboxes have new mail"
msgstr "���� �������� ����� � ���� �����."

#: curs_main.c:1204 mx.c:472 mx.c:621
#: curs_main.c:1231 mx.c:487 mx.c:580
#, c-format
msgid "%s is not a mailbox."
msgstr "%s �� � �������� �����."

#: curs_main.c:1303
#: curs_main.c:1334
msgid "Exit Mutt without saving?"
msgstr "������� �� �� ��������� Mutt ��� �� �������� ���������?"

#: curs_main.c:1321 curs_main.c:1357 curs_main.c:1815 curs_main.c:1847
#: flags.c:282 thread.c:1028 thread.c:1083 thread.c:1138
#: 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
msgid "Threading is not enabled."
msgstr "����������� �� ����� �� � ��������."

#: curs_main.c:1333
#: curs_main.c:1364
msgid "Thread broken"
msgstr ""

#: curs_main.c:1344
#: curs_main.c:1375
msgid "Thread cannot be broken, message is not part of a thread"
msgstr ""

#. L10N: CHECK_ACL
#: curs_main.c:1354
#: curs_main.c:1385
msgid "Cannot link threads"
msgstr ""

#: curs_main.c:1359
#: curs_main.c:1390
msgid "No Message-ID: header available to link thread"
msgstr ""

#: curs_main.c:1361
#: curs_main.c:1392
#, fuzzy
msgid "First, please tag a message to be linked here"
msgstr "������� ������� ���� ������� �� ��-����� ���������"

#: curs_main.c:1373
#: curs_main.c:1404
msgid "Threads linked"
msgstr ""

#: curs_main.c:1376
#: curs_main.c:1407
msgid "No thread linked"
msgstr ""

#: curs_main.c:1412 curs_main.c:1437
#: curs_main.c:1443 curs_main.c:1468
msgid "You are on the last message."
msgstr "���� � ���������� �����."

#: curs_main.c:1419 curs_main.c:1463
#: curs_main.c:1450 curs_main.c:1494
msgid "No undeleted messages."
msgstr "���� ������������ �����."

#: curs_main.c:1456 curs_main.c:1480
#: curs_main.c:1487 curs_main.c:1511
msgid "You are on the first message."
msgstr "���� � ������� �����."

#: curs_main.c:1555 menu.c:757 pager.c:2057 pattern.c:1489
#: curs_main.c:1586 menu.c:773 pager.c:2115 pattern.c:1491
msgid "Search wrapped to top."
msgstr "��������� � ��������� ������."

#: curs_main.c:1564 pager.c:2079 pattern.c:1500
#: curs_main.c:1595 pager.c:2137 pattern.c:1502
msgid "Search wrapped to bottom."
msgstr "��������� � ��������� ������."

#: curs_main.c:1608
#: curs_main.c:1639
#, fuzzy
msgid "No new messages in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: curs_main.c:1610
#: curs_main.c:1641
#, fuzzy
msgid "No new messages."
msgstr "���� ���� �����."

#: curs_main.c:1615
#: curs_main.c:1646
#, fuzzy
msgid "No unread messages in this limited view."
msgstr "������������ ����� �� � ������ � ���� ��������� ������"

#: curs_main.c:1617
#: curs_main.c:1648
#, fuzzy
msgid "No unread messages."
msgstr "���� ����������� �����"

#. L10N: CHECK_ACL
#: curs_main.c:1635
#: curs_main.c:1666
#, fuzzy
msgid "Cannot flag message"
msgstr "������� �����"

#. L10N: CHECK_ACL
#: curs_main.c:1673 pager.c:2668
#: curs_main.c:1704 pager.c:2728
msgid "Cannot toggle new"
msgstr ""

#: curs_main.c:1750
#: curs_main.c:1781
msgid "No more threads."
msgstr "���� ������ �����."

#: curs_main.c:1752
#: curs_main.c:1783
msgid "You are on the first thread."
msgstr "���� � ������� �����."

#: curs_main.c:1833
#: curs_main.c:1864
msgid "Thread contains unread messages."
msgstr "������� ������� ����������� �����."

#. L10N: CHECK_ACL
#: curs_main.c:1928 pager.c:2358
#: curs_main.c:1960 pager.c:2417
#, fuzzy
msgid "Cannot delete message"
msgstr "���� ������������ �����."

#. L10N: CHECK_ACL
#: curs_main.c:2012
#: curs_main.c:2046
#, fuzzy
msgid "Cannot edit message"
msgstr "���������� ����� �� �����"

#. L10N: CHECK_ACL
#: curs_main.c:2144
#: curs_main.c:2178
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "���� ��� ������������ ����� � �������"

#. L10N: CHECK_ACL
#: curs_main.c:2240 pager.c:2688
#: curs_main.c:2274 pager.c:2748
#, fuzzy
msgid "Cannot undelete message"
msgstr "���� ������������ �����."


@@ 2034,128 2040,128 @@ msgstr "
msgid "Can't append to folder: %s"
msgstr "������ ��� ���������� �� ����� ��� ���������� �����: %s"

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

#: flags.c:325
#: flags.c:345
msgid "Set flag"
msgstr "��������� �� ����������"

#: flags.c:325
#: flags.c:345
msgid "Clear flag"
msgstr "��������� �� ����������"

#: handler.c:1138
#: handler.c:1139
msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
msgstr ""
"[-- ������: ���������� � ����������� �� ����� � �� � �� �������������� ����� "
"�� ������� --]\n"

#: handler.c:1253
#: handler.c:1254
#, c-format
msgid "[-- Attachment #%d"
msgstr "[-- ����������: #%d"

#: handler.c:1265
#: handler.c:1266
#, c-format
msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
msgstr "[-- ���: %s/%s, ��������: %s, ������: %s --]\n"

#: handler.c:1281
#: handler.c:1282
msgid "One or more parts of this message could not be displayed"
msgstr ""

#: handler.c:1333
#: handler.c:1334
#, c-format
msgid "[-- Autoview using %s --]\n"
msgstr "[-- ����������� ��������� ����������� %s --]\n"

#: handler.c:1334
#: handler.c:1335
#, c-format
msgid "Invoking autoview command: %s"
msgstr "����������� ��������� �����������: %s"

#: handler.c:1366
#: handler.c:1367
#, c-format
msgid "[-- Can't run %s. --]\n"
msgstr "[-- ������ ��� ���������� �� %s. --]\n"

#: handler.c:1385 handler.c:1406
#: handler.c:1386 handler.c:1407
#, c-format
msgid "[-- Autoview stderr of %s --]\n"
msgstr "[-- ������ �� %s --]\n"

#: handler.c:1445
#: handler.c:1446
msgid "[-- Error: message/external-body has no access-type parameter --]\n"
msgstr ""
"[-- ������: message/external-body ���� ��������� �� ����� �� ������ --]\n"

#: handler.c:1466
#: handler.c:1467
#, c-format
msgid "[-- This %s/%s attachment "
msgstr "[-- ���� %s/%s ���������� "

#: handler.c:1473
#: handler.c:1474
#, c-format
msgid "(size %s bytes) "
msgstr "(������ %s �����) "

#: handler.c:1475
#: handler.c:1476
msgid "has been deleted --]\n"
msgstr "�� ������� --]\n"

#: handler.c:1480
#: handler.c:1481
#, c-format
msgid "[-- on %s --]\n"
msgstr "[-- �� %s --]\n"

#: handler.c:1485
#: handler.c:1486
#, c-format
msgid "[-- name: %s --]\n"
msgstr "[-- ���: %s --]\n"

#: handler.c:1498 handler.c:1514
#: handler.c:1499 handler.c:1515
#, c-format
msgid "[-- This %s/%s attachment is not included, --]\n"
msgstr "[-- ���� %s/%s ���������� �� � �������� � �������, --]\n"

#: handler.c:1500
#: handler.c:1501
msgid ""
"[-- and the indicated external source has --]\n"
"[-- expired. --]\n"
msgstr "[-- � ������, ��������� �� ���������� ���� �� ����������. --]\n"

#: handler.c:1518
#: handler.c:1519
#, c-format
msgid "[-- and the indicated access-type %s is unsupported --]\n"
msgstr "[-- � ��������� ����� �� ������ %s �� �� �������. --]\n"

#: handler.c:1624
#: handler.c:1625
msgid "Unable to open temporary file!"
msgstr "������ ��� �������� �� ��������� ����!"

#: handler.c:1770
#: handler.c:1771
msgid "Error: multipart/signed has no protocol."
msgstr "������: multipart/signed ��� protocol ���������."

#: handler.c:1821
#: handler.c:1822
#, fuzzy
msgid "[-- This is an attachment "
msgstr "[-- ���� %s/%s ���������� "

#: handler.c:1823
#: handler.c:1824
#, c-format
msgid "[-- %s/%s is unsupported "
msgstr "[-- %s/%s �� �� ��������"

#: handler.c:1830
#: handler.c:1831
#, c-format
msgid "(use '%s' to view this part)"
msgstr " (�����������'%s' �� �� ������ ���� ����)"

#: handler.c:1832
#: handler.c:1833
msgid "(need 'view-attachments' bound to key!)"
msgstr "('view-attachments' ���� �������� ����������!)"



@@ 2164,15 2170,15 @@ msgstr "('view-attachments' 
msgid "%s: unable to attach file"
msgstr "%s: ������ ��� ����������� �� ����"

#: help.c:306
#: help.c:310
msgid "ERROR: please report this bug"
msgstr "������: ����, �������� �� �� ���� ������"

#: help.c:348
#: help.c:352
msgid "<UNKNOWN>"
msgstr "<����������>"

#: help.c:360
#: help.c:364
msgid ""
"\n"
"Generic bindings:\n"


@@ 2182,7 2188,7 @@ msgstr ""
"���� �������� ����������:\n"
"\n"

#: help.c:364
#: help.c:368
msgid ""
"\n"
"Unbound functions:\n"


@@ 2192,7 2198,7 @@ msgstr ""
"�������, ��� �������� ����������:\n"
"\n"

#: help.c:372
#: help.c:376
#, c-format
msgid "Help for %s"
msgstr "����� �� %s"


@@ 2274,42 2280,47 @@ msgstr "
msgid "SASL authentication failed."
msgstr "��������� SASL �������������."

#: imap/browse.c:58 imap/imap.c:569
#: imap/browse.c:59 imap/imap.c:569
#, c-format
msgid "%s is an invalid IMAP path"
msgstr "%s �� � ������� IMAP ������"

#: imap/browse.c:69
#: imap/browse.c:70
msgid "Getting folder list..."
msgstr "��������� �� ������� �� �������� �����..."

#: imap/browse.c:189
#: imap/browse.c:190
msgid "No such folder"
msgstr "���� ������ �����"

#: imap/browse.c:278
#: imap/browse.c:243
msgid "Create mailbox: "
msgstr "��������� �� �������� �����: "

#: imap/browse.c:283 imap/browse.c:338
#: imap/browse.c:248 imap/browse.c:301
msgid "Mailbox must have a name."
msgstr "���������� ����� ������ �� ��� ���."

#: imap/browse.c:291
#: imap/browse.c:256
msgid "Mailbox created."
msgstr "���������� ����� � ���������."

#: imap/browse.c:330
#: imap/browse.c:289
#, fuzzy
msgid "Cannot rename root folder"
msgstr "�������� �� ���� �� ���� ��������"

#: imap/browse.c:293
#, fuzzy, c-format
msgid "Rename mailbox %s to: "
msgstr "��������� �� �������� �����: "

#: imap/browse.c:346
#: imap/browse.c:309
#, fuzzy, c-format
msgid "Rename failed: %s"
msgstr "��������� SSL: %s"

#: imap/browse.c:351
#: imap/browse.c:314
#, fuzzy
msgid "Mailbox renamed."
msgstr "���������� ����� � ���������."


@@ 2344,80 2355,85 @@ msgstr "
msgid "Encrypted connection unavailable"
msgstr ""

#: imap/imap.c:601
#: imap/imap.c:602
#, c-format
msgid "Selecting %s..."
msgstr "�������� �� %s..."

#: imap/imap.c:756
#: imap/imap.c:757
msgid "Error opening mailbox"
msgstr "������ ��� �������� �� ���������� �����!"

#: imap/imap.c:808 imap/message.c:861 muttlib.c:1541
#: imap/imap.c:808 imap/imap.c:2147 imap/message.c:877 muttlib.c:1565
#, c-format
msgid "Create %s?"
msgstr "������� �� �� ��������� %s?"

#: imap/imap.c:1183
#: imap/imap.c:1201
msgid "Expunge failed"
msgstr "��������� ����������"

#: imap/imap.c:1195
#: imap/imap.c:1213
#, c-format
msgid "Marking %d messages deleted..."
msgstr "��������� �� %d ��������� �� ���������..."

#: imap/imap.c:1227
#: imap/imap.c:1245
#, fuzzy, c-format
msgid "Saving changed messages... [%d/%d]"
msgstr "����� �� ������������ �� �������... [%d/%d]"

#: imap/imap.c:1282
#: imap/imap.c:1300
msgid "Error saving flags. Close anyway?"
msgstr ""

#: imap/imap.c:1290
#: imap/imap.c:1308
#, fuzzy
msgid "Error saving flags"
msgstr "������ ��� ��������� �� �������!"

#: imap/imap.c:1313
#: imap/imap.c:1331
msgid "Expunging messages from server..."
msgstr "���������� �� ����������� �� �������..."

#: imap/imap.c:1318
#: imap/imap.c:1336
msgid "imap_sync_mailbox: EXPUNGE failed"
msgstr "imap_sync_mailbo: ��������� EXPUNGE"

#: imap/imap.c:1768
#: imap/imap.c:1805
#, c-format
msgid "Header search without header name: %s"
msgstr ""

#: imap/imap.c:1839
#: imap/imap.c:1876
msgid "Bad mailbox name"
msgstr "��������� ��� �� ���������� �����"

#: imap/imap.c:1863
#: imap/imap.c:1900
#, c-format
msgid "Subscribing to %s..."
msgstr "��������� �� %s..."

#: imap/imap.c:1865
#: imap/imap.c:1902
#, fuzzy, c-format
msgid "Unsubscribing from %s..."
msgstr "��������� �� %s..."

#: imap/imap.c:1875
#: imap/imap.c:1912
#, fuzzy, c-format
msgid "Subscribed to %s"
msgstr "��������� �� %s..."

#: imap/imap.c:1877
#: imap/imap.c:1914
#, fuzzy, c-format
msgid "Unsubscribed from %s"
msgstr "��������� �� %s..."

#: imap/imap.c:2132 imap/message.c:841
#, c-format
msgid "Copying %d messages to %s..."
msgstr "�������� �� %d ��������� � %s..."

#: imap/message.c:98
msgid "Unable to fetch headers from this IMAP server version."
msgstr ""


@@ 2440,26 2456,21 @@ msgstr "
msgid "Fetching message headers..."
msgstr "��������� �� ���������� �����... [%d/%d]"

#: imap/message.c:443 imap/message.c:500 pop.c:572
#: imap/message.c:444 imap/message.c:501 pop.c:573
msgid "Fetching message..."
msgstr "��������� �� �����..."

#: imap/message.c:489 pop.c:567
#: imap/message.c:490 pop.c:568
msgid "The message index is incorrect. Try reopening the mailbox."
msgstr ""
"��������� ������ �� �����. �������� �� �������� ������ ���������� �����."

#: imap/message.c:644
#: imap/message.c:660
#, fuzzy
msgid "Uploading message..."
msgstr "��������� �� ����� �� ������� ..."

#: imap/message.c:825
#, c-format
msgid "Copying %d messages to %s..."
msgstr "�������� �� %d ��������� � %s..."

#: imap/message.c:829
#: imap/message.c:845
#, c-format
msgid "Copying message %d to %s..."
msgstr "�������� �� %d-�� ��������� � %s..."


@@ 2468,7 2479,7 @@ msgstr "
msgid "Continue?"
msgstr "������� �� �� ����������?"

#: init.c:60 init.c:1762 pager.c:50
#: init.c:60 init.c:1768 pager.c:53
#, c-format
msgid "Not available in this menu."
msgstr "��������� �� � �������� �� ���� ����."


@@ 2545,126 2556,126 @@ msgstr "%s: 
msgid "mutt_restore_default(%s): error in regexp: %s\n"
msgstr "mutt_restore_default(%s): ������ � ���������� �����: %s\n"

#: init.c:1739 init.c:1852
#: init.c:1745 init.c:1858
#, c-format
msgid "%s: unknown variable"
msgstr "%s: ��������� ����������"

#: init.c:1748
#: init.c:1754
#, c-format
msgid "prefix is illegal with reset"
msgstr "���� ������� �� � ������� � \"reset\""

#: init.c:1754
#: init.c:1760
#, c-format
msgid "value is illegal with reset"
msgstr "���� �������� �� � ������� � \"reset\""

#: init.c:1790 init.c:1802
#: init.c:1796 init.c:1808
#, c-format
msgid "Usage: set variable=yes|no"
msgstr ""

#: init.c:1810
#: init.c:1816
#, c-format
msgid "%s is set"
msgstr "%s � �������"

#: init.c:1810
#: init.c:1816
#, c-format
msgid "%s is unset"
msgstr "%s � ��������"

#: init.c:1913
#: init.c:1919
#, fuzzy, c-format
msgid "Invalid value for option %s: \"%s\""
msgstr "��������� ��� �� ������: %s"

#: init.c:2050
#: init.c:2056
#, c-format
msgid "%s: invalid mailbox type"
msgstr "%s: ��������� ��� �� ���������� �����"

#: init.c:2081
#: init.c:2087
#, fuzzy, c-format
msgid "%s: invalid value (%s)"
msgstr "%s: ��������� ��������"

#: init.c:2082
#: init.c:2088
msgid "format error"
msgstr ""

#: init.c:2082
#: init.c:2088
msgid "number overflow"
msgstr ""

#: init.c:2142
#: init.c:2148
#, c-format
msgid "%s: invalid value"
msgstr "%s: ��������� ��������"

#: init.c:2183
#: init.c:2192
#, c-format
msgid "%s: Unknown type."
msgstr "%s: �������� ���."

#: init.c:2210
#: init.c:2219
#, c-format
msgid "%s: unknown type"
msgstr "%s: �������� ���"

#: init.c:2272
#: init.c:2287
#, c-format
msgid "Error in %s, line %d: %s"
msgstr "������ � %s, ��� %d: %s"

#: init.c:2295
#: init.c:2310
#, c-format
msgid "source: errors in %s"
msgstr "source: ������ � %s"

#: init.c:2296
#: init.c:2311
#, fuzzy, c-format
msgid "source: reading aborted due to too many errors in %s"
msgstr "source: ���������� � ���������� ������ ������ ����� ������ � %s"

#: init.c:2310
#: init.c:2325
#, c-format
msgid "source: error at %s"
msgstr "source: ������ ��� %s"

#: init.c:2315
#: init.c:2330
msgid "source: too many arguments"
msgstr "source: ������ ����� ���������"

#: init.c:2369
#: init.c:2384
#, c-format
msgid "%s: unknown command"
msgstr "%s: ��������� �������"

#: init.c:2857
#: init.c:2872
#, c-format
msgid "Error in command line: %s\n"
msgstr "������ � ��������� ���: %s\n"

#: init.c:2936
#: init.c:2951
msgid "unable to determine home directory"
msgstr "������� �� ���������� �� ���� �� ���� ��������"

#: init.c:2944
#: init.c:2959
msgid "unable to determine username"
msgstr "��������������� �� ��� �� ���� �� ���� ����������"

#: init.c:2970
#: init.c:2985
#, fuzzy
msgid "unable to determine nodename via uname()"
msgstr "��������������� �� ��� �� ���� �� ���� ����������"

#: init.c:3214
#: init.c:3229
msgid "-group: no group name"
msgstr ""

#: init.c:3224
#: init.c:3239
#, fuzzy
msgid "out of arguments"
msgstr "������������ ���������"


@@ 2743,7 2754,7 @@ msgstr "Integer overflow -- 
msgid "Out of memory!"
msgstr "������������ �����!"

#: main.c:65
#: main.c:68
#, fuzzy
msgid ""
"To contact the developers, please mail to <mutt-dev@mutt.org>.\n"


@@ 2752,7 2763,7 @@ msgstr ""
"�� ������� � �������������, ���� ��������� ����� �� <mutt-dev@mutt.org>.\n"
"�� �� �������� �� ������, ���� ����������� ������� flea(1).\n"

#: main.c:69
#: main.c:72
#, fuzzy
msgid ""
"Copyright (C) 1996-2016 Michael R. Elkins and others.\n"


@@ 2765,9 2776,9 @@ msgstr ""
"Mutt � �������� ������� � ���� �� ���� ���������������\n"
"��� ���������� �������; �������� `mutt -vv' �� ������ �����������.\n"

#: main.c:75
#: main.c:78
msgid ""
"Copyright (C) 1996-2014 Michael R. Elkins <me@mutt.org>\n"
"Copyright (C) 1996-2016 Michael R. Elkins <me@mutt.org>\n"
"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
"Copyright (C) 1997-2009 Thomas Roessler <roessler@does-not-exist.org>\n"
"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"


@@ 2775,13 2786,13 @@ msgid ""
"Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
"Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>\n"
"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
"Copyright (C) 2014-2015 Kevin J. McCarthy <kevin@8t8.us>\n"
"Copyright (C) 2014-2016 Kevin J. McCarthy <kevin@8t8.us>\n"
"\n"
"Many others not mentioned here contributed code, fixes,\n"
"and suggestions.\n"
msgstr ""

#: main.c:89
#: main.c:92
msgid ""
"    This program is free software; you can redistribute it and/or modify\n"
"    it under the terms of the GNU General Public License as published by\n"


@@ 2794,7 2805,7 @@ msgid ""
"    GNU General Public License for more details.\n"
msgstr ""

#: main.c:99
#: main.c:102
msgid ""
"    You should have received a copy of the GNU General Public License\n"
"    along with this program; if not, write to the Free Software\n"


@@ 2802,7 2813,7 @@ msgid ""
"02110-1301, USA.\n"
msgstr ""

#: main.c:116
#: main.c:119
msgid ""
"usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
"       mutt [<options>] [-Ex] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "


@@ 2816,7 2827,7 @@ msgid ""
"       mutt -v[v]\n"
msgstr ""

#: main.c:125
#: main.c:128
msgid ""
"options:\n"
"  -A <alias>\texpand the given alias\n"


@@ 2827,11 2838,11 @@ msgid ""
"  -D\t\tprint the value of all variables to stdout"
msgstr ""

#: main.c:134
#: main.c:137
msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
msgstr ""

#: main.c:137
#: main.c:140
#, fuzzy
msgid ""
"  -E\t\tedit the draft (-H) or include (-i) file\n"


@@ 2880,7 2891,7 @@ msgstr ""
"�� ���������� ��� ���� ������\n"
"  -h\t\t������� ���� �����"

#: main.c:147
#: main.c:150
#, fuzzy
msgid ""
"  -Q <variable>\tquery a configuration variable\n"


@@ 2929,7 2940,7 @@ msgstr ""
"�� ���������� ��� ���� ������\n"
"  -h\t\t������� ���� �����"

#: main.c:228
#: main.c:231
msgid ""
"\n"
"Compile options:"


@@ 2937,211 2948,221 @@ msgstr ""
"\n"
"����� ��� ����������:"

#: main.c:532
#: main.c:541
msgid "Error initializing terminal."
msgstr "������ ��� ������������� �� ���������."

#: main.c:669
#: main.c:679
#, fuzzy, c-format
msgid "Error: value '%s' is invalid for -d.\n"
msgstr "������: '%s' � ��������� IDN."

#: main.c:672
#: main.c:682
#, c-format
msgid "Debugging at level %d.\n"
msgstr "Debugging �� ���� %d.\n"

#: main.c:674
#: main.c:684
msgid "DEBUG was not defined during compilation.  Ignored.\n"
msgstr "������� DEBUG �� � � ���������� ��� ���������� � � ����������.\n"

#: main.c:848
#: main.c:862
#, c-format
msgid "%s does not exist. Create it?"
msgstr "%s �� ����������. �� ���� �� ��������?"

#: main.c:852
#: main.c:866
#, c-format
msgid "Can't create %s: %s."
msgstr "������ ��� ��������� �� %s: %s."

#: main.c:891
#: main.c:906
msgid "Failed to parse mailto: link\n"
msgstr ""

#: main.c:903
#: main.c:918
msgid "No recipients specified.\n"
msgstr "�� �� ������� ����������.\n"

#: main.c:929
#: main.c:944
msgid "Cannot use -E flag with stdin\n"
msgstr ""

#: main.c:1082
#: main.c:1097
#, c-format
msgid "%s: unable to attach file.\n"
msgstr "%s: ������ ��� ��������� �� �����.\n"

#: main.c:1162
#: main.c:1178
msgid "No mailbox with new mail."
msgstr "���� �������� ����� � ���� �����."

#: main.c:1171
#: main.c:1187
msgid "No incoming mailboxes defined."
msgstr "�� �� ���������� ������ �������� �����."

#: main.c:1199
#: main.c:1215
msgid "Mailbox is empty."
msgstr "���������� ����� � ������."

#: mbox.c:119 mbox.c:269 mh.c:1205 mx.c:642
#: mbox.c:120 mbox.c:271 mh.c:1255 mx.c:598
#, c-format
msgid "Reading %s..."
msgstr "��������� �� %s..."

#: mbox.c:157 mbox.c:214
#: mbox.c:158 mbox.c:215
msgid "Mailbox is corrupt!"
msgstr "���������� ����� � ���������!"

#: mbox.c:670
#: mbox.c:456
#, c-format
msgid "Couldn't lock %s\n"
msgstr "���������� ���������� �� %s\n"

#: mbox.c:493 mbox.c:508
msgid "Can't write message"
msgstr "���������� ����� �� �����"

#: mbox.c:748
msgid "Mailbox was corrupted!"
msgstr "���������� ����� � ���������!"

#: mbox.c:751 mbox.c:1011
#: mbox.c:829 mbox.c:1089
msgid "Fatal error!  Could not reopen mailbox!"
msgstr ""
"����������� ������! ������ ��� ���������� �������� �� ���������� �����!"

#: mbox.c:760
#: mbox.c:838
msgid "Unable to lock mailbox!"
msgstr "������ ��� ���������� �� ���������� �����!"

#: mbox.c:803
#: mbox.c:881
msgid "sync: mbox modified, but no modified messages! (report this bug)"
msgstr ""
"sync: ���������� ����� � ���������, �� ���� ��������� �����! (����, �������� "
"�� ���� ������)"

#: mbox.c:827 mh.c:1711 mx.c:739
#: mbox.c:905 mh.c:1889 mx.c:675
#, c-format
msgid "Writing %s..."
msgstr "����� �� %s..."

#: mbox.c:962
#: mbox.c:1040
msgid "Committing changes..."
msgstr "����������� �� ���������..."

#: mbox.c:997
#: mbox.c:1075
#, c-format
msgid "Write failed!  Saved partial mailbox to %s"
msgstr "������ ��� �����! ���������� ����� � �������� �������� � %s"

#: mbox.c:1059
#: mbox.c:1137
msgid "Could not reopen mailbox!"
msgstr "������ ��� ���������� �������� �� ���������� �����!"

#: mbox.c:1095
#: mbox.c:1164
msgid "Reopening mailbox..."
msgstr "�������� �������� �� ���������� �����..."

#: menu.c:418
#: menu.c:430
msgid "Jump to: "
msgstr "���� ���: "

#: menu.c:427
#: menu.c:439
msgid "Invalid index number."
msgstr "��������� ����� �� ������."

#: menu.c:431 menu.c:452 menu.c:517 menu.c:560 menu.c:576 menu.c:587 menu.c:598
#: menu.c:609 menu.c:622 menu.c:635 menu.c:1044
#: menu.c:443 menu.c:464 menu.c:529 menu.c:572 menu.c:588 menu.c:599 menu.c:610
#: menu.c:621 menu.c:634 menu.c:647 menu.c:1065
msgid "No entries."
msgstr "���� ���������."

#: menu.c:449
#: menu.c:461
msgid "You cannot scroll down farther."
msgstr "�� ���� �� ���������� ������ ������."

#: menu.c:467
#: menu.c:479
msgid "You cannot scroll up farther."
msgstr "�� ���� �� ���������� ������ ������."

#: menu.c:510
#: menu.c:522
msgid "You are on the first page."
msgstr "���� � ������� ��������."

#: menu.c:511
#: menu.c:523
msgid "You are on the last page."
msgstr "���� � ���������� ��������."

#: menu.c:646
#: menu.c:658
msgid "You are on the last entry."
msgstr "���� � ���������� �����."

#: menu.c:657
#: menu.c:669
msgid "You are on the first entry."
msgstr "���� � ������� �����."

#: menu.c:731 pager.c:2101 pattern.c:1428
#: menu.c:747 pager.c:2159 pattern.c:1430
msgid "Search for: "
msgstr "�������: "

#: menu.c:731 pager.c:2101 pattern.c:1428
#: menu.c:747 pager.c:2159 pattern.c:1430
msgid "Reverse search for: "
msgstr "������� �������: "

#: menu.c:775 pager.c:2054 pager.c:2076 pager.c:2196 pattern.c:1543
#: menu.c:791 pager.c:2112 pager.c:2134 pager.c:2254 pattern.c:1545
msgid "Not found."
msgstr "���� ��������� �� ���������."

#: menu.c:901
#: menu.c:922
msgid "No tagged entries."
msgstr "���� ��������� ������."

#: menu.c:1001
#: menu.c:1022
msgid "Search is not implemented for this menu."
msgstr "�� ���� ���� �� � �������������� �������."

#: menu.c:1006
#: menu.c:1027
msgid "Jumping is not implemented for dialogs."
msgstr "��������� �� �� �������������� �� �������."

#: menu.c:1047
#: menu.c:1068
msgid "Tagging is not supported."
msgstr "����������� �� �� ��������."

#: mh.c:1184
#: mh.c:1235
#, fuzzy, c-format
msgid "Scanning %s..."
msgstr "�������� �� %s..."

#: mh.c:1385 mh.c:1463
#: mh.c:1558 mh.c:1641
#, fuzzy
msgid "Could not flush message to disk"
msgstr "������� �� ���� �� ���� ���������."

#: mh.c:1430
msgid "maildir_commit_message(): unable to set time on file"
#: mh.c:1603
#, fuzzy
msgid "_maildir_commit_message(): unable to set time on file"
msgstr ""
"maildir_commit_message(): ������ ��� ����������� �� ����� �� ����� �� �����"

#: mutt_sasl.c:194
#: mutt_sasl.c:196
msgid "Unknown SASL profile"
msgstr ""

#: mutt_sasl.c:228
#: mutt_sasl.c:230
#, fuzzy
msgid "Error allocating SASL connection"
msgstr "������ � ������� ���: %s"

#: mutt_sasl.c:239
#: mutt_sasl.c:241
msgid "Error setting SASL security properties"
msgstr ""

#: mutt_sasl.c:249
#: mutt_sasl.c:251
msgid "Error setting SASL external security strength"
msgstr ""

#: mutt_sasl.c:258
#: mutt_sasl.c:260
msgid "Error setting SASL external user name"
msgstr ""



@@ 3188,35 3209,44 @@ msgstr "
msgid "Could not connect to %s (%s)."
msgstr "������ ��� ��������� � %s (%s)"

#: mutt_ssl.c:225
#: mutt_ssl.c:226
msgid "Failed to find enough entropy on your system"
msgstr "������������ �������� � ���������"

#: mutt_ssl.c:249
#: mutt_ssl.c:250
#, c-format
msgid "Filling entropy pool: %s...\n"
msgstr "�������� �� �������� �� ���������� �� �������� �������: %s...\n"

#: mutt_ssl.c:257
#: mutt_ssl.c:258
#, c-format
msgid "%s has insecure permissions!"
msgstr "%s ��� ��������� ����� �� ������!"

#: mutt_ssl.c:276
#: mutt_ssl.c:277
#, fuzzy
msgid "SSL disabled due to the lack of entropy"
msgstr "SSL � �������� ������ ����� �� ���������� ��������"

#: mutt_ssl.c:409
#. L10N: an SSL context is a data structure returned by the OpenSSL
#. *       function SSL_CTX_new().  In this case it returned NULL: an
#. *       error condition.
#.
#: mutt_ssl.c:344
#, fuzzy
msgid "Unable to create SSL context"
msgstr "������: �� ���� �� ���� ��������� ������� OpenSSL ������!"

#: mutt_ssl.c:420
msgid "I/O error"
msgstr "������-������� ������"

#: mutt_ssl.c:418
#: mutt_ssl.c:429
#, c-format
msgid "SSL failed: %s"
msgstr "��������� SSL: %s"

#: mutt_ssl.c:427 mutt_ssl_gnutls.c:1079 mutt_ssl_gnutls.c:1114
#: 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 "�� ������� �� ���� �� ���� ������� ����������"


@@ 3225,106 3255,106 @@ msgstr "
#. %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:439
#: mutt_ssl.c:450
#, fuzzy, c-format
msgid "%s connection using %s (%s)"
msgstr "SSL ������, ���������� %s (%s)"

#: mutt_ssl.c:541
#: mutt_ssl.c:576
msgid "Unknown"
msgstr "����������"

#: mutt_ssl.c:566 mutt_ssl_gnutls.c:598
#: mutt_ssl.c:601 mutt_ssl_gnutls.c:598
#, c-format
msgid "[unable to calculate]"
msgstr "[������ ��� ����������]"

#: mutt_ssl.c:584 mutt_ssl_gnutls.c:621
#: mutt_ssl.c:619 mutt_ssl_gnutls.c:621
msgid "[invalid date]"
msgstr "[��������� ����]"

#: mutt_ssl.c:712
#: mutt_ssl.c:747
msgid "Server certificate is not yet valid"
msgstr "������������ �� ������� ��� ��� �� � �������"

#: mutt_ssl.c:719
#: mutt_ssl.c:754
msgid "Server certificate has expired"
msgstr "������������ �� ������� � �������"

#: mutt_ssl.c:841
#: mutt_ssl.c:876
#, fuzzy
msgid "cannot get certificate subject"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: mutt_ssl.c:851 mutt_ssl.c:860
#: mutt_ssl.c:886 mutt_ssl.c:895
#, fuzzy
msgid "cannot get certificate common name"
msgstr "�� ������� �� ���� �� ���� ������� ����������"

#: mutt_ssl.c:874
#: mutt_ssl.c:909
#, fuzzy, c-format
msgid "certificate owner does not match hostname %s"
msgstr "������������ �� S/MIME ����������� �� ������� � �������� �� �������."

#: mutt_ssl.c:915
#: mutt_ssl.c:950
#, fuzzy, c-format
msgid "Certificate host check failed: %s"
msgstr "������������ � �������"

#: mutt_ssl.c:993 mutt_ssl_gnutls.c:860
#: mutt_ssl.c:1028 mutt_ssl_gnutls.c:860
msgid "This certificate belongs to:"
msgstr "���� ���������� ���������� ��:"

#: mutt_ssl.c:1006 mutt_ssl_gnutls.c:899
#: mutt_ssl.c:1041 mutt_ssl_gnutls.c:899
msgid "This certificate was issued by:"
msgstr "���� ���������� � ������� ��:"

#: mutt_ssl.c:1017 mutt_ssl_gnutls.c:938
#: mutt_ssl.c:1052 mutt_ssl_gnutls.c:938
#, c-format
msgid "This certificate is valid"
msgstr "���� ���������� � �������"

#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:941
#: mutt_ssl.c:1053 mutt_ssl_gnutls.c:941
#, c-format
msgid "   from %s"
msgstr "   �� %s"

#: mutt_ssl.c:1020 mutt_ssl_gnutls.c:945
#: mutt_ssl.c:1055 mutt_ssl_gnutls.c:945
#, c-format
msgid "     to %s"
msgstr "    �� %s"

#: mutt_ssl.c:1026
#: mutt_ssl.c:1061
#, c-format
msgid "Fingerprint: %s"
msgstr "������� ���������: %s"

#: mutt_ssl.c:1029 mutt_ssl_gnutls.c:982
#: mutt_ssl.c:1064 mutt_ssl_gnutls.c:982
#, c-format
msgid "SSL Certificate check (certificate %d of %d in chain)"
msgstr ""

#: mutt_ssl.c:1037 mutt_ssl_gnutls.c:991
#: mutt_ssl.c:1072 mutt_ssl_gnutls.c:991
msgid "(r)eject, accept (o)nce, (a)ccept always"
msgstr "����������(r), ���������� ��������(o), �������� ������(a)"

#: mutt_ssl.c:1038 mutt_ssl_gnutls.c:992
#: mutt_ssl.c:1073 mutt_ssl_gnutls.c:992
msgid "roa"
msgstr "roa"

#: mutt_ssl.c:1042 mutt_ssl_gnutls.c:996
#: mutt_ssl.c:1077 mutt_ssl_gnutls.c:996
msgid "(r)eject, accept (o)nce"
msgstr "����������(r), ���������� ��������(o)"

#: mutt_ssl.c:1043 mutt_ssl_gnutls.c:997
#: mutt_ssl.c:1078 mutt_ssl_gnutls.c:997
msgid "ro"
msgstr "ro"

#: mutt_ssl.c:1074 mutt_ssl_gnutls.c:1046
#: mutt_ssl.c:1109 mutt_ssl_gnutls.c:1046
msgid "Warning: Couldn't save certificate"
msgstr "��������������: ������������ �� ���� �� ���� �������"

#: mutt_ssl.c:1079 mutt_ssl_gnutls.c:1051
#: mutt_ssl.c:1114 mutt_ssl_gnutls.c:1051
msgid "Certificate saved"
msgstr "������������ � �������"



@@ 3420,183 3450,184 @@ 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:974
#: muttlib.c:976
msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
msgstr ""
"������ � ����������. ������� �� �� �������� � ���? [(y) ��, (n) ��, (a) "
"������]"

#: muttlib.c:974
#: muttlib.c:976
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:993
#: muttlib.c:995
msgid "File is a directory, save under it?"
msgstr "������ � ����������. ������� �� �� �������� � ���?"

#: muttlib.c:997
#: muttlib.c:999
msgid "File under directory: "
msgstr "���� � ���� ����������: "

#: muttlib.c:1006
#: muttlib.c:1008
msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
msgstr "������ ����������. ��������(o), ��������(a) ��� �����(c)?"

#: muttlib.c:1006
#: muttlib.c:1008
msgid "oac"
msgstr "oac"

#: muttlib.c:1507
#: muttlib.c:1531
msgid "Can't save message to POP mailbox."
msgstr "����� �� ����� �� POP ������ �� � ��������."

#: muttlib.c:1516
#: muttlib.c:1540
#, c-format
msgid "Append messages to %s?"
msgstr "������� �� �� �������� ������� ��� %s?"

#: muttlib.c:1528
#: muttlib.c:1552
#, c-format
msgid "%s is not a mailbox!"
msgstr "%s �� � �������� �����!"

#: mx.c:116
#: mx.c:143
#, c-format
msgid "Lock count exceeded, remove lock for %s?"
msgstr ""
"�������� � ����������� ���� �����������. ������� �� �� ���������� "
"������������ �� %s?"

#: mx.c:128
#: mx.c:155
#, c-format
msgid "Can't dotlock %s.\n"
msgstr "���������� dot-���������� �� %s.\n"

#: mx.c:184
#: mx.c:211
msgid "Timeout exceeded while attempting fcntl lock!"
msgstr "fcntl ���������� �� � �������� � ������������ ����� (timeout)!"

#: mx.c:190
#: mx.c:217
#, c-format
msgid "Waiting for fcntl lock... %d"
msgstr "������ �� fcntl ����������... %d"

#: mx.c:217
#: mx.c:244
msgid "Timeout exceeded while attempting flock lock!"
msgstr "flock ���������� �� � �������� � ������������ ����� (timeout)!"

#: mx.c:224
#: mx.c:251
#, c-format
msgid "Waiting for flock attempt... %d"
msgstr "������ �� flock ����������... %d"

#: mx.c:555
#, c-format
msgid "Couldn't lock %s\n"
msgstr "���������� ���������� �� %s\n"

#: mx.c:771
#: mx.c:707
#, c-format
msgid "Could not synchronize mailbox %s!"
msgstr "������ ��� ��������������� �� %s!"

#: mx.c:835
#: mx.c:742
#, fuzzy
msgid "message(s) not deleted"
msgstr "��������� �� %d ��������� �� ���������..."

#: mx.c:775
#, fuzzy
msgid "Can't open trash folder"
msgstr "������ ��� ���������� �� ����� ��� ���������� �����: %s"

#: mx.c:844
#, c-format
msgid "Move read messages to %s?"
msgstr "������� �� �� ���������� ����������� ����� � %s?"

#: mx.c:851 mx.c:1118
#: mx.c:860 mx.c:1146
#, c-format
msgid "Purge %d deleted message?"
msgstr "������� �� �� �������� %d-�� ���������� �� ��������� �����?"

#: mx.c:851 mx.c:1118
#: mx.c:860 mx.c:1146
#, c-format
msgid "Purge %d deleted messages?"
msgstr "������� �� �� ��������  %d ���������� �� ��������� �����?"

#: mx.c:872
#: mx.c:881
#, c-format
msgid "Moving read messages to %s..."
msgstr "����������� �� ����������� ����� � %s..."

#: mx.c:932 mx.c:1109
#: mx.c:942 mx.c:1137
msgid "Mailbox is unchanged."
msgstr "���������� ����� � �����������."

#: mx.c:972
#: mx.c:995
#, c-format
msgid "%d kept, %d moved, %d deleted."
msgstr "��������: %d; ����������: %d; �������: %d"

#: mx.c:975 mx.c:1161
#: mx.c:998 mx.c:1198
#, c-format
msgid "%d kept, %d deleted."
msgstr "��������: %d; �������: %d"

#: mx.c:1093
#: mx.c:1121
#, c-format
msgid " Press '%s' to toggle write"
msgstr "��������� '%s' �� ���������/���������� �� ������ �� �����"

#: mx.c:1095
#: mx.c:1123
msgid "Use 'toggle-write' to re-enable write!"
msgstr "����������� 'toggle-write' �� ������������ �� ������ �� �����!"

#: mx.c:1097
#: mx.c:1125
#, c-format
msgid "Mailbox is marked unwritable. %s"
msgstr "���������� ����� � ���� �� ������. %s"

#: mx.c:1155
#: mx.c:1192
msgid "Mailbox checkpointed."
msgstr "���������� ����� � ����������."

#: mx.c:1474
msgid "Can't write message"
msgstr "���������� ����� �� �����"

#: mx.c:1513
#: mx.c:1367
#, fuzzy
msgid "Integer overflow -- can't allocate memory."
msgstr "Integer overflow -- ���������� �� ����� � ����������."

#: pager.c:1533
#: pager.c:1554
msgid "PrevPg"
msgstr "����. ���."

#: pager.c:1534
#: pager.c:1555
msgid "NextPg"
msgstr "�����. ���."

#: pager.c:1538
#: pager.c:1559
msgid "View Attachm."
msgstr "����������"

#: pager.c:1541
#: pager.c:1562
msgid "Next"
msgstr "��������"

#: pager.c:1955 pager.c:1986 pager.c:2018 pager.c:2294
#: pager.c:2013 pager.c:2044 pager.c:2076 pager.c:2352
msgid "Bottom of message is shown."
msgstr "���� � ����� �� �������."

#: pager.c:1971 pager.c:1993 pager.c:2000 pager.c:2007
#: pager.c:2029 pager.c:2051 pager.c:2058 pager.c:2065
msgid "Top of message is shown."
msgstr "���� � �������� �� �������."

#: pager.c:2232
#: pager.c:2290
msgid "Help is currently being shown."
msgstr "������� ���� � ��������."

#: pager.c:2261
#: pager.c:2319
msgid "No more quoted text."
msgstr "���� ������ ������� �����."

#: pager.c:2274
#: pager.c:2332
msgid "No more unquoted text after quoted text."
msgstr "���� ������ ��������� ����� ���� ���������."



@@ 3673,7 3704,7 @@ msgstr "
msgid "error: unknown op %d (report this error)."
msgstr "������: �������� �������� %d (����, �������� �� ���� ������)."

#: pattern.c:1309 pattern.c:1449
#: pattern.c:1309 pattern.c:1451
msgid "Compiling search pattern..."
msgstr "����������� �� ������� �� �������..."



@@ 3681,24 3712,24 @@ msgstr "
msgid "Executing command on matching messages..."
msgstr "����������� �� ������� ����� �������..."

#: pattern.c:1397
#: pattern.c:1399
msgid "No messages matched criteria."
msgstr "���� �����, ���������� �� ���� ��������."

#: pattern.c:1479
#: pattern.c:1481
#, fuzzy
msgid "Searching..."
msgstr "���������..."

#: pattern.c:1492
#: pattern.c:1494
msgid "Search hit bottom without finding match"
msgstr "��������� �������� �� ����, ��� �� ���� �������� ����������"

#: pattern.c:1503
#: pattern.c:1505
msgid "Search hit top without finding match"
msgstr "��������� �������� �� ��������, ��� �� ���� �������� ����������"

#: pattern.c:1535
#: pattern.c:1537
msgid "Search interrupted."
msgstr "��������� � ����������."



@@ 3825,29 3856,29 @@ msgstr ""
msgid "esabfc"
msgstr "eswabf"

#: pgpinvoke.c:309
#: pgpinvoke.c:310
msgid "Fetching PGP key..."
msgstr "���������� �� PGP ����..."

#: pgpkey.c:491
#: pgpkey.c:492
msgid "All matching keys are expired, revoked, or disabled."
msgstr "������ ��������� ������� �� ��������, ��������� ��� ������������."

#: pgpkey.c:532
#: pgpkey.c:533
#, c-format
msgid "PGP keys matching <%s>."
msgstr "PGP �������, ��������� � <%s>."

#: pgpkey.c:534
#: pgpkey.c:535
#, c-format
msgid "PGP keys matching \"%s\"."
msgstr "PGP �������, ��������� � \"%s\"."

#: pgpkey.c:553 pgpkey.c:746
#: pgpkey.c:554 pgpkey.c:747
msgid "Can't open /dev/null"
msgstr "������ ��� �������� �� /dev/null"

#: pgpkey.c:778
#: pgpkey.c:779
#, c-format
msgid "PGP Key %s."
msgstr "PGP ���� %s."


@@ 3872,55 3903,55 @@ msgid "%d messages have been lost. Try reopening the mailbox."
msgstr ""
"��������� ������ �� �����. �������� �� �������� ������ ���������� �����."

#: pop.c:411 pop.c:801
#: pop.c:411 pop.c:807
#, c-format
msgid "%s is an invalid POP path"
msgstr "%s �� � ������� POP ������"

#: pop.c:454
#: pop.c:455
msgid "Fetching list of messages..."
msgstr "��������� �� ������ � �������..."

#: pop.c:612
#: pop.c:613
msgid "Can't write message to temporary file!"
msgstr "������ ��� ����� �� ������� ��� �������� ����"

#: pop.c:678
#: pop.c:684
#, fuzzy
msgid "Marking messages deleted..."
msgstr "��������� �� %d ��������� �� ���������..."

#: pop.c:756 pop.c:821
#: pop.c:762 pop.c:827
msgid "Checking for new messages..."
msgstr "�������� �� ���� �����..."

#: pop.c:785
#: pop.c:791
msgid "POP host is not defined."
msgstr "POP ������ �� � ���������."

#: pop.c:849
#: pop.c:855
msgid "No new mail in POP mailbox."
msgstr "���� ���� ����� � ���� POP �������� �����."

#: pop.c:856
#: pop.c:862
msgid "Delete messages from server?"
msgstr "������� �� �� �������� ������� �� �������?"

#: pop.c:858
#: pop.c:864
#, c-format
msgid "Reading new messages (%d bytes)..."
msgstr "��������� �� ������ ����� (%d �����)..."

#: pop.c:900
#: pop.c:906
msgid "Error while writing mailbox!"
msgstr "������ ��� ��������� �� ���������� �����!"

#: pop.c:904
#: pop.c:910
#, c-format
msgid "%s [%d of %d messages read]"
msgstr "%s [%d �� %d ����� �� ���������]"

#: pop.c:927 pop_lib.c:378
#: pop.c:933 pop_lib.c:378
msgid "Server closed connection!"
msgstr "�������� ������� ��������!"



@@ 3975,25 4006,25 @@ msgstr "
msgid "Postponed Messages"
msgstr "�������"

#: postpone.c:245 postpone.c:254
#: postpone.c:246 postpone.c:255
msgid "No postponed messages."
msgstr "���� �������� �������."

#: postpone.c:455 postpone.c:476 postpone.c:510
#: postpone.c:457 postpone.c:478 postpone.c:512
#, fuzzy
msgid "Illegal crypto header"
msgstr "��������� PGP �������� ����"

#: postpone.c:496
#: postpone.c:498
msgid "Illegal S/MIME header"
msgstr "��������� S/MIME �������� ����"

#: postpone.c:584
#: postpone.c:586
#, fuzzy
msgid "Decrypting message..."
msgstr "��������� �� �����..."

#: postpone.c:592
#: postpone.c:594
msgid "Decryption failed."
msgstr "��������� ������������."



@@ 4039,72 4070,72 @@ msgstr "Pipe"
msgid "Print"
msgstr "�����������"

#: recvattach.c:484
#: recvattach.c:485
msgid "Saving..."
msgstr "���������..."

#: recvattach.c:487 recvattach.c:578
#: recvattach.c:488 recvattach.c:579
msgid "Attachment saved."
msgstr "������������ � �������� �� �����."

#: recvattach.c:590
#: recvattach.c:591
#, c-format
msgid "WARNING!  You are about to overwrite %s, continue?"
msgstr "��������������! �� ��� ��� �� ����������� %s, �������� ��?"

#: recvattach.c:608
#: recvattach.c:609
msgid "Attachment filtered."
msgstr "������������ � ����������."

#: recvattach.c:675
#: recvattach.c:676
msgid "Filter through: "
msgstr "���������� ����: "

#: recvattach.c:675
#: recvattach.c:676
msgid "Pipe to: "
msgstr "��������� �� (pipe): "

#: recvattach.c:710
#: recvattach.c:711
#, fuzzy, c-format
msgid "I don't know how to print %s attachments!"
msgstr "�� � ���������� ������� �� ����������� �� %s ����������!"

#: recvattach.c:775
#: recvattach.c:776
msgid "Print tagged attachment(s)?"
msgstr "������� �� �� ���������� ����������� ����������?"

#: recvattach.c:775
#: recvattach.c:776
msgid "Print attachment?"
msgstr "������� �� �� ���������� ������������?"

#: recvattach.c:1009
#: recvattach.c:1010
msgid "Can't decrypt encrypted message!"
msgstr "������ ��� ������������� �� ��������� �����!"

#: recvattach.c:1021
#: recvattach.c:1022
msgid "Attachments"
msgstr "����������"

#: recvattach.c:1057
#: recvattach.c:1058
#, fuzzy
msgid "There are no subparts to show!"
msgstr "���� ��������, ����� �� ����� ��������!."

#: recvattach.c:1118
#: recvattach.c:1119
msgid "Can't delete attachment from POP server."
msgstr "������ ��� ����������� �� ���������� �� POP �������."

#: recvattach.c:1126
#: recvattach.c:1127
msgid "Deletion of attachments from encrypted messages is unsupported."
msgstr "����������� �� ���������� �� ��������� ����� �� �� ��������."

#: recvattach.c:1132
#: recvattach.c:1133
#, fuzzy
msgid ""
"Deletion of attachments from signed messages may invalidate the signature."
msgstr "����������� �� ���������� �� ��������� ����� �� �� ��������."

#: recvattach.c:1149 recvattach.c:1166
#: recvattach.c:1150 recvattach.c:1167
msgid "Only deletion of multipart attachments is supported."
msgstr "�������� �� ���� ��������� �� ���������� �� �������� �����."



@@ 4158,69 4189,69 @@ msgstr ""
"������������ �� ������ ��������� ���������� � ����������. ������� �� �� "
"����������� � MIME ����������?"

#: remailer.c:478
#: remailer.c:481
msgid "Append"
msgstr "��������"

#: remailer.c:479
#: remailer.c:482
msgid "Insert"
msgstr "��������"

#: remailer.c:480
#: remailer.c:483
msgid "Delete"
msgstr "���������"

#: remailer.c:482
#: remailer.c:485
msgid "OK"
msgstr "��"

#: remailer.c:510
#: remailer.c:512
msgid "Can't get mixmaster's type2.list!"
msgstr "���������� ������������ �� mixmaster \"type2.list\"!"

#: remailer.c:535
#: remailer.c:537
msgid "Select a remailer chain."
msgstr "����� �� remailer ������."

#: remailer.c:595
#: remailer.c:596
#, c-format
msgid "Error: %s can't be used as the final remailer of a chain."
msgstr "������: %s �� ���� �� �� �������� ���� �������� remailer ��� ��������."

#: remailer.c:625
#: remailer.c:626
#, c-format
msgid "Mixmaster chains are limited to %d elements."
msgstr "mixmaster �������� �� ���������� �� %d ��������."

#: remailer.c:648
#: remailer.c:649
msgid "The remailer chain is already empty."
msgstr "remailer �������� ���� � ������."

#: remailer.c:658
#: remailer.c:659
msgid "You already have the first chain element selected."
msgstr "������� ������� �� �������� � ���� ������."

#: remailer.c:668
#: remailer.c:669
msgid "You already have the last chain element selected."
msgstr "���������� ������� �� �������� � ���� ������."

#: remailer.c:707
#: remailer.c:708
msgid "Mixmaster doesn't accept Cc or Bcc headers."
msgstr "mixmaster �� ������ Cc ��� Bcc �������� ������."

#: remailer.c:731
#: remailer.c:732
msgid ""
"Please set the hostname variable to a proper value when using mixmaster!"
msgstr ""
"����, ��������� ������� �������� � ������������ \"hostname\" ������ "
"���������� mixmaster!"

#: remailer.c:765
#: remailer.c:766
#, c-format
msgid "Error sending message, child exited %d.\n"
msgstr "������ (%d) ��� ��������� �� �������.\n"

#: remailer.c:769
#: remailer.c:770
msgid "Error sending message."
msgstr "������ ��� ��������� �� �������."



@@ 4366,25 4397,25 @@ msgstr "%s 
msgid "%s isn't a regular file."
msgstr "%s �� � ��������� ����."

#: sendlib.c:1050
#: sendlib.c:1051
#, c-format
msgid "Could not open %s"
msgstr "������ ��� �������� �� %s"

#: sendlib.c:2357
#: sendlib.c:2360
msgid "$sendmail must be set in order to send mail."
msgstr ""

#: sendlib.c:2428
#: sendlib.c:2431
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "������ %d (%s) ��� ��������� �� �������."

#: sendlib.c:2434
#: sendlib.c:2437
msgid "Output of the delivery process"
msgstr "�������� ������:"

#: sendlib.c:2608
#: sendlib.c:2611
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "��� IDN %s ������ ������� �� �������� ��������� ���� ����������."


@@ 4409,79 4440,79 @@ msgstr "
msgid "Enter S/MIME passphrase:"
msgstr "��������� �� SMIME ������:"

#: smime.c:379
#: smime.c:380
msgid "Trusted   "
msgstr "������� �� � �������   "

#: smime.c:382
#: smime.c:383
msgid "Verified  "
msgstr "��������   "

#: smime.c:385
#: smime.c:386
msgid "Unverified"
msgstr "����������"

#: smime.c:388
#: smime.c:389
msgid "Expired   "
msgstr "�������   "

#: smime.c:391
#: smime.c:392
msgid "Revoked   "
msgstr "��������   "

#: smime.c:394
#: smime.c:395
msgid "Invalid   "
msgstr "���������   "

#: smime.c:397
#: smime.c:398
msgid "Unknown   "
msgstr "����������   "

#: smime.c:429
#: smime.c:430
#, c-format
msgid "S/MIME certificates matching \"%s\"."
msgstr "S/MIME �����������, ��������� � \"%s\"."

#: smime.c:472
#: smime.c:473
#, fuzzy
msgid "ID is not trusted."
msgstr "���� ������������� �� �� � �������."

#: smime.c:761
#: smime.c:762
msgid "Enter keyID: "
msgstr "�������� ������ �������������: "

#: smime.c:908
#: smime.c:909
#, c-format
msgid "No (valid) certificate found for %s."
msgstr "�� � ������� (�������) ���������� �� %s."

#: smime.c:961 smime.c:991 smime.c:1058 smime.c:1102 smime.c:1167 smime.c:1242
#: smime.c:962 smime.c:992 smime.c:1059 smime.c:1103 smime.c:1168 smime.c:1243
msgid "Error: unable to create OpenSSL subprocess!"
msgstr "������: �� ���� �� ���� ��������� ������� OpenSSL ������!"

#: smime.c:1320
#: smime.c:1321
#, fuzzy
msgid "no certfile"
msgstr "no certfile"

#: smime.c:1323
#: smime.c:1324
msgid "no mbox"
msgstr "���� �������� �����"

#: smime.c:1466 smime.c:1623
#: smime.c:1467 smime.c:1624
msgid "No output from OpenSSL..."
msgstr "���� �������� �� �������� OpenSSL ������..."

#: smime.c:1533
#: smime.c:1534
msgid "Can't sign: No key specified. Use Sign As."
msgstr ""

#: smime.c:1585
#: smime.c:1586
msgid "Can't open OpenSSL subprocess!"
msgstr "�� ���� �� ���� ��������� ������� OpenSSL ������!"

#: smime.c:1791 smime.c:1914
#: smime.c:1792 smime.c:1915
msgid ""
"[-- End of OpenSSL output --]\n"
"\n"


@@ 4489,19 4520,19 @@ msgstr ""
"[-- ���� �� OpenSSL-��������� --]\n"
"\n"

#: smime.c:1873 smime.c:1884
#: smime.c:1874 smime.c:1885
msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
msgstr "[-- ������: �� ���� �� ���� ��������� ������� OpenSSL ������! --]\n"

#: smime.c:1918
#: smime.c:1919
msgid "[-- The following data is S/MIME encrypted --]\n"
msgstr "[-- �������� ����� �� ��������� ��� S/MIME --]\n"

#: smime.c:1921
#: smime.c:1922
msgid "[-- The following data is S/MIME signed --]\n"
msgstr "[-- �������� ����� �� ��������� ��� S/MIME --]\n"

#: smime.c:1985
#: smime.c:1986
msgid ""
"\n"
"[-- End of S/MIME encrypted data. --]\n"


@@ 4509,7 4540,7 @@ msgstr ""
"\n"
"[-- ���� �� ����������� ��� S/MIME ����� --]\n"

#: smime.c:1987
#: smime.c:1988
msgid ""
"\n"
"[-- End of S/MIME signed data. --]\n"


@@ 4517,7 4548,7 @@ msgstr ""
"\n"
"[-- ���� �� ����������� ��� S/MIME ����� --]\n"

#: smime.c:2109
#: smime.c:2110
#, fuzzy
msgid ""
"S/MIME (s)ign, encrypt (w)ith, sign (a)s, (c)lear, or (o)ppenc mode off? "


@@ 4529,11 4560,11 @@ 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 two following letter sequences.
#: smime.c:2114
#: smime.c:2115
msgid "swafco"
msgstr ""

#: smime.c:2123
#: smime.c:2124
#, fuzzy
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, (c)lear, or "


@@ 4542,12 4573,12 @@ msgstr ""
"S/MIME ���������(e), ������(s), ��������� �(w), ������ ����(a), � �����(b) "
"��� ��� ���(f)?"

#: smime.c:2124
#: smime.c:2125
#, fuzzy
msgid "eswabfco"
msgstr "eswabf"

#: smime.c:2132
#: smime.c:2133
#, fuzzy
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "


@@ 4555,40 4586,40 @@ msgstr ""
"S/MIME ���������(e), ������(s), ��������� �(w), ������ ����(a), � �����(b) "
"��� ��� ���(f)?"

#: smime.c:2133
#: smime.c:2134
#, fuzzy
msgid "eswabfc"
msgstr "eswabf"

#: smime.c:2154
#: smime.c:2155
msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
msgstr ""

#: smime.c:2157
#: smime.c:2158
msgid "drac"
msgstr ""

#: smime.c:2160
#: smime.c:2161
msgid "1: DES, 2: Triple-DES "
msgstr ""

#: smime.c:2161
#: smime.c:2162
msgid "dt"
msgstr ""

#: smime.c:2173
#: smime.c:2174
msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
msgstr ""

#: smime.c:2174
#: smime.c:2175
msgid "468"
msgstr ""

#: smime.c:2189
#: smime.c:2190
msgid "1: AES128, 2: AES192, 3: AES256 "
msgstr ""

#: smime.c:2190
#: smime.c:2191
msgid "895"
msgstr ""



@@ 5248,225 5279,273 @@ msgid "print the current entry"
msgstr "��������� �������� �����"

#: ../keymap_alldefs.h:149
msgid "really delete the current entry, bypassing the trash folder"
msgstr ""

#: ../keymap_alldefs.h:150
msgid "query external program for addresses"
msgstr "������� ��������� ��� ������ �������� �� �����"

#: ../keymap_alldefs.h:150
#: ../keymap_alldefs.h:151
msgid "append new query results to current results"
msgstr "������ ����������� �� ����������� ��� �����������"

#: ../keymap_alldefs.h:151
#: ../keymap_alldefs.h:152
msgid "save changes to mailbox and quit"
msgstr "������� ��������� � ���������� ����� � ������� ����������"

#: ../keymap_alldefs.h:152
#: ../keymap_alldefs.h:153
msgid "recall a postponed message"
msgstr "��������� �������"

#: ../keymap_alldefs.h:153
#: ../keymap_alldefs.h:154
msgid "clear and redraw the screen"
msgstr "������� � ��������� ������"

#: ../keymap_alldefs.h:154
#: ../keymap_alldefs.h:155
msgid "{internal}"
msgstr "{��������}"

#: ../keymap_alldefs.h:155
#: ../keymap_alldefs.h:156
#, fuzzy
msgid "rename the current mailbox (IMAP only)"
msgstr "������� �������� �������� ����� (���� IMAP)"

#: ../keymap_alldefs.h:156
#: ../keymap_alldefs.h:157
msgid "reply to a message"
msgstr "������� �� �����"

#: ../keymap_alldefs.h:157
#: ../keymap_alldefs.h:158
msgid "use the current message as a template for a new one"
msgstr "�������� �������� ����� ���� ������ �� ����"

#: ../keymap_alldefs.h:158
#: ../keymap_alldefs.h:159
#, fuzzy
msgid "save message/attachment to a mailbox/file"
msgstr "������� ����� ��� ���������� ��� ����"

#: ../keymap_alldefs.h:159
#: ../keymap_alldefs.h:160
msgid "search for a regular expression"
msgstr "������� �� ��������� �����"

#: ../keymap_alldefs.h:160
#: ../keymap_alldefs.h:161
msgid "search backwards for a regular expression"
msgstr "������� �� ��������� ����� � ��������� ������"

#: ../keymap_alldefs.h:161
#: ../keymap_alldefs.h:162
msgid "search for next match"
msgstr "����� ���������� ���������"

#: ../keymap_alldefs.h:162
#: ../keymap_alldefs.h:163
msgid "search for next match in opposite direction"
msgstr "����� ���������� ��������� � ��������� ������"

#: ../keymap_alldefs.h:163
#: ../keymap_alldefs.h:164
msgid "toggle search pattern coloring"
msgstr "�������/�������� ������������ ��� �������"

#: ../keymap_alldefs.h:164
#: ../keymap_alldefs.h:165
msgid "invoke a command in a subshell"
msgstr "��������� ������� � ��������� �������������"

#: ../keymap_alldefs.h:165
#: ../keymap_alldefs.h:166
msgid "sort messages"
msgstr "�������� �������"

#: ../keymap_alldefs.h:166
#: ../keymap_alldefs.h:167
msgid "sort messages in reverse order"
msgstr "�������� ������� � ������� ���"

#: ../keymap_alldefs.h:167
#: ../keymap_alldefs.h:168
msgid "tag the current entry"
msgstr "������� �������� �����"

#: ../keymap_alldefs.h:168
#: ../keymap_alldefs.h:169
msgid "apply next function to tagged messages"
msgstr "������� ���������� ������� ����� ����������� �����"

#: ../keymap_alldefs.h:169
#: ../keymap_alldefs.h:170
msgid "apply next function ONLY to tagged messages"
msgstr "������� ���������� ������� ���� ����� ����������� �����"

#: ../keymap_alldefs.h:170
#: ../keymap_alldefs.h:171
msgid "tag the current subthread"
msgstr "������� �������� ��������"

#: ../keymap_alldefs.h:171
#: ../keymap_alldefs.h:172
msgid "tag the current thread"
msgstr "������� �������� �����"

#: ../keymap_alldefs.h:172
#: ../keymap_alldefs.h:173
msgid "toggle a message's 'new' flag"
msgstr "�������/�������� ����������, ���� ������� � ����"

#: ../keymap_alldefs.h:173
#: ../keymap_alldefs.h:174
msgid "toggle whether the mailbox will be rewritten"
msgstr "�������/�������� ���������� �� ���������� �����"

#: ../keymap_alldefs.h:174
#: ../keymap_alldefs.h:175
msgid "toggle whether to browse mailboxes or all files"
msgstr "���������� ��������� ����� �������� ����� ��� ������ �������"

#: ../keymap_alldefs.h:175
#: ../keymap_alldefs.h:176
msgid "move to the top of the page"
msgstr "����������� ��� �������� �� ����������"

#: ../keymap_alldefs.h:176
#: ../keymap_alldefs.h:177
msgid "undelete the current entry"
msgstr "������������ �������� �����"

#: ../keymap_alldefs.h:177
#: ../keymap_alldefs.h:178
msgid "undelete all messages in thread"
msgstr "������������ ������ ����� � �������"

#: ../keymap_alldefs.h:178
#: ../keymap_alldefs.h:179
msgid "undelete all messages in subthread"
msgstr "������������ ������ ����� � ����������"

#: ../keymap_alldefs.h:179
#: ../keymap_alldefs.h:180
msgid "show the Mutt version number and date"
msgstr "������� �������� �� mutt"

#: ../keymap_alldefs.h:180
#: ../keymap_alldefs.h:181
msgid "view attachment using mailcap entry if necessary"
msgstr "������� ����������, ����������� mailcap"

#: ../keymap_alldefs.h:181
#: ../keymap_alldefs.h:182
msgid "show MIME attachments"
msgstr "������� MIME ����������"

#: ../keymap_alldefs.h:182
#: ../keymap_alldefs.h:183
msgid "display the keycode for a key press"
msgstr "������� ���� �� �������� ������"

#: ../keymap_alldefs.h:183
#: ../keymap_alldefs.h:184
msgid "show currently active limit pattern"
msgstr "������� �������� ������������� ������"

#: ../keymap_alldefs.h:184
#: ../keymap_alldefs.h:185
msgid "collapse/uncollapse current thread"
msgstr "�����/�������� �������� �����"

#: ../keymap_alldefs.h:185
#: ../keymap_alldefs.h:186
msgid "collapse/uncollapse all threads"
msgstr "�����/�������� ������ �����"

#: ../keymap_alldefs.h:186
#: ../keymap_alldefs.h:187
msgid "move the highlight to next mailbox"
msgstr ""

#: ../keymap_alldefs.h:188
#, fuzzy
msgid "move the highlight to next mailbox with new mail"
msgstr "���� �������� ����� � ���� �����."

#: ../keymap_alldefs.h:189
#, fuzzy
msgid "open highlighted mailbox"
msgstr "�������� �������� �� ���������� �����..."

#: ../keymap_alldefs.h:190
#, fuzzy
msgid "scroll the sidebar down 1 page"
msgstr "�������� ������ ������ � 1/2 ��������"

#: ../keymap_alldefs.h:191
#, fuzzy
msgid "scroll the sidebar up 1 page"
msgstr "�������� ������ ������ � 1/2 ��������"

#: ../keymap_alldefs.h:192
#, fuzzy
msgid "move the highlight to previous mailbox"
msgstr "����������� ��� ���������� ��������"

#: ../keymap_alldefs.h:193
#, fuzzy
msgid "move the highlight to previous mailbox with new mail"
msgstr "���� �������� ����� � ���� �����."

#: ../keymap_alldefs.h:194
msgid "make the sidebar (in)visible"
msgstr ""

#: ../keymap_alldefs.h:195
msgid "attach a PGP public key"
msgstr "������� PGP �������� ����"

#: ../keymap_alldefs.h:187
#: ../keymap_alldefs.h:196
msgid "show PGP options"
msgstr "������� PGP �����������"

#: ../keymap_alldefs.h:188
#: ../keymap_alldefs.h:197
msgid "mail a PGP public key"
msgstr "������� PGP �������� ����"

#: ../keymap_alldefs.h:189
#: ../keymap_alldefs.h:198
msgid "verify a PGP public key"
msgstr "����������� PGP �������� ����"

#: ../keymap_alldefs.h:190
#: ../keymap_alldefs.h:199
msgid "view the key's user id"
msgstr "������� �������������� ����� ��� ����"

#: ../keymap_alldefs.h:191
#: ../keymap_alldefs.h:200
#, fuzzy
msgid "check for classic PGP"
msgstr "��������� �� ���������� pgp"

#: ../keymap_alldefs.h:192
msgid "Accept the chain constructed"
#: ../keymap_alldefs.h:201
#, fuzzy
msgid "accept the chain constructed"
msgstr "�������� �������������� ������"

#: ../keymap_alldefs.h:193
msgid "Append a remailer to the chain"
#: ../keymap_alldefs.h:202
#, fuzzy
msgid "append a remailer to the chain"
msgstr "������ remailer ��� ��������"

#: ../keymap_alldefs.h:194
msgid "Insert a remailer into the chain"
#: ../keymap_alldefs.h:203
#, fuzzy
msgid "insert a remailer into the chain"
msgstr "������ remailer ��� ��������"

#: ../keymap_alldefs.h:195
msgid "Delete a remailer from the chain"
#: ../keymap_alldefs.h:204
#, fuzzy
msgid "delete a remailer from the chain"
msgstr "������� remailer �� ��������"

#: ../keymap_alldefs.h:196
msgid "Select the previous element of the chain"
#: ../keymap_alldefs.h:205
#, fuzzy
msgid "select the previous element of the chain"
msgstr "������ ��������� ������� �� ��������"

#: ../keymap_alldefs.h:197
msgid "Select the next element of the chain"
#: ../keymap_alldefs.h:206
#, fuzzy
msgid "select the next element of the chain"
msgstr "������ ��������� ������� �� ��������"

#: ../keymap_alldefs.h:198
#: ../keymap_alldefs.h:207
msgid "send the message through a mixmaster remailer chain"
msgstr "������� ������� ���� mixmaster remailer ������"

#: ../keymap_alldefs.h:199
#: ../keymap_alldefs.h:208
msgid "make decrypted copy and delete"
msgstr "������� ����������� ����� � �������"

#: ../keymap_alldefs.h:200
#: ../keymap_alldefs.h:209
msgid "make decrypted copy"
msgstr "������� ����������� �����"

#: ../keymap_alldefs.h:201
#: ../keymap_alldefs.h:210
msgid "wipe passphrase(s) from memory"
msgstr "���������� �������� �� �������"

#: ../keymap_alldefs.h:202
#: ../keymap_alldefs.h:211
msgid "extract supported public keys"
msgstr "������� ������������ �������� �������"

#: ../keymap_alldefs.h:203
#: ../keymap_alldefs.h:212
msgid "show S/MIME options"
msgstr "������� S/MIME �����������"


M po/ca.po => po/ca.po +1 -1
@@ 49,7 49,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mutt 1.7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-09 09:45-0700\n"
"POT-Creation-Date: 2016-08-17 20:11-0700\n"
"PO-Revision-Date: 2016-08-10 09:13+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"

M po/cs.po => po/cs.po +713 -633
@@ 10,7 10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mutt ec1ebdf1e088\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-06 10:39-0700\n"
"POT-Creation-Date: 2016-08-17 20:11-0700\n"
"PO-Revision-Date: 2016-03-19 21:53+01:00\n"
"Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"


@@ 29,16 29,16 @@ msgstr "Uživatelské jméno na %s: "
msgid "Password for %s@%s: "
msgstr "Heslo pro %s@%s: "

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

#: addrbook.c:38 curs_main.c:482 pager.c:1539 postpone.c:42
#: addrbook.c:38 curs_main.c:487 pager.c:1560 postpone.c:42
msgid "Del"
msgstr "Smazat"

#: addrbook.c:39 curs_main.c:483 postpone.c:43
#: addrbook.c:39 curs_main.c:488 postpone.c:43
msgid "Undel"
msgstr "Obnovit"



@@ 46,9 46,9 @@ msgstr "Obnovit"
msgid "Select"
msgstr "Volba"

#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:4022 curs_main.c:488
#: mutt_ssl.c:1049 mutt_ssl_gnutls.c:1003 pager.c:1631 pgpkey.c:522
#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:439
#: 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
#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:440
msgid "Help"
msgstr "Nápověda"



@@ 91,8 91,8 @@ msgstr "Vlastní jméno: "
msgid "[%s = %s] Accept?"
msgstr "[%s = %s] Přijmout?"

#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
#: recvattach.c:492 recvattach.c:522
#: alias.c:347 recvattach.c:441 recvattach.c:467 recvattach.c:480
#: recvattach.c:493 recvattach.c:523
msgid "Save to file: "
msgstr "Uložit jako: "



@@ 117,8 117,8 @@ msgstr "Shodu pro jmenný vzor nelze nalézt, pokračovat?"
msgid "Mailcap compose entry requires %%s"
msgstr "Položka mailcapu „compose“ vyžaduje %%s"

#: attach.c:134 attach.c:266 commands.c:223 compose.c:1207 curs_lib.c:196
#: curs_lib.c:569
#: attach.c:134 attach.c:266 commands.c:223 compose.c:1208 curs_lib.c:204
#: curs_lib.c:723
#, c-format
msgid "Error running \"%s\"!"
msgstr "Chyba při běhu programu \"%s\"!"


@@ 182,8 182,8 @@ msgstr "---Příloha: %s: %s"
msgid "---Attachment: %s"
msgstr "--–Příloha: %s"

#: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1362
#: pgpkey.c:571 pgpkey.c:760
#: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1363
#: pgpkey.c:572 pgpkey.c:761
msgid "Can't create filter"
msgstr "Filtr nelze vytvořit"



@@ 203,154 203,154 @@ msgstr "Změnit adresář"
msgid "Mask"
msgstr "Maska"

#: browser.c:400 browser.c:1055
#: browser.c:425 browser.c:1091
#, c-format
msgid "%s is not a directory."
msgstr "%s není adresářem."

#: browser.c:539
#: browser.c:573
#, c-format
msgid "Mailboxes [%d]"
msgstr "Schránky [%d]"

#: browser.c:546
#: browser.c:580
#, c-format
msgid "Subscribed [%s], File mask: %s"
msgstr "Přihlášená schránka [%s], Souborová maska: %s"

#: browser.c:550
#: browser.c:584
#, c-format
msgid "Directory [%s], File mask: %s"
msgstr "Adresář [%s], Souborová maska: %s"

#: browser.c:562
#: browser.c:596
msgid "Can't attach a directory!"
msgstr "Adresář nelze připojit!"

#: browser.c:701 browser.c:1123 browser.c:1221
#: browser.c:735 browser.c:1159 browser.c:1257
msgid "No files match the file mask"
msgstr "Souborové masce nevyhovuje žádný soubor."

#: browser.c:905
#: browser.c:939
msgid "Create is only supported for IMAP mailboxes"
msgstr "Vytváření funguje pouze u IMAP schránek."

#: browser.c:929
#: browser.c:963
msgid "Rename is only supported for IMAP mailboxes"
msgstr "Přejmenování funguje pouze u IMAP schránek."

#: browser.c:952
#: browser.c:986
msgid "Delete is only supported for IMAP mailboxes"
msgstr "Mazání funguje pouze u IMAP schránek."

#: browser.c:962