[evolution/gnome-3-16] Updated Russian translation



commit 3bd2a4fd33ec758f6860b7f0530afef0d0d8a6ad
Author: Stas Solovey <whats_up tut by>
Date:   Tue Apr 14 22:21:44 2015 +0000

    Updated Russian translation

 po/ru.po | 9348 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 5376 insertions(+), 3972 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 57e9239..431c5e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,31 +3,32 @@
 # Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # Valek Filippov <frob df ru>, 2000.
-# Dmitry Mastrukov  <dmitry taurussoft org>, 2001-2003.
+# Dmitry Mastrukov <dmitry taurussoft org>, 2001-2003.
 # Leonid Kanter <leon asplinux ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Michael Yakhontov <mvy asplinux ru>, 2003, 2005.
 # Anatol Kamynin <anatol tiflocomp ru>, 2008.
 # Yuri Kozlov <yuray komyakino ru>, 2011.
-# Stas Solovey <whats_up tut by>, 2014.
 # SourceLocalizer <mail sourcelocalizer ru>, 2014.
 # Yuri Myasoedov <ymyasoedov yandex ru>, 2012, 2013, 2014.
+# Stas Solovey <whats_up tut by>, 2014, 2015.
 #
+#: ../shell/main.c:506
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-07-08 04:22+0000\n"
-"PO-Revision-Date: 2014-07-08 16:56+0300\n"
-"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
-"Language-Team: русский <gnome-cyr gnome org>\n"
+"POT-Creation-Date: 2015-04-01 16:27+0000\n"
+"PO-Revision-Date: 2015-04-15 00:40+0300\n"
+"Last-Translator: Stas Solovey <whats_up tut by>\n"
+"Language-Team: Русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.5.4\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -129,7 +130,6 @@ msgid "Unable to perform search."
 msgstr "Не удалось выполнить поиск."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to refresh address book '{0}'"
 msgstr "Не удалось обновить адресную книгу «{0}»"
 
@@ -202,12 +202,12 @@ msgstr ""
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:396
-#: ../mail/em-vfolder-editor-rule.c:625 ../mail/mail-config.ui.h:53
-#: ../modules/mail/em-composer-prefs.c:397
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:416
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -283,9 +283,9 @@ msgstr ""
 "открыта. Дождитесь пока она не закроется или выберите другую книгу."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:706
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:728
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2896
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -318,16 +318,16 @@ msgid "Full _Name..."
 msgstr "По_лное имя…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "Согласен получать почту в формате _HTML"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1162
 msgid "Email"
 msgstr "Эл. почта"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "Согласен получать почту в формате _HTML"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Телефон"
@@ -352,7 +352,7 @@ msgstr "_Домашняя страница:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1881
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Calendar:"
 msgstr "_Календарь:"
 
@@ -369,7 +369,7 @@ msgid "Home Page:"
 msgstr "Домашняя страница:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:93
+#: ../modules/cal-config-google/e-cal-config-google.c:92
 msgid "Calendar:"
 msgstr "Календарь:"
 
@@ -395,57 +395,53 @@ msgid "Web Addresses"
 msgstr "Веб-адреса"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-msgid "Web addresses"
-msgstr "Веб-адреса"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Profession:"
 msgstr "_Профессия:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Заголовок:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Company:"
 msgstr "_Компания:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Department:"
 msgstr "От_дел:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Office:"
 msgstr "_Должность:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Менеджер:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "Помо_щник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Работа"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "С_упруг(а):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Birthday:"
 msgstr "_День рождения:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Anniversary:"
 msgstr "_Годовщина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:2311
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Годовщина"
 
@@ -454,135 +450,141 @@ msgstr "Годовщина"
 #. Get the icon file for some default category.  Doesn't matter
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
-#: ../calendar/gui/e-calendar-view.c:2310 ../shell/main.c:127
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Personal Information"
 msgstr "Личная информация"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_City:"
 msgstr "_Город:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Zip/Postal Code:"
 msgstr "_Почтовый индекс:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "_Область, край:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Country:"
 msgstr "С_трана:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_PO Box:"
 msgstr "_Абонентский ящик:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Домашний"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:908
-#: ../calendar/gui/e-cal-model.c:3951
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Другой"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "Mailing Address"
 msgstr "Почтовый адрес"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "Notes"
 msgstr "Примечания"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "_Справка"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
+msgid "Options"
+msgstr "Параметры"
+
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3472
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
 #: ../addressbook/gui/widgets/eab-contact-merging.c:474
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:267 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:340 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
-#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
-#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-color-chooser-widget.c:117
-#: ../e-util/e-filter-datespec.c:291 ../e-util/e-html-editor-actions.c:472
-#: ../e-util/e-html-editor-actions.c:565
-#: ../e-util/e-image-chooser-dialog.c:168
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:406
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3206 ../e-util/evolution-source-viewer.c:833
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3136
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:740
-#: ../mail/mail-send-recv.c:822 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:917
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:900
+#: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/face/face.c:291
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:237 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Отменить"
 
@@ -590,73 +592,125 @@ msgstr "_Отменить"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:381
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3207
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3137
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:241
-#: ../calendar/gui/dialogs/comp-editor.c:1299
-#: ../e-util/e-html-editor-actions.c:1027
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#| msgid "Telephone"
+msgid "Show Telephone"
+msgstr "Показать телефон"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#| msgid "SIP Address"
+msgid "Show SIP Address"
+msgstr "Показать адрес SIP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#| msgid "Instant Messaging"
+msgid "Show Instant Messaging"
+msgstr "Показать систему мгновенных сообщений"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#| msgid "Web Addresses"
+msgid "Show Web Addresses"
+msgstr "Показать веб-адреса"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#| msgid "Show the second time zone"
+msgid "Show Job section"
+msgstr "Показать раздел Работа"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#| msgid "Miscellaneous"
+msgid "Show Miscellaneous"
+msgstr "Показать прочее"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#| msgid "Mailing Address"
+msgid "Show Home Mailing Address"
+msgstr "Показать домашний почтовый адрес"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#| msgid "Mailing Address"
+msgid "Show Work Mailing Address"
+msgstr "Показать рабочий почтовый адрес"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#| msgid "Mailing Address"
+msgid "Show Other Mailing Address"
+msgstr "Показать другой почтовый адрес"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#| msgid "Show %s"
+msgid "Show Notes"
+msgstr "Показать примечания"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:1129
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:243
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Отменить"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../e-util/e-html-editor-actions.c:985
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "_Redo"
 msgstr "_Вернуть"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Вернуть"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Ошибка добавления контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Ошибка изменения контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Ошибка удаления контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор контактов — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3469
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "Выберите изображение для этого контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3473
-#: ../e-util/e-category-editor.c:146 ../e-util/e-html-editor-actions.c:473
-#: ../e-util/e-html-editor-actions.c:566
-#: ../e-util/e-image-chooser-dialog.c:171 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3474
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Нет изображения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3823
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -664,32 +718,32 @@ msgstr ""
 "Данные контакта неверны:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3829
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» имеет неверный формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3837
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "«%s» не может быть датой в будущем"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» имеет неверный формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3858
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3872
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» пуст"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3887
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Неверный контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
@@ -697,26 +751,26 @@ msgstr "Неверный контакт."
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 #: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
-#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
-#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-color-chooser-widget.c:118
-#: ../e-util/e-filter-datespec.c:292 ../e-util/e-html-editor-link-dialog.c:370
-#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
-#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
-#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:377
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:388 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
 #: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:168 ../smime/gui/e-cert-selector.c:238
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
-msgstr "_OK"
+msgstr "_ОК"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
@@ -726,15 +780,15 @@ msgstr "Быстрое добавление контакта"
 msgid "_Edit Full"
 msgstr "_Изменить все"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Полное имя"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "_Эл. почта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Выберите адресную книгу"
 
@@ -842,12 +896,11 @@ msgstr "Удалить адрес эл. почты из списка"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
-#: ../mail/mail-config.ui.h:54
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:460
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
@@ -888,22 +941,235 @@ msgstr "П_оследний"
 msgid "Contact List Members"
 msgstr "Участники списка контактов"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1488
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Участники"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1628
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Ошибка добавления списка"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1648
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Ошибка изменения списка"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Ошибка удаления списка"
 
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "Имя содержит"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+msgid "Email begins with"
+msgstr "Почтовый адрес начинается с"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Любое поле содержит"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "адресная книга evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Копировать адрес _эл. почты"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "Копировать адрес эл. почты в буфер обмена"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "_Отправить новое сообщение…"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "Отправить сообщение этому адресату"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:999
+#, c-format
+msgid "Click to mail %s"
+msgstr "Нажмите, чтобы написать письмо %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Открыть карту"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Список участников:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Компания"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Отдел"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Офис"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Профессия"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Должность"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Менеджер"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Помощник"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "Видеочат"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Свободен/занят"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Телефон"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Факс"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Адрес"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Домашняя страница"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Веб-журнал"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Супруг(а)"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Личное"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Примечание"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Участники списка"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Должность"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Домашняя страничка"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Блог"
+
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
@@ -954,25 +1220,122 @@ msgstr "Конфликтующий контакт:"
 msgid "Old Contact:"
 msgstr "Старый контакт:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1253
-msgid "Name contains"
-msgstr "Имя содержит"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Не удалось открыть эту адресную книгу. Это значит, что либо книга не "
+"помечена для автономного использования, либо ещё не загружена для "
+"автономного использования. Загрузите эту книгу в режиме подключения к сети, "
+"чтобы получить доступ к её содержимому"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
-msgid "Email begins with"
-msgstr "Почтовый адрес начинается с"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Не удалось открыть эту адресную книгу. Убедитесь, что путь %s существует и "
+"что у вас имеются необходимые права доступа."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1239
-#: ../modules/calendar/e-cal-shell-view-actions.c:1762
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-msgid "Any field contains"
-msgstr "Любое поле содержит"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Эта версия Evolution не имеет встроенной поддержки LDAP. Чтобы использовать "
+"LDAP в Evolution, необходимо установить пакет Evolution с поддержкой LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Не удалось открыть эту адресную книгу. Это значит, что либо введён неверный "
+"URI, либо сервер недоступен."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Подробное сообщение об ошибке:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"С этим запросом совпало больше карточек, чем \n"
+"настроено для выдачи в сервере или Evolution.\n"
+"Определите условия поиска точнее, или\n"
+"поднимите ограничения для выдачи результатов в\n"
+"настройках сервера каталога для этой адресной книги."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Время исполнения запроса превысило ограничения сервера\n"
+"или ограничения, определённого для этой адресной книги.\n"
+"Определите условия поиска точнее или\n"
+"поднимите ограничения времени в настройках сервера\n"
+"каталога или в настройках этой адресной книги."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"Компонент обработки этой адресной книги не смог обработать текущий запрос. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+"Компонент обработки этой адресной книги отказался обрабатывать текущий "
+"запрос. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Этот запрос завершился с ошибкой. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Выберите адресную книгу"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "список"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Переместить контакт в"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Копировать контакт в"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Переместить контакты в"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Копировать контакты в"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1011,7 +1374,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Вставить контакты из буфера обмена"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Удалить выбранные контакты"
 
@@ -1046,16 +1409,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Действительно удалить этот контакт (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:804
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1125
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
-#: ../modules/calendar/e-memo-shell-view-actions.c:684
-#: ../modules/calendar/e-task-shell-view-actions.c:836
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Удалить"
 
@@ -1101,11 +1464,6 @@ msgstr "Имя"
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:752
-msgid "Nickname"
-msgstr "Псевдоним"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Эл. почта 2"
@@ -1158,11 +1516,6 @@ msgstr "Домашний факс"
 msgid "ISDN Phone"
 msgstr "Телефон ISDN"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Другие телефоны"
@@ -1197,20 +1550,10 @@ msgstr "Телекс"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:818
-msgid "Company"
-msgstr "Компания"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Подразделение"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
-msgid "Office"
-msgstr "Офис"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Заголовок"
@@ -1221,16 +1564,6 @@ msgstr "Заголовок"
 msgid "Role"
 msgstr "Должность"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
-msgid "Manager"
-msgstr "Менеджер"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
-msgid "Assistant"
-msgstr "Помощник"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Веб-сайт"
@@ -1247,15 +1580,37 @@ msgstr "Журнал"
 msgid "Categories"
 msgstr "Категории"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-msgid "Spouse"
-msgstr "Супруг(а)"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Открыть"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
-msgid "Note"
-msgstr "Примечание"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Список контактов: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Контакт: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "миникарточка evolution"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Создать контакт"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Создать список контактов"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "в текущей папке адресной книги %s имеется %d карточка"
+msgstr[1] "в текущей папке адресной книги %s имеются %d карточки"
+msgstr[2] "в текущей папке адресной книги %s имеются %d карточек"
 
 #: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
@@ -1268,15 +1623,15 @@ msgstr "У_величить"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2362
 msgid "Zoom _Out"
 msgstr "У_меньшить"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1939
+#: ../e-util/e-html-editor-actions.c:2108
 #: ../e-util/e-html-editor-find-dialog.c:195
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Найти"
 
@@ -1338,315 +1693,12 @@ msgstr ""
 "\n"
 "Нет элементов для отображения в этом окне."
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "адресная книга evolution"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Создать контакт"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Создать список контактов"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "в текущей папке адресной книги %s имеется %d карточка"
-msgstr[1] "в текущей папке адресной книги %s имеются %d карточки"
-msgstr[2] "в текущей папке адресной книги %s имеются %d карточек"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Открыть"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Список контактов: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Контакт: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "миникарточка evolution"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Копировать адрес _эл. почты"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:310
-msgid "Copy the email address to the clipboard"
-msgstr "Копировать адрес эл. почты в буфер обмена"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:315
-msgid "_Send New Message To..."
-msgstr "_Отправить новое сообщение…"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:317
-msgid "Send a mail message to this address"
-msgstr "Отправить сообщение этому адресату"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1035
-#, c-format
-msgid "Click to mail %s"
-msgstr "Нажмите, чтобы написать письмо %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
-msgid "Open map"
-msgstr "Открыть карту"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
-msgid "SIP"
-msgstr "SIP"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-msgid "List Members:"
-msgstr "Список участников:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
-msgid "AIM"
-msgstr "AIM"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
-msgid "Skype"
-msgstr "Skype"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
-msgid "Department"
-msgstr "Отдел"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
-msgid "Profession"
-msgstr "Профессия"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
-msgid "Position"
-msgstr "Должность"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
-msgid "Video Chat"
-msgstr "Видеочат"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Календарь"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Свободен/занят"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
-msgid "Phone"
-msgstr "Телефон"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
-msgid "Fax"
-msgstr "Факс"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:831
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:872
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:898
-msgid "Address"
-msgstr "Адрес"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:867
-msgid "Home Page"
-msgstr "Домашняя страница"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
-msgid "Web Log"
-msgstr "Веб-журнал"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:885
-msgid "Personal"
-msgstr "Личное"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1126
-msgid "List Members"
-msgstr "Участники списка"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1147
-msgid "Job Title"
-msgstr "Должность"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1188
-msgid "Home page"
-msgstr "Домашняя страничка"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1198
-msgid "Blog"
-msgstr "Блог"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Не удалось открыть эту адресную книгу. Это значит, что либо книга не "
-"помечена для автономного использования, либо ещё не загружена для "
-"автономного использования. Загрузите эту книгу в режиме подключения к сети, "
-"чтобы получить доступ к её содержимому"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Не удалось открыть эту адресную книгу. Убедитесь, что путь %s существует и "
-"что у вас имеются необходимые права доступа."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP. Чтобы использовать "
-"LDAP в Evolution, необходимо установить пакет Evolution с поддержкой LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Не удалось открыть эту адресную книгу. Это значит, что либо введён неверный "
-"URI, либо сервер недоступен."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Подробное сообщение об ошибке:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"С этим запросом совпало больше карточек, чем \n"
-"настроено для выдачи в сервере или Evolution.\n"
-"Определите условия поиска точнее, или\n"
-"поднимите ограничения для выдачи результатов в\n"
-"настройках сервера каталога для этой адресной книги."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Время исполнения запроса превысило ограничения сервера\n"
-"или ограничения, определённого для этой адресной книги.\n"
-"Определите условия поиска точнее или\n"
-"поднимите ограничения времени в настройках сервера\n"
-"каталога или в настройках этой адресной книги."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr ""
-"Компонент обработки этой адресной книги не смог обработать текущий запрос. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr ""
-"Компонент обработки этой адресной книги отказался обрабатывать текущий "
-"запрос. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Этот запрос завершился с ошибкой. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Выберите адресную книгу"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "список"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Переместить контакт в"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Копировать контакт в"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Переместить контакты в"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Копировать контакты в"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Импортирование…"
 
@@ -1697,38 +1749,38 @@ msgstr "Evolution vCard Importer"
 msgid "Page %d"
 msgstr "Страница %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Указать файл вместо стандартного вывода"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Перечислить папки локальной адресной книги"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Показывать карточки как файлы vcard или csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Ошибка аргументов командной строки, используйте параметр --help, чтобы "
 "просмотреть доступные аргументы."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Поддерживаются форматы только vcard или csv."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Необрабатываемая ошибка"
 
@@ -1743,19 +1795,16 @@ msgid "Failed to open client '%s': %s"
 msgstr "Сбой при открытии клиента «%s»: %s"
 
 #: ../addressbook/util/eab-book-util.c:36
-#| msgid "Work Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Рабочая эл. почта"
 
 #: ../addressbook/util/eab-book-util.c:37
-#| msgid "Home Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Домашняя эл. почта"
 
 #: ../addressbook/util/eab-book-util.c:38
-#| msgid "Other Email"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Другая эл. почта"
@@ -1782,61 +1831,51 @@ msgid "Other SIP"
 msgstr "Другой"
 
 #: ../addressbook/util/eab-book-util.c:74
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/util/eab-book-util.c:75
-#| msgid "Jabber"
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/util/eab-book-util.c:76
-#| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/util/eab-book-util.c:77
-#| msgid "Gadu-Gadu"
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/util/eab-book-util.c:78
-#| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/util/eab-book-util.c:79
-#| msgid "ICQ"
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/util/eab-book-util.c:80
-#| msgid "GroupWise"
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/util/eab-book-util.c:81
-#| msgid "Skype"
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/util/eab-book-util.c:82
-#| msgid "Twitter"
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Twitter"
 
 #: ../addressbook/util/eab-book-util.c:83
-#| msgid "Google Talk"
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -1846,7 +1885,6 @@ msgstr "Google Talk"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:126
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Эл. почта"
@@ -1857,7 +1895,6 @@ msgstr "Эл. почта"
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
 #: ../addressbook/util/eab-book-util.c:173
-#| msgid "SIP"
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "SIP"
@@ -1868,18 +1905,16 @@ msgstr "SIP"
 #. * IM=Instant Messaging
 #.
 #: ../addressbook/util/eab-book-util.c:216
-#, fuzzy
 #| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
-msgstr "AIM"
+msgstr "IM"
 
 #. To Translators:
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:269
-#| msgid "Phone"
+#: ../addressbook/util/eab-book-util.c:271
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Телефон"
@@ -1927,19 +1962,18 @@ msgstr "Напомнить по_зже"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1057
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-html-editor-actions.c:1138
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
 #: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Правка"
@@ -1948,16 +1982,16 @@ msgstr "_Правка"
 msgid "_Print"
 msgstr "_Печать"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Отменить"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
 msgstr "Адрес:"
 
@@ -1972,49 +2006,49 @@ msgstr "Напомнить _через:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "дни"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "часы"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "минуты"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Сводка недоступна."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Описание недоступно."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Сведения о местонахождении недоступны."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Напоминатели Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -2022,22 +2056,22 @@ msgstr[0] "У вас %d напоминание"
 msgstr[1] "У вас %d напоминания"
 msgstr[2] "У вас %d напоминаний"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Нет"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2054,7 +2088,7 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -2481,82 +2515,209 @@ msgstr "Этот список заметок не отмечен для авто
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+#| msgid "Failed to refresh calendar '{0}'"
+msgid "Failed to open calendar '{0}'"
+msgstr "Не удалось открыть календарь «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+#| msgid "Failed to refresh memo list '{0}'"
+msgid "Failed to open memo list '{0}'"
+msgstr "Не удалось открыть список заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+#| msgid "Failed to refresh task list '{0}'"
+msgid "Failed to open task list '{0}'"
+msgstr "Не удалось открыть список задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Не удалось создать событие в календаре «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "Не удалось создать заметку в списке заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "Не удалось создать задачу в списке задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "Не удалось изменить событие в календаре «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "Не удалось изменить заметку в списке заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "Не удалось изменить задачу в списке задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "Не удалось удалить событие в календаре «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "Не удалось удалить заметку в списке заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "Не удалось удалить задачу в списке задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "Не удалось обновить событие в календаре «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "Не удалось обновить заметку в списке заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "Не удалось обновить задачу в списке задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "Не удалось отправить событие в календарь «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "Не удалось отправить заметку в список заметок «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "Не удалось отправить задачу в список задач «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+#| msgid "Error loading calendar '{0}'"
+msgid "Error creating view for the calendar '{0}'"
+msgstr "Ошибка при создании вида для календаря «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+#| msgid "Error loading task list '{0}'"
+msgid "Error creating view for the task list '{0}'"
+msgstr "Ошибка при создании вида для списка задач «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+#| msgid "Error loading memo list '{0}'"
+msgid "Error creating view for the memo list '{0}'"
+msgstr "Ошибка при создании вида для списка заметок «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Не удалось скопировать событие в календарь «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Не удалось скопировать задачу в список задач «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Не удалось скопировать заметку в список заметок «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Не удалось переместить событие в календарь «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Не удалось переместить задачу в список задач «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Не удалось переместить заметку в список заметок «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Копирование события в календарь «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Копирование задачи в список задач «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Копирование заметки в список заметок «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Перемещение события в календарь «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Перемещение задачи в список задач «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Перемещение заметки в список заметок «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
-#| msgid "Delete remote calendar '{0}'?"
+#: ../calendar/calendar.error.xml.h:153
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Не удалось обновить календарь «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:113
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:155
 msgid "Failed to refresh task list '{0}'"
 msgstr "Не удалось обновить список задач «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:115
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:157
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Не удалось обновить список заметок «{0}»"
 
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "Не удалось сделать вхождение перемещаемым"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2579,7 +2740,7 @@ msgstr "не содержит"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Описание"
@@ -2607,24 +2768,24 @@ msgstr "не является"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:556
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Общее"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:557 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Личное"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7 ../e-util/e-html-editor-page-dialog.c:111
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:116 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
@@ -2654,7 +2815,7 @@ msgstr "Категория"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
+#: ../em-format/e-mail-formatter-print-headers.c:157
 #: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
 #: ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
@@ -2779,10 +2940,6 @@ msgstr "_Повторить напоминатель"
 msgid "extra times every"
 msgstr "дополнительное время каждые"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:34
-msgid "Options"
-msgstr "Параметры"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Другое _сообщение"
@@ -2821,7 +2978,7 @@ msgstr "Действие/Переключатель"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Напоминатели"
 
@@ -2873,293 +3030,294 @@ msgstr "%s Изменений не было. Обновить редактор?"
 msgid "Could not save attachments"
 msgstr "Не удалось сохранить вложения"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Не удалось обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Собрание — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначенная задача — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Задача — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Заметка — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Нет сводки"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Оставить первоначальное значение?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Невозможно синхронизироваться с сервером"
 
 #. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:360 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
 #: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Закрыть текущее окно"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:936 ../e-util/e-text.c:2089
-#: ../e-util/e-web-view.c:342 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:344
-#: ../e-util/e-web-view.c:1364 ../mail/e-mail-browser.c:135
-#: ../shell/e-shell-window-actions.c:932
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Копировать выделение"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:943 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "В_ырезать"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1358
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1322
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Удалить выделение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Показать справку"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1370
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1334
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Вставить из буфера обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:414 ../mail/e-mail-reader.c:2131
-#: ../modules/addressbook/e-book-shell-view-actions.c:1263
-#: ../modules/addressbook/e-book-shell-view-actions.c:1277
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2264
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "_Печать…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2138
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2271
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "Пред_варительный просмотр…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Сохранить текущие изменения"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 #: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Сохранить текущие изменения и закрыть редактор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:352
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Выделить _всё"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Выделить весь текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Классификация"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-html-editor-actions.c:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1145
 #: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1166
 msgid "_Insert"
 msgstr "_Вставка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:404
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Параметры"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
-#: ../e-util/e-html-editor-actions.c:1106 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Вид"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:353
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Прикрепить…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:355 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:448
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Категории"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Переключает отображение категорий"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Часовой _пояс"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Переключает отображение часового пояса"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "Пу_бличное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Классифицировать как публичное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Классифицировать как личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Классифицировать как конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "Поле _должности"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Переключает отображение поля «Должность»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "П_росьба ответить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Переключает отображение поля «Просьба ответить»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "Поле _состояния"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Переключает отображение поля «Состояние»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "Поле _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Переключает отображение поля «Тип участников»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Вложить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2564
-#: ../calendar/gui/dialogs/comp-editor.c:2774
-#: ../calendar/gui/dialogs/comp-editor.c:3787
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отменены, если будет получено обновление"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3749
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "вложение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3819
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Не удалось использовать текущую версию!"
 
@@ -3168,21 +3326,28 @@ msgstr "Не удалось использовать текущую версию
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Не удалось открыть назначение"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Назначение доступно только для чтения"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:174
-msgid "Cannot create object"
-msgstr "Не удалось создать объект"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar %s"
+msgid "Copying events to the calendar '%s'"
+msgstr "Копирование события в календарь %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:205
-msgid "Could not open source"
-msgstr "Не удалось открыть источник"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, fuzzy, c-format
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying memos to the memo list '%s'"
+msgstr "Копирование заметки в список заметок «{0}»"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, fuzzy, c-format
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying tasks to the task list '%s'"
+msgstr "Копирование задачи в список задач «{0}»"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3192,70 +3357,6 @@ msgstr "_Удалить этот элемент из ящиков всех ос
 msgid "_Retract comment"
 msgstr "_Отменить комментарий"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Невозможно удалить событие из-за ошибки dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Невозможно удалить задачу из-за ошибки dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Невозможно удалить заметку из-за ошибки dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Невозможно удалить элемент из-за ошибки dbus: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Невозможно удалить событие: доступ запрещён"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Невозможно удалить задачу: доступ запрещён"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Невозможно удалить заметку: доступ запрещён"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Невозможно удалить элемент: доступ запрещён"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Невозможно удалить событие из-за ошибки: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Невозможно удалить задачу из-за ошибки: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Невозможно удалить заметку из-за ошибки: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Невозможно удалить элемент из-за ошибки: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Выберите представителя"
@@ -3317,7 +3418,7 @@ msgstr "Сво_боден/Занят"
 msgid "Query free / busy information for the attendees"
 msgstr "Запросить информацию о занятости для участников"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Встреча"
 
@@ -3366,7 +3467,7 @@ msgstr "Событие без даты завершения"
 
 #: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
@@ -3384,12 +3485,12 @@ msgstr "Неверное время завершения"
 
 #: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
 #: ../calendar/gui/dialogs/event-page.c:1732
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник."
 
@@ -3473,8 +3574,8 @@ msgstr "_Расположение:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:511
-#: ../e-util/e-html-editor-link-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:374
 msgid "_Description:"
 msgstr "_Описание:"
 
@@ -3558,11 +3659,11 @@ msgid "Select Date"
 msgstr "Выделить дату"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "В_ыделить сегодняшний день"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Заметка"
 
@@ -3586,8 +3687,8 @@ msgstr ""
 "Заметку нельзя полностью изменить, поскольку вы не являетесь организатором"
 
 #: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:201
-#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
 #: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
 #: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
 #: ../modules/mail/em-mailer-prefs.c:64
@@ -3891,7 +3992,7 @@ msgstr "Уведомить _только новых участников"
 msgid "_Send Options"
 msgstr "Параметры _отправки"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
 #: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Задание"
@@ -3926,43 +4027,43 @@ msgstr ""
 "Задачу нельзя изменить, поскольку выбранный список задач не поддерживает "
 "назначение задач"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 msgid "High"
 msgstr "Высокий"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Нормальный"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:342
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "Низкий"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Не определено"
@@ -3971,9 +4072,9 @@ msgstr "Не определено"
 #: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:218
-#: ../calendar/gui/e-task-table.c:233 ../calendar/gui/e-task-table.c:665
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Не началась"
 
@@ -3982,9 +4083,9 @@ msgstr "Не началась"
 #: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:666
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "Выполняется"
 
@@ -3994,8 +4095,8 @@ msgstr "Выполняется"
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:237
-#: ../calendar/gui/e-task-table.c:667 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -4005,9 +4106,9 @@ msgstr "Завершена"
 #: ../calendar/gui/dialogs/task-page.ui.h:22
 #: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:224
-#: ../calendar/gui/e-task-table.c:239 ../calendar/gui/e-task-table.c:668
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:960
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "Отменена"
 
@@ -4043,56 +4144,56 @@ msgstr "К_лассификация:"
 msgid "_Web Page:"
 msgstr "_Веб-страница:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Новая встреча"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Новое ежедневное событие"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Перейти к сегодняшнему дню"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Перейти к дате"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Есть напоминатели."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Имеет повторения."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Это собрание."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Событие календаря: Сводка: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Событие календаря: Не имеет сводки."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "событие обзора календаря"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Перехватывать фокус"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4102,89 +4203,33 @@ msgstr[2] "Имеет %d событий."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Не имеет событий."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Обзор рабочей недели: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Вид дня: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "окно календаря для просмотра рабочей недели"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "окно календаря для просмотра одного или более дней"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "таблица для просмотра и выбора текущего диапазона времени"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1108
-msgid "Gnome Calendar"
-msgstr "Календарь Gnome"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A, %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-week-view-main-item.c:216
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%a, %d %b"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a, %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2828
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-week-view-main-item.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%d %b"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Кнопка перехода"
@@ -4263,21 +4308,21 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Обзор месяца: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Обзор недели: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "окно календаря для обзора месяца"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "окно календаря для просмотра одной или более недель"
 
@@ -4307,8 +4352,8 @@ msgid "Due Date:"
 msgstr "Дата выполнения:"
 
 #: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1496
-#: ../modules/itip-formatter/itip-view.c:1613
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "Состояние:"
 
@@ -4317,7 +4362,7 @@ msgid "Priority:"
 msgstr "Приоритет:"
 
 #: ../calendar/gui/e-cal-component-preview.c:361
-#: ../mail/e-mail-config-service-page.c:671
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Описание:"
 
@@ -4325,17 +4370,23 @@ msgstr "Описание:"
 msgid "Web Page:"
 msgstr "Веб-страница:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
-#, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Копирование события в календарь %s"
+#: ../calendar/gui/e-cal-data-model.c:1608
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Creating view for calendar '%s'"
+msgstr "Открывается календарь «%s»"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
-#, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Перемещение события в календарь %s"
+#: ../calendar/gui/e-cal-data-model.c:1612
+#, fuzzy, c-format
+#| msgid "Opening task list '%s'"
+msgid "Creating view for task list '%s'"
+msgstr "Открывается список задач «%s»"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, fuzzy, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Creating view for memo list '%s'"
+msgstr "Открывается список заметок «%s»"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4350,7 +4401,7 @@ msgstr "Дата начала"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Тип"
 
@@ -4358,7 +4409,7 @@ msgstr "Тип"
 msgid "Completion date"
 msgstr "Дата выполнения"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:962
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "Завершена"
 
@@ -4380,12 +4431,12 @@ msgstr "Приоритет"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4005
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:33
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Состояние"
 
@@ -4402,37 +4453,58 @@ msgstr "Создано"
 msgid "Last modified"
 msgstr "Последнее изменение"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Вырезать выделенные события в буфер обмена"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Копировать выделенные события в буфер обмена"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Вставить события из буфера обмена"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Удалить выделенные события"
 
-#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:274
-msgid "Deleting selected objects"
-msgstr "Удаление выделенных объектов"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1190
-msgid "Updating objects"
-msgstr "Обновление объектов"
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#| msgid "Default User Calendar"
+msgid "Default calendar not found"
+msgstr "Календарь по умолчанию не найден"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#, fuzzy
+#| msgid "Mark as default memo list"
+msgid "Default memo list not found"
+msgstr "Пометить как список заметок по умолчанию"
+
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#, fuzzy
+#| msgid "Mark as default task list"
+msgid "Default task list not found"
+msgstr "Пометить как список задач по умолчанию"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:988
+#, fuzzy
+#| msgid "Save as iCalendar"
+msgid "Pasting iCalendar data"
+msgstr "Сохранить как iCalendar"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2112 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
@@ -4440,25 +4512,70 @@ msgstr "Организатор: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2116 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2132
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Адрес: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2167
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Время: %s %s"
 
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+#, fuzzy
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+#, fuzzy
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#, fuzzy
+msgid "%A %d %b %Y"
+msgstr "%A, %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+#, fuzzy
+msgid "%a %d %b"
+msgstr "%a, %d %b"
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %d %b %Y"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4468,77 +4585,105 @@ msgstr "Дата начала"
 msgid "End Date"
 msgstr "Дата завершения"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3500
-#: ../modules/itip-formatter/itip-view.c:6087
+#: ../modules/itip-formatter/itip-view.c:3607
+#: ../modules/itip-formatter/itip-view.c:6197
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../calendar/gui/e-cal-model.c:1661
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+#, fuzzy
+#| msgid "Create a new all day event"
+msgid "Creating an event"
+msgstr "Создать новое ежедневное событие"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+#, fuzzy
+#| msgid "Create a Mem_o"
+msgid "Creating a memo"
+msgstr "Создать за_метку"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+#, fuzzy
+#| msgid "Create a _Task"
+msgid "Creating a task"
+msgstr "Создать _задачу"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Повторение"
 
-#: ../calendar/gui/e-cal-model.c:1663
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Назначено"
 
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Нет"
 
-#: ../calendar/gui/e-cal-model.c:3946
+#: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../modules/itip-formatter/itip-view.c:6185
 msgid "Accepted"
 msgstr "Принято"
 
-#: ../calendar/gui/e-cal-model.c:3947
+#: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6081
+#: ../modules/itip-formatter/itip-view.c:6191
 msgid "Declined"
 msgstr "Отклонено"
 
-#: ../calendar/gui/e-cal-model.c:3948
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Экспериментальный"
 
-#: ../calendar/gui/e-cal-model.c:3949
+#: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6084
+#: ../modules/itip-formatter/itip-view.c:6194
 msgid "Delegated"
 msgstr "Поручено"
 
-#: ../calendar/gui/e-cal-model.c:3950
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Требуется действие"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:640
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Свободен"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:641
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Занят"
 
@@ -4558,17 +4703,236 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Нет"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:287
+#, fuzzy
+#| msgid "Missing name."
+msgid "Modifying a memo"
+msgstr "Отсутствует имя."
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:387
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "Удаление вложений"
+
+#: ../calendar/gui/e-cal-ops.c:391
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "Удаление вложений"
+
+#: ../calendar/gui/e-cal-ops.c:395
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "Удаление вложений"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, fuzzy, c-format
+#| msgid "Meeting information sent"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Информация о собрании послана"
+msgstr[1] "Информация о собрании послана"
+msgstr[2] "Информация о собрании послана"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, fuzzy, c-format
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Удалить заметку"
+msgstr[1] "Удалить заметку"
+msgstr[2] "Удалить заметку"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, fuzzy, c-format
+#| msgid "Delete Task"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Удалить задачу"
+msgstr[1] "Удалить задачу"
+msgstr[2] "Удалить задачу"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, fuzzy, c-format
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Вывести на печать это событие"
+msgstr[1] "Вывести на печать это событие"
+msgstr[2] "Вывести на печать это событие"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, fuzzy, c-format
+#| msgid "Print this memo"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Вывести на печать эту заметку"
+msgstr[1] "Вывести на печать эту заметку"
+msgstr[2] "Вывести на печать эту заметку"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, fuzzy, c-format
+#| msgid "Print this task"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Вывести на печать эту задачу"
+msgstr[1] "Вывести на печать эту задачу"
+msgstr[2] "Вывести на печать эту задачу"
+
+#: ../calendar/gui/e-cal-ops.c:820
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating an event"
+msgstr "Обновление объектов"
+
+#: ../calendar/gui/e-cal-ops.c:824
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a memo"
+msgstr "Обновление объектов"
+
+#: ../calendar/gui/e-cal-ops.c:828
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a task"
+msgstr "Обновление объектов"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar %s"
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Перемещение события в календарь %s"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Перемещение заметки в список заметок «{0}»"
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Перемещение задачи в список задач «{0}»"
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar %s"
+msgid "Purging events in the calendar '%s'"
+msgstr "Перемещение события в календарь %s"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Purging memos in the memo list '%s'"
+msgstr "Перемещение заметки в список заметок «{0}»"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Purging tasks in the task list '%s'"
+msgstr "Перемещение задачи в список задач «{0}»"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+#, fuzzy
+#| msgid "Purging"
+msgid "Purging events"
+msgstr "Очистка"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+#, fuzzy
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "Вывести на печать заметки"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "Вывести на печать задачи"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "Скрывать выполненные задачи"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Копирование элементов"
+msgstr[1] "Копирование элементов"
+msgstr[2] "Копирование элементов"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Перемещение элементов"
+msgstr[1] "Перемещение элементов"
+msgstr[2] "Перемещение элементов"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Копирование элементов"
+msgstr[1] "Копирование элементов"
+msgstr[2] "Копирование элементов"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Перемещение элементов"
+msgstr[1] "Перемещение элементов"
+msgstr[2] "Перемещение элементов"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Копирование элементов"
+msgstr[1] "Копирование элементов"
+msgstr[2] "Копирование элементов"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:165
+#, fuzzy
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:168
+#, fuzzy
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4578,18 +4942,18 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1992 ../calendar/gui/e-week-view.c:1591
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
-msgstr "am"
+msgstr "д.п."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1995 ../calendar/gui/e-week-view.c:1594
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
-msgstr "pm"
+msgstr "п.п."
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. * %B = full month name. Don't use any other specifiers.
@@ -4597,13 +4961,14 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2795 ../calendar/gui/e-day-view-top-item.c:852
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#, fuzzy
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3459
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "Неделя: %d"
@@ -4808,7 +5173,7 @@ msgstr ""
 "Сводка: %s\n"
 "Местоположение: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Сводка: %s"
@@ -4837,46 +5202,46 @@ msgstr "Общее имя"
 msgid "Language"
 msgstr "Язык"
 
-#: ../calendar/gui/e-memo-table.c:429
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Заметки"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Нет краткого описания *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:901
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Начало: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:919
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Завершение: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Вырезать выделенные заметки в буфер обмена"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Копировать выделенные заметки в буфер обмена"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Вставить заметки из буфера обмена"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Удалить выделенные заметки"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Выделить все видимые заметки"
 
@@ -4888,40 +5253,40 @@ msgstr "Нажмите, чтобы добавить заметку"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:613
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:730 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/importers/icalendar-importer.c:1062
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1560
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../calendar/gui/e-task-table.c:1054
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Вырезать выделенные задания в буфер обмена"
 
-#: ../calendar/gui/e-task-table.c:1060
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Копировать выделенные задания в буфер обмена"
 
-#: ../calendar/gui/e-task-table.c:1066
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Вставить задачи из буфера обмена"
 
-#: ../calendar/gui/e-task-table.c:1072
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Удалить выбранные задачи"
 
-#: ../calendar/gui/e-task-table.c:1078
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Выделить все видимые задания"
 
@@ -4933,13 +5298,10 @@ msgstr "Выбор часового пояса"
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
+#, fuzzy
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2374
-msgid "Purging"
-msgstr "Очистка"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -5049,142 +5411,162 @@ msgstr "Информация о занятости (%s в %s)"
 msgid "iCalendar information"
 msgstr "Информация iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Не удаётся зарезервировать ресурс, новое событие конфликтует с каким-то "
 "другим."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1153
+#, fuzzy
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to book a resource, error: "
 msgstr "Не удалось зарезервировать ресурс. Ошибка: %s"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1917
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "Отправка сообщения"
+
+#: ../calendar/gui/itip-utils.c:1921
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending a memo"
+msgstr "Отправка сообщения"
+
+#: ../calendar/gui/itip-utils.c:1925
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending a task"
+msgstr "Отправка эл. почты"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1-ый"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2-ый"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3-ый"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4-ый"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5-ый"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6-ый"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7-ый"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8-ый"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9-ый"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10-ый"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11-ый"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12-ый"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13-ый"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14-ый"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15-ый"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16-ый"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17-ый"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18-ый"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19-ый"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20-ый"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21-ый"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22-ый"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23-ый"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24-ый"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25-ый"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26-ый"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27-ый"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28-ый"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29-ый"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30-ый"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31-ый"
 
@@ -5192,102 +5574,102 @@ msgstr "31-ый"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Пн"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Вт"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Ср"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Чт"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Пт"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Сб"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "Вс"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " к "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Завершено "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Завершено "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (к дате"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Участники: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Контакты: "
 
@@ -5300,13 +5682,13 @@ msgstr "Выполняется"
 msgid "% Completed"
 msgstr "% выполнено"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:30
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "больше, чем"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "меньше, чем"
 
@@ -5314,177 +5696,181 @@ msgstr "меньше, чем"
 msgid "Appointments and Meetings"
 msgstr "Встречи и собрания"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Открытие календаря"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "Файлы iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "Импортёр Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "Напоминание!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "Файлы vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "Импортёр Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:1065
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "События календаря"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../calendar/importers/icalendar-importer.c:1098
+msgid "Gnome Calendar"
+msgstr "Календарь Gnome"
+
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интеллектуальный импортёр календаря Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Собрание"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Событие"
 
-#: ../calendar/importers/icalendar-importer.c:1183
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задание"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1496
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Заметка"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "имеет повторения"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "является записью"
 
-#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "имеет напоминатели"
 
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "имеет вложения"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Общее"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1226
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Личное"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Классификация"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1238
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сводка"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Адрес"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1252
-#: ../calendar/importers/icalendar-importer.c:1533
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Начало"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1263
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Срок завершения"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Конец"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1285
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Категории"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1309
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Завершено"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1328
-#: ../calendar/importers/icalendar-importer.c:1331
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Организатор"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1351
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Участники"
 
-#: ../calendar/importers/icalendar-importer.c:1368
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Описание"
 
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Тип"
@@ -7036,156 +7422,183 @@ msgstr "Тихий океан/о-в Уоллис"
 msgid "Pacific/Yap"
 msgstr "Тихий океан/о-в Яп"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Не показывать больше это сообщение"
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Сохранить как…"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "_Новое сообщение"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Открыть окно создания нового сообщения"
 
-#: ../composer/e-composer-actions.c:374 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: ../composer/e-composer-actions.c:376 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Настроить Evolution"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Сохранить _как…"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "_Кодировка символов"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Пред_варительный просмотр"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Сохранить как _черновик"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Сохранить как черновик"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "Отпр_авить"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "За_шифровать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Зашифровать это сообщение с помощью PGP"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "Подпи_сать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение вашим PGP-ключом"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "_Галерея изображений"
 
-#: ../composer/e-composer-actions.c:463
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Показать коллекцию изображений, которые можно перетащить в сообщение"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "Изменить _приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Установить высокий приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:477
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "Запросить уведомление о прочт_ении"
 
-#: ../composer/e-composer-actions.c:479
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Установите, чтобы получить уведомление о том, что ваше сообщение прочитано"
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "Зашифровать с _помощью S/MIME"
 
-#: ../composer/e-composer-actions.c:487
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Зашифровать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "Подписать с по_мощью S/MIME"
 
-#: ../composer/e-composer-actions.c:495
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Подписать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#, fuzzy
+#| msgid "Unicode"
+msgid "Unicode smileys"
+msgstr "Юникод"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr ""
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "Поле «Скрытая копия»"
 
-#: ../composer/e-composer-actions.c:503
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Переключить отображение поля скрытой копии"
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "Поле «Копия»"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Переключить отображение поля копии"
 
-#: ../composer/e-composer-actions.c:517
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:549
+#, fuzzy
+#| msgid "Toggles whether the Role field is displayed"
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "Переключает отображение поля «Должность»"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "Поле «Об_ратный адрес»"
 
-#: ../composer/e-composer-actions.c:519
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Показывать или нет поле «Обратный адрес»"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Сохранить черновик"
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:327
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "_Имя:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Введите получателей сообщения"
@@ -7202,48 +7615,48 @@ msgstr ""
 "Введите адреса, которые должны получить копию сообщения, не попав в список "
 "получателей"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "_От кого:"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "Об_ратный адрес:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Кому:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "Ко_пия:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Скрытая копия:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "По_местить в:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "По_дпись:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Нажмите, чтобы создать адресную книгу"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Нажмите, чтобы выбрать папки для помещения в них сообщений"
 
-#: ../composer/e-msg-composer.c:858
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7251,7 +7664,7 @@ msgstr ""
 "Не удалось подписать исходящее сообщение: нет сертификата подписи для этой "
 "учётной записи"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7260,11 +7673,11 @@ msgstr ""
 "Не удалось зашифровать исходящее сообщение: нет сертификата шифрования для "
 "этой учётной записи"
 
-#: ../composer/e-msg-composer.c:1631 ../composer/e-msg-composer.c:2186
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
 msgid "Compose Message"
 msgstr "Новое сообщение"
 
-#: ../composer/e-msg-composer.c:4398
+#: ../composer/e-msg-composer.c:4583
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Редактор содержит нетекстовое тело сообщения, которое нельзя изменить."
 
@@ -7403,7 +7816,7 @@ msgstr "Сообщение об ошибке: «{0}». Скорее всего,
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Во время отправки сообщения произошла ошибка. Хотите продолжить?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:161
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Сообщение об ошибке: «{0}»."
 
@@ -7442,10 +7855,35 @@ msgstr "Действительно открыть одновременно %d с
 
 #: ../composer/mail-composer.error.xml.h:38
 msgid ""
-"A keyboard accelerator to send the message had been pressed. Either cancel "
-"message send, if it was done by an accident, or send the message."
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
 msgstr ""
 
+#: ../composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to open %d message at once?"
+#| msgid_plural "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Действительно открыть одновременно %d сообщение?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:41
+#, fuzzy
+#| msgid "Address formatting"
+msgid "_Don't lose formatting"
+msgstr "Форматирование адреса"
+
+#: ../composer/mail-composer.error.xml.h:42
+#, fuzzy
+#| msgid "Address formatting"
+msgid "Lose _formatting"
+msgstr "Форматирование адреса"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Уведомление сигналами в Evolution"
@@ -7454,34 +7892,13 @@ msgstr "Уведомление сигналами в Evolution"
 msgid "Calendar event notifications"
 msgstr "Уведомления о календарных событиях"
 
-#: ../data/evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution — это приложение для управления персональной информацией, которое "
-"включает в себя почту, календарь и адресную книгу."
-
-#: ../data/evolution.appdata.xml.in.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution поддерживает широкий спектр промышленных стандартов форматов "
-"данных и сетевых протоколов для информационного обмена с упором на "
-"совместимость со стандартами и конфиденциальность. Evolution поддерживает "
-"интеграцию с Microsoft Exchange посредством расширения Exchange Web Services "
-"(EWS)."
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1034
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Пакет для групповой работы"
 
@@ -7605,6 +8022,70 @@ msgstr "Показывать панель предварительного пр
 msgid "Whether to show the preview pane."
 msgstr "Показывать ли панель предварительного просмотра."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show phone numbers in the editor"
+msgstr "Отображать ли поле «Часовой пояс» в редакторе событий/задач/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show IM addresses in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show job information in the editor"
+msgstr "Отображать ли поле «Часовой пояс» в редакторе событий/задач/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show notes in the editor"
+msgstr "Отображать ли поле «Категории» в редакторе событий/собраний"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Преобразовывать почтовые сообщения в Юникод"
@@ -7617,6 +8098,17 @@ msgstr ""
 "Преобразовывать текст сообщения в кодировку UTF-8 для облегчения работы "
 "фильтров спама, имеющих проблемы с различными кодировками."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Каталог сохранения для звуков напоминателей"
@@ -8372,14 +8864,18 @@ msgid "Automatic emoticon recognition"
 msgstr "Автоматическое распознавание эмоций"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
+#, fuzzy
+#| msgid "Recognize emoticons in text and replace them with images."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
 msgstr "Распознавать эмоции в тексте и заменять их значками."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "Вложенное сообщение"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -8387,11 +8883,11 @@ msgstr ""
 "Текст, вставляемый при ответе, указывающий на первоначального отправителя "
 "сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "Пересылаемое сообщение"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -8399,22 +8895,22 @@ msgstr ""
 "Текст, вставляемый при перенаправлении, обозначающий начало "
 "перенаправляемого сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "Исходное сообщение"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
 msgstr ""
 "Текст, вставляемый при ответе (top posting), обозначающий исходное сообщение"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr "«Ответить всем» отвечает в список"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8425,11 +8921,11 @@ msgstr ""
 "«Ответить всем» на панели инструментов на ответ только в список рассылки, "
 "через который вы получили копию сообщения, на которое отвечаете."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr "Помещать курсор в начало при ответе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8439,35 +8935,35 @@ msgstr ""
 "при ответе на сообщения. Этот параметр определяет, будет ли курсор в начале "
 "или в конце сообщения."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr "Всегда запрашивать отчёт о прочтении"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Добавлять ли отчёт о прочтении к каждому сообщению."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr "Отправлять почту в формате HTML по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr "Отправлять почту в формате HTML по умолчанию."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Языки проверки орфографии"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Список языков, используемый для проверки орфографии."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Отображать поле «Скрытая копия» при отправке почтового сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8475,11 +8971,11 @@ msgstr ""
 "Показывать поле «Скрытая копия» при отправке почтового сообщения. Этот "
 "параметр управляется из меню Вид, когда выбрана учётная запись почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Отображать поле «Копия» при отправке почтового сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8487,11 +8983,29 @@ msgstr ""
 "Показывать поле «Копия» при отправке почтового сообщения. Этот параметр "
 "управляется из меню Вид, когда выбрана учётная запись почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show \"From\" override field when sending a mail message"
+msgstr "Отображать поле «Копия» при отправке почтового сообщения"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#, fuzzy
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"Показывать поле «Копия» при отправке почтового сообщения. Этот параметр "
+"управляется из меню Вид, когда выбрана учётная запись почты."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Отображать поле «Адрес для ответа» при отправке почтовых сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8499,11 +9013,11 @@ msgstr ""
 "Показывать поле «Адрес для ответа» при отправке почтового сообщения. Этот "
 "параметр управляется из меню Вид, когда выбрана почтовая учётная запись."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Отображать поле «От» при отправке в группу новостей"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8511,11 +9025,11 @@ msgstr ""
 "Показывать поле «От» при отправке в группу новостей. Этот параметр "
 "управляется из меню Вид, когда выбрана учётная запись новостей."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Отображать поле «Адрес для ответа» при отправке в группу новостей"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8523,13 +9037,13 @@ msgstr ""
 "Показывать поле «Адрес для ответа» при отправке в группу новостей. Этот "
 "параметр управляется из меню Вид, когда выбрана учётная запись новостей."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 "Делать цифровую подпись ответов, если исходное сообщение имело цифровую "
 "подпись"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8537,11 +9051,11 @@ msgstr ""
 "Автоматически включать подписи PGP или S/MIME при ответе на сообщение с "
 "подписью PGP или S/MIME."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Кодировать имена файлов в стиле Outlook/GMail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8553,23 +9067,23 @@ msgstr ""
 "именами в формате UTF-8, потому что они не полностью следуют RFC 2231 и "
 "используют некорректный стандарт RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 #, fuzzy
 #| msgid "Saving message to Outbox."
 msgid "Send messages through Outbox folder"
 msgstr "Сохранение сообщения в папку для исходящих сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr "Помещать персональную подпись в верхней части ответов"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8579,11 +9093,11 @@ msgstr ""
 "на сообщение. Этот параметр определяет, будет ли подпись в начале или в "
 "конце сообщения."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "Не добавлять разделитель для подписи."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8591,11 +9105,11 @@ msgstr ""
 "Установите в значение ИСТИНА, если вы не хотите добавлять разделитель "
 "подписи при создании почтового сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
 msgstr "Игнорировать «Обратный адрес» списка"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8613,11 +9127,11 @@ msgstr ""
 "список» отправит ответ в список. Работа этого параметра основана на "
 "сравнении заголовков обратного адреса и списка рассылки."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr "Список локализованных префиксов «Re»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -8627,38 +9141,38 @@ msgstr ""
 "которые будут пропускаться в тексте темы при ответе на сообщение. Как "
 "дополнение к стандартному префиксу «Re»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 #, fuzzy
 #| msgid "Enable express mode"
 msgid "Enable developer mode"
 msgstr "Включить экспресс-режим"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enables some hidden actions and tools aimed for development and debugging."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Save file format for drag-and-drop operation"
 msgstr "Формат сохранения файлов для операций перетаскивания"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Может быть либо «mbox», либо «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Show image animations"
 msgstr "Показывать анимацию изображений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8667,11 +9181,11 @@ msgstr ""
 "анимированные изображения раздражающими и вместо этого предпочитают видеть "
 "статические изображения."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8679,11 +9193,11 @@ msgstr ""
 "Включить функцию поиска в боковой панели, для интерактивного поиска названий "
 "папок."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable magic space bar"
 msgstr "Включить или выключить «волшебный пробел»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8691,76 +9205,76 @@ msgstr ""
 "Установите этот ключ, чтобы можно было использовать клавишу пробела для "
 "прокрутки предпросмотра сообщения, списка сообщений и папок."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Использовать установленные параметры отображения списка сообщений для всех "
 "папок."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Использовать установленные параметры отображения списка сообщений для всех "
 "папок."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Mark citations in the message \"Preview\""
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Citation highlight color"
 msgstr "Цвет подсветки цитирования"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Citation highlight color."
 msgstr "Цвет подсветки цитирования."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable/disable caret mode"
 msgstr "Включить/выключить режим каретки"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Default charset in which to display messages"
 msgstr "Кодировка по умолчанию для отображения сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Default charset in which to display messages."
 msgstr "Кодировка по умолчанию для отображения сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Автоматически загружать изображения для сообщений в формате HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show Animations"
 msgstr "Показывать анимацию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show animated images as animations."
 msgstr "Показывать анимированные изображения как анимации."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show all message headers"
 msgstr "Показывать все заголовки сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show all the headers when viewing a messages."
 msgstr "Показывать все заголовки при просмотре сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "List of headers to show when viewing a message."
 msgstr "Список заголовков, отображаемых при просмотре сообщения."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -8770,53 +9284,53 @@ msgstr ""
 "которое показывает, включён ли заголовок. Отключённые заголовки не "
 "показываются при просмотре сообщения, но доступны в списке параметров."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show photo of the sender"
 msgstr "Показать фотографию отправителя"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Показывать фотографию отправителя в панели чтения сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 #, fuzzy
 #| msgid "Show photo of the sender"
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Показать фотографию отправителя"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout"
 msgstr "Помечать как просмотренные через указанное время"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Mark as Seen after specified timeout."
 msgstr "Помечать сообщение как просмотренное через указанный период времени."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout for marking messages as seen"
 msgstr "Задержка, после которой сообщения отмечаются как просмотренные"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr ""
 "Задержка в милисекундах, после которой сообщения отмечаются как "
 "просмотренные."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Sender email-address column in the message list"
 msgstr "Показывать адрес отправителя в столбце списка сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Показывать адрес отправителя в отдельном столбце списка сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8824,7 +9338,7 @@ msgstr ""
 "Определяет, надо ли использовать одинаковые шрифты для строк «От» и «Тема» в "
 "столбце «Сообщения» в вертикальном режиме просмотра"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8832,20 +9346,20 @@ msgstr ""
 "Определяет, надо ли использовать одинаковые шрифты для строк «От» и «Тема» в "
 "столбце «Сообщения» в вертикальном режиме просмотра."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages in the message-list"
 msgstr "Показывать удалённые сообщения в списке сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Показывать удалённые сообщения (будут перечёркнуты) в списке сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable Unmatched search folder"
 msgstr "Включить папку поиска для несовпадений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8853,12 +9367,12 @@ msgstr ""
 "Включить папку поиска для несовпадений. Она ничего не делает, если папки "
 "поиска отключены."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 "Скрыть предварительный просмотр для каждого каталога и удалить выделение"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8867,31 +9381,31 @@ msgstr ""
 "помощью него можно отменить выделение почты и отключить панель просмотра "
 "текущего каталога."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane"
 msgstr "Высота панели списка сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Height of the message-list pane."
 msgstr "Высота панели списка сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Можно ли сворачивать в интерфейсе заголовки сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "Ширина панели списка сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "Высота панели списка сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "Стиль размещения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8903,35 +9417,35 @@ msgstr ""
 "список сообщений. «1» (вертикальный вид) помещает панель рядом со списком "
 "сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "Шрифт переменной ширины"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "Пропорциональный шрифт для основного дисплея."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "Шрифт терминала"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "Шрифт терминала для отображения почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "Использовать другие шрифты"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "Использовать другие шрифты для отображения почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сжимать отображение адресов в TO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8939,11 +9453,11 @@ msgstr ""
 "Уменьшить количество адресов отображаемых в TO/CC/BCC адресов до числа, "
 "указанного в address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Количество адресов, отображаемых в TO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8951,11 +9465,11 @@ msgstr ""
 "Устанавливает количество адресов, отображаемых при просмотре сообщения, за "
 "которыми отображается «…»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "Сохранять список сообщений по полю «Тема»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8963,11 +9477,11 @@ msgstr ""
 "Переходить ли к разворачиванию обсуждений по теме, если сообщения не "
 "содержат заголовков In-Reply-To и References."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "Состояние обсуждения по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8975,11 +9489,11 @@ msgstr ""
 "Этот ключ определяет, свёрнуты или развёрнуты обсуждения по умолчанию. "
 "Изменение этого параметра требует перезапуска Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Упорядочивать ли обсуждения по последнему сообщению в этом обсуждении"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8989,11 +9503,11 @@ msgstr ""
 "сообщению в каждом обсуждении, а не по дате сообщения. Чтобы изменение этого "
 "ключа вступило в силу, надо перезапустить Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Упорядочивать учётные записи в алфавитном порядке в дереве папок"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9006,27 +9520,27 @@ msgstr ""
 "папки «На этом компьютере» и папок поиска, в противном случае порядок "
 "сортировки устанавливается пользователем"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "Регистрировать действия фильтра"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "Регистрировать действия фильтра в указанном файле журнала."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "Файл журнала действий фильтра"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "Файл журнала действий фильтра."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "Отправить исходящие после фильтрации"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9036,19 +9550,19 @@ msgstr ""
 "произойдёт только при использовании какого-либо действия фильтра "
 "«Перенаправить» и примерно через минуту после выполнения последнего действия."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "Стиль пересылки по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Default reply style"
 msgstr "Стиль ответа по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 #, fuzzy
 #| msgid ""
 #| "Prompt the user when he or she tries to send a message without a Subject."
@@ -9058,40 +9572,40 @@ msgid ""
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение без темы."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Предупреждать, если тема пустая"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение без темы."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt when emptying the trash"
 msgstr "Запрашивать подтверждение при очистке корзины"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Предупреждать пользователя при очистке корзины."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user expunges"
 msgstr "Предупреждать при очистке пользователем"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Предупреждать, если пользователь пытается очистить удалённые сообщения в "
 "папке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Предупреждать перед отправкой получателям, не входящим в список адресатов"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9099,35 +9613,35 @@ msgstr ""
 "Включает/выключает предупреждения при отправке личных сообщений, попадающих "
 "получателям, не указанным в списке адресатов"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждать, если пользователь заполнил только поле скрытой копии"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Предупреждать при попытке отправки сообщений с пустыми полями «Кому» или "
 "«Копия»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Выводить запрос при попытке пользователя открыть 10 или более сообщений "
 "одновременно"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9135,20 +9649,20 @@ msgstr ""
 "Если пользователь пытается открыть 10 или более сообщений одновременно, "
 "выводить диалог запроса, действительно ли пользователь хочет это сделать."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Предупреждать при пометке нескольких сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 "Включает/выключает запрос подтверждения при пометке нескольких сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when deleting messages in search folder"
 msgstr "Предупреждать при удалении сообщений в папке поиска"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9158,13 +9672,13 @@ msgstr ""
 "сообщений из папки поиска они удаляются совсем, а не только из результатов "
 "поиска."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Спрашивает разрешение на копирование папки с помощью перетаскивания в дереве "
 "папок"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9176,13 +9690,13 @@ msgstr ""
 "перетаскивания в дереве папок; «ask» (или любое другое значение) — "
 "спрашивать у пользователя."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Спрашивает разрешение на перемещение папки с помощью перетаскивания в дереве "
 "папок"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9194,11 +9708,11 @@ msgstr ""
 "перетаскивания в дереве папок; «ask» (или любое другое значение) — "
 "спрашивать у пользователя."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying privately to list messages"
 msgstr "Предупреждать при личном ответе в список сообщений"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9206,11 +9720,11 @@ msgstr ""
 "Включает/выключает повторяющиеся предупреждения при отправке личного "
 "сообщения, попадающего в список рассылки."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Предупреждать, когда список рассылки захватывает личные ответы "
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9220,17 +9734,35 @@ msgstr ""
 "ответов на сообщения, полученные через список рассылки, в заголовке которых "
 "установлен обратный адрес, перенаправляющий ответы обратно в список."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when replying to many recipients"
 msgstr "Предупреждать при ответе нескольким получателям"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "Включает/выключает предупреждения "
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"Включает/выключает предупреждения при отправке личных сообщений, попадающих "
+"получателям, не указанным в списке адресатов"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9238,43 +9770,43 @@ msgstr ""
 "Политика автоматического закрытия окна просмотра сообщения при "
 "перенаправлении или ответе на показанное сообщение."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Empty Trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Очищать все корзины при выходе из Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимальное количество дней между очисткой корзины при выходе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Минимальное время между очисткой корзины при выходе, в днях."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Last time Empty Trash was run"
 msgstr "Последний раз мусорная корзина очищалась"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Время последней очистки корзины (в днях с начала эпохи (1 января 1970))."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Количество времени в секундах, в течение которого ошибка должна показываться "
 "в строке состояния."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Level beyond which the message should be logged."
 msgstr "Уровень, за которым сообщение должно заноситься в журнал."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9282,11 +9814,11 @@ msgstr ""
 "У этого ключа может быть одно из трёх значений: «0» — ошибки, «1» — "
 "предупреждения; «2» — отладочные сообщения."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Show original \"Date\" header value."
 msgstr "Показать исходное значение заголовка «Дата»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9296,11 +9828,11 @@ msgstr ""
 "отличается часовой пояс). В противном случае, всегда показывать значение "
 "заголовка «Дата» в формате и с часовым поясом, выбранным пользователем."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "List of Labels and their associated colors"
 msgstr "Список меток и связанных с ними цветов"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9308,45 +9840,45 @@ msgstr ""
 "Список меток, известных почтовому компоненту Evolution. Список содержит "
 "строки имя:цвет, где цвет использует кодировку цвета HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Check incoming mail being junk"
 msgstr "Проверять, являются ли входящие сообщения спамом"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Run junk test on incoming mail."
 msgstr "Проверять на спам входящую почту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Empty Junk folders on exit"
 msgstr "Очищать каталог спама при выходе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Очищать все каталоги со спамом при выходе из Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимальное количество дней между очисткой спама при выходе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Минимальное время между очисткой спама при выходе, в днях."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Last time Empty Junk was run"
 msgstr "Последний раз спам очищался"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Время последней очистки от спама (в днях с начала эпохи (1 января 1970))."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "The default plugin for Junk hook"
 msgstr "Модуль, обрабатывающий спам по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9356,11 +9888,11 @@ msgstr ""
 "обработки спама включены одновременно. Если модуль по умолчанию выключен, "
 "доступные модули обработки спама всё равно не будут использоваться."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Определяет, нужно ли искать отправителя в адресной книге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9373,7 +9905,7 @@ msgstr ""
 "быть медленным, если для автодополнения помечены удалённые книги (например, "
 "LDAP)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9381,7 +9913,7 @@ msgstr ""
 "Определяет, нужно ли искать адреса для фильтрации спама только в локальной "
 "адресной книге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9391,13 +9923,13 @@ msgstr ""
 "использовать ли только локальные адресные книги при исключении известных "
 "контактов при фильтрации спама."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Определяет, надо ли использовать указанные пользователем заголовки для "
 "выявления спама"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9407,11 +9939,11 @@ msgstr ""
 "выявления спама. Если этот ключ установлен и заголовки указаны, то скорость "
 "проверки на спам повысится."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Custom headers to use while checking for junk."
 msgstr "Указанные пользователем заголовки для выявления спама"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9419,31 +9951,31 @@ msgstr ""
 "Указанные пользователем заголовки для выявления спама. Формат в GConf: "
 "«заголовок=значение»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "UID string of the default account."
 msgstr "Строка UID основной учётной записи."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Save directory"
 msgstr "Сохранить каталог"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Directory for saving mail component files."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Composer load/attach directory"
 msgstr "Каталог загрузки/прикрепления при написании сообщения"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Directory for loading/attaching files to composer."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Check for new messages on start"
 msgstr "Проверять почту при запуске"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9451,11 +9983,11 @@ msgstr ""
 "Проверять ли наличие новых сообщений при запуске. Это также подразумевает "
 "отправку сообщений из папки для исходящих сообщений."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Check for new messages in all active accounts"
 msgstr "Проверять почту для всех включённых учётных записей"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9465,11 +9997,11 @@ msgstr ""
 "записей (параметр «Проверять почту каждые X минут» не учитывается). Этот "
 "параметр используется только одновременно с параметром «send_recv_on_start»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Server synchronization interval"
 msgstr "Интервал синхронизации с сервером"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9477,11 +10009,35 @@ msgstr ""
 "Определяет, как часто локальны изменения синхронизируются с удалённым "
 "почтовым сервером. Интервал должен быть хотя бы 30 секунд."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#, fuzzy
+#| msgid "Confirm _when expunging a folder"
+msgid "Allow expunge in virtual folders"
+msgstr "_Запрашивать подтверждение очистки папки от удалённых сообщений"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "(Deprecated) Default forward style"
 msgstr "(Устарело) Стиль пересылки по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9489,11 +10045,11 @@ msgstr ""
 "Этот ключ устарел в версии 3.10 и больше не должен использоваться. "
 "Используйте вместо него «forward-style-name»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "(Deprecated) Default reply style"
 msgstr "(Устарело) Стиль ответа по умолчанию"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9501,11 +10057,11 @@ msgstr ""
 "Этот ключ устарел в версии 3.10 и больше не должен использоваться. "
 "Используйте вместо него «reply-style-name»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Устарело) Список дополнительных заголовков и включены ли они."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9513,11 +10069,11 @@ msgstr ""
 "Этот ключ устарел в версии 3.10 и больше не должен использоваться. "
 "Используйте вместо него «show-headers»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Устарело) Загружать сообщения для сообщений в формате HTML по HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9525,7 +10081,7 @@ msgstr ""
 "Этот ключ устарел в версии 3.10 и больше не должен использоваться. "
 "Используйте вместо него «image-loading-policy»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9533,7 +10089,7 @@ msgstr ""
 "(Устарело) Спрашивать при закрытии окна сообщения, когда пользователь "
 "перенаправляет или отвечает на сообщение, которое отображается в окне"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9931,9 +10487,31 @@ msgstr "Использовать только локальные спам-тес
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Использовать только локальные спам-тесты (без DNS)."
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../em-format/e-mail-formatter-attachment.c:405
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9963,7 +10541,7 @@ msgstr "От"
 msgid "(no subject)"
 msgstr "(без темы)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Это письмо было отправлено %s от имени %s"
@@ -9987,8 +10565,6 @@ msgstr "Форматировать часть в виде сообщения RFC
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
-#: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Имя"
@@ -9998,72 +10574,50 @@ msgstr "Имя"
 msgid "Size"
 msgstr "Размер"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "Подписано GPG"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "Зашифровано GPG"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "Подписано S/MIME"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "Зашифровано S/MIME"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:737
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
-msgid "Security"
-msgstr "Безопасность"
-
-#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-formatter-quote-headers.c:174
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
 #: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Тема"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1482
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Формат Richtext"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Показать часть в виде текста в формате Richtext"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:361
 msgid "Format part as HTML"
 msgstr "Форматировать часть в виде HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:197
-#: ../e-util/e-html-editor-actions.c:1382
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1544
 msgid "Plain Text"
 msgstr "Обычный текст"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "Форматировать часть в виде обычного текста"
 
@@ -10178,7 +10732,7 @@ msgstr ""
 "в разумный период времени."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
@@ -10194,18 +10748,45 @@ msgstr "Код"
 msgid "Display source of a MIME part"
 msgstr "Показать код части MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "Копия"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
 #: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Скрытая копия"
 
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "Подписано GPG"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+#, fuzzy
+#| msgid "GPG encrpyted"
+msgid "GPG encrypted"
+msgstr "Зашифровано GPG"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "Подписано S/MIME"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+#, fuzzy
+#| msgid "S/MIME encrpyted"
+msgid "S/MIME encrypted"
+msgstr "Зашифровано S/MIME"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "Безопасность"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -10293,339 +10874,24 @@ msgstr "Группы новостей"
 msgid "Face"
 msgstr "Фото"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "вложение %s"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Стандартный"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Личный"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Секретное"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Совершенно секретно"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Только для ваших глаз"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Нет"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Сообщение о доставке"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "_Запрошен ответ"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "_В течение"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "дни"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Когда удобно"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:848
-msgid "Replies"
-msgstr "Ответы"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Отложить доставку сообщения"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_После"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "дни"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Установить срок актуальности"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_До"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Параметры доставки"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Приоритет:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Классификация:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Общие па_раметры"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "_Создать отправленный элемент для отслеживания информации"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Доставлено"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Доста_влено и открыто"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Все сведения"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "А_втоматически удалять отправленные элементы"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Отслеживание состояния"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Когда открыто:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "При _отказе:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "При _завершении:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "_При получении:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Извещение о доставке"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "О_тслеживание состояния"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-msgid "_Apply"
-msgstr "_Применить"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Упорядочить…"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Группировать по…"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "Отображаемые _поля…"
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Очистить _все"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "_Отображать это поле"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
-msgid "Ascending"
-msgstr "По возрастанию"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
-msgid "Descending"
-msgstr "По убыванию"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Группировать элементы по"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "Показывать _поле при просмотре"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Затем по"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Показывать п_оле при просмотре"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Показывать по_ле при просмотре"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Сортировать"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Очистить все"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Сортировать элементы по"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Выбор часового пояса"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Используйте левую кнопку мыши для увеличения области на карте и выберите "
-"часовой пояс.\n"
-"Используйте правую кнопку для уменьшения области."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Часовые пояса"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Выделение"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Выпадающий список с часовыми поясами"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1244
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Входящие"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "текущее время"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "время, указанное вами"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "время относительно текущего времени"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:85
-msgid "seconds"
-msgstr "секунд"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "недели"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "месяцы"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "годы"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "тому назад"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "в будущем"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Показать фильтры для почты:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Правила фильтра"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Сравнивать с"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"текущего времени запуска фильтра."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"12:00am указанной даты."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"времени запуска фильтра."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Создать новый режим просмотра"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "_Имя:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Заменить существующий режим просмотра"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Календарь: с %s по %s"
 
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1817
-msgid "Cancel"
-msgstr "Отменить"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "элемент календаря evolution"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10657,24 +10923,99 @@ msgstr "%s (отменяется)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1786
+msgid "Cancel"
+msgstr "Отменить"
+
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Закрыть это сообщение (Escape)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-alert-sink.c:246
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Failed to create a thread: "
+msgstr "Не удалось отметить сообщения как прочитанные."
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "В виде значков"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "В виде списка"
 
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1223
+msgid "Attached message"
+msgstr "Вложенное сообщение"
+
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+#, fuzzy
+#| msgid "Import cancelled."
+msgid "Operation was cancelled"
+msgstr "Импортирование отменено."
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+msgid "A load operation is already in progress"
+msgstr "Операция загрузки уже выполняется"
+
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+msgid "A save operation is already in progress"
+msgstr "Операция сохранения уже выполняется"
+
+#: ../e-util/e-attachment.c:2521
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Не удалось загрузить «%s»"
+
+#: ../e-util/e-attachment.c:2524
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Не удалось загрузить вложение"
+
+#: ../e-util/e-attachment.c:2809
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Не удалось открыть «%s»"
+
+#: ../e-util/e-attachment.c:2812
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Не удалось открыть вложение"
+
+#: ../e-util/e-attachment.c:3459
+msgid "Attachment contents not loaded"
+msgstr "Содержимое вложения не загружено"
+
+#: ../e-util/e-attachment.c:3550
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Не удалось сохранить «%s»"
+
+#: ../e-util/e-attachment.c:3553
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Не удалось сохранить вложение"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Свойства вложения"
@@ -10687,165 +11028,147 @@ msgstr "_Имя файла:"
 msgid "MIME Type:"
 msgstr "Тип MIME:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предполагать автоматическое отображение вложения"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Не удалось установить как фон"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Установить как _фон"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Загрузка"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Сохранение"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Скрыть панель _вложений"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Показать панель _вложений"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Добавить вложение"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "В_ложить"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Сохранить вложение"
 msgstr[1] "Сохранить вложения"
 msgstr[2] "Сохранить вложения"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2059
-#: ../e-util/e-attachment.c:2722
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:653
+#, fuzzy
+#| msgid "Could not load the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "Не удалось загрузить вложение"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr ""
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:413
 msgid "Open With Other Application..."
 msgstr "Открыть с помощью другого приложения…"
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:420
 msgid "S_ave All"
 msgstr "С_охранить все"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:427
 msgid "Sa_ve As"
 msgstr "Со_хранить как"
 
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:436
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Сохранить _как"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:446
 msgid "A_dd Attachment..."
 msgstr "_Добавить вложение…"
 
-#: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../e-util/e-attachment-view.c:453
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_Properties"
 msgstr "_Свойства"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:470
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:477
 msgid "Hid_e All"
 msgstr "Скрыть _все"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:484
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:491
 msgid "Vie_w All Inline"
 msgstr "В_строенный просмотр для всех"
 
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Открыть с помощью «%s»"
-
-#: ../e-util/e-attachment-view.c:788
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Открыть это вложение в %s"
-
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1109
-msgid "Attached message"
-msgstr "Вложенное сообщение"
-
-#: ../e-util/e-attachment.c:2140 ../e-util/e-attachment.c:3028
-msgid "A load operation is already in progress"
-msgstr "Операция загрузки уже выполняется"
-
-#: ../e-util/e-attachment.c:2148 ../e-util/e-attachment.c:3036
-msgid "A save operation is already in progress"
-msgstr "Операция сохранения уже выполняется"
-
-#: ../e-util/e-attachment.c:2268
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Не удалось загрузить «%s»"
-
-#: ../e-util/e-attachment.c:2271
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Не удалось загрузить вложение"
+#: ../e-util/e-attachment-view.c:498
+msgid "_Zoom to 100%"
+msgstr ""
 
-#: ../e-util/e-attachment.c:2575
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Не удалось открыть «%s»"
+#: ../e-util/e-attachment-view.c:500
+#, fuzzy
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "Установить размер текста в исходный"
 
-#: ../e-util/e-attachment.c:2578
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Не удалось открыть вложение"
+#: ../e-util/e-attachment-view.c:505
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Закрыть это окно"
 
-#: ../e-util/e-attachment.c:3045
-msgid "Attachment contents not loaded"
-msgstr "Содержимое вложения не загружено"
+#: ../e-util/e-attachment-view.c:507
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
 
-#: ../e-util/e-attachment.c:3125
+#: ../e-util/e-attachment-view.c:850
 #, c-format
-msgid "Could not save '%s'"
-msgstr "Не удалось сохранить «%s»"
+msgid "Open With \"%s\""
+msgstr "Открыть с помощью «%s»"
 
-#: ../e-util/e-attachment.c:3128
+#: ../e-util/e-attachment-view.c:853
 #, c-format
-msgid "Could not save the attachment"
-msgstr "Не удалось сохранить вложение"
+msgid "Open this attachment in %s"
+msgstr "Открыть это вложение в %s"
 
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
@@ -10864,6 +11187,44 @@ msgstr "Скопировать книгу локально для автоном
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-щелчок, чтобы открыть ссылку"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Предыдущий месяц"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Следующий месяц"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Предыдущий год"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Следующий год"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Календарь месяца"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Пометить как календарь по умолчанию"
@@ -10892,44 +11253,6 @@ msgstr "Копировать содержимое списка задач лок
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Копировать список заметок локально для автономной работы"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2205
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../e-util/e-calendar.c:195
-msgid "Previous month"
-msgstr "Предыдущий месяц"
-
-#: ../e-util/e-calendar.c:220
-msgid "Next month"
-msgstr "Следующий месяц"
-
-#: ../e-util/e-calendar.c:246
-msgid "Previous year"
-msgstr "Предыдущий год"
-
-#: ../e-util/e-calendar.c:271
-msgid "Next year"
-msgstr "Следующий год"
-
-#: ../e-util/e-calendar.c:295
-msgid "Month Calendar"
-msgstr "Календарь месяца"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "_Используемые категории:"
@@ -10939,11 +11262,26 @@ msgid "_Available Categories:"
 msgstr "_Доступные категории:"
 
 #: ../e-util/e-categories-editor.c:274
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#, fuzzy
+#| msgid "_New"
+msgctxt "category"
 msgid "_New"
 msgstr "_Создать"
 
+#: ../e-util/e-categories-editor.c:278
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../e-util/e-categories-editor.c:282
+#, fuzzy
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Удалить"
+
 #: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Значок"
@@ -10984,13 +11322,17 @@ msgstr "В конфигурации уже имеется категория «%
 msgid "popup list"
 msgstr "выпадающий список"
 
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "Сейчас"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1891
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Сегодня"
@@ -11004,33 +11346,17 @@ msgstr "Нет"
 
 #: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
-msgstr "OK"
+msgstr "ОК"
 
 #: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Время должно быть в формате: %s"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:1877
-msgid "?"
-msgstr "?"
-
 #: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значение процента должно быть между 0 и 100, включительно"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Кодировка символов"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Введите используемый набор символов"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Другой…"
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Арабская"
@@ -11108,189 +11434,201 @@ msgstr "Украинская"
 msgid "Visual"
 msgstr "Визуально"
 
-#: ../e-util/e-client-cache.c:1209
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Кодировка символов"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Введите используемый набор символов"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Другой…"
+
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Не удалось создать клиентский объект из расширения с именем «%s» "
 
-#: ../e-util/e-color-chooser-widget.c:114
+#: ../e-util/e-color-chooser-widget.c:124
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "Choose custom color"
 msgstr "Использовать другие шрифты"
 
-#: ../e-util/e-color-combo.c:82
+#: ../e-util/e-color-combo.c:81
 msgid "black"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:83
+#: ../e-util/e-color-combo.c:82
 msgid "light brown"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:84
+#: ../e-util/e-color-combo.c:83
 msgid "brown gold"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:85
+#: ../e-util/e-color-combo.c:84
 msgid "dark green #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:86
+#: ../e-util/e-color-combo.c:85
 msgid "navy"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:87
+#: ../e-util/e-color-combo.c:86
 msgid "dark blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:88
+#: ../e-util/e-color-combo.c:87
 msgid "purple #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:89
+#: ../e-util/e-color-combo.c:88
 msgid "very dark gray"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:91
+#: ../e-util/e-color-combo.c:90
 #, fuzzy
 #| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "Пометить как _непрочитанные"
 
-#: ../e-util/e-color-combo.c:92
+#: ../e-util/e-color-combo.c:91
 msgid "red-orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:93
+#: ../e-util/e-color-combo.c:92
 msgid "gold"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:94
+#: ../e-util/e-color-combo.c:93
 msgid "dark green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:95
+#: ../e-util/e-color-combo.c:94
 msgid "dull blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:96
+#: ../e-util/e-color-combo.c:95
 msgid "blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:97
+#: ../e-util/e-color-combo.c:96
 msgid "dull purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:98
+#: ../e-util/e-color-combo.c:97
 msgid "dark grey"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:100
+#: ../e-util/e-color-combo.c:99
 #, fuzzy
 #| msgid "3rd"
 msgid "red"
 msgstr "3-ый"
 
-#: ../e-util/e-color-combo.c:101
+#: ../e-util/e-color-combo.c:100
 msgid "orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:102
+#: ../e-util/e-color-combo.c:101
 msgid "lime"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:103
+#: ../e-util/e-color-combo.c:102
 msgid "dull green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:104
+#: ../e-util/e-color-combo.c:103
 msgid "dull blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:105
+#: ../e-util/e-color-combo.c:104
 msgid "sky blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:106
+#: ../e-util/e-color-combo.c:105
 msgid "purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:107
+#: ../e-util/e-color-combo.c:106
 msgid "gray"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:109
+#: ../e-util/e-color-combo.c:108
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "Изображение"
 
-#: ../e-util/e-color-combo.c:110
+#: ../e-util/e-color-combo.c:109
 msgid "bright orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:111
+#: ../e-util/e-color-combo.c:110
 msgid "yellow"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:112
+#: ../e-util/e-color-combo.c:111
 msgid "green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:113
+#: ../e-util/e-color-combo.c:112
 msgid "cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:114
+#: ../e-util/e-color-combo.c:113
 msgid "bright blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:115
+#: ../e-util/e-color-combo.c:114
 #, fuzzy
 #| msgid "_Required people"
 msgid "red purple"
 msgstr "_Требуемые люди"
 
-#: ../e-util/e-color-combo.c:116
+#: ../e-util/e-color-combo.c:115
 msgid "light grey"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:118
+#: ../e-util/e-color-combo.c:117
 msgid "pink"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:119
+#: ../e-util/e-color-combo.c:118
 msgid "light orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:120
+#: ../e-util/e-color-combo.c:119
 msgid "light yellow"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:121
+#: ../e-util/e-color-combo.c:120
 msgid "light green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:122
+#: ../e-util/e-color-combo.c:121
 msgid "light cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:123
+#: ../e-util/e-color-combo.c:122
 msgid "light blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:124
+#: ../e-util/e-color-combo.c:123
 msgid "light purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:125
+#: ../e-util/e-color-combo.c:124
 msgid "white"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:597 ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:427
-#: ../mail/e-mail-config-security-page.c:567 ../mail/e-mail-reader.c:3647
-#: ../mail/mail-config.ui.h:68
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3865
+#: ../mail/mail-config.ui.h:69
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -11409,125 +11747,124 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "След. вск"
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Параметры локализации по умолчанию"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Формат:"
 
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:39
+#: ../e-util/e-emoticon-chooser.c:40
 msgid "_Smile"
 msgstr ""
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:41
+#: ../e-util/e-emoticon-chooser.c:42
 msgid "S_ad"
 msgstr ""
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:43
+#: ../e-util/e-emoticon-chooser.c:44
 #, fuzzy
 #| msgid "_Window"
 msgid "_Wink"
 msgstr "_Окно"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:45
+#: ../e-util/e-emoticon-chooser.c:46
 msgid "Ton_gue"
 msgstr ""
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:47
+#: ../e-util/e-emoticon-chooser.c:48
 msgid "Laug_h"
 msgstr ""
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:49
+#: ../e-util/e-emoticon-chooser.c:50
 #, fuzzy
 #| msgid "_Plain text"
 msgid "_Plain"
 msgstr "_Обычный текст"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:51
+#: ../e-util/e-emoticon-chooser.c:52
 msgid "Smi_rk"
 msgstr ""
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:53
+#: ../e-util/e-emoticon-chooser.c:54
 msgid "_Embarrassed"
 msgstr ""
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:55
+#: ../e-util/e-emoticon-chooser.c:56
 msgid "_Big Smile"
 msgstr ""
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:57
+#: ../e-util/e-emoticon-chooser.c:58
 msgid "Uncer_tain"
 msgstr ""
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:59
+#: ../e-util/e-emoticon-chooser.c:60
 msgid "S_urprise"
 msgstr ""
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:61
+#: ../e-util/e-emoticon-chooser.c:62
 msgid "W_orried"
 msgstr ""
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:63
+#: ../e-util/e-emoticon-chooser.c:64
 msgid "_Kiss"
 msgstr ""
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:65
+#: ../e-util/e-emoticon-chooser.c:66
 msgid "A_ngry"
 msgstr ""
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:67
+#: ../e-util/e-emoticon-chooser.c:68
 msgid "_Cool"
 msgstr ""
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:69
+#: ../e-util/e-emoticon-chooser.c:70
 msgid "Ange_l"
 msgstr ""
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:71
+#: ../e-util/e-emoticon-chooser.c:72
 msgid "Cr_ying"
 msgstr ""
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:73
+#: ../e-util/e-emoticon-chooser.c:74
 msgid "S_ick"
 msgstr ""
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:75
+#: ../e-util/e-emoticon-chooser.c:76
 msgid "Tire_d"
 msgstr ""
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:77
+#: ../e-util/e-emoticon-chooser.c:78
 msgid "De_vilish"
 msgstr ""
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:79
-#, fuzzy
+#: ../e-util/e-emoticon-chooser.c:80
 #| msgid "_Mon"
 msgid "_Monkey"
-msgstr "_Пн"
+msgstr ""
 
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
@@ -11671,6 +12008,7 @@ msgstr "сейчас"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: ../e-util/e-filter-datespec.c:139
+#, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
@@ -11706,12 +12044,12 @@ msgstr "Найти элементы, которые соответствуют 
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:57
-#: ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62
+#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Нет"
 
@@ -11719,6 +12057,10 @@ msgstr "Нет"
 msgid "All related"
 msgstr "Всё связанное"
 
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Ответы"
+
 #: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "Ответы и родительские"
@@ -11735,95 +12077,125 @@ msgstr "_Включить обсуждения:"
 msgid "A_dd Condition"
 msgstr "Добавить _критерий"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:164
+msgid "Incoming"
+msgstr "Входящие"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:165
 msgid "Outgoing"
 msgstr "Исходящие"
 
-#: ../e-util/e-html-editor-actions.c:56
+#: ../e-util/e-html-editor-actions.c:58
 #, fuzzy
 #| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
 msgstr "Не удалось открыть папку."
 
-#: ../e-util/e-html-editor-actions.c:93
+#: ../e-util/e-html-editor-actions.c:95
 #, fuzzy
 #| msgid "Failed to import certificate"
 msgid "Failed to insert text file."
 msgstr "Сбой при импортировании сертификата"
 
-#: ../e-util/e-html-editor-actions.c:470
+#: ../e-util/e-html-editor-actions.c:612
 msgid "Insert HTML File"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:476
+#: ../e-util/e-html-editor-actions.c:618
 #, fuzzy
 #| msgid "HTML _Mode"
 msgid "HTML file"
 msgstr "Ре_жим HTML"
 
-#: ../e-util/e-html-editor-actions.c:503
-#: ../e-util/e-html-editor-actions.c:1266
-#| msgid "Inline Image"
+#: ../e-util/e-html-editor-actions.c:645
+#, fuzzy
+#| msgid "Insert Image"
+msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Вставить изображение"
 
-#: ../e-util/e-html-editor-actions.c:563
-#| msgid "Increase the text size"
+#: ../e-util/e-html-editor-actions.c:706
 msgid "Insert text file"
 msgstr "Вставить текстовый файл"
 
-#: ../e-util/e-html-editor-actions.c:569
-#| msgid "Select a file"
+#: ../e-util/e-html-editor-actions.c:712
 msgid "Text file"
 msgstr "Текстовый файл"
 
-#: ../e-util/e-html-editor-actions.c:938
-#| msgid "Copy selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Copy selected text to the clipboard"
 msgstr "Копировать выделенный текст в буфер обмена"
 
-#: ../e-util/e-html-editor-actions.c:945
-#| msgid "Cut selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:1103
 msgid "Cut selected text to the clipboard"
 msgstr "Вырезать выделенный текст в буфер обмена"
 
-#: ../e-util/e-html-editor-actions.c:950
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:1110
+msgid "Paste text from the clipboard"
+msgstr "Вставить текст из буфера обмена"
+
+#: ../e-util/e-html-editor-actions.c:1117
+msgid "Redo the last undone action"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1131
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Undo the last action"
+msgstr "Копировать выделение"
+
+#: ../e-util/e-html-editor-actions.c:1152
+msgid "For_mat"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1159
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "_Paragraph Style"
+msgstr "Сти_ль панели инструментов"
+
+#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-image-dialog.c:635
+#, fuzzy
+#| msgid "A_lignment"
+msgid "_Alignment"
+msgstr "Выр_авнивание"
+
+#: ../e-util/e-html-editor-actions.c:1180
+#, fuzzy
+#| msgid "_Languages"
+msgid "Current _Languages"
+msgstr "_Языки"
+
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "_Increase Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:952
+#: ../e-util/e-html-editor-actions.c:1199
 msgid "Increase Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:957
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "_HTML File..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:964
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Te_xt File..."
 msgstr ""
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:973
-#| msgid "Paste events from the clipboard"
-msgid "Paste text from the clipboard"
-msgstr "Вставить текст из буфера обмена"
-
-#: ../e-util/e-html-editor-actions.c:978
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Paste _Quotation"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:987
-msgid "Redo the last undone action"
-msgstr ""
-
-#: ../e-util/e-html-editor-actions.c:999
+#: ../e-util/e-html-editor-actions.c:1225
 #, fuzzy
 #| msgid "_Find"
 msgid "_Find..."
 msgstr "_Найти"
 
-#: ../e-util/e-html-editor-actions.c:1001
+#: ../e-util/e-html-editor-actions.c:1227
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -11835,475 +12207,436 @@ msgstr ""
 "\n"
 "Поиск контакта."
 
-#: ../e-util/e-html-editor-actions.c:1006
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Find A_gain"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1013
+#: ../e-util/e-html-editor-actions.c:1239
 #, fuzzy
 #| msgid "_Replace"
 msgid "Re_place..."
 msgstr "_Заменить"
 
-#: ../e-util/e-html-editor-actions.c:1015
+#: ../e-util/e-html-editor-actions.c:1241
 #, fuzzy
 #| msgid "Search for text in the displayed contact"
 msgid "Search for and replace text"
 msgstr "Поиск текста в отображаемом контакте"
 
-#: ../e-util/e-html-editor-actions.c:1020
+#: ../e-util/e-html-editor-actions.c:1246
 #, fuzzy
 #| msgid "Canceling..."
 msgid "Check _Spelling..."
 msgstr "Отмена…"
 
-#: ../e-util/e-html-editor-actions.c:1029
-#, fuzzy
-#| msgid "Copy the selection"
-msgid "Undo the last action"
-msgstr "Копировать выделение"
-
-#: ../e-util/e-html-editor-actions.c:1034
+#: ../e-util/e-html-editor-actions.c:1253
 msgid "_Decrease Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1036
+#: ../e-util/e-html-editor-actions.c:1255
 msgid "Decrease Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1041
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "_Wrap Lines"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1048
+#: ../e-util/e-html-editor-actions.c:1267
 msgid "Open Inspector"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1071
-msgid "For_mat"
-msgstr ""
-
-#: ../e-util/e-html-editor-actions.c:1078
-#, fuzzy
-#| msgid "Tool_bar Style"
-msgid "_Paragraph Style"
-msgstr "Сти_ль панели инструментов"
-
-#: ../e-util/e-html-editor-actions.c:1092
-#: ../e-util/e-html-editor-image-dialog.c:588
-#, fuzzy
-#| msgid "A_lignment"
-msgid "_Alignment"
-msgstr "Выр_авнивание"
-
-#: ../e-util/e-html-editor-actions.c:1099
-#, fuzzy
-#| msgid "_Languages"
-msgid "Current _Languages"
-msgstr "_Языки"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1116
-#: ../e-util/e-html-editor-paragraph-dialog.c:107
+#: ../e-util/e-html-editor-actions.c:1277
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1118
+#: ../e-util/e-html-editor-actions.c:1279
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Center Alignment"
 msgstr "Выр_авнивание"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1123
-#: ../e-util/e-html-editor-paragraph-dialog.c:98
+#: ../e-util/e-html-editor-actions.c:1284
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1286
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Left Alignment"
 msgstr "Выр_авнивание"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1130
-#: ../e-util/e-html-editor-paragraph-dialog.c:116
+#: ../e-util/e-html-editor-actions.c:1291
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1132
+#: ../e-util/e-html-editor-actions.c:1293
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Right Alignment"
 msgstr "Выр_авнивание"
 
-#: ../e-util/e-html-editor-actions.c:1140
+#: ../e-util/e-html-editor-actions.c:1301
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-actions.c:1303
 msgid "HTML editing mode"
 msgstr "Режим редактирования HTML"
 
-#: ../e-util/e-html-editor-actions.c:1147
+#: ../e-util/e-html-editor-actions.c:1308
 #, fuzzy
 #| msgid "Plain Text"
 msgid "Plain _Text"
 msgstr "Обычный текст"
 
-#: ../e-util/e-html-editor-actions.c:1149
-#| msgid "Plain Text Mode"
+#: ../e-util/e-html-editor-actions.c:1310
 msgid "Plain text editing mode"
 msgstr "Режим редактирования текста"
 
-#: ../e-util/e-html-editor-actions.c:1157
+#: ../e-util/e-html-editor-actions.c:1318
 #, fuzzy
 #| msgid "Normal"
 msgid "_Normal"
 msgstr "Нормальный"
 
-#: ../e-util/e-html-editor-actions.c:1164
+#: ../e-util/e-html-editor-actions.c:1325
 #, fuzzy
 #| msgid "Header"
 msgid "Header _1"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1171
+#: ../e-util/e-html-editor-actions.c:1332
 #, fuzzy
 #| msgid "Header"
 msgid "Header _2"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1178
+#: ../e-util/e-html-editor-actions.c:1339
 #, fuzzy
 #| msgid "Header"
 msgid "Header _3"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1185
+#: ../e-util/e-html-editor-actions.c:1346
 #, fuzzy
 #| msgid "Header"
 msgid "Header _4"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1192
+#: ../e-util/e-html-editor-actions.c:1353
 #, fuzzy
 #| msgid "Header"
 msgid "Header _5"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1199
+#: ../e-util/e-html-editor-actions.c:1360
 #, fuzzy
 #| msgid "Header"
 msgid "Header _6"
 msgstr "Заголовок"
 
-#: ../e-util/e-html-editor-actions.c:1206
+#: ../e-util/e-html-editor-actions.c:1367
 msgid "_Preformatted"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1213
+#: ../e-util/e-html-editor-actions.c:1374
 #, fuzzy
 #| msgid "Address"
 msgid "A_ddress"
 msgstr "Адрес"
 
-#: ../e-util/e-html-editor-actions.c:1220
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "_Blockquote"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1227
+#: ../e-util/e-html-editor-actions.c:1388
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "_Удалить список заметок"
 
-#: ../e-util/e-html-editor-actions.c:1234
+#: ../e-util/e-html-editor-actions.c:1395
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1241
+#: ../e-util/e-html-editor-actions.c:1402
 msgid "Numbered _List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1248
+#: ../e-util/e-html-editor-actions.c:1409
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1264
-#: ../e-util/e-html-editor-actions.c:1301
-#| msgid "Save _Image..."
+#: ../e-util/e-html-editor-actions.c:1425
+#: ../e-util/e-html-editor-actions.c:1463
 msgid "_Image..."
 msgstr "_Изображение…"
 
-#: ../e-util/e-html-editor-actions.c:1271
-#: ../e-util/e-html-editor-actions.c:1308
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1428
+msgid "Insert Image"
+msgstr "Вставить изображение"
+
+#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1470
 msgid "_Link..."
 msgstr "_Ссылка…"
 
-#: ../e-util/e-html-editor-actions.c:1273
-#| msgid "_Insert"
+#: ../e-util/e-html-editor-actions.c:1435
 msgid "Insert Link"
 msgstr "Вставить ссылку"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1279
-#: ../e-util/e-html-editor-actions.c:1323
+#: ../e-util/e-html-editor-actions.c:1441
+#: ../e-util/e-html-editor-actions.c:1485
 #, fuzzy
 #| msgid "_Rename..."
 msgid "_Rule..."
 msgstr "Пе_реименовать…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-actions.c:1444
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Rule"
 msgstr "_Вставка"
 
-#: ../e-util/e-html-editor-actions.c:1287
-#: ../e-util/e-html-editor-actions.c:1330
-#| msgid "_Rename..."
+#: ../e-util/e-html-editor-actions.c:1449
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "_Table..."
 msgstr "_Таблица…"
 
-#: ../e-util/e-html-editor-actions.c:1289
-#| msgid "_Insert"
+#: ../e-util/e-html-editor-actions.c:1451
 msgid "Insert Table"
 msgstr "Вставить таблицу"
 
-#: ../e-util/e-html-editor-actions.c:1294
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "_Cell..."
 msgstr "_Ячейка…"
 
-#: ../e-util/e-html-editor-actions.c:1315
+#: ../e-util/e-html-editor-actions.c:1477
 #, fuzzy
 #| msgid "Save _Image..."
 msgid "Pa_ge..."
 msgstr "Сохранить _изображение…"
 
-#: ../e-util/e-html-editor-actions.c:1339
+#: ../e-util/e-html-editor-actions.c:1501
 msgid "Font _Size"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1346
+#: ../e-util/e-html-editor-actions.c:1508
 #, fuzzy
 #| msgid "_Forward style:"
 msgid "_Font Style"
 msgstr "Стиль _пересылки:"
 
-#: ../e-util/e-html-editor-actions.c:1353
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Paste As _Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1364
+#: ../e-util/e-html-editor-actions.c:1526
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1366
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1534
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../e-util/e-html-editor-actions.c:1536
 msgid "Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1380
-#| msgid "Plain Text"
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "_Plain Text"
 msgstr "_Обычный текст"
 
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-actions.c:1550
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1552
 msgid "Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1558
 #: ../e-util/e-html-editor-text-dialog.c:236
 #, fuzzy
 #| msgid "Undefined"
 msgid "_Underline"
 msgstr "Не определено"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1560
 #, fuzzy
 #| msgid "Undefined"
 msgid "Underline"
 msgstr "Не определено"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1408
+#: ../e-util/e-html-editor-actions.c:1570
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1416
+#: ../e-util/e-html-editor-actions.c:1578
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../e-util/e-html-editor-actions.c:1586
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1432
+#: ../e-util/e-html-editor-actions.c:1594
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1440
+#: ../e-util/e-html-editor-actions.c:1602
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1448
+#: ../e-util/e-html-editor-actions.c:1610
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1456
+#: ../e-util/e-html-editor-actions.c:1618
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1475
+#: ../e-util/e-html-editor-actions.c:1637
 #, fuzzy
 #| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "_Содержание"
 
-#: ../e-util/e-html-editor-actions.c:1482
-#| msgid "Add a Column"
+#: ../e-util/e-html-editor-actions.c:1644
 msgid "Column"
 msgstr "Столбец"
 
-#: ../e-util/e-html-editor-actions.c:1489
-#| msgid "Low"
+#: ../e-util/e-html-editor-actions.c:1651
 msgid "Row"
 msgstr "Строка"
 
-#: ../e-util/e-html-editor-actions.c:1496
-#: ../e-util/e-html-editor-actions.c:1581
-#| msgid "Table Cell"
+#: ../e-util/e-html-editor-actions.c:1658
+#: ../e-util/e-html-editor-actions.c:1743
 msgid "Table"
 msgstr "Таблица"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1506
+#: ../e-util/e-html-editor-actions.c:1668
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Delete"
 msgstr "Ячейка таблицы"
 
-#: ../e-util/e-html-editor-actions.c:1513 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
 msgid "Input Methods"
 msgstr "Методы ввода"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1521
+#: ../e-util/e-html-editor-actions.c:1683
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "Ячейка таблицы"
 
-#: ../e-util/e-html-editor-actions.c:1528
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-actions.c:1690
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../e-util/e-html-editor-actions.c:1546
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Column After"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1553
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Column Before"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1722
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert _Link"
 msgstr "_Вставка"
 
-#: ../e-util/e-html-editor-actions.c:1567
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Row Above"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1574
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Row Below"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1588
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Cell..."
 msgstr "Ячейка…"
 
-#: ../e-util/e-html-editor-actions.c:1595
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:1757
 msgid "Image..."
 msgstr "Изображение…"
 
-#: ../e-util/e-html-editor-actions.c:1602
+#: ../e-util/e-html-editor-actions.c:1764
 msgid "Link..."
 msgstr "Ссылка…"
 
-#: ../e-util/e-html-editor-actions.c:1609
-#| msgid "Pager"
+#: ../e-util/e-html-editor-actions.c:1771
 msgid "Page..."
 msgstr "Страница…"
 
-#: ../e-util/e-html-editor-actions.c:1616
+#: ../e-util/e-html-editor-actions.c:1778
 msgid "Paragraph..."
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1624
+#: ../e-util/e-html-editor-actions.c:1786
 #, fuzzy
 #| msgid "Full _Name..."
 msgid "Rule..."
 msgstr "По_лное имя…"
 
-#: ../e-util/e-html-editor-actions.c:1631
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Table..."
 msgstr "Таблица…"
 
-#: ../e-util/e-html-editor-actions.c:1638
-#| msgid "Select..."
+#: ../e-util/e-html-editor-actions.c:1800
 msgid "Text..."
 msgstr "Текст…"
 
-#: ../e-util/e-html-editor-actions.c:1645
-#| msgid "_Remove"
+#: ../e-util/e-html-editor-actions.c:1807
 msgid "Remove Link"
 msgstr "Удалить ссылку"
 
-#: ../e-util/e-html-editor-actions.c:1662
-#| msgid "Add \"%s\" to Dictionary"
+#: ../e-util/e-html-editor-actions.c:1824
 msgid "Add Word to Dictionary"
 msgstr "Добавить слово в словарь"
 
-#: ../e-util/e-html-editor-actions.c:1669
+#: ../e-util/e-html-editor-actions.c:1831
 #, fuzzy
 #| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "Цвет для _ошибочных слов:"
 
-#: ../e-util/e-html-editor-actions.c:1676
+#: ../e-util/e-html-editor-actions.c:1838
 msgid "Add Word To"
 msgstr "Добавить слово в"
 
-#: ../e-util/e-html-editor-actions.c:1685
+#: ../e-util/e-html-editor-actions.c:1847
 #, fuzzy
 #| msgid "(no suggestions)"
 msgid "More Suggestions"
@@ -12312,185 +12645,209 @@ msgstr "(нет вариантов)"
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1793
+#: ../e-util/e-html-editor-actions.c:1955
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Добавить «%s» в словарь"
 
-#: ../e-util/e-html-editor-actions.c:1873
+#: ../e-util/e-html-editor-actions.c:2042
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-actions.c:2043
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Insert Emoticon"
 msgstr "Перезапустить Evolution"
 
-#: ../e-util/e-html-editor-actions.c:1942
+#: ../e-util/e-html-editor-actions.c:2111
 #, fuzzy
 #| msgid "_Replace"
 msgid "Re_place"
 msgstr "_Заменить"
 
-#: ../e-util/e-html-editor-actions.c:1945
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:2114
 msgid "_Image"
 msgstr "_Изображение"
 
-#: ../e-util/e-html-editor-actions.c:1948
+#: ../e-util/e-html-editor-actions.c:2117
 msgid "_Link"
 msgstr "_Ссылка"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1952
+#: ../e-util/e-html-editor-actions.c:2121
 #, fuzzy
 #| msgid "Add Rule"
 msgid "_Rule"
 msgstr "Добавить правило"
 
-#: ../e-util/e-html-editor-actions.c:1955
-#: ../e-util/e-html-editor-cell-dialog.c:625
-#| msgid "E_nable"
+#: ../e-util/e-html-editor-actions.c:2124
+#: ../e-util/e-html-editor-cell-dialog.c:732
 msgid "_Table"
 msgstr "_Таблица"
 
-#: ../e-util/e-html-editor-cell-dialog.c:585
+#: ../e-util/e-html-editor.c:672
+msgid "Paragraph Style"
+msgstr ""
+
+#: ../e-util/e-html-editor.c:686
+msgid "Editing Mode"
+msgstr "Режим редактирования"
+
+#: ../e-util/e-html-editor.c:698
+msgid "Font Color"
+msgstr "Цвет шрифта"
+
+#: ../e-util/e-html-editor.c:716
+msgid "Font Size"
+msgstr "Размер шрифта"
+
+#: ../e-util/e-html-editor-cell-dialog.c:692
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:599
+#: ../e-util/e-html-editor-cell-dialog.c:706
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:612
+#: ../e-util/e-html-editor-cell-dialog.c:719
 msgid "_Row"
 msgstr "_Строка"
 
-#: ../e-util/e-html-editor-cell-dialog.c:638
+#: ../e-util/e-html-editor-cell-dialog.c:745
 msgid "Col_umn"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:648
+#: ../e-util/e-html-editor-cell-dialog.c:755
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:661
-#: ../e-util/e-html-editor-hrule-dialog.c:384
-#: ../e-util/e-html-editor-table-dialog.c:785
+#: ../e-util/e-html-editor-cell-dialog.c:768
+#: ../e-util/e-html-editor-hrule-dialog.c:407
+#: ../e-util/e-html-editor-table-dialog.c:894
 msgid "Left"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:662
-#: ../e-util/e-html-editor-hrule-dialog.c:386
-#: ../e-util/e-html-editor-table-dialog.c:786
+#: ../e-util/e-html-editor-cell-dialog.c:769
+#: ../e-util/e-html-editor-hrule-dialog.c:409
+#: ../e-util/e-html-editor-table-dialog.c:895
 msgid "Center"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:663
-#: ../e-util/e-html-editor-hrule-dialog.c:388
-#: ../e-util/e-html-editor-table-dialog.c:787
+#: ../e-util/e-html-editor-cell-dialog.c:770
+#: ../e-util/e-html-editor-hrule-dialog.c:411
+#: ../e-util/e-html-editor-table-dialog.c:896
 msgid "Right"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:671
+#: ../e-util/e-html-editor-cell-dialog.c:778
 msgid "_Horizontal:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:679
-#: ../e-util/e-html-editor-image-dialog.c:578
+#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-image-dialog.c:625
 #, fuzzy
 #| msgid "_Top"
 msgid "Top"
 msgstr "П_ервый"
 
-#: ../e-util/e-html-editor-cell-dialog.c:680
-#: ../e-util/e-html-editor-image-dialog.c:579
+#: ../e-util/e-html-editor-cell-dialog.c:787
+#: ../e-util/e-html-editor-image-dialog.c:626
 #, fuzzy
 #| msgid "_Middle:"
 msgid "Middle"
 msgstr "_Отчество:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
-#: ../e-util/e-html-editor-image-dialog.c:580
+#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-image-dialog.c:627
 #, fuzzy
 #| msgid "_Bottom"
 msgid "Bottom"
 msgstr "П_оследний"
 
-#: ../e-util/e-html-editor-cell-dialog.c:689
+#: ../e-util/e-html-editor-cell-dialog.c:796
 #, fuzzy
 #| msgid "_Vertical View"
 msgid "_Vertical:"
 msgstr "_Вертикальный вид"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:695
+#: ../e-util/e-html-editor-cell-dialog.c:802
 #, fuzzy
 #| msgid "Plain Text"
 msgid "_Wrap Text"
 msgstr "Обычный текст"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:703
+#: ../e-util/e-html-editor-cell-dialog.c:810
 #, fuzzy
 #| msgid "Header Value"
 msgid "_Header Style"
 msgstr "Значение заголовка"
 
-#: ../e-util/e-html-editor-cell-dialog.c:717
-#: ../e-util/e-html-editor-image-dialog.c:518
-#: ../e-util/e-html-editor-table-dialog.c:697
+#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:806
 msgid "<b>Layout</b>"
 msgstr ""
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:728
+#: ../e-util/e-html-editor-cell-dialog.c:835
 msgid "_Width"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:767
+#: ../e-util/e-html-editor-cell-dialog.c:874
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:781
+#: ../e-util/e-html-editor-cell-dialog.c:888
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:788
-#: ../e-util/e-html-editor-table-dialog.c:801
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-table-dialog.c:910
 msgid "<b>Background</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:808
+#: ../e-util/e-html-editor-cell-dialog.c:908
+#: ../e-util/e-html-editor-table-dialog.c:923
+msgid "Transparent"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:916
 #, fuzzy
 #| msgid "Color:"
 msgid "C_olor:"
 msgstr "Цвет:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:816
-#: ../e-util/e-html-editor-image-dialog.c:480
-#: ../e-util/e-html-editor-table-dialog.c:829
+#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:939
 #, fuzzy
 #| msgid "Could not set as background"
 msgid "Choose Background Image"
 msgstr "Не удалось установить как фон"
 
-#: ../e-util/e-html-editor-cell-dialog.c:821
-#: ../e-util/e-html-editor-image-dialog.c:486
-#: ../e-util/e-html-editor-table-dialog.c:834
-#| msgid "Image"
+#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:944
 msgid "Images"
 msgstr "Изображения"
 
-#: ../e-util/e-html-editor-cell-dialog.c:834
-#| msgid "Image"
+#: ../e-util/e-html-editor-cell-dialog.c:942
 msgid "_Image:"
 msgstr "_Изображение:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:850
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-cell-dialog.c:949
+#: ../e-util/e-html-editor-page-dialog.c:579
+#: ../e-util/e-html-editor-table-dialog.c:964
+#, fuzzy
+#| msgid "_No image"
+msgid "_Remove image"
+msgstr "_Нет изображения"
+
+#: ../e-util/e-html-editor-cell-dialog.c:969
 msgid "Cell Properties"
 msgstr "Свойства ячейки"
 
@@ -12501,7 +12858,7 @@ msgid "No match found"
 msgstr ""
 
 #: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:229
+#: ../e-util/e-html-editor-replace-dialog.c:247
 #, fuzzy
 #| msgid "Search _Folders"
 msgid "Search _backwards"
@@ -12523,237 +12880,226 @@ msgstr "П_оиск"
 msgid "Find"
 msgstr "_Найти"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:319
+#: ../e-util/e-html-editor-hrule-dialog.c:342
 msgid "<b>Size</b>"
 msgstr "<b>Размер</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:339
-#: ../e-util/e-html-editor-image-dialog.c:536
-#: ../e-util/e-html-editor-table-dialog.c:708
+#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:817
 msgid "_Width:"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:364
-#| msgid "Size"
+#: ../e-util/e-html-editor-hrule-dialog.c:387
 msgid "_Size:"
 msgstr "_Размер:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:371
+#: ../e-util/e-html-editor-hrule-dialog.c:394
 msgid "<b>Style</b>"
 msgstr "<b>Стиль</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:396
-#: ../e-util/e-html-editor-table-dialog.c:794
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-table-dialog.c:903
 msgid "_Alignment:"
 msgstr "_Выравнивание:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:402
+#: ../e-util/e-html-editor-hrule-dialog.c:425
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-hrule-dialog.c:442
 #, fuzzy
 #| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Свойства папки"
 
-#: ../e-util/e-html-editor-image-dialog.c:468
-#: ../e-util/e-html-editor-paragraph-dialog.c:63
-#: ../e-util/e-html-editor-table-dialog.c:651
-#| msgid "General"
+#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:760
 msgid "<b>General</b>"
 msgstr "<b>Общие</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:497
+#: ../e-util/e-html-editor-image-dialog.c:544
 #, fuzzy
 #| msgid "Source"
 msgid "_Source:"
 msgstr "Код"
 
-#: ../e-util/e-html-editor-image-dialog.c:560
+#: ../e-util/e-html-editor-image-dialog.c:607
 msgid "_Height:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:601
+#: ../e-util/e-html-editor-image-dialog.c:648
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:617
+#: ../e-util/e-html-editor-image-dialog.c:664
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:633
-#: ../e-util/e-html-editor-table-dialog.c:775
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:884
 msgid "_Border:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:690
 msgid "<b>Link</b>"
 msgstr "<b>Ссылка</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:661
-#: ../e-util/e-html-editor-link-dialog.c:334
-#| msgid "URL:"
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:352
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:666
-#: ../e-util/e-html-editor-link-dialog.c:339
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:357
 msgid "_Test URL..."
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:683
-#| msgid "Category Properties"
+#: ../e-util/e-html-editor-image-dialog.c:730
 msgid "Image Properties"
 msgstr "Свойства изображения"
 
-#: ../e-util/e-html-editor-link-dialog.c:363
-#| msgid "_Remove"
+#: ../e-util/e-html-editor-link-dialog.c:381
 msgid "_Remove Link"
 msgstr "_Удалить ссылку"
 
-#: ../e-util/e-html-editor-link-dialog.c:388
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-link-dialog.c:406
 msgid "Link Properties"
 msgstr "Свойства ссылки"
 
-#: ../e-util/e-html-editor-page-dialog.c:66
+#: ../e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:75
+#: ../e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:84
+#: ../e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:93
+#: ../e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:102
+#: ../e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:120 ../mail/filtertypes.xml.in.h:35
-#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr "Черновик"
 
-#: ../e-util/e-html-editor-page-dialog.c:129
+#: ../e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:384
+#: ../e-util/e-html-editor-page-dialog.c:478
 msgid "<b>Colors</b>"
 msgstr "<b>Цвета</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:403
-#| msgid "_Text Only"
+#: ../e-util/e-html-editor-page-dialog.c:497
 msgid "_Text:"
 msgstr "_Текст:"
 
-#: ../e-util/e-html-editor-page-dialog.c:418
+#: ../e-util/e-html-editor-page-dialog.c:512
 msgid "_Link:"
 msgstr "_Ссылка:"
 
-#: ../e-util/e-html-editor-page-dialog.c:433
-#| msgid "Set as _Background"
+#: ../e-util/e-html-editor-page-dialog.c:527
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../e-util/e-html-editor-page-dialog.c:441
+#: ../e-util/e-html-editor-page-dialog.c:535
 msgid "<b>Background Image</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:463
-#| msgid "Template:"
+#: ../e-util/e-html-editor-page-dialog.c:557
 msgid "_Template:"
 msgstr "_Шаблон:"
 
-#: ../e-util/e-html-editor-page-dialog.c:471
-#, fuzzy
-#| msgid "Select a file"
-msgid "Selection a file"
+#: ../e-util/e-html-editor-page-dialog.c:565
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: ../e-util/e-html-editor-page-dialog.c:478
+#: ../e-util/e-html-editor-page-dialog.c:572
 #, fuzzy
 #| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Другой"
 
-#: ../e-util/e-html-editor-page-dialog.c:494
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-page-dialog.c:599
 msgid "Page Properties"
 msgstr "Свойства страницы"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:80
-#| msgid "_Reply style:"
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
 msgid "_Style:"
 msgstr "_Стиль:"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:87
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
 msgid "<b>Alignment</b>"
 msgstr "<b>Выравнивание</b>"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:152
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
 #, fuzzy
 #| msgid "Category Properties"
 msgid "Paragraph Properties"
 msgstr "Свойства категории"
 
-#: ../e-util/e-html-editor-replace-dialog.c:148
+#: ../e-util/e-html-editor-replace-dialog.c:163
 #, fuzzy, c-format
 #| msgid "occurrences"
-msgid "%d occurences replaced"
-msgstr "раз(а)"
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] "раз(а)"
+msgstr[1] "раз(а)"
+msgstr[2] "раз(а)"
 
-#: ../e-util/e-html-editor-replace-dialog.c:209
+#: ../e-util/e-html-editor-replace-dialog.c:227
 #, fuzzy
 #| msgid "_Replace"
 msgid "R_eplace:"
 msgstr "_Заменить"
 
-#: ../e-util/e-html-editor-replace-dialog.c:221
+#: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:233
+#: ../e-util/e-html-editor-replace-dialog.c:251
 msgid "_Case sensitive"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:237
+#: ../e-util/e-html-editor-replace-dialog.c:255
 #, fuzzy
 #| msgid "_Search"
 msgid "Wra_p search"
 msgstr "П_оиск"
 
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-replace-dialog.c:265
 msgid "_Skip"
 msgstr "_Пропустить"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:273
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: ../e-util/e-html-editor-replace-dialog.c:263
+#: ../e-util/e-html-editor-replace-dialog.c:281
 #, fuzzy
 #| msgid "Reply to _All"
 msgid "Replace _All"
 msgstr "Ответить _всем"
 
-#. Replace
-#: ../e-util/e-html-editor-replace-dialog.c:283
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-replace-dialog.c:301
+#, fuzzy
+#| msgid "Replace"
+msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Заменить"
 
@@ -12762,81 +13108,80 @@ msgstr "Заменить"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:501
+#: ../e-util/e-html-editor-spell-check-dialog.c:505
 msgid "<b>Suggestions</b>"
 msgstr ""
 
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:540
+msgid "Replace"
+msgstr "Заменить"
+
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-spell-check-dialog.c:549
 msgid "Replace All"
 msgstr "Заменить все"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../e-util/e-html-editor-spell-check-dialog.c:558
 #: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:567
 msgid "Skip"
 msgstr "Пропустить"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
-#| msgid "Go Back"
+#: ../e-util/e-html-editor-spell-check-dialog.c:576
 msgid "Back"
 msgstr "Назад"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:585
 msgid "<b>Dictionary</b>"
 msgstr "<b>Словарь</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
-#| msgid "Add Folder"
+#: ../e-util/e-html-editor-spell-check-dialog.c:605
 msgid "Add word"
 msgstr "Добавить слово"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618
-#: ../mail/mail-config.ui.h:36
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../mail/mail-config.ui.h:37
 msgid "Spell Checking"
 msgstr "Проверка орфографии"
 
-#: ../e-util/e-html-editor-table-dialog.c:673
+#: ../e-util/e-html-editor-table-dialog.c:782
 msgid "_Rows:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:690
+#: ../e-util/e-html-editor-table-dialog.c:799
 #, fuzzy
 #| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "С_толбец таблицы:"
 
-#: ../e-util/e-html-editor-table-dialog.c:741
+#: ../e-util/e-html-editor-table-dialog.c:850
 msgid "_Spacing:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:758
+#: ../e-util/e-html-editor-table-dialog.c:867
 #, fuzzy
 #| msgid "Loading"
 msgid "_Padding:"
 msgstr "Загрузка"
 
-#: ../e-util/e-html-editor-table-dialog.c:821
+#: ../e-util/e-html-editor-table-dialog.c:931
 #: ../e-util/e-html-editor-text-dialog.c:261
-#| msgid "Color:"
 msgid "_Color:"
 msgstr "_Цвет:"
 
-#: ../e-util/e-html-editor-table-dialog.c:847
-#| msgid "Image"
+#: ../e-util/e-html-editor-table-dialog.c:957
 msgid "Image:"
 msgstr "Изображение:"
 
-#: ../e-util/e-html-editor-table-dialog.c:863
-#| msgid "Calendar Properties"
+#: ../e-util/e-html-editor-table-dialog.c:984
 msgid "Table Properties"
 msgstr "Свойства таблицы"
 
@@ -12845,59 +13190,21 @@ msgid "Si_ze:"
 msgstr ""
 
 #: ../e-util/e-html-editor-text-dialog.c:296
-#| msgid "_Properties"
 msgid "Text Properties"
 msgstr "Свойства текста"
 
-#: ../e-util/e-html-editor-view.c:2535
+#: ../e-util/e-html-editor-view.c:4960
 #, fuzzy
 #| msgid "Calendar Properties"
 msgid "Changed property"
 msgstr "Свойства календаря"
 
-#: ../e-util/e-html-editor-view.c:2536
+#: ../e-util/e-html-editor-view.c:4961
 #, fuzzy
 #| msgid "Whether to emit a beep."
 msgid "Whether editor changed"
 msgstr "Подавать ли звуковой сигнал."
 
-#: ../e-util/e-html-editor-view.c:5734
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:5738
-#, fuzzy
-#| msgid "Address formatting"
-msgid "_Don't lose formatting"
-msgstr "Форматирование адреса"
-
-#: ../e-util/e-html-editor-view.c:5739
-#, fuzzy
-#| msgid "Address formatting"
-msgid "_Lose formatting"
-msgstr "Форматирование адреса"
-
-#: ../e-util/e-html-editor.c:667
-msgid "Paragraph Style"
-msgstr ""
-
-#: ../e-util/e-html-editor.c:681
-#| msgid "Edit Reminder"
-msgid "Editing Mode"
-msgstr "Режим редактирования"
-
-#: ../e-util/e-html-editor.c:693
-#| msgid "Unset Color"
-msgid "Font Color"
-msgstr "Цвет шрифта"
-
-#: ../e-util/e-html-editor.c:711
-#| msgid "Size"
-msgid "Font Size"
-msgstr "Размер шрифта"
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -12905,10 +13212,6 @@ msgid ""
 msgstr ""
 "Выберите импортируемый в Evolution файл и выберите тип файла из списка."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Выбрать файл"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "_Тип файла:"
@@ -12930,7 +13233,7 @@ msgid "Import a _single file"
 msgstr "Импорт _одного файла"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "Укажите, какую информацию вы хотите импортировать:"
 
@@ -12945,7 +13248,7 @@ msgstr ""
 "импортировать. Если вы хотите попробовать ещё раз, нажмите клавишу «Назад»."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "Из %s:"
@@ -13002,7 +13305,7 @@ msgstr "Выберите файл"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Нажмите «Применить» для начала импорта файлов в Evolution. "
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Автоматически сгенерированная"
 
@@ -13014,15 +13317,15 @@ msgstr "Закрыть"
 msgid "_Save and Close"
 msgstr "Со_хранить и закрыть"
 
-#: ../e-util/e-mail-signature-editor.c:530
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Изменить подпись"
 
-#: ../e-util/e-mail-signature-editor.c:563
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "_Имя подписи:"
 
-#: ../e-util/e-mail-signature-editor.c:599
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Без названия"
 
@@ -13038,7 +13341,7 @@ msgstr "Добавление скрипта подписи"
 msgid "Edit Signature Script"
 msgstr "Редактирование скрипта подписи"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13048,11 +13351,11 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "С_крипт:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Файл скрипта должен быть исполняемым."
 
@@ -13068,14 +13371,40 @@ msgstr ""
 "Интерактивная карта для выбора часового пояса при помощи мыши. При помощи "
 "клавиатуры можно выбрать часовой пояс из выпадающего списка ниже."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:249
 msgid "Could not open the link."
 msgstr "Не удалось открыть ссылку."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:331
 msgid "Could not display help for Evolution."
 msgstr "Не удалось показать справку по Evolution."
 
+#: ../e-util/e-misc-utils.c:2384
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Открывается календарь «%s»"
+
+#: ../e-util/e-misc-utils.c:2387
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Открывается список заметок «%s»"
+
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Открывается список задач «%s»"
+
+#: ../e-util/e-misc-utils.c:2393
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Opening address book '%s'"
+msgstr "Открывается календарь «%s»"
+
+#: ../e-util/e-misc-utils.c:3127
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Не показывать больше это сообщение"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Отображение контактов"
@@ -13094,10 +13423,10 @@ msgstr "_Поиск:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1215
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "Любая категория"
 
@@ -13116,7 +13445,7 @@ msgstr "Адресная книга"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Контакты"
 
@@ -13125,25 +13454,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Выберите контакты из адресной книги"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3066
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Развернуть контейнер %s"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3082
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Копировать %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3093
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "_Вырезать %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3111
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "_Изменить %s"
@@ -13170,27 +13499,27 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution сейчас работает в автономном режиме, потому что сеть недоступна."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Невозможно использовать ключ: не указан пользователь или имя узла"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Включён Caps Lock."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "_Запомнить пароль"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Запомнить этот пароль для напоминателя этого сеанса"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "_Запомнить пароль"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль для напоминателя этого сеанса"
 
@@ -13211,63 +13540,63 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Система печати не предоставила подробностей о причине ошибки."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Метод:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Предпочитать параметры рабочего стола"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Открыть параметры рабочего стола"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Руководство"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "Прокси _HTTP:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "Прокси H_TTPS:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "Прокси _Socks:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "_Игнорировать узлы:"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "Конфигурационный _URL:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Использовать прямое подключение, прокси не требуется."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Переключиться на основные параметры прокси"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Переключиться на расширенные параметры прокси"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Применить пользовательские параметры прокси для этих учётных записей:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -13341,8 +13670,10 @@ msgid "Reached top of page, continued from bottom"
 msgstr "Достигнут верх страницы, продолжено снизу"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "Почта"
 
@@ -13350,79 +13681,212 @@ msgstr "Почта"
 msgid "When de_leted:"
 msgstr "Когда уда_лено:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Стандартный"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Личный"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Секретное"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Совершенно секретно"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Только для ваших глаз"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Нет"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Сообщение о доставке"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "_Запрошен ответ"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "_В течение"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "дни"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Когда удобно"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Отложить доставку сообщения"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_После"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "дни"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Установить срок актуальности"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_До"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Параметры доставки"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Приоритет:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Классификация:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Общие па_раметры"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "_Создать отправленный элемент для отслеживания информации"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Доставлено"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Доста_влено и открыто"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Все сведения"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "А_втоматически удалять отправленные элементы"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Отслеживание состояния"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Когда открыто:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "При _отказе:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "При _завершении:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "_При получении:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Извещение о доставке"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "О_тслеживание состояния"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 msgid "Name:"
 msgstr "Имя:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1302
+#: ../e-util/e-source-config.c:1311
 msgid "Refresh every"
 msgstr "Обновлять каждые"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr "Использовать безопасное соединение"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr "Отменить _доверие SSL-сертификатам"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1473
 msgid "User"
 msgstr "Пользователь"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "_Назначение"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "Выберите назначение"
 
 #. Translators: %s is the language ISO code.
-#: ../e-util/e-spell-dictionary.c:286
-#, fuzzy, c-format
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
 #| msgid "Unknown"
 msgctxt "language"
 msgid "Unknown (%s)"
-msgstr "Неизвестно"
+msgstr "Неизвестно (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../e-util/e-spell-dictionary.c:301 ../e-util/e-spell-dictionary.c:306
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u%s)"
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:408
 msgid "(no suggestions)"
 msgstr "(нет вариантов)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:432
 msgid "More..."
 msgstr "Ещё…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:493
+#: ../e-util/e-spell-entry.c:517
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Добавить «%s» в словарь"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:542
+#: ../e-util/e-spell-entry.c:566
 msgid "Ignore All"
 msgstr "Игнорировать всё"
 
-#: ../e-util/e-spell-entry.c:574
+#: ../e-util/e-spell-entry.c:598
 msgid "Spelling Suggestions"
 msgstr "Предложения правописания"
 
@@ -13530,23 +13994,23 @@ msgstr "Движок списка задач, обслуживающий «{0}»
 msgid "click to add"
 msgstr "нажмите, чтобы добавить"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Переместить выделенные имена столбцов вверх"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Переместить выделенные имена столбцов на одну строку вверх"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Переместить выделенные имена столбцов на одну строку вниз"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Переместить выделенные имена столбцов вниз"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Выделить все имена столбцов"
 
@@ -13574,9 +14038,69 @@ msgstr "Показывать поля"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Выберите порядок появления информации в списке сообщений."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Добавить столбец"
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Apply"
+msgstr "_Применить"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Упорядочить…"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Группировать по…"
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "Отображаемые _поля…"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Очистить _все"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Отображать это поле"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "По возрастанию"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "По убыванию"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Группировать элементы по"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Показывать _поле при просмотре"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Затем по"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Показывать п_оле при просмотре"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Показывать по_ле при просмотре"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Сортировать"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Очистить все"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Сортировать элементы по"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -13586,6 +14110,10 @@ msgstr ""
 "Чтобы добавить столбец в таблицу,\n"
 "перетащите его в нужное место."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Добавить столбец"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -13670,6 +14198,32 @@ msgstr "Выделить всё"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Выбор часового пояса"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Используйте левую кнопку мыши для увеличения области на карте и выберите "
+"часовой пояс.\n"
+"Используйте правую кнопку для уменьшения области."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Часовые пояса"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Выделение"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Выпадающий список с часовыми поясами"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Нажмите, чтобы перейти по ссылке"
@@ -13678,129 +14232,116 @@ msgstr "Нажмите, чтобы перейти по ссылке"
 msgid "Enter a URL here"
 msgstr "Введите адрес URL"
 
-#: ../e-util/e-web-view.c:288
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Просмотр кода"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Отображаемое имя"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Метки"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Учётная запись"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
-#: ../e-util/e-web-view.c:290
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Копировать ссылку в буфер обмена"
 
-#: ../e-util/e-web-view.c:298
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в веб-браузере"
 
-#: ../e-util/e-web-view.c:300
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "Открыть ссылку в браузере"
 
-#: ../e-util/e-web-view.c:308
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "_Копировать адрес эл. почты"
 
-#: ../e-util/e-web-view.c:325
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Копировать изображение"
 
-#: ../e-util/e-web-view.c:327
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Копировать изображение в буфер обмена"
 
-#: ../e-util/e-web-view.c:332
+#: ../e-util/e-web-view.c:329
 msgid "Save _Image..."
 msgstr "Сохранить _изображение…"
 
-#: ../e-util/e-web-view.c:334
+#: ../e-util/e-web-view.c:331
 msgid "Save the image to a file"
 msgstr "Сохранить изображение в файл"
 
-#: ../e-util/e-web-view.c:354 ../e-util/e-web-view.c:1376
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
 msgid "Select all text and images"
 msgstr "Выделить весь текст и изображения"
 
-#: ../e-util/e-web-view.c:1040
+#: ../e-util/e-web-view.c:1004
 #, c-format
 msgid "Click to call %s"
 msgstr "Нажмите, чтобы позвонить %s"
 
-#: ../e-util/e-web-view.c:1042
+#: ../e-util/e-web-view.c:1006
 msgid "Click to hide/unhide addresses"
 msgstr "Нажмите, чтобы показать/скрыть адреса"
 
-#: ../e-util/e-web-view.c:1053
+#: ../e-util/e-web-view.c:1017
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Перейти к разделу %s в сообщении"
 
-#: ../e-util/e-web-view.c:1055
+#: ../e-util/e-web-view.c:1019
 msgid "Go to the beginning of the message"
 msgstr "Перейти к началу сообщения"
 
-#: ../e-util/e-web-view.c:1059
+#: ../e-util/e-web-view.c:1023
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
 
-#: ../e-util/e-web-view.c:3016
+#: ../e-util/e-web-view.c:2946
 msgid "Copying image to clipboard"
 msgstr "Копирование изображения в буфер обмена"
 
-#: ../e-util/e-web-view.c:3204
+#: ../e-util/e-web-view.c:3134
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#: ../e-util/e-web-view.c:3240
+#: ../e-util/e-web-view.c:3170
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Сохранение сообщения в «%s»"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Отменить «Вставить текст»"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Вернуть «Вставить текст»"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Отменить «Удалить текст»"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Вернуть «Удалить текст»"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Календарь: с %s по %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "элемент календаря evolution"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Просмотр кода"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Отображаемое имя"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Метки"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Учётная запись"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Отсутствует дата."
@@ -13861,13 +14402,95 @@ msgstr "Отсутствует значение."
 msgid "One or more values cannot be empty."
 msgstr "Одно или несколько значений не могут быть пустыми."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "текущее время"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "время, указанное вами"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "время относительно текущего времени"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+msgid "seconds"
+msgstr "секунд"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "недели"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "месяцы"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "годы"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "тому назад"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "в будущем"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Показать фильтры для почты:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "_Правила фильтра"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Сравнивать с"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"текущего времени запуска фильтра."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"12:00am указанной даты."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"времени запуска фильтра."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Ячейка таблицы"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "создать контекстное окно"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "начать изменение этой ячейки"
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "переключить ячейку"
 
@@ -13881,10 +14504,6 @@ msgstr "расширить строку в ETree, содержащую эту я
 msgid "collapses the row in the ETree containing this cell"
 msgstr "сворачивает строку в ETree, содержащую эту ячейку"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Ячейка таблицы"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "нажмите"
@@ -13897,6 +14516,14 @@ msgstr "сортировка"
 msgid "Save Current View"
 msgstr "Сохранить текущий вид"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Создать новый режим просмотра"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Заменить существующий режим просмотра"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Сохранить изменения?"
@@ -13933,6 +14560,27 @@ msgstr "Не удалось загрузить подпись."
 msgid "Could not save signature."
 msgstr "Не удалось сохранить подпись."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution — это приложение для управления персональной информацией, которое "
+"включает в себя почту, календарь и адресную книгу."
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution поддерживает широкий спектр промышленных стандартов форматов "
+"данных и сетевых протоколов для информационного обмена с упором на "
+"совместимость со стандартами и конфиденциальность. Evolution поддерживает "
+"интеграцию с Microsoft Exchange посредством расширения Exchange Web Services "
+"(EWS)."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -13943,11 +14591,6 @@ msgstr ""
 "Этот параметр будет использовать токен доступа OAuth 2.0 для подключения к "
 "серверу"
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Неверный код аутентификации (%d)"
-
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -14001,98 +14644,114 @@ msgstr[2] "Сохранение %d сообщений"
 msgid "Invalid folder URI '%s'"
 msgstr "Неверный URI папки «%s»"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Почтовые транспортные службы недоступны"
-
-#: ../libemail-engine/e-mail-session-utils.c:659
-#: ../libemail-engine/mail-ops.c:727
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Ошибка применения фильтров исходящей почты: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:708
-#: ../libemail-engine/mail-ops.c:770
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Не удалось добавить в %s: %s\n"
-"Производится добавление в локальную папку «Отправленные»."
-
-#: ../libemail-engine/e-mail-session-utils.c:734
-#: ../libemail-engine/mail-ops.c:794
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Не удалось добавить в локальную папку «Отправленные»: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:935
-#: ../libemail-engine/mail-ops.c:926 ../libemail-engine/mail-ops.c:1028
-msgid "Sending message"
-msgstr "Отправка сообщения"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1175
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Входящие"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Черновики"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1179
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Исходящие"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1183
-#: ../modules/mail/e-mail-shell-view-private.c:1070
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Отправленные"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1171
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
-#: ../plugins/templates/templates.c:1442
+#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
+#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Пользователь отменил действие"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "Сбой при проверке подлинности %s"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Для UID «%s» источник данных не найден"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Не указан адрес получателя, пересылка сообщения отменена."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Не найден идентификатор, пересылка сообщения отменена."
 
+#: ../libemail-engine/e-mail-session.c:2360
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Ожидание «%s»"
+
+#: ../libemail-engine/e-mail-session-utils.c:540
+msgid "No mail transport service available"
+msgstr "Почтовые транспортные службы недоступны"
+
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Posting message to '%s'"
+msgstr "Перемещение сообщений в «%s»"
+
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Ошибка применения фильтров исходящей почты: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:697
+#: ../libemail-engine/e-mail-session-utils.c:732
+#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Storing sent message to '%s'"
+msgstr "Перемещение сообщений в «%s»"
+
+#: ../libemail-engine/e-mail-session-utils.c:721
+#: ../libemail-engine/mail-ops.c:803
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Не удалось добавить в %s: %s\n"
+"Производится добавление в локальную папку «Отправленные»."
+
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Не удалось добавить в локальную папку «Отправленные»: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+msgid "Sending message"
+msgstr "Отправка сообщения"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -14130,7 +14789,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Получение почты с «%s»"
 
-#: ../libemail-engine/mail-ops.c:721
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14143,12 +14802,12 @@ msgstr ""
 "фильтры (Правка->Фильтры сообщений).\n"
 "Первоначальная ошибка: %s"
 
-#: ../libemail-engine/mail-ops.c:937
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -14156,44 +14815,50 @@ msgstr[0] "Не удалось отправить %d из %d сообщение"
 msgstr[1] "Не удалось отправить %d из %d сообщений"
 msgstr[2] "Не удалось отправить %d из %d сообщений"
 
-#: ../libemail-engine/mail-ops.c:995
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Отменено."
 
-#: ../libemail-engine/mail-ops.c:997
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Выполнено."
 
-#: ../libemail-engine/mail-ops.c:1109
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Перемещение сообщений в «%s»"
 
-#: ../libemail-engine/mail-ops.c:1110
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Копирование сообщений в «%s»"
 
-#: ../libemail-engine/mail-ops.c:1229
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки «%s»"
 
-#: ../libemail-engine/mail-ops.c:1357
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Очистка и сохранение учётной записи «%s»"
 
-#: ../libemail-engine/mail-ops.c:1358
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Сохранение учётной записи «%s»"
 
-#: ../libemail-engine/mail-ops.c:1433
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Очистка корзины в «%s»"
 
+#: ../libemail-engine/mail-ops.c:1580
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Processing folder changes in '%s'"
+msgstr "Сохранение папки «%s»"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -14263,45 +14928,41 @@ msgid "This account was created through the Online Accounts service."
 msgstr ""
 "Эта учётная запись была создана с помощью службы сетевых учётных записей."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Сбросить порядок"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 "Вы можете перетаскивать учётные записи с помощью мыши, чтобы изменить их "
 "порядок."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "_По умолчанию"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1173
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1263
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Имя учётной записи"
 
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Не указан адрес эл. почты"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "В адресе эл. почты не указан домен"
 
-#: ../mail/e-mail-backend.c:855
-msgid "Unknown background operation"
-msgstr "Неизвестное действие, выполняемое в фоновом режиме"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -14315,23 +14976,23 @@ msgid "Go _Back"
 msgstr "_Назад"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Не выполнять поиск"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Мастер учётных записей Evolution"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Просмотреть"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "Проверить поддерживаемые типы"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14345,7 +15006,7 @@ msgstr ""
 "\n"
 "Нажмите «Применить», чтобы сохранить параметры."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Готово"
 
@@ -14374,62 +15035,75 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "_Сохранять ответы в папке сообщения, на которое пишется ответ"
 
 #: ../mail/e-mail-config-defaults-page.c:628
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Archi_ve Folder:"
+msgstr "Папки поиска"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1395
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder to archive messages to."
+msgstr "Выберите папки для помещения в них сообщений."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "По _умолчанию"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Использовать настоящую папку для _корзины:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Выберите папку для удалённых сообщений."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Использовать реальную папку для _спама:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Выберите папку для спама."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Создание сообщений"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Всегда отправлять _копию на:"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Всегда отправлять _слепую копию на:"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Отчёты"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "О_тправлять отчёты:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Никогда"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Всегда"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Спрашивать для каждого сообщения"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "По умолчанию"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14439,13 +15113,13 @@ msgstr ""
 "обязательны для заполнения, если только вы не хотите включать эти сведения в "
 "отправляемую вами почту."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Информация об учётной записи"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -14453,36 +15127,40 @@ msgstr ""
 "Укажите имя, используемое для дальнейших обращений к этой \n"
 "учётной записи. Например, «Служебная» или «Личная»."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Обязательная информация"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "_Полное имя:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "_Электронная почта:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "Добавить но_вую подпись…"
 
-#: ../mail/e-mail-config-lookup-page.c:71
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr ""
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Поиск данных об учётной записи…"
 
@@ -14494,7 +15172,7 @@ msgstr "Проверка на наличие новой почты"
 msgid "Check for _new messages every"
 msgstr "Проверять _новую почту каждые"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Параметры получения"
 
@@ -14510,101 +15188,101 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s — %s"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Общие"
 
-#: ../mail/e-mail-config-security-page.c:350
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Не подписывать запросы собраний (для совместимости с Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:372
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:381
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "Идентификатор _ключа OpenPGP:"
 
-#: ../mail/e-mail-config-security-page.c:414
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "А_лгоритм подписи:"
 
-#: ../mail/e-mail-config-security-page.c:430
-#: ../mail/e-mail-config-security-page.c:570 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:433
-#: ../mail/e-mail-config-security-page.c:573 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:436
-#: ../mail/e-mail-config-security-page.c:576 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:439
-#: ../mail/e-mail-config-security-page.c:579 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:455
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "_Всегда подписывать исходящие сообщения, когда используется эта учётная "
 "запись"
 
-#: ../mail/e-mail-config-security-page.c:467
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Всегда ш_ифровать для себя при отправке зашифрованных сообщений"
 
-#: ../mail/e-mail-config-security-page.c:479
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Всегда д_оверять ключам в моей связке ключей при шифровании"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "Безопасный MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:512
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "Се_ртификат подписи:"
 
-#: ../mail/e-mail-config-security-page.c:536
-#: ../mail/e-mail-config-security-page.c:642
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../mail/e-mail-config-security-page.c:545
-#: ../mail/e-mail-config-security-page.c:651 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "О_чистить"
 
-#: ../mail/e-mail-config-security-page.c:554
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "_Алгоритм подписи:"
 
-#: ../mail/e-mail-config-security-page.c:595
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "Всегда подписывать исходящие сообщения для этой учётной записи"
 
-#: ../mail/e-mail-config-security-page.c:618
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "Сертификат шифрования:"
 
-#: ../mail/e-mail-config-security-page.c:660
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Всегда шифровать исходящие сообщения для этой учётной записи"
 
-#: ../mail/e-mail-config-security-page.c:680
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Всегда шифровать для себя при отправке зашифрованных сообщений"
 
@@ -14612,7 +15290,7 @@ msgstr "Всегда шифровать для себя при отправке
 msgid "Sending Email"
 msgstr "Отправка эл. почты"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Тип сервера:"
 
@@ -14624,112 +15302,173 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "Это параметры, которые будут использоваться для доступа к вашей почте."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Персональные данные"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Адрес эл. почты:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Получение"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Отправка"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Тип сервера:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Безопасность:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "Информация об учётной записи"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Добро пожаловать в мастер настройки электронной почты Evolution.\n"
 "\n"
 "Чтобы приступить к настройке, нажмите «Продолжить»."
 
-#: ../mail/e-mail-config-welcome-page.c:167
+#: ../mail/e-mail-config-welcome-page.c:166
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Редактор учётной записи"
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "_Добавить в адресную книгу…"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "_По этому адресу"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_С этого адреса"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "_Отправить ответ…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Отправить ответ на этот адрес"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "_Создать папку поиска"
 
-#: ../mail/e-mail-folder-create-dialog.c:328
+#: ../mail/e-mail-folder-create-dialog.c:327
 msgid "Create Folder"
 msgstr "Создать папку"
 
-#: ../mail/e-mail-folder-create-dialog.c:332
+#: ../mail/e-mail-folder-create-dialog.c:331
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: ../mail/e-mail-folder-create-dialog.c:335
+#: ../mail/e-mail-folder-create-dialog.c:334
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: ../mail/e-mail-folder-create-dialog.c:352
+#: ../mail/e-mail-folder-create-dialog.c:351
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:236
+#, fuzzy
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Отвечено"
+
+#: ../mail/e-mail-free-form-exp.c:237
+#, fuzzy
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Удалено"
+
+#: ../mail/e-mail-free-form-exp.c:238
+#, fuzzy
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Черновик"
+
+#: ../mail/e-mail-free-form-exp.c:239
+#, fuzzy
+#| msgid "Flagged"
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Отмечено"
+
+#: ../mail/e-mail-free-form-exp.c:240
+#, fuzzy
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Прочитано"
+
+#: ../mail/e-mail-free-form-exp.c:241
+#, fuzzy
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Вложение"
+
+#: ../mail/e-mail-free-form-exp.c:489
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "нет"
+
+#: ../mail/e-mail-free-form-exp.c:490
+msgctxt "ffe"
+msgid "false"
+msgstr ""
+
 #: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "ПО для фильтрации спама:"
@@ -14738,32 +15477,32 @@ msgstr "ПО для фильтрации спама:"
 msgid "_Label name:"
 msgstr "_Название метки:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Важное"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Работа"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Личное"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "В_ыполнить"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Позже"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Add Label"
 msgstr "Добавить метку"
 
@@ -14783,637 +15522,723 @@ msgstr ""
 msgid "Color"
 msgstr "Цвет"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Переместить выделенные заголовки вверх"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Переместить выделенные заголовки на одну строку вверх"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Переместить выделенные заголовки на одну строку вниз"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Переместить выделенные заголовки вниз"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Выделить все заголовки"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Название заголовка"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Значение заголовка"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:110
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:118
 msgid "Headers"
 msgstr "Заголовки"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: ../mail/e-mail-reader.c:345 ../mail/filtertypes.xml.in.h:63
-msgid "Copy to Folder"
-msgstr "Скопировать в папку"
-
-#: ../mail/e-mail-reader.c:349 ../mail/em-folder-utils.c:487
-msgid "C_opy"
-msgstr "_Копировать"
-
-#: ../mail/e-mail-reader.c:847 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:348 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Переместить в папку"
 
-#: ../mail/e-mail-reader.c:851 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:348 ../mail/filtertypes.xml.in.h:63
+msgid "Copy to Folder"
+msgstr "Скопировать в папку"
+
+#: ../mail/e-mail-reader.c:352 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:352 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "_Копировать"
+
+#: ../mail/e-mail-reader.c:1270 ../mail/e-mail-reader.c:1482
+#: ../mail/e-mail-reader.c:1522
 msgid "_Do not ask me again."
 msgstr "_Не спрашивать в следующий раз."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1528
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Всегда игнорировать обратный адрес для списков рассылки."
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1730
 msgid "Failed to retrieve message:"
 msgstr "Не удалось получить сообщения:"
 
-#: ../mail/e-mail-reader.c:1677 ../mail/e-mail-reader.c:2854
+#: ../mail/e-mail-reader.c:1775 ../mail/e-mail-reader.c:3016
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Получение сообщения «%s»"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1963
 msgid "A_dd Sender to Address Book"
 msgstr "_Добавить отправителя в адресную книгу"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1965
 msgid "Add sender to address book"
 msgstr "Добавить отправителя в адресную книгу"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1970
+msgid "_Archive..."
+msgstr "_Архивировать…"
+
+#: ../mail/e-mail-reader.c:1972
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Переместить выделенные сообщения в другую папку"
+
+#: ../mail/e-mail-reader.c:1977
 msgid "Check for _Junk"
 msgstr "Проверить на _спам"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1979
 msgid "Filter the selected messages for junk status"
 msgstr "Фильтровать выбранные сообщения по состоянию «спам»"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1984
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку…"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1986
 msgid "Copy selected messages to another folder"
 msgstr "Копировать выбранные сообщения в другую папку"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1991
 msgid "_Delete Message"
 msgstr "_Удалить сообщение"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1993
 msgid "Mark the selected messages for deletion"
 msgstr "Пометить выбранные сообщения для удаления"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Создать фильтр для _списка рассылки…"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Создать правило для фильтрации сообщений в этот список рассылки"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Создать фильтр для _получателей…"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:2007
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Создать правило для фильтрации сообщений к этим получателям"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Создать фильтр для _отправителя…"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2014
 msgid "Create a rule to filter messages from this sender"
 msgstr "Создать правило для фильтрации сообщений от этого отправителя"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Создать фильтр для _темы…"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a rule to filter messages with this subject"
 msgstr "Создать правило для фильтрации сообщений с этой темой"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2026
 msgid "A_pply Filters"
 msgstr "Применить _фильтры"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2028
 msgid "Apply filter rules to the selected messages"
 msgstr "Применить фильтры к выбранным сообщениям"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2033
 msgid "_Find in Message..."
 msgstr "_Найти в сообщении…"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2035
 msgid "Search for text in the body of the displayed message"
 msgstr "Поиск в тексте отображаемого сообщения"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2040
 msgid "_Clear Flag"
 msgstr "О_чистить отметку"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2042
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Снять метку «к исполнению» с выбранных сообщений"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2047
 msgid "_Flag Completed"
 msgstr "_Метка «Завершено»"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2049
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Установить метку «к исполнению» в значение «завершено» для выделенных "
 "сообщений"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2054
 msgid "Follow _Up..."
 msgstr "К _исполнению…"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2056
 msgid "Flag the selected messages for follow-up"
 msgstr "Отметить выделенные сообщения к исполнению"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2061
 msgid "_Attached"
 msgstr "_Вложение"
 
-#: ../mail/e-mail-reader.c:1958 ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2063 ../mail/e-mail-reader.c:2070
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Перенаправить выбранное сообщение кому-либо как вложение"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2068
 msgid "Forward As _Attached"
 msgstr "Перенаправить как _вложенное"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2075
 msgid "_Inline"
 msgstr "В_строенное"
 
-#: ../mail/e-mail-reader.c:1972 ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2077 ../mail/e-mail-reader.c:2084
 msgid "Forward the selected message in the body of a new message"
 msgstr "Перенаправить выбранное сообщение в теле нового сообщения"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2082
 msgid "Forward As _Inline"
 msgstr "Перенаправить как вс_троенное"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2089
 msgid "_Quoted"
 msgstr "_Цитирование"
 
-#: ../mail/e-mail-reader.c:1986 ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2091 ../mail/e-mail-reader.c:2098
 msgid "Forward the selected message quoted like a reply"
 msgstr "Перенаправить выбранное сообщение процитированным как при ответе"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2096
 msgid "Forward As _Quoted"
 msgstr "Перенаправить как _цитируемое"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2103
 msgid "_Load Images"
 msgstr "_Загрузить изображения"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2105
 msgid "Force images in HTML mail to be loaded"
 msgstr "Включить загрузку картинок в почте в формате HTML"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2110 ../mail/e-mail-reader.c:2488
+msgid "_Ignore Subthread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2112
+msgid "Mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2117 ../mail/e-mail-reader.c:2492
+#, fuzzy
+#| msgid "Next _Thread"
+msgid "_Ignore Thread"
+msgstr "_Следующему обсуждению"
+
+#: ../mail/e-mail-reader.c:2119
+msgid "Mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2124
 msgid "_Important"
 msgstr "_Важное"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as important"
 msgstr "Отметить выделенные сообщения как важные"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2131
 msgid "_Junk"
 msgstr "_Спам"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2133
 msgid "Mark the selected messages as junk"
 msgstr "Отметить выделенные сообщения как спам"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2138
 msgid "_Not Junk"
 msgstr "_Не спам"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2140
 msgid "Mark the selected messages as not being junk"
 msgstr "Отметить выделенные сообщения как не спам"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2145
 msgid "_Read"
 msgstr "_Прочитанное"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2147
 msgid "Mark the selected messages as having been read"
 msgstr "Отметить выделенные сообщения как прочитанные"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2152 ../mail/e-mail-reader.c:2512
+#, fuzzy
+#| msgid "Could not create publish thread."
+msgid "Do not _Ignore Subthread"
+msgstr "Не удалось создать открытое обсуждение."
+
+#: ../mail/e-mail-reader.c:2154
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2159 ../mail/e-mail-reader.c:2516
+msgid "Do not _Ignore Thread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2161
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2166
 msgid "Uni_mportant"
 msgstr "_Неважное"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2168
 msgid "Mark the selected messages as unimportant"
 msgstr "Отметить выделенные сообщения как неважные"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2173
 msgid "_Unread"
 msgstr "_Непрочитанное"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2175
 msgid "Mark the selected messages as not having been read"
 msgstr "Отметить выделенные сообщения как ещё не прочитанные"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2180
 msgid "_Edit as New Message..."
 msgstr "_Редактировать как новое сообщение…"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2182
 msgid "Open the selected messages in the composer for editing"
 msgstr "Открыть выделенные сообщения в редакторе для изменения"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2187
 msgid "Compose _New Message"
 msgstr "Созд_ать новое сообщение"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2189
 msgid "Open a window for composing a mail message"
 msgstr "Открыть окно для создания почтового сообщения"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2194
 msgid "_Open in New Window"
 msgstr "_Открыть в новом окне"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2196
 msgid "Open the selected messages in a new window"
 msgstr "Отправить выделенные сообщения в новом окне"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2201
 msgid "_Move to Folder..."
 msgstr "_Переместить в папку…"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2203
 msgid "Move selected messages to another folder"
 msgstr "Переместить выделенные сообщения в другую папку"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2208
 msgid "_Next Message"
 msgstr "_Следующему сообщению"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next message"
 msgstr "Показать следующее сообщение"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2215
 msgid "Next _Important Message"
 msgstr "Следующему _важному сообщению"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the next important message"
 msgstr "Показать следующее важное сообщение"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2222
 msgid "Next _Thread"
 msgstr "_Следующему обсуждению"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the next thread"
 msgstr "Показать следующее обсуждение"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2229
 msgid "Next _Unread Message"
 msgstr "Следующему _непрочитанному сообщению"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the next unread message"
 msgstr "Показать следующее непрочитанное сообщение"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2236
 msgid "_Previous Message"
 msgstr "Предыдущему _сообщению"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous message"
 msgstr "Показать предыдущее сообщение"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2243
 msgid "Pr_evious Important Message"
 msgstr "Предыдущему _важному сообщению"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2245
 msgid "Display the previous important message"
 msgstr "Показать предыдущее важное сообщение"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2250
 msgid "Previous T_hread"
 msgstr "Предыдущему _обсуждение"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2252
 msgid "Display the previous thread"
 msgstr "Показать предыдущее обсуждение"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2257
 msgid "P_revious Unread Message"
 msgstr "Предыдущему _непрочитанному сообщению"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2259
 msgid "Display the previous unread message"
 msgstr "Показать предыдущее непрочитанное сообщение"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2266
 msgid "Print this message"
 msgstr "Вывести на печать это сообщение"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2273
 msgid "Preview the message to be printed"
 msgstr "Посмотреть вид сообщения на печати"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2278
 msgid "Re_direct"
 msgstr "Пе_ренаправить"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2280
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Переслать выбранное сообщение кому-либо от своего имени"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2285
 msgid "Remo_ve Attachments"
 msgstr "Удалить _вложения"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2287
 msgid "Remove attachments"
 msgstr "Удалить вложения"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2292
 msgid "Remove Du_plicate Messages"
 msgstr "Удалить _дублируемые сообщения"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2294
 msgid "Checks selected messages for duplicates"
 msgstr "Проверить выделенные сообщения на наличие дубликатов"
 
-#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1538
+#: ../mail/e-mail-reader.c:2299 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2301
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Ответить всем получателям выделенного сообщения"
 
-#: ../mail/e-mail-reader.c:2173 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2306 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Ответить в _список"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2308
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Ответить в список рассылки этого сообщения"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2313
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2315
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2320
 msgid "_Save as mbox..."
 msgstr "Со_хранить как mbox…"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2322
 msgid "Save selected messages as an mbox file"
 msgstr "Сохранить выделенные сообщения как файл mbox"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2327
 msgid "_Message Source"
 msgstr "_Исходный текст сообщения"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2329
 msgid "Show the raw email source of the message"
 msgstr "Показать исходный текст сообщения"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2341
 msgid "_Undelete Message"
 msgstr "В_осстановить сообщение"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2343
 msgid "Undelete the selected messages"
 msgstr "Восстановить выделенные сообщения"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2348
 msgid "_Normal Size"
 msgstr "_Обычный размер"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2350
 msgid "Reset the text to its original size"
 msgstr "Установить размер текста в исходный"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2355
 msgid "_Zoom In"
 msgstr "У_величить"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2357
 msgid "Increase the text size"
 msgstr "Увеличить размер текста"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2364
 msgid "Decrease the text size"
 msgstr "Уменьшить размер текста"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2371
 msgid "Cre_ate"
 msgstr "Соз_дать"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2378
 msgid "Ch_aracter Encoding"
 msgstr "Ко_дировка символов"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2385
 msgid "F_orward As"
 msgstr "_Перенаправить как"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2392
 msgid "_Group Reply"
 msgstr "_Ответить всем"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2399
 msgid "_Go To"
 msgstr "Пе_рейти к"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2406
 msgid "Mar_k As"
 msgstr "По_метить как"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2413
 msgid "_Message"
 msgstr "Сооб_щение"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2420
 msgid "_Zoom"
 msgstr "_Масштаб"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Создать папку поиска из списка _рассылки…"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this mailing list"
 msgstr "Создать папку поиска для этого списка рассылки"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Создать папку поиска из _получателей…"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2439
 msgid "Create a search folder for these recipients"
 msgstr "Создать папку поиска для этих получателей"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Создать папку поиска из _отправителей…"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2446
 msgid "Create a search folder for this sender"
 msgstr "Создать папку поиска для этого отправителя"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Создать папку поиска из _темы…"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a search folder for this subject"
 msgstr "Создать папку поиска для этой темы"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2480
 msgid "Mark for Follo_w Up..."
 msgstr "Пометить к _исполнению…"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2496
 msgid "Mark as _Important"
 msgstr "Пометить как _важное"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2500
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: ../mail/e-mail-reader.c:2359
+#: ../mail/e-mail-reader.c:2504
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2508
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: ../mail/e-mail-reader.c:2367
+#: ../mail/e-mail-reader.c:2520
 msgid "Mark as Uni_mportant"
 msgstr "Пометить как нева_жное"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2524
 msgid "Mark as _Unread"
 msgstr "Пометить как _непрочитанные"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2568
 msgid "_Caret Mode"
 msgstr "Режим _каретки"
 
-#: ../mail/e-mail-reader.c:2417
+#: ../mail/e-mail-reader.c:2570
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Показывать мигающий курсор в теле отображаемых сообщений"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2576
 msgid "All Message _Headers"
 msgstr "Все _заголовки сообщения"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2578
 msgid "Show messages with all email headers"
 msgstr "Отображать сообщения со всеми заголовками"
 
-#: ../mail/e-mail-reader.c:2860
+#: ../mail/e-mail-reader.c:3022
 msgid "Retrieving message"
 msgstr "Загрузка сообщения"
 
-#: ../mail/e-mail-reader.c:3817
+#: ../mail/e-mail-reader.c:4035
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Пе_реслать"
 
-#: ../mail/e-mail-reader.c:3818
+#: ../mail/e-mail-reader.c:4036
 msgid "Forward the selected message to someone"
 msgstr "Перенаправить выбранное сообщение кому-либо"
 
-#: ../mail/e-mail-reader.c:3837
+#: ../mail/e-mail-reader.c:4055
 msgid "Group Reply"
 msgstr "Ответить всем"
 
-#: ../mail/e-mail-reader.c:3838
+#: ../mail/e-mail-reader.c:4056
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Ответить в список рассылки или всем получателям"
 
-#: ../mail/e-mail-reader.c:3904 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4122 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../mail/e-mail-reader.c:3916
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../mail/e-mail-reader.c:4134
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Следующее"
 
-#: ../mail/e-mail-reader.c:3920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../mail/e-mail-reader.c:4138
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Предыдущее"
 
-#: ../mail/e-mail-reader.c:3929 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4147 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Ответить"
 
+#: ../mail/e-mail-reader.c:5150
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5152
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5169
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5225
+#, fuzzy
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Содержимое заголовка"
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Не предупреждать больше об этом"
 
 #: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../shell/e-shell.c:867 ../shell/e-shell.c:888
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../mail/e-mail-reader-utils.c:973
+#: ../mail/e-mail-reader-utils.c:1043
+#, fuzzy
+#| msgid "Preview data to be imported"
+msgid "Marking thread to be ignored"
+msgstr "Предпросмотр данных для импортирования"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Unmarking thread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1051
+msgid "Marking subthread to be ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1055
+msgid "Unmarking subthread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1294
 msgid "Printing"
 msgstr "Печать"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1208
+#: ../mail/e-mail-reader-utils.c:1529
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15431,7 +16256,7 @@ msgstr[2] ""
 "В папке «%s» находится %u дублируемых сообщений. Уверены, что хотите их "
 "удалить?"
 
-#: ../mail/e-mail-reader-utils.c:2023
+#: ../mail/e-mail-reader-utils.c:2359
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Сохранить сообщение"
@@ -15443,14 +16268,14 @@ msgstr[2] "Сохранить сообщения"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2044
+#: ../mail/e-mail-reader-utils.c:2380
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Сообщение"
 msgstr[1] "Сообщения"
 msgstr[2] "Сообщений"
 
-#: ../mail/e-mail-reader-utils.c:2413
+#: ../mail/e-mail-reader-utils.c:2753
 msgid "Parsing message"
 msgstr "Разбор сообщения"
 
@@ -15462,11 +16287,21 @@ msgstr "В сообщении нет текстового содержимого
 msgid "Flag to Follow Up"
 msgstr "Пометить к исполнению"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "Сбой при проверке подлинности %s"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Для UID «%s» источник данных не найден"
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1491
+#: ../mail/em-composer-utils.c:1542
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15474,24 +16309,24 @@ msgstr ""
 "В ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} в ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пишет:"
 
-#: ../mail/em-composer-utils.c:1497
+#: ../mail/em-composer-utils.c:1548
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересылаемое сообщение --------"
 
-#: ../mail/em-composer-utils.c:1502
+#: ../mail/em-composer-utils.c:1553
 msgid "-----Original Message-----"
 msgstr "-------- Исходное сообщение --------"
 
-#: ../mail/em-composer-utils.c:2652
+#: ../mail/em-composer-utils.c:2706
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3047
+#: ../mail/em-composer-utils.c:3145
 msgid "Posting destination"
 msgstr "Назначение"
 
-#: ../mail/em-composer-utils.c:3052
+#: ../mail/em-composer-utils.c:3150
 msgid "Choose folders to post the message to."
 msgstr "Выберите папки для помещения в них сообщений."
 
@@ -15574,12 +16409,12 @@ msgstr "Перемещение папки %s"
 msgid "Copying folder %s"
 msgstr "Копирование папки %s"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2309
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2311
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в папку %s"
@@ -15594,7 +16429,7 @@ msgstr "Нельзя перетащить сообщение в хранилищ
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:1259 ../mail/em-folder-tree-model.c:1635
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Загрузка…"
 
@@ -15619,7 +16454,7 @@ msgid "Subscribe To _All"
 msgstr "Подписаться на _все"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "_Unsubscribe"
 msgstr "_Отказаться от подписки"
 
@@ -15656,7 +16491,7 @@ msgid "Su_bscribe"
 msgstr "_Подписаться"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Unsubscribe from the selected folder"
 msgstr "Отписаться от выделенной папки"
 
@@ -15681,8 +16516,8 @@ msgid "Refresh the folder list"
 msgstr "Обновить список папок"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Refresh"
 msgstr "_Обновить"
 
@@ -15691,7 +16526,7 @@ msgid "Stop the current operation"
 msgstr "Остановить текущую операцию"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Остановить"
 
@@ -15707,11 +16542,11 @@ msgstr[0] "Действительно открыть одновременно %d
 msgstr[1] "Действительно открыть одновременно %d сообщения?"
 msgstr[2] "Действительно открыть одновременно %d сообщений?"
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:176
 msgid "Message Filters"
 msgstr "Фильтры сообщений"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:922
 #, c-format
 msgid "Messages from %s"
 msgstr "Сообщения от %s"
@@ -15844,89 +16679,95 @@ msgstr "Выражение"
 
 #: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
 #: ../mail/vfoldertypes.xml.in.h:26
-msgid "Date sent"
-msgstr "Отправлена дата"
+#, fuzzy
+#| msgid "Expression"
+msgid "Free Form Expression"
+msgstr "Выражение"
 
 #: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
 #: ../mail/vfoldertypes.xml.in.h:27
-msgid "is before"
-msgstr "до"
+msgid "Date sent"
+msgstr "Отправлена дата"
 
 #: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
 #: ../mail/vfoldertypes.xml.in.h:28
-msgid "is after"
-msgstr "после"
+msgid "is before"
+msgstr "до"
 
 #: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
 #: ../mail/vfoldertypes.xml.in.h:29
-msgid "Date received"
-msgstr "Получена дата"
+msgid "is after"
+msgstr "после"
 
 #: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
 #: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Получена дата"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Метка"
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:31 ../mail/vfoldertypes.xml.in.h:31
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Вес"
 
-#: ../mail/filtertypes.xml.in.h:32 ../mail/searchtypes.xml.in.h:34
-#: ../mail/vfoldertypes.xml.in.h:34
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
 msgstr "Размер (кБ)"
 
-#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
 msgid "Replied to"
 msgstr "Ответ на"
 
-#: ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39
-#: ../mail/vfoldertypes.xml.in.h:39
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Important"
 msgstr "Важное"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:37 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:40 ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Read"
 msgstr "Прочитанное"
 
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:117
-#: ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:125
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Спам"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:41
-#: ../mail/vfoldertypes.xml.in.h:42
-msgid "Follow Up"
-msgstr "К исполнению"
-
 #: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
 #: ../mail/vfoldertypes.xml.in.h:43
-msgid "is Flagged"
-msgstr "отмечено"
+msgid "Follow Up"
+msgstr "К исполнению"
 
 #: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
 #: ../mail/vfoldertypes.xml.in.h:44
-msgid "is not Flagged"
-msgstr "не отмечено"
+msgid "is Flagged"
+msgstr "отмечено"
 
 #: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
 #: ../mail/vfoldertypes.xml.in.h:45
-msgid "Completed On"
-msgstr "Завершено в"
+msgid "is not Flagged"
+msgstr "не отмечено"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "is set"
-msgstr "установлено"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "% выполнено"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-msgid "is not set"
-msgstr "не установлено"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "% выполнено"
 
 #: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
 #: ../mail/vfoldertypes.xml.in.h:51
@@ -16016,8 +16857,8 @@ msgstr "Скорректировать вес"
 msgid "Set Status"
 msgstr "Установить состояние"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Удалено"
 
@@ -16054,54 +16895,89 @@ msgid "Import mail from Elm."
 msgstr "Импорт почты из Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Папка назначения:"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Выбрать папку"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Выберите папку для импорта"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Тема"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "От"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../mail/importers/evolution-mbox-importer.c:568
 #: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Импорт папок в формате Berkeley Mailbox"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../mail/importers/kmail-importer.c:263
+#, fuzzy, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "Адрес"
+msgstr[1] "Адрес"
+msgstr[2] "Адрес"
+
+#: ../mail/importers/kmail-importer.c:354
+#, fuzzy
+#| msgid "Evolution Elm importer"
+msgid "Evolution KMail importer"
+msgstr "Evolution Elm importer"
+
+#: ../mail/importers/kmail-importer.c:355
+#, fuzzy
+#| msgid "Import mail from Elm."
+msgid "Import mail and contacts from KMail."
+msgstr "Импорт почты из Elm."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+msgid "Trash"
+msgstr "Корзина"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Импорт из файла mailbox"
 
+#: ../mail/importers/mail-importer.c:61
+#, fuzzy
+#| msgid "Import mail from Elm."
+msgid "Importing mail and contacts from KMail"
+msgstr "Импорт почты из Elm."
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Импортирование «%s»"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканирование %s"
@@ -16197,108 +17073,114 @@ msgid "For_mat messages in HTML"
 msgstr "Форматировать сообщения в _HTML"
 
 #: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
+#, fuzzy
+#| msgid "Automatically insert _emoticon images"
+msgid "Automatically insert _emoticons"
 msgstr "Автоматически вставлять _изображения эмоций"
 
 #: ../mail/mail-config.ui.h:10
+msgid "Use Unicode characters for smile_ys"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Всегда запрашивать _отчёт о прочтении"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Кодировать имена файлов в стиле _Outlook/GMail"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 #, fuzzy
 #| msgid "Saving message to Outbox."
 msgid "Send messages through Outbo_x folder"
 msgstr "Сохранение сообщения в папку для исходящих сообщений."
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Number of characters for word w_rapping:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Ch_aracter encoding:"
 msgstr "Ко_дировка символов:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Replies and Forwards"
 msgstr "Ответы и перенаправления"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "_Reply style:"
 msgstr "Стиль _ответа:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Forward style:"
 msgstr "Стиль _пересылки:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Start _typing at the bottom on replying"
 msgstr "При ответе начинать _ввод после цитаты"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "_Keep signature above the original message on replying"
 msgstr "Помещать подпись _над исходным сообщением при ответе"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Игнорировать «Обратный адрес» для списков рассылки"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 "«Ответить _всем» отправляет по возможности письма только в список рассылки"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Добавлять _цифровую подпись к ответам, если подписаны исходные сообщения "
 "(PGP or S/MIME)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Вложение"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Встроенный (в стиле Outlook)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Цитата"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Не цитировать"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Встроенное"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Sig_natures"
 msgstr "_Подписи"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Signatures"
 msgstr "Подписи"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "_Languages"
 msgstr "_Языки"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Languages Table"
 msgstr "Таблица языков"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -16306,11 +17188,11 @@ msgstr ""
 "Этот список языков перечисляет только те языки, для которых у вас "
 "установлены словари."
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Check spelling while I _type"
 msgstr "Проверять орфографию в процессе ввода _текста"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -16319,74 +17201,74 @@ msgstr ""
 "перед выполнением указанных действий:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Sending a message with an _empty subject line"
 msgstr "Отправка сообщений с пустой _темой"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Отправка сообщений только с указанием скрытой _копии"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Отправка _личных ответов в список рассылки"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Отправка сообщений _большому кол-ву получателей"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Разрешить _списку рассылки перенаправлять личные сообщения в список"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Отправка сообщений _получателям, не входящих в список адресатов"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 #, fuzzy
 #| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Отправка сообщений с пустой _темой"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Confirmations"
 msgstr "Подтверждения"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Use for Folders"
 msgstr "Использовать для папок"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "A_dd"
 msgstr "_Добавить"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Re_move"
 msgstr "_Удалить"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:62
 msgid "Use for Recipients"
 msgstr "Использовать для получателей"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
+#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Send account overrides"
 msgstr "Переопределение отправителя"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -16398,198 +17280,238 @@ msgstr ""
 "содержать неполные адреса и имена. Части имён и адресов сравниваются "
 "отдельно."
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "_Переназначение для папок имеет приоритет над переназначением для получателей"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Send Account"
 msgstr "Отправитель"
 
-#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 msgid "Start up"
 msgstr "Запуск"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new _messages on start"
 msgstr "Проверять почту при _запуске"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Проверять почту для _всех включённых уч. записей"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "Message Display"
 msgstr "Отображение сообщений"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "_Use the same fonts as other applications"
 msgstr "_Использовать такие же шрифты, как и прочие приложения"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "S_tandard Font:"
 msgstr "С_тандартный шрифт:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML fixed width font"
 msgstr "Выбрать шрифт HTML фиксированной ширины"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML variable width font"
 msgstr "Выбрать шрифт HTML переменной ширины"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Fix_ed Width Font:"
 msgstr "_Моноширинный шрифт:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "_Mark messages as read after"
 msgstr "_Помечать сообщения как прочитанные после"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Highlight _quotations with"
 msgstr "Выделять _цитирование цветом:"
 
-#: ../mail/mail-config.ui.h:87
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../mail/mail-config.ui.h:88
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Выберите цвет"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "color"
 msgstr "цвет"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Default character e_ncoding:"
 msgstr "_Кодировка символов по умолчанию:"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Apply the same _view settings to all folders"
 msgstr "_Применить эти параметры отображения для всех папок"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "F_all back to threading messages by subject"
 msgstr "Вернуться к обсуждению по _теме"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Delete Mail"
 msgstr "Удаление сообщений"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Empty _trash folders"
 msgstr "Очистить _корзины"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Confirm _when expunging a folder"
 msgstr "_Запрашивать подтверждение очистки папки от удалённых сообщений"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:96
+msgid "Archive Mail"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:97
+msgid "On This Computer A_rchive folder:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:98
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:100
 msgid "_Show animated images"
 msgstr "Показывать _анимированные изображения"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:101
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
-#: ../mail/mail-config.ui.h:98
-msgid "Loading Images"
-msgstr "Загрузка изображений"
+#: ../mail/mail-config.ui.h:102
+msgid "Loading Remote Content"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:99
-msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+#| msgid "_Never load images from the Internet"
+msgid "_Never load remote content from the Internet"
 msgstr "_Никогда не загружать изображения из Интернета"
 
-#: ../mail/mail-config.ui.h:100
-msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:104
+#, fuzzy
+#| msgid "_Load images only in messages from contacts"
+msgid "_Load remote content only in messages from contacts"
 msgstr "_Загружать изображения только в сообщениях от контактов"
 
-#: ../mail/mail-config.ui.h:101
-msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+#| msgid "_Always load images from the Internet"
+msgid "_Always load remote content from the Internet"
 msgstr "_Всегда загружать изображения из Интернета"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:106
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Добавить"
+
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "_Удалить"
+
+#: ../mail/mail-config.ui.h:108
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:109
+#, fuzzy
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Все локальные папки"
+
+#: ../mail/mail-config.ui.h:110
 msgid "HTML Messages"
 msgstr "Сообщения HTML"
 
-#: ../mail/mail-config.ui.h:103 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:111 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Метки"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:112
 msgid "Sender Photograph"
 msgstr "Фотография отправителя"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:113
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Показывать фотографию _отправителя в панели просмотра почты"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:114
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:115
 msgid "Displayed Message Headers"
 msgstr "Отображаемые заголовки сообщений"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:116
 msgid "Mail Headers Table"
 msgstr "Таблица заголовков почты"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:117
 #: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Формат даты и времени"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:119
 msgid "Check incoming _messages for junk"
 msgstr "Проверять в_ходящие сообщения на спам"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:120
 msgid "_Delete junk messages"
 msgstr "_Удалить спам"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:121
 #, fuzzy
 #| msgid "Send Options"
-msgid "Just Test Options"
+msgid "Junk Test Options"
 msgstr "Параметры отправки"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:122
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Не поме_чать сообщения как спам, если отправитель есть в моей адресной книге"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:123
 msgid "_Lookup in local address book only"
 msgstr "Просматривать только _локальную адресную книгу"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:124
 msgid "Check cu_stom headers for junk"
 msgstr "Про_верять дополнительные заголовки для определения спама"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:126
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Без шифрования"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:127
 msgid "TLS encryption"
 msgstr "Шифрование TLS"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:128
 msgid "SSL encryption"
 msgstr "Шифрование SSL"
 
@@ -16869,7 +17791,7 @@ msgstr ""
 "Действительно безвозвратно уничтожить все удалённые сообщения во всех папках?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "_Empty Trash"
 msgstr "О_чистить корзину"
 
@@ -17379,38 +18301,53 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+#, fuzzy
+#| msgid "Send mail also when in offline _mode"
+msgid "Message is not available in offline mode."
+msgstr "Отправлять почту даже в _автономном режиме"
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Не удалось открыть папку."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Не удалось найти дублируемые сообщения."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Не удалось получить сообщения."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Не удалось отметить сообщения как прочитанные."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Не удалось удалить вложения из сообщений."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Не удалось загрузить сообщения для автономного просмотра."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Не удалось записать сообщения на диск."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Прикреплён скрытый файл."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -17418,26 +18355,54 @@ msgstr ""
 "Вложение с именем {0} является скрытым файлом и может содержать важные "
 "данные. Просмотрите файл перед отправкой."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Сбой печати."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Сообщение от принтера: «{0}»."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Не удалось выполнить это действие в {0}."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "Чтобы выполнить это действие, необходимо подключение к сети."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Сообщение от учётной записи «{0}»:"
 
+#: ../mail/mail.error.xml.h:177
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "Не удалось переместить событие в календарь «{0}»"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:181
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:182
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Отмена…"
@@ -17446,35 +18411,35 @@ msgstr "Отмена…"
 msgid "Send & Receive Mail"
 msgstr "Получение и отправка почты"
 
-#: ../mail/mail-send-recv.c:647
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "Отменить _все"
 
-#: ../mail/mail-send-recv.c:737 ../mail/mail-send-recv.c:1250
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 msgid "Updating..."
 msgstr "Обновление…"
 
-#: ../mail/mail-send-recv.c:737 ../mail/mail-send-recv.c:819
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Ожидание…"
 
-#: ../mail/mail-send-recv.c:1222
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Проверка новой почты на «%s»"
 
-#: ../mail/mail-send-recv.c:1423
+#: ../mail/mail-send-recv.c:1434
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1425
+#: ../mail/mail-send-recv.c:1436
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at '%s'"
 msgstr "Переподключение к «%s»"
 
-#: ../mail/mail-send-recv.c:1427
+#: ../mail/mail-send-recv.c:1438
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at '%s'"
@@ -17492,86 +18457,86 @@ msgstr "Изменить папку поиска"
 msgid "New Search Folder"
 msgstr "Новая папка поиска"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Отвечено"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Переслано"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Низкий"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Высокий"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5798
+#: ../mail/message-list.c:459 ../mail/message-list.c:6043
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1885 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: ../mail/message-list.c:1894
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1906
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1914
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2796
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr "Выделить все видимые сообщения"
 
-#: ../mail/message-list.c:3440 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Сообщения"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4747
+#: ../mail/message-list.c:4985
 msgid "Follow-up"
 msgstr "К исполнению"
 
-#: ../mail/message-list.c:5735
+#: ../mail/message-list.c:5980
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -17583,7 +18548,7 @@ msgstr ""
 "поиск, изменив запрос или очистив поиск с помощью пункта меню «Найти»-"
 ">«Очистить»."
 
-#: ../mail/message-list.c:5743
+#: ../mail/message-list.c:5988
 msgid "There are no messages in this folder."
 msgstr "В папке нет сообщений."
 
@@ -17624,33 +18589,40 @@ msgid "Subject or Addresses contains"
 msgstr "Тема или получатели содержат"
 
 #: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Recipients contain"
 msgstr "Получатели содержат"
 
 #: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2088
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Message contains"
 msgstr "Сообщение содержит"
 
 #: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Subject contains"
 msgstr "Тема содержит"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Sender contains"
 msgstr "Отправитель содержит"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2081
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "Body contains"
 msgstr "Тело содержит"
 
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#, fuzzy
+#| msgid "Expression"
+msgid "Free form expression"
+msgstr "Выражение"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1222
+#: ../modules/mail/em-mailer-prefs.c:1550
 msgid "_Table column:"
 msgstr "С_толбец таблицы:"
 
@@ -17701,7 +18673,7 @@ msgid "_Contact"
 msgstr "_Контакт"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Создать новый контакт"
 
@@ -17711,7 +18683,7 @@ msgid "Contact _List"
 msgstr "Список к_онтактов"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Создать новый список контактов"
 
@@ -17721,7 +18693,7 @@ msgid "Address _Book"
 msgstr "Адресная кн_ига"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Создать новую адресную книгу"
 
@@ -17734,265 +18706,265 @@ msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:578
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Сохранить как vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "_Копировать все контакты…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Копировать контакты из выбранной адресной книги в другую книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "_Удалить адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Удалить выбранную адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Пере_местить все контакты…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Переместить контакты из выбранной адресной книги в другую книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Новая адресная книга"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "_Свойства адресной книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Показать свойства выбранной адресной книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "О_бновление"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Обновить выделенную адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "_Карта адресной книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "Показывать карту со всеми контактами из выбранной адресной книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
-#: ../modules/calendar/e-task-shell-view-actions.c:758
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Rename..."
 msgstr "Пе_реименовать…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Переименовать выбранную адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Остановить загрузку"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Копировать контакт в…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Копировать выделенные контакты в другую адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "_Удалить контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Найти в контактах…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Поиск текста в отображаемом контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "_Переслать контакт…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Переслать выбранные контакты другому лицу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "_Переместить контакт в…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Переместить выделенные контакты в другую адресную книгу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "Со_здать контакт…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1086
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Соз_дать список контактов…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Открыть контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Просмотреть текущий контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1100
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "Отправить _сообщение контакту…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Отправить сообщение к выбранным контактам"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1109
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
-#: ../modules/calendar/e-task-shell-view-actions.c:823
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "_Preview"
 msgstr "_Предварительный просмотр"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Карта адресной книги"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "_Предварительный просмотр контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Показать окно просмотра контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Показывать _карты"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Показывать карту в окне просмотра контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1198
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Classic View"
 msgstr "_Классический вид"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Показывать предварительный просмотр контактов ниже списка контактов"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Vertical View"
 msgstr "_Вертикальный вид"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 "Показывать предварительный просмотр контакта рядом со списком контактов"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1222
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Прочее"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1232
-#: ../modules/calendar/e-cal-shell-view-actions.c:1755
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
-#: ../modules/mail/e-mail-shell-view-actions.c:2074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Печать всех видимых контактов"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Предварительный просмотр контактов для печати"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1279
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Вывести на печать выделенные контакты"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "С_охранить адресную книгу в формате vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1296
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Сохранить контакты из выбранной адресной книги в формате vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1302
-#: ../modules/addressbook/e-book-shell-view-actions.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Сохранить как vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1304
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Сохранить выделенные контакты как vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "_Переслать контакты"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "_Переслать контакт"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Отправить сообщение контактам"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Отправить сообщение в список"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Отправить сообщение контакту"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -18002,17 +18974,17 @@ msgstr ""
 "\n"
 "Это восстановит все ваши личные данные, параметры фильтров и т. п."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Восстановить из резервной копии:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Выберите файл резервной копии для восстановления"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Восстановление из резервной копии"
@@ -18030,8 +19002,8 @@ msgid "Select name of the Evolution backup file to restore"
 msgstr "Выберите файл резервной копии для восстановления"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "Пе_резапустить Evlution после восстановления"
+msgid "Re_start Evolution after restore"
+msgstr "Пере_запустить Evolution после восстановления"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
@@ -18049,106 +19021,106 @@ msgstr "_Восстановить данные Evolution…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Восстановить данные и параметры Evolution из архивного файла"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Сделать резервную копию каталога Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Восстановить каталог Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Проверить резервную копию Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Перезапустить Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "С графическим интерфейсом"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:289
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Останавливается Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:298
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Сохранение и восстановление данных и параметров Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Сохранение данных Evolution (писем, контактов, календарей, задач, заметок)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Резервное копирование завершено"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
-#: ../modules/backup-restore/evolution-backup-tool.c:670
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Перезапуск Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:489
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Сделать резервную копию текущих данных Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:496
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Извлечение файлов из резервной копии"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Загрузка настроек Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:644
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Удаление временных файлов резервной копии"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:655
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Перезагрузка службы регистрации"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:884
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 msgid "Evolution Back Up"
 msgstr "Резервная копия Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:885
+#: ../modules/backup-restore/evolution-backup-tool.c:868
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Архивация данных в каталог %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 msgid "Evolution Restore"
 msgstr "Восстановление Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:873
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Восстановление из каталога %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:959
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Backing up Evolution Data"
 msgstr "Резервное копирование данных Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:960
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Подождите, пока Evolution выполняет резервное копирование ваших данных."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:962
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Restoring Evolution Data"
 msgstr "Восстановление данных Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:963
+#: ../modules/backup-restore/evolution-backup-tool.c:946
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Подождите, пока Evolution восстанавливает ваши данные."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:985
+#: ../modules/backup-restore/evolution-backup-tool.c:968
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Это может занять некоторое время, зависящее от объёма данных в вашей учётной "
@@ -18175,8 +19147,8 @@ msgstr ""
 "Evolution. Сохраните все данные перед продолжением."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Закрыть и сделать резервную копию Evolution"
+msgid "Close and _Back up Evolution"
+msgstr "Закрыть и сделать _резервную копию Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -18197,8 +19169,8 @@ msgstr ""
 "настроек из резервной копии."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Закрыть и восстановить Evolution"
+msgid "Close and _Restore Evolution"
+msgstr "Закрыть и _восстановить Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -18208,94 +19180,99 @@ msgstr "Недостаточно прав доступа"
 msgid "The selected folder is not writable."
 msgstr "Выделенная папка недоступна для записи."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Сбой при порождении процесса Bogofilter (%s):"
+msgstr "Не удалось породить процесс Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "Сбой при направлении содержимого сообщения Bogofilter:"
+msgstr "Не удалось направить содержимое почтового сообщения в Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 "Bogofilter завершился с ошибкой или во время обработки сообщения произошёл "
 "сбой"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Параметры Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Преобразовывать текст сообщения в _Юникод"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "Фильтр спама с помощью Bogofilter"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr "Стандартный порт LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP через SSL (устарело)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr "Глобальный каталог Microsoft"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Глобальный каталог Microsoft через SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr "Переподключение к LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Сведения о сервере"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (рекомендуется)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Шифрование:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Проверка подлинности"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "Используя адрес эл. почты"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr "Используя уникальное имя"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18306,36 +19283,36 @@ msgstr ""
 "использования анонимного доступа к вашему серверу LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr "Использование LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Поиск"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "База поиска:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Найти возможные базы поиска"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "Один уровень"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Поддерево"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Диапазон поиска:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -18347,28 +19324,28 @@ msgstr ""
 "каталогом начала поиска. Глубина поиска «один уровень» включает в себя "
 "элементы на один уровень ниже каталога начала поиска."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Фильтр поиска:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Загрузка"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Ограничение:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "контакты"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr "Просматривать, пока не достигнуто ограничение"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
@@ -18377,61 +19354,38 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Избегать IfMatch (требуется для сервера Apache версии < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "Ошибка HTTP: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
-msgid "Could not parse response"
-msgstr "Не удалось разобрать ответ"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
-msgid "Empty response"
-msgstr "Ответ пуст"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
-msgid "Unexpected reply from server"
-msgstr "Неожиданный ответ от сервера"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
-msgid "Could not locate user's calendars"
-msgstr "Не удалось найти календари пользователя."
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
-msgid "Path"
-msgstr "Путь"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
 msgid "Choose a Calendar"
 msgstr "Выберите календарь"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
 msgid "Choose a Memo List"
 msgstr "Выберите список заметок"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
 msgid "Choose a Task List"
 msgstr "Выберите список задач"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Найти календари"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr "Найти списки заметок"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr "Найти списки задач"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "Эл. почта:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr "Сервер обрабатывает приглашения на встречи"
 
@@ -18439,40 +19393,31 @@ msgstr "Сервер обрабатывает приглашения на вст
 msgid "Choose which address books to use."
 msgstr "Выберите используемую адресную книгу."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Использовать в календаре дней рождений и годовщин"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Календарь пользователя по умолчанию"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Введите пароль Google для «%s»."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "Пользователь отклонил предоставление пароля"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Использовать существующий файл iCalendar (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "Файл iCalendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Выберите файл iCalendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Файл:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Разрешить Evolution обновлять файл"
 
@@ -18483,52 +19428,123 @@ msgstr "Разрешить Evolution обновлять файл"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "по Фаренгейту (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "по Цельсию (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "по Кельвину (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Единицы:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "_Импорт"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "Импорт события"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "Импорт заметки"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "Импорт задачи"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
-msgstr "Выбор календаря"
+msgstr "Выберите календарь"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "Выберите список заметок"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
-msgstr "Выбор списка задач"
+msgstr "Выберите список задач"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "_Импортировать в календарь"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "_Импортировать в задачи"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "_Импортировать в список заметок"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "_Импортировать в список задач"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Создать календарь"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Создать список заметок"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Создать список задач"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+msgid "Copying an event into the calendar '%s'"
+msgstr "Копирование события в календарь «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+msgid "Moving an event into the calendar '%s'"
+msgstr "Перемещение события в календарь «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Копирование заметки в список заметок «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Перемещение заметки в список заметок «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+msgid "Copying a task into the task list '%s'"
+msgstr "Копирование задачи в список задач «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+msgid "Moving a task into the task list '%s'"
+msgstr "Перемещение задачи в список задач «%s»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Выбор календаря"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Выбор списка заметок"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Выбор списка задач"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
@@ -18572,7 +19588,7 @@ msgstr "10 минут"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
-msgstr "05 минут"
+msgstr "5 минут"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
@@ -18592,14 +19608,14 @@ msgstr "Формат времени:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
-msgstr "_12-часовой"
+msgstr "_12-часовой (д.п./п.п.)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24-часовой"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Рабочая неделя"
 
@@ -18655,13 +19671,9 @@ msgstr "Вс_к"
 msgid "Day _ends:"
 msgstr "_Конец дня:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Сигналы"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Запрашивать подтверждение при удалении элементов"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "Параметры отображения"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -18687,138 +19699,131 @@ msgstr "Выделять в календаре курсивом по_вторя
 msgid "Sc_roll Month View by a week"
 msgstr "Л_истать обзор месяца по неделям"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Сигналы"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Запрашивать подтверждение при удалении элементов"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Вид"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Список задач"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Выделять _задачи, истекающие сегодня"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Выделять _просроченные задачи"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Скрывать выполненные задачи через"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Показывать напоминатели только в о_бласти уведомлений"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "Показы_вать напоминание"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "Показ_ывать напоминание"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "перед каждым юбилеем/днём рождения"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Выберите календари для уведомления"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Сервер «свободен/занят» по умолчанию"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Шаблон:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u и %d будут заменены на пользователя и домен из адреса электронной почты."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "Информация о публикации"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
-msgid "New Calendar"
-msgstr "Создать календарь"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ежедневная встреча"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
-#: ../modules/calendar/e-cal-shell-backend.c:712
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Открывается календарь «%s»"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Выбор календаря"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Печать"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Свойства календаря"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -18829,355 +19834,351 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Очистить события старше, чем"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:576
-msgid "Copying Items"
-msgstr "Копирование элементов"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:869
-msgid "Moving Items"
-msgstr "Перемещение элементов"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+msgid "Making an occurrence movable"
+msgstr "Сделать это вхождение перемещаемым"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1202
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "событие"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1204
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:518
-#: ../modules/calendar/e-task-shell-view-actions.c:635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Сохранить как iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Копировать…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "_Удалить календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Удалить выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Вперёд"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Выделить сегодняшний день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Выделить _дату"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Выделить указанную дату"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "_Создать календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "О_чистить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Очистить старые встречи и собрания"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Обновить выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Переименовать выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "Найти _следующее"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Найти следующее совпадение с текущей строкой поиска"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "Найти _предыдущее"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Найти предыдущее совпадение с текущей строкой поиска"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "_Остановить запущенный поиск"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Остановить выполняемый поиск"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "_Показывать только этот календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ировать в календарь…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "_Поручить собрание…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "_Удалить встречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Удалить выделенные встречи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "_Удалить это вхождение"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Удалить это вхождение"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "_Удалить все вхождения"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Удалить все вхождения"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "_Создать ежедневное событие…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Создать новое ежедневное событие"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Создать _собрание…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Создать новое собрание"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Пере_местить в календарь…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Создать _встречу…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать это вхождение пере_мещаемым"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Открыть встречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Просмотреть текущую встречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Преобразовывает встречу в собрание"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "_Преобразовать во встречу…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Преобразовывает собрание во встречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Выйти"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "День"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Показывать день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Список"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Показывать в виде списка"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Месяц"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Показывать месяц"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Неделя"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Показывать неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Показывать рабочую неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Активные встречи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Встречи на следующую неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Происходит менее 5 раз"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1769
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Описание содержит"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1776
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Сводка содержит"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1786
-#: ../modules/calendar/e-cal-shell-view-actions.c:1800
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "Печать…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Вывести на печать этот календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Предварительный просмотр календаря для печати"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1817
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:837
-#: ../modules/calendar/e-task-shell-view-actions.c:1036
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "_Сохранить как iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Перейти к"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:516
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "заметка"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "_Создать заметку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Создать новую заметку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Открыть заметку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Просмотреть выделенные заметки"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:662
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Печать выделенной заметки"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Поиск следующего совпадающего события"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Поиск предыдущего совпадающего события"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -19185,7 +20186,7 @@ msgstr[0] "Не удалось найти совпадающего событи
 msgstr[1] "Не удалось найти совпадающего события в %d будущих годах"
 msgstr[2] "Не удалось найти совпадающего события в %d будущих годах"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -19193,7 +20194,7 @@ msgstr[0] "Не удалось найти совпадающего событи
 msgstr[1] "Не удалось найти совпадающего события в %d предыдущих годах"
 msgstr[2] "Не удалось найти совпадающего события в %d предыдущих годах"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Невозможно выполнить поиск без выбранного календаря"
 
@@ -19201,179 +20202,165 @@ msgstr "Невозможно выполнить поиск без выбранн
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "задача"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "О_тметить как выполненное"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Пометить выделенные задачи как выполненные"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "По_метить как невыполненные"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Пометить выделенные задачи как невыполненные"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "Создать _задачу"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Открыть задачу"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Показать выделенную задачу"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Печать выделенной задачи"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-msgid "New Memo List"
-msgstr "Создать список заметок"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "За_метка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Общая заме_тка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Создать новую общую заметку"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "С_писок заметок"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Создать новый список заметок"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Открывается список заметок «%s»"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Выбор списка заметок"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Вывести на печать заметки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Свойства списка заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "_Удалить заметку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Найти в заметке…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Поиск текста в отображаемой заметке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "_Удалить список заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Удалить список выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Создать список заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Обновить список выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Переименовать список выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "_Показывать только этот список заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:720
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "_Предварительный просмотр заметки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:722
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Показывать панель предварительного просмотра заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr ""
 "Показывать панель предварительного просмотра заметок под списком заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr ""
 "Показывать панель предварительного просмотра заметок рядом со списком заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Распечатать список заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Предварительный просмотр списка заметок для печати"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Удалить заметки"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Удалить заметку"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -19381,60 +20368,46 @@ msgstr[0] "%d заметка"
 msgstr[1] "%d заметки"
 msgstr[2] "%d заметок"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:767
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "выделено %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:219
-msgid "New Task List"
-msgstr "Создать список задач"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "З_адача"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Наз_наченная задача"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Список задач"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Открывается список задач «%s»"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Выбор списка задач"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Вывести на печать задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Свойства списка задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -19446,112 +20419,108 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Не задавать больше этот вопрос"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "_Удалить задачу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Найти в задаче…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Поиск текста в отображаемой задаче"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "_Удалить список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Удалить выбранный список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "_Создать список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Обновить выбранный список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Переименовать выделенный список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "_Показывать только этот список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "От_метить как невыполненные"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Удалить выполненные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:884
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "_Предварительный просмотр задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:886
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Показывать панель предварительного просмотра задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Показывать панель предварительного просмотра задач под списком задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr ""
 "Показывать панель предварительного просмотра задач рядом со списком задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Активные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Завершённые задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи на следующую неделю"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Просроченные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Задачи с вложениями"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Распечатать список задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Предварительный просмотр списка задач для печати"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Удалить задачи"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Удалить задачу"
 
-#: ../modules/calendar/e-task-shell-view-private.c:652
-msgid "Expunging"
-msgstr "Очистка папки"
-
-#: ../modules/calendar/e-task-shell-view-private.c:763
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -19643,26 +20612,26 @@ msgstr "%A %l:%M:%S %p"
 #. * without a year.
 #: ../modules/itip-formatter/itip-view.c:315
 msgid "%A, %B %e"
-msgstr "%A, %e %b"
+msgstr "%A, %e %b."
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:321
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %b %H:%M"
+msgstr "%A, %e %b. %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
 #: ../modules/itip-formatter/itip-view.c:325
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %b %H:%M:%S"
+msgstr "%A, %e %b. %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %b %I:%M:%p"
+msgstr "%A, %e %b. %I:%M:%p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
@@ -19673,31 +20642,31 @@ msgstr "%A, %e %b %I:%M:%S %p"
 #. strftime format of a weekday and a date.
 #: ../modules/itip-formatter/itip-view.c:340
 msgid "%A, %B %e, %Y"
-msgstr "%A, %e %b %Y"
+msgstr "%A, %e %b. %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e %b %Y %H:%M"
+msgstr "%A, %e %b. %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
 #: ../modules/itip-formatter/itip-view.c:349
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %e %b %Y %H:%M:%S"
+msgstr "%A, %e %b. %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %e %b %Y %I:%M %p"
+msgstr "%A, %e %b. %Y %I:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
 #: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %e %b %Y %I:%M:%S %p"
+msgstr "%A, %e %b. %Y %I:%M:%S %p"
 
 #: ../modules/itip-formatter/itip-view.c:396
 #: ../modules/itip-formatter/itip-view.c:397
@@ -19929,261 +20898,262 @@ msgstr "%s через %s отменил следующую общую замет
 msgid "%s has canceled the following shared memo:"
 msgstr "%s отменил следующую общую заметку:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:676
 msgid "All day:"
 msgstr "Весь день:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "День начала:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1494
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
 msgid "Start time:"
 msgstr "Время начала:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:691
 msgid "End day:"
 msgstr "День завершения:"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "End time:"
 msgstr "Время завершения:"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Ope_n Calendar"
 msgstr "_Открыть календарь"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Decline all"
 msgstr "_Отклонить все"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1047
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1050
 msgid "_Tentative all"
 msgstr "_Неопределённые все"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1053
 msgid "_Tentative"
 msgstr "_Неопределённое"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1056
 msgid "Acce_pt all"
 msgstr "Принять _все"
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1059
 msgid "Acce_pt"
 msgstr "_Принять"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1062
 msgid "Send _Information"
 msgstr "_Отправить сведения"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1065
 msgid "_Update Attendee Status"
 msgstr "_Обновить состояние участника"
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1068
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "_Обновить"
 
-#: ../modules/itip-formatter/itip-view.c:1497
-#: ../modules/itip-formatter/itip-view.c:1545
-#: ../modules/itip-formatter/itip-view.c:1616
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
 msgid "Comment:"
 msgstr "Комментарий:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1533
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Send reply to sender"
 msgstr "Отправить ответ отправителю"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1571
 msgid "Send _updates to attendees"
 msgstr "Отправить о_бновления к участникам"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1551
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Apply to all instances"
 msgstr "П_рименить ко всем записям"
 
-#: ../modules/itip-formatter/itip-view.c:1552
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Show time as _free"
 msgstr "Показать время как _свободное"
 
-#: ../modules/itip-formatter/itip-view.c:1553
+#: ../modules/itip-formatter/itip-view.c:1576
 msgid "_Preserve my reminder"
 msgstr "_Сохранять сигналы"
 
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1577
 msgid "_Inherit reminder"
 msgstr "Нас_ледовать напоминание"
 
-#: ../modules/itip-formatter/itip-view.c:1884
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: ../modules/itip-formatter/itip-view.c:1887
+#: ../modules/itip-formatter/itip-view.c:1914
 msgid "_Memos:"
 msgstr "_Заметки:"
 
-#: ../modules/itip-formatter/itip-view.c:3115
+#: ../modules/itip-formatter/itip-view.c:3220
 msgid "Sa_ve"
 msgstr "_Сохранить"
 
-#: ../modules/itip-formatter/itip-view.c:3575
-#: ../modules/itip-formatter/itip-view.c:5022
+#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:5131
 msgid "Attendee status updated"
 msgstr "Статус участника обновлён"
 
-#: ../modules/itip-formatter/itip-view.c:3754
+#: ../modules/itip-formatter/itip-view.c:3862
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Встреча в календаре «%s» конфликтует с этим собранием"
 
-#: ../modules/itip-formatter/itip-view.c:3783
+#: ../modules/itip-formatter/itip-view.c:3891
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Встреча найдена в календаре «%s»"
 
-#: ../modules/itip-formatter/itip-view.c:3896
+#: ../modules/itip-formatter/itip-view.c:4004
 msgid "Unable to find any calendars"
 msgstr "Не удалось найти ни одного календаря"
 
-#: ../modules/itip-formatter/itip-view.c:3904
+#: ../modules/itip-formatter/itip-view.c:4012
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не удалось найти эту встречу ни в одном календаре"
 
-#: ../modules/itip-formatter/itip-view.c:3909
+#: ../modules/itip-formatter/itip-view.c:4017
 msgid "Unable to find this task in any task list"
 msgstr "Не удалось найти эту задачу ни в одном списке задач"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4022
 msgid "Unable to find this memo in any memo list"
 msgstr "Не удалось найти эту заметку ни в одном списке заметок"
 
-#: ../modules/itip-formatter/itip-view.c:4258
+#: ../modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait..."
 msgstr "Открытие календаря. Подождите…"
 
-#: ../modules/itip-formatter/itip-view.c:4263
+#: ../modules/itip-formatter/itip-view.c:4372
 msgid "Searching for an existing version of this appointment"
 msgstr "Поиск существующей версии этой встречи"
 
-#: ../modules/itip-formatter/itip-view.c:4658
+#: ../modules/itip-formatter/itip-view.c:4767
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не удалось отправить элемент в календарь «%s».  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4673
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Отправлен в календарь «%s» как принятый"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Отправлен в календарь «%s» как пробный"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4793
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Отправлен в календарь «%s» как отклонённый"
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4799
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Отправлен в календарь «%s» как отменённый"
 
-#: ../modules/itip-formatter/itip-view.c:4711
-#: ../modules/itip-formatter/itip-view.c:5168
-#: ../modules/itip-formatter/itip-view.c:5274
+#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:5384
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Сохранение изменений в календаре. Подождите…"
 
-#: ../modules/itip-formatter/itip-view.c:4752
+#: ../modules/itip-formatter/itip-view.c:4861
 msgid "Unable to parse item"
 msgstr "Не удалось разобрать элемент"
 
-#: ../modules/itip-formatter/itip-view.c:4945
+#: ../modules/itip-formatter/itip-view.c:5054
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор удалил представителя %s "
 
-#: ../modules/itip-formatter/itip-view.c:4962
+#: ../modules/itip-formatter/itip-view.c:5071
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Представителю отправлено сообщение об отмене"
 
-#: ../modules/itip-formatter/itip-view.c:4966
+#: ../modules/itip-formatter/itip-view.c:5075
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Невозможно отправить уведомление об отмене представителю"
 
-#: ../modules/itip-formatter/itip-view.c:5014
+#: ../modules/itip-formatter/itip-view.c:5123
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не удалось обновить участника. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5057
+#: ../modules/itip-formatter/itip-view.c:5167
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Встреча является некорректной и не может быть обновлена"
 
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:5243
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса"
 
-#: ../modules/itip-formatter/itip-view.c:5205
-#: ../modules/itip-formatter/itip-view.c:5244
+#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5354
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: ../modules/itip-formatter/itip-view.c:5307
+#: ../modules/itip-formatter/itip-view.c:5417
 msgid "Meeting information sent"
 msgstr "Информация о собрании послана"
 
-#: ../modules/itip-formatter/itip-view.c:5312
+#: ../modules/itip-formatter/itip-view.c:5422
 msgid "Task information sent"
 msgstr "Информация о задаче послана"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5427
 msgid "Memo information sent"
 msgstr "Информация о заметке послана"
 
-#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5438
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Не удалось послать информацию о встрече, встреча не существует"
 
-#: ../modules/itip-formatter/itip-view.c:5333
+#: ../modules/itip-formatter/itip-view.c:5443
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не удалось послать информацию о задаче, задача не существует"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5448
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Не удалось послать информацию о заметке, заметка не существует"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5403
+#: ../modules/itip-formatter/itip-view.c:5513
 msgid "calendar.ics"
 msgstr "календарь.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5408
+#: ../modules/itip-formatter/itip-view.c:5518
 msgid "Save Calendar"
 msgstr "Сохранить календарь"
 
-#: ../modules/itip-formatter/itip-view.c:5457
-#: ../modules/itip-formatter/itip-view.c:5470
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
 msgid "The calendar attached is not valid"
 msgstr "Вложенный календарь недействителен"
 
-#: ../modules/itip-formatter/itip-view.c:5458
-#: ../modules/itip-formatter/itip-view.c:5471
+#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5581
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -20191,15 +21161,15 @@ msgstr ""
 "Это сообщение претендует, что содержит календарь, но календарь не является "
 "действительным iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5513
-#: ../modules/itip-formatter/itip-view.c:5543
-#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
 msgid "The item in the calendar is not valid"
 msgstr "Элемент в календаре недействителен"
 
-#: ../modules/itip-formatter/itip-view.c:5514
-#: ../modules/itip-formatter/itip-view.c:5544
-#: ../modules/itip-formatter/itip-view.c:5645
+#: ../modules/itip-formatter/itip-view.c:5624
+#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5755
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -20207,11 +21177,11 @@ msgstr ""
 "Это сообщение содержит календарь, но календарь не содержит событий, задач "
 "или сведений о занятости."
 
-#: ../modules/itip-formatter/itip-view.c:5559
+#: ../modules/itip-formatter/itip-view.c:5669
 msgid "The calendar attached contains multiple items"
 msgstr "Вложенный календарь содержит несколько элементов"
 
-#: ../modules/itip-formatter/itip-view.c:5560
+#: ../modules/itip-formatter/itip-view.c:5670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -20219,24 +21189,24 @@ msgstr ""
 "Чтобы обработать все эти элементы, файл должен быть сохранен и календарь "
 "должен быть импортирован"
 
-#: ../modules/itip-formatter/itip-view.c:6062
+#: ../modules/itip-formatter/itip-view.c:6172
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Нет"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../modules/itip-formatter/itip-view.c:6188
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: ../modules/itip-formatter/itip-view.c:6238
+#: ../modules/itip-formatter/itip-view.c:6348
 msgid "This meeting recurs"
 msgstr "Эта встреча повторяется"
 
-#: ../modules/itip-formatter/itip-view.c:6241
+#: ../modules/itip-formatter/itip-view.c:6351
 msgid "This task recurs"
 msgstr "Эта задача повторяется"
 
-#: ../modules/itip-formatter/itip-view.c:6244
+#: ../modules/itip-formatter/itip-view.c:6354
 msgid "This memo recurs"
 msgstr "Эта заметка повторяется"
 
@@ -20281,19 +21251,19 @@ msgstr "Форматтер Itip"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Отображает в сообщениях MIME-части «text/calendar»."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Возможности Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "Добавить в учётной записи поддержку _календаря Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "Добавить в учётной записи поддержку к_онтактов Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "Возможно, требуется включить доступ IMAP"
 
@@ -20336,39 +21306,39 @@ msgstr "Выберите каталог очереди mbox"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Настройка"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Сервер:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Порт:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "Метод _шифрования:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS после подключения"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL на соответствующем порту"
 
@@ -20402,19 +21372,19 @@ msgstr ""
 msgid "Send mail also when in offline _mode"
 msgstr "Отправлять почту даже в _автономном режиме"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "_Тип:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Возможности Yahoo!"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "_Добавить в учётную запись календарь и задачи Yahoo!"
 
@@ -20426,388 +21396,389 @@ msgstr[0] "%d вложенное сообщение"
 msgstr[1] "%d вложенных сообщения"
 msgstr[2] "%d вложенных сообщений"
 
-#: ../modules/mail/e-mail-shell-backend.c:348
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "Почтовое сообщ_ение"
 
-#: ../modules/mail/e-mail-shell-backend.c:350
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Создать новое почтовое сообщение"
 
-#: ../modules/mail/e-mail-shell-backend.c:358
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Учётная запись почты"
 
-#: ../modules/mail/e-mail-shell-backend.c:360
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Создать новую почтовую учётную запись"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Почтовая _папка"
 
-#: ../modules/mail/e-mail-shell-backend.c:367
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Создать новую почтовую папку"
 
-#: ../modules/mail/e-mail-shell-backend.c:683
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "Учётные записи"
 
-#: ../modules/mail/e-mail-shell-backend.c:692
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "Настройки почты"
 
-#: ../modules/mail/e-mail-shell-backend.c:701
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Настройки редактора"
 
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Настройки сети"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1003
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Нет"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:749
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Сообщения отмечаются как прочитанные…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Disable Account"
 msgstr "О_тключить учётную запись"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Disable this account"
 msgstr "Отключить эту учётную запись"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Уничтожить безвозвратно все удалённые сообщения во всех папках"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Edit properties of this account"
 msgstr "Изменить свойства учётной записи"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Refresh list of folders of this account"
 msgstr "Обновить список папок этой учётной записи"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr "_Загрузить сообщения для автономной работы"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Загрузить сообщения учётных записей и папок, отмеченных для автономной работы"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Fl_ush Outbox"
 msgstr "Отправить исход_ящие"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To..."
 msgstr "_Копировать папку…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1649
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "Копировать выделенную папку в другую папку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "Безвозвратно удалить эту папку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "E_xpunge"
 msgstr "Уни_чтожить удалённые"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1663
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Уничтожить все сообщения, помеченные как удалённые, в этой папке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Mar_k All Messages as Read"
 msgstr "Пометить сообщения как «_Прочитанные»"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Mark all messages in the folder as read"
 msgstr "Пометить все сообщения в папке как прочитанные"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_Move Folder To..."
 msgstr "Пере_местить папку…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Move the selected folder into another folder"
 msgstr "Переместить выделенную папку в другую папку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "_New..."
 msgstr "_Создать…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Create a new folder for storing mail"
 msgstr "Создать новую папку для сохранения почты"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Change the properties of this folder"
 msgstr "Изменить свойства этой папки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Refresh the folder"
 msgstr "Обновить папку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Change the name of this folder"
 msgstr "Изменить имя этой папки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Select Message _Thread"
 msgstr "Выделить _обсуждение"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Выделить все сообщения в том же обсуждении, что и выделенное сообщение"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message S_ubthread"
 msgstr "Выделить _подветвь обсуждения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all replies to the currently selected message"
 msgstr "Выделить все ответы на выделенное сообщение"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
 msgid "Empty _Trash"
 msgstr "О_чистить корзину"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Убрать все удалённые сообщения из всех учётных записей"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1707
 msgid "_New Label"
 msgstr "_Новая метка"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "N_one"
 msgstr "_Нет"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Manage Subscriptions"
 msgstr "_Управление подписками"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1763
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Подписаться или отказаться от подписки на папки на удалённом сервере"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Send / _Receive"
 msgstr "_Отправить / Получить"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1777
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Send queued items and retrieve new items"
 msgstr "Отправить элементы из очереди и получить новые элементы"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "R_eceive All"
 msgstr "_Получить всё"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Receive new items from all accounts"
 msgstr "Получить новые элементы для всех учётных записей"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "_Send All"
 msgstr "_Отправить всё"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Send queued items in all accounts"
 msgstr "Отправить элементы из очереди для всех учётных записей"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1819
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "Cancel the current mail operation"
 msgstr "Отменить текущую почтовую операцию"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse All _Threads"
 msgstr "Свернуть все о_бсуждения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1826
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "Collapse all message threads"
 msgstr "Свернуть все обсуждения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1831
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "E_xpand All Threads"
 msgstr "_Развернуть все обсуждения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Expand all message threads"
 msgstr "Развернуть все обсуждения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "_Message Filters"
 msgstr "_Фильтры сообщений"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Create or edit rules for filtering new mail"
 msgstr "Создать или исправить правила фильтрации новой почты"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1845
+#: ../modules/mail/e-mail-shell-view-actions.c:1814
 msgid "_Subscriptions..."
 msgstr "_Подписки…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "F_older"
 msgstr "П_апка"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "_Label"
 msgstr "_Метка"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 msgid "C_reate Search Folder From Search..."
 msgstr "Со_здать папку по результатам поиска…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 msgid "Search F_olders"
 msgstr "П_апки поиска"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Create or edit search folder definitions"
 msgstr "Создать или изменить определения папки поиска"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1926
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_New Folder..."
 msgstr "_Создать папку…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1954
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Show Message _Preview"
 msgstr "_Предварительный просмотр сообщения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Show message preview pane"
 msgstr "Показать панель предварительного просмотра сообщений"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1962
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "Show _Deleted Messages"
 msgstr "Показывать _удалённые сообщения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "Show deleted messages with a line through them"
 msgstr "Показывать удалённые сообщения перечёркнутыми"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "_Group By Threads"
 msgstr "_Группировать по обсуждениям"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1972
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "Threaded message list"
 msgstr "Список обсуждений"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1978
+#: ../modules/mail/e-mail-shell-view-actions.c:1947
 msgid "_Unmatched Folder Enabled"
 msgstr "_Папка несовпадающего поиска включена"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../modules/mail/e-mail-shell-view-actions.c:1949
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Переключает папку несовпадающего поиска"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2000
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show message preview below the message list"
 msgstr "Предварительный просмотр сообщения под списком сообщений"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2007
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
 msgid "Show message preview alongside the message list"
 msgstr ""
 "Показывать предварительный просмотр сообщений рядом со списком сообщений"
 
 # This translation and all below should be short
 # to fit window on 800 x 600
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "All Messages"
 msgstr "Все сообщения"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Important Messages"
 msgstr "Важные"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2029
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Last 5 Days' Messages"
 msgstr "За последние 5 дней"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "Messages Not Junk"
 msgstr "Не спам"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "Messages with Attachments"
 msgstr "С вложениями"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2019
 msgid "No Label"
 msgstr "Без метки"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Read Messages"
 msgstr "Прочитанные"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "Unread Messages"
 msgstr "Непрочитанные"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2116
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "Subject or Addresses contain"
 msgstr "Тема или адреса содержат"
 
 # This translation and below will be used
 # in search bar in main window, so it should
 # be shorter
-#: ../modules/mail/e-mail-shell-view-actions.c:2126
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "All Accounts"
 msgstr "всей почте"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2133
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Current Account"
 msgstr "учётной записи"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2140
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Current Folder"
 msgstr "текущей папке"
 
 # This translation and below will be used
 # in search bar in main window, so it should
 # be shorter
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
-msgstr "По всем уч. записям"
+msgstr "По всем учётным записям"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
-msgstr "Поиск по уч. записи"
+msgstr "Поиск по учётной записи"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
-msgstr[0] "выделено %d,"
-msgstr[1] "выделено %d,"
-msgstr[2] "выделено %d,"
+msgstr[0] "выделено %d, "
+msgstr[1] "выделено %d, "
+msgstr[2] "выделено %d, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:987
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -20815,8 +21786,8 @@ msgstr[0] "%d удалённое"
 msgstr[1] "%d удалённых"
 msgstr[2] "%d удалённых"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -20824,7 +21795,7 @@ msgstr[0] "%d спам"
 msgstr[1] "%d спам"
 msgstr[2] "%d спам"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -20832,7 +21803,7 @@ msgstr[0] "%d черновик"
 msgstr[1] "%d черновика"
 msgstr[2] "%d черновиков"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -20840,7 +21811,7 @@ msgstr[0] "%d неотправленное"
 msgstr[1] "%d неотправленных"
 msgstr[2] "%d неотправленных"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -20848,7 +21819,7 @@ msgstr[0] "%d отправленное"
 msgstr[1] "%d отправленных"
 msgstr[2] "%d отправленных"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -20856,7 +21827,7 @@ msgstr[0] "%d непрочитанное, "
 msgstr[1] "%d непрочитанных, "
 msgstr[2] "%d непрочитанных, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -20864,27 +21835,35 @@ msgstr[0] "%d всего"
 msgstr[1] "%d всего"
 msgstr[2] "%d всего"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1074
-msgid "Trash"
-msgstr "Корзина"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1561
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Отправить / Получить"
 
-#: ../modules/mail/em-composer-prefs.c:394
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Выберите папку для добавления"
 
-#: ../modules/mail/em-composer-prefs.c:854
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Папка"
 
-#: ../modules/mail/em-composer-prefs.c:890
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Получатель"
 
-#: ../modules/mail/em-composer-prefs.c:1177
+#: ../modules/mail/em-composer-prefs.c:1192
+msgid "Keep in Outbox"
+msgstr "Сохранить в исходящих"
+
+#: ../modules/mail/em-composer-prefs.c:1193
+msgid "Send immediately"
+msgstr "Отправить сразу же"
+
+#: ../modules/mail/em-composer-prefs.c:1194
+msgid "Send after 5 minutes"
+msgstr "Отправить через 5 минут"
+
+#: ../modules/mail/em-composer-prefs.c:1267
 msgid "Language(s)"
 msgstr "Язык(и)"
 
@@ -20893,17 +21872,14 @@ msgid "On exit, every time"
 msgstr "Каждый раз при выходе"
 
 #: ../modules/mail/em-mailer-prefs.c:80
-#| msgid "On exit, once per day"
 msgid "Once per day"
 msgstr "Один раз в день"
 
 #: ../modules/mail/em-mailer-prefs.c:81
-#| msgid "On exit, once per week"
 msgid "Once per week"
 msgstr "Один раз в неделю"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-#| msgid "On exit, once per month"
 msgid "Once per month"
 msgstr "Один раз в месяц"
 
@@ -20911,20 +21887,20 @@ msgstr "Один раз в месяц"
 msgid "Immediately, on folder leave"
 msgstr "После закрытия папки"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "Заголовок"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:422
 msgid "Contains Value"
 msgstr "Содержит значение"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1224
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Date header:"
 msgstr "З_аголовок даты:"
 
-#: ../modules/mail/em-mailer-prefs.c:1225
+#: ../modules/mail/em-mailer-prefs.c:1553
 msgid "Show _original header value"
 msgstr "Показывать _исходное значение заголовка"
 
@@ -21029,22 +22005,22 @@ msgstr "Показывать в виде HTML"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Показывать сообщение multipart/alternative в виде HTML"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Показывать HTML, если есть"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution выбирает лучшую часть для отображения."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Показывать простой текст, если есть"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -21053,12 +22029,12 @@ msgstr ""
 "Показывать часть с простым текстом, если она есть, иначе Evolution выберет "
 "лучшую часть для отображения."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Всегда показывать простой текст"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -21090,58 +22066,61 @@ msgstr ""
 "Просматривать почтовые сообщения в виде простого текста, даже если они "
 "содержат HTML."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "Сбой при порождении процесса SpamAssassin (%s):"
+msgstr "Не удалось породить процесс SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "Сбой при направлении содержимого почтового сообщения SpamAssassin."
+msgstr "Не удалось направить содержимое почтового сообщения в SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "Не удалось записать «%s» в SpamAssassin:"
+msgstr "Не удалось записать «%s» в SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
-msgstr "Не удалось прочитать вывод из SpamAssassin:"
+msgstr "Не удалось прочитать вывод из SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
-msgstr ""
-"Bogofilter завершился с ошибкой или во время обработки сообщения произошёл "
-"сбой"
+msgstr "SpamAssassin завершился с ошибкой или во время обработки сообщения произошёл сбой"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "Параметры SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "В_ключить удалённые тесты"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Это сделает SpamAssassin более надёжным, но и более медленным."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+msgstr "Фильтр спама с помощью SpamAssassin"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Импорт файлов"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Импортирование отменено."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Импортирование завершено."
 
@@ -21169,11 +22148,11 @@ msgstr "_Форматировать как…"
 msgid "_Other languages"
 msgstr "_Другие языки"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Подсветка текста"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:483
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Синтаксическая подсветка письма"
 
@@ -21362,30 +22341,26 @@ msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
@@ -21464,37 +22439,37 @@ msgstr "Напоминание о вложении"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Напоминает, если вы забыли добавить вложение в почтовое сообщение."
 
-#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Автоматические контакты"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Создавать _записи в адресной книге при отправке сообщений"
 
-#: ../plugins/bbdb/bbdb.c:725
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Выберите адресную книгу для автоматических контактов"
 
-#: ../plugins/bbdb/bbdb.c:742
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Контакты мгновенных сообщений"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:757
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Синхронизировать контактную информацию и изображения из списка собеседников "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:764
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Выберите адресную книгу для списка контактов Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:777
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "_Синхронизировать со списком контактов сейчас"
 
@@ -21623,8 +22598,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Запускать _автоматически при редактировании нового сообщения"
 
-#: ../plugins/external-editor/external-editor.c:466
-#: ../plugins/external-editor/external-editor.c:468
+#: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr "Составлять сообщения во внешнем редакторе"
 
@@ -21865,8 +22840,8 @@ msgstr ""
 "\n"
 "Заголовок: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:394
+#: ../plugins/mail-notification/mail-notification.c:430
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -21876,54 +22851,54 @@ msgstr[2] "Вы получили %d новых сообщений."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "От %s:"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:436
 msgid "New email in Evolution"
 msgstr "Новая почта в Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:471
 #, c-format
 msgid "Show %s"
 msgstr "Показать %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:673
 msgid "_Play sound when a new message arrives"
 msgstr "_Воспроизводить звук при получении сообщений"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Beep"
 msgstr "По_давать гудок"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:718
 msgid "Use sound _theme"
 msgstr "_Использовать звуковую тему"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _file:"
 msgstr "Воспроизводить _файл:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Выбрать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Опове_щать о новых сообщениях только во «Входящих»"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr "Показывать _уведомления при получении сообщений"
 
@@ -21941,7 +22916,25 @@ msgstr "Уведомляет о получении новых почтовых 
 msgid "Created from a mail by %s"
 msgstr "Создано из сообщения от %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Отменить"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "_Правка"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Создать"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -21949,7 +22942,7 @@ msgid ""
 msgstr ""
 "Выделенный календарь уже содержит событие «%s». Изменить старое событие?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -21958,7 +22951,7 @@ msgstr ""
 "Выделенный список задач уже содержит задачу «%s». Хотите изменить старую "
 "задачу?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -21967,7 +22960,7 @@ msgstr ""
 "Выделенный список заметок уже содержит заметку «%s». Хотите изменить старую "
 "заметку?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -21982,7 +22975,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Для преобразования в события выбрано %d писем. Хотите их все добавить?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -21996,7 +22989,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Для преобразования в задачи выбрано %d писем. Хотите их все добавить?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22011,29 +23004,29 @@ msgstr[1] ""
 msgstr[2] ""
 "Для преобразования в заметки выбрано %d писем. Хотите их все добавить?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Хотите продолжить преобразование оставшейся почты?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Нет сводки]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Неверный объект получен от сервера"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "При обработке произошла ошибка: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не удалось открыть календарь. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -22041,7 +23034,7 @@ msgstr ""
 "Выбранный календарь доступен только для чтения, для него нельзя создавать "
 "события. Выберите другой календарь."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -22049,7 +23042,7 @@ msgstr ""
 "Выбранный список задач доступен только для чтения, для него нельзя создавать "
 "задачи. Выберите другой список."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -22057,35 +23050,35 @@ msgstr ""
 "Выбранный список заметок доступен только для чтения, для него нельзя "
 "создавать заметки. Выберите другой список."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr "Создать новую _встречу"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Создать новое событие из выделенного сообщения"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr "Создать за_метку"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "Создать новую заметку из выделенного сообщения"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "Создать _задачу"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "Создать новую задачу из выделенного сообщения"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "Создать _собрание"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "Создать новое собрание из выделенного сообщения"
 
@@ -22265,6 +23258,7 @@ msgid "_Username:"
 msgstr "_Имя пользователя:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Пароль:"
 
@@ -22276,8 +23270,8 @@ msgstr "_Запомнить пароль"
 msgid "Publishing Location"
 msgstr "Адрес для публикации"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Неверный UID источника «%s»"
@@ -22394,15 +23388,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Формат:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Выберите файл назначения"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "_Сохранить как"
 
@@ -22428,34 +23422,38 @@ msgstr ""
 "вида $ORIG[subject], $ORIG[from], $ORIG[to] или $ORIG[body], которые будут "
 "заменены значениями из письма, на которое вы отвечаете."
 
-#: ../plugins/templates/templates.c:1199
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Нет заголовка"
 
-#: ../plugins/templates/templates.c:1308
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Сохранить как _шаблон"
 
-#: ../plugins/templates/templates.c:1310
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Сохранить как шаблон"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr "Выполняется выход из сети…"
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr "Выполняется вход в сеть…"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr "Подготовка к выходу"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr "Подготовка к выходу…"
 
+#: ../shell/e-shell.c:915
+msgid "Credentials are required to connect to the destination host."
+msgstr "Необходимы учётные данные для подключения к целевому хосту."
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Поиски"
@@ -22470,13 +23468,13 @@ msgstr "Сохранить результаты поиска"
 #. * "Important Messages", or "Active Appointments".
 #: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
-msgstr "По_казывать: "
+msgstr "По_казывать:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
-msgstr "По_иск: "
+msgstr "По_иск:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
@@ -22492,165 +23490,171 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Все файлы (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Запоминается состояния пользовательского интерфейса"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob df ru>\n"
-"Dmitry Mastrukov  <dmitry taurussoft org>\n"
+"Dmitry Mastrukov <dmitry taurussoft org>\n"
 "Leonid Kanter <leon asplinux ru>\n"
-"Michael Yakhontov <mvy asplinux ru>"
+"Michael Yakhontov <mvy asplinux ru>\n"
+"Stas Solovey <whats_up tut by>, 2014, 2015."
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Веб-сайт Evolution"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Редактор категорий"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy не установлен."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Не удалось запустить Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "_О приложении"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Открыть руководство пользователя Evolution"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "_Импортировать…"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Импортировать данные из других программ"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Соз_дать окно"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Создать новое окно с этим обзором"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Доступные _категории"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Управление доступными категориями"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "_Быстрая справка"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Показать комбинации клавиш Evolution"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
-msgstr "_Закончить"
+msgstr "_Завершить"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "_Расширенный поиск…"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Создать расширенные параметры поиска"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Очистить текущие параметры поиска"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Изменить сохранённые результаты поиска…"
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Управление сохранёнными параметрами поиска"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Нажмите, чтобы изменить тип поиска"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Найти сейчас"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Выполнить поиск с текущими параметрами"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "_Сохранить поиск…"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Сохранить текущие параметры поиска"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "О_тправить отчёт об ошибке…"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Отправить отчёт об ошибке с помощью Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "Работать _автономно"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Перевести Evolution в автономный режим"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "Работать в _сети"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Перевести Evolution в сетевой режим"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "Панели _инструментов"
 
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Создать"
+
 #: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "П_оиск"
@@ -22779,7 +23783,10 @@ msgstr "Удалить вид: %s"
 msgid "Execute these search parameters"
 msgstr "Выполнить эти параметры поиска"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "Создать"
 
@@ -22889,11 +23896,11 @@ msgstr ""
 "Не удалось запустить Evolution. Может быть запущена другая копия Evolution. "
 "Системная ошибка: %s"
 
-#: ../shell/main.c:497 ../shell/main.c:502
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Почтовый клиент и ежедневник Evolution"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22902,7 +23909,7 @@ msgstr ""
 "%s: --online и --offline не могут использоваться одновременно.\n"
 "  Используйте «%s --help» для получения более подробной информации.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -22949,7 +23956,72 @@ msgstr ""
 "обновления можно попытаться обновить Evolution до версии 2, а затем до "
 "версии 3."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+#, fuzzy
+#| msgid "Unknown background operation"
+msgid "Close Evolution with pending background operations?"
+msgstr "Неизвестное действие, выполняемое в фоновом режиме"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:14
+#, fuzzy
+#| msgid "Waiting..."
+msgid "Keep _Waiting"
+msgstr "Ожидание…"
+
+#: ../shell/shell.error.xml.h:15
+#, fuzzy
+#| msgid "Failed to refresh calendar '{0}'"
+msgid "Failed to get values from '{0}'"
+msgstr "Не удалось обновить календарь «{0}»"
+
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Не удалось переместить событие в календарь «{0}»"
+
+#: ../shell/shell.error.xml.h:17
+#, fuzzy
+#| msgid "Failed to refresh task list '{0}'"
+msgid "Failed to connect to '{0}'"
+msgstr "Не удалось обновить список задач «{0}»"
+
+#: ../shell/shell.error.xml.h:18"
+msgid "_Reconnect"
+msgstr "_Переподключить"
+
+#: ../shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Failed to refresh calendar '{0}'"
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Не удалось обновить календарь «{0}»"
+
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to refresh task list '{0}'"
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Не удалось обновить список задач «{0}»"
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr ""
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -22960,101 +24032,305 @@ msgstr ""
 "\n"
 "Изменить доверие сертификата:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Имя сертификата"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Выдан организации"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Выдан подразделению организации"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Серийный номер"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Назначения"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Выпущен кем"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Выдан организацией"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Выдан подразделением организации"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Выдан"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Годен до"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "Отпечаток SHA1"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Отпечаток MD5"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Адрес эл. почты:"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "Выберите сертификат для импортирования…"
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:635
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+#, fuzzy
+#| msgid "Certificate"
+msgid "Backup Certificate"
+msgstr "Сертификат"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+msgid "_File name:"
+msgstr "_Имя файла:"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+msgid "Please select a file..."
+msgstr "Выберите файл…"
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:786
+msgid "_Repeat Password:"
+msgstr "_Повторите пароль:"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr "Пароли не совпадают"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:858
+#, fuzzy
+#| msgid "No email address provided"
+msgid "No file name provided"
+msgstr "Не указан адрес эл. почты"
+
+#: ../smime/gui/certificate-manager.c:862
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Failed to backup key and certificate"
+msgstr "Сбой при импортировании сертификата"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "Выберите сертификат для импортирования…"
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Сбой при импортировании сертификата"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1119
+#, fuzzy
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Никогда"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1333
+#, fuzzy
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "Доверие поставщику сертификата"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1371
+#, fuzzy
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "Никогда"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
+#| msgid "_Full name"
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Полное имя"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1378
+#, fuzzy
+#| msgid ""
+#| "Before trusting this CA for any purpose, you should examine its "
+#| "certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Перед тем как доверять сертификатам этого поставщика для любых назначений, "
+"вам необходимо просмотреть сертификат, его политику и процедуры (если "
+"доступны)."
+
+#: ../smime/gui/certificate-manager.c:1393
+#, fuzzy
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "_Просмотреть сертификат"
+
+#: ../smime/gui/certificate-manager.c:1598
+#, fuzzy
+#| msgid "You have certificates on file that identify these people:"
+msgid "You have certificates on file that identify these mail servers:"
+msgstr ""
+"У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
+
+#: ../smime/gui/certificate-manager.c:1629
+#, fuzzy
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "Имя _списка:"
+
+#: ../smime/gui/certificate-manager.c:1631
+#, fuzzy
+#| msgid "Issued"
+msgid "Issuer"
+msgstr "Выдан"
+
+#: ../smime/gui/certificate-manager.c:1632
+#, fuzzy
+#| msgid "MD5 Fingerprint"
+msgid "Fingerprint"
+msgstr "Отпечаток MD5"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1654
+#, fuzzy
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "_Изменить доверие поставщику"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "Все файлы PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Все файлы с сертификатами почты"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "Все файлы сертификатов CA"
 
@@ -23198,19 +24474,48 @@ msgstr "Подписать"
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Сертификат уже существует"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "Пароль файла PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Введите пароль для файла PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:328
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create export context, err_code: %i"
+msgstr "Не удалось зарезервировать ресурс. Ошибка: %s"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:345
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Не удалось зарезервировать ресурс. Ошибка: %s"
+
+#: ../smime/lib/e-pkcs12.c:363
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "Не удалось зарезервировать ресурс. Ошибка: %s"
+
+#: ../smime/lib/e-pkcs12.c:381
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "Не удалось зарезервировать ресурс. Ошибка: %s"
+
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "Импортированный сертификат"
 
@@ -23285,3 +24590,102 @@ msgstr "С _датой выполнения"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "С _состоянием"
+
+#~ msgid "Web addresses"
+#~ msgstr "Веб-адреса"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Не удалось открыть назначение"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Не удалось создать объект"
+
+#~ msgid "Could not open source"
+#~ msgstr "Не удалось открыть источник"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Невозможно удалить событие из-за ошибки dbus: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Невозможно удалить задачу из-за ошибки dbus: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Невозможно удалить заметку из-за ошибки dbus: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Невозможно удалить элемент из-за ошибки dbus: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Невозможно удалить событие: доступ запрещён"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Невозможно удалить задачу: доступ запрещён"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Невозможно удалить заметку: доступ запрещён"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Невозможно удалить элемент: доступ запрещён"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Невозможно удалить событие из-за ошибки: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Невозможно удалить задачу из-за ошибки: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Невозможно удалить заметку из-за ошибки: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Невозможно удалить элемент из-за ошибки: %s"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Удаление выделенных объектов"
+
+#~ msgid "Selection a file"
+#~ msgstr "Выбор файла"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Неверный код аутентификации (%d)"
+
+#~ msgid "Completed On"
+#~ msgstr "Завершено в"
+
+#~ msgid "is set"
+#~ msgstr "установлено"
+
+#~ msgid "is not set"
+#~ msgstr "не установлено"
+
+#~ msgid "Loading Images"
+#~ msgstr "Загрузка изображений"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "Ошибка HTTP: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Не удалось разобрать ответ"
+
+#~ msgid "Empty response"
+#~ msgstr "Ответ пуст"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Неожиданный ответ от сервера"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Не удалось найти календари пользователя."
+
+#~ msgid "Path"
+#~ msgstr "Путь"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Введите пароль Google для «%s»."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "Пользователь отклонил предоставление пароля"
+
+#~ msgid "Expunging"
+#~ msgstr "Очистка папки"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]