[evolution/wip/webkit2] Updated Kazakh translation



commit 569ed6151f6a751234e266946f574c3cf2494d52
Author: Baurzhan Muftakhidinov <baurthefirst gmail com>
Date:   Fri Sep 4 17:43:49 2015 +0000

    Updated Kazakh translation

 po/kk.po | 5702 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 3072 insertions(+), 2630 deletions(-)
---
diff --git a/po/kk.po b/po/kk.po
index 8fef55e..84003c7 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-03-08 05:19+0000\n"
-"PO-Revision-Date: 2015-03-08 19:29+0500\n"
+"POT-Creation-Date: 2015-09-04 16:32+0000\n"
+"PO-Revision-Date: 2015-09-04 22:42+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
 "Language: kk\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -76,7 +76,7 @@ msgid "This address book will be removed permanently."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Ө_шірмеу"
 
@@ -181,8 +181,8 @@ msgstr ""
 #: ../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:397
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../mail/mail-config.ui.h:57 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:438
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -218,7 +218,7 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr ""
 
@@ -249,9 +249,9 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Contact Editor"
 msgstr ""
 
@@ -318,7 +318,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:1908
+#: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Күнтізбе:"
 
@@ -335,7 +335,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 "Күнтізбе"
 
@@ -407,18 +407,15 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2049
 msgid "Anniversary"
 msgstr ""
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. 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:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2048
 msgid "Birthday"
 msgstr "Туған күні"
 
@@ -474,7 +471,7 @@ msgstr "Жұмыс"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3034
+#: ../calendar/gui/e-cal-model.c:3791
 msgid "Other"
 msgstr "Басқа"
 
@@ -487,234 +484,336 @@ msgid "Notes"
 msgstr "Жазбалар"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+msgid "Add _PGP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../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/e-attachment-view.c:475
+#: ../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:58
+#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../plugins/email-custom-header/email-custom-header.c:849
+#: ../plugins/publish-calendar/publish-calendar.c:791
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "Ө_шіру"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
+#: ../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:1305
+#: ../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:3230
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
+#: ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "Сертификаттар"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 #: ../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:1085
+#: ../shell/e-shell.c:1215 ../shell/e-shell-window-actions.c:955
 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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
 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:3683
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../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/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1332
 #: ../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-activity-bar.c:340
+#: ../calendar/gui/dialogs/recurrence-page.c:2326
+#: ../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:370
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:421
 #: ../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:484 ../e-util/e-html-editor-actions.c:578
+#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
 #: ../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-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-source-selector-dialog.c:372 ../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:3131
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../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: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:900
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:363
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../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/publish-calendar/publish-calendar.c:806
+#: ../plugins/face/face.c:297
+#: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../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: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
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
+#: ../smime/gui/certificate-manager.c:731
+#: ../smime/gui/certificate-manager.c:955
+#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
-#: ../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:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3132
-#: ../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/contact-editor.ui.h:56
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
 msgid "Show Telephone"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Show SIP Address"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
 msgid "Show Instant Messaging"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Show Web Addresses"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Show Job section"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Show Miscellaneous"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Show Home Mailing Address"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "Show Work Mailing Address"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Show Other Mailing Address"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
 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:999
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+msgid "Show Certificates"
+msgstr "Сертификаттарды көрсету"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../e-util/e-html-editor-actions.c:1111
 msgid "_Undo"
 msgstr "Бол_дырмау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
-#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Болдырмау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:985
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1097
 msgid "_Redo"
 msgstr "Қай_талау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Қайтару"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "X.509 сертификаттары"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
+#: ../smime/gui/certificate-manager.c:678
+#: ../smime/gui/certificate-manager.c:967
+msgid "All files"
+msgstr "Барлық файлдар"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open PGP key"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#| msgid "Imported Certificate"
+msgid "Open X.509 certificate"
+msgstr "X.509 сертификатын ашу"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
 #: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:485 ../e-util/e-html-editor-actions.c:579
-#: ../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
+#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "_Ашу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+msgid "Chosen file is not a local file."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, c-format
+msgid "Failed to load certificate: %s"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save X.509 certificate"
+msgstr "X.509 сертификатын сақтау"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+msgid "Failed to save certificate: %s"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 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
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 #: ../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
+#: ../calendar/gui/dialogs/recurrence-page.c:2327
 #: ../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:381 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:436 ../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-source-selector-dialog.c:373 ../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
@@ -723,7 +822,7 @@ msgstr ""
 #: ../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/certificate-manager.c:1336
+#: ../shell/main.c:184 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_ОК"
@@ -847,23 +946,6 @@ msgstr ""
 msgid "Remove an email address from the List"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../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/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 ../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
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "Ө_шіру"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr ""
@@ -943,22 +1025,22 @@ msgid "Copy _Email Address"
 msgstr "Email а_дресін көшіру"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:307
+#: ../e-util/e-web-view.c:338
 msgid "Copy the email address to the clipboard"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view.c:350
 msgid "_Send New Message To..."
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:314
+#: ../e-util/e-web-view.c:352
 msgid "Send a mail message to this address"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:999
+#: ../e-util/e-web-view.c:1064
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
@@ -1055,7 +1137,7 @@ 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
+#: ../modules/calendar/e-cal-shell-view.c:572
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Күнтізбе"
@@ -1283,73 +1365,73 @@ msgstr ""
 msgid "Search Interrupted"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
 #: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "Бұл контактты өшіруді шынымен қалайсыз ба?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../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:1615
-#: ../shell/e-shell-window-actions.c:943
-#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../shell/e-shell-window-actions.c:813
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "Ө_шіру"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1358,13 +1440,12 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr ""
 
@@ -1475,7 +1556,7 @@ msgid "Title"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr ""
@@ -1525,7 +1606,6 @@ msgstr ""
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
@@ -1538,26 +1618,26 @@ msgstr "Үлке_йту"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2293
 msgid "Zoom _Out"
 msgstr "Кі_шірейту"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-actions.c:2090
 #: ../e-util/e-html-editor-find-dialog.c:195
-#: ../shell/e-shell-window-actions.c:1020
+#: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Табу"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
 "Searching for the Contacts..."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1566,7 +1646,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1575,14 +1655,14 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1820,16 +1900,17 @@ msgstr[0] ""
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "күн"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr ""
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 msgid "Appointments"
 msgstr "Тағайындаулар"
 
@@ -1843,18 +1924,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:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 #: ../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/e-html-editor-actions.c:1008
+#: ../e-util/e-html-editor-actions.c:1120
 #: ../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
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
+#: ../plugins/attachment-reminder/attachment-reminder.c:443
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "Тү_зету"
@@ -1868,11 +1949,11 @@ msgid "_Dismiss"
 msgstr "_Елемеу"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1844
-#: ../calendar/alarm-notify/alarm-queue.c:1854
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1627
+#: ../calendar/alarm-notify/alarm-queue.c:1888
+#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1514
+#: ../modules/itip-formatter/itip-view.c:1625
 msgid "Location:"
 msgstr "Орналасуы:"
 
@@ -1909,49 +1990,47 @@ msgstr "сағат"
 msgid "minutes"
 msgstr "минут"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1824
+#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1868
 msgid "No summary available."
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1696
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1723
+#: ../calendar/alarm-notify/alarm-queue.c:1725
 msgid "No description available."
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 msgid "No location information available."
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1711
-#: ../calendar/alarm-notify/alarm-queue.c:1815
-#: ../calendar/alarm-notify/alarm-queue.c:2156
+#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1859
+#: ../calendar/alarm-notify/alarm-queue.c:2214
 msgid "Evolution Reminders"
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1782
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1974
+#: ../calendar/alarm-notify/alarm-queue.c:2032
 msgid "Warning"
 msgstr "Ескерту"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
+#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Жоқ"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2034
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Иә"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1980
+#: ../calendar/alarm-notify/alarm-queue.c:2038
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1962,7 +2041,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1995
+#: ../calendar/alarm-notify/alarm-queue.c:2053
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -2586,24 +2665,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:246 ../calendar/gui/e-cal-model.c:278
-#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
+#: ../calendar/gui/e-cal-model.c:313 ../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:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
 #: ../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:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
 #: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
+#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Құпия"
 
@@ -2620,7 +2699,7 @@ msgstr ""
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
@@ -2634,20 +2713,20 @@ 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:157
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
 msgstr "Салынымдар"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr ""
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr ""
 
@@ -2844,138 +2923,138 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Unable to synchronize with the server"
 msgstr ""
 
 #. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../calendar/gui/dialogs/comp-editor.c:1249
 #: ../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:387 ../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
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
+#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
-#: ../smime/gui/certificate-manager.c:2064
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2066
 msgid "_Close"
 msgstr "_Жабу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr ""
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:964 ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
+#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "_Көшіріп алу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../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:341
-#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
-#: ../shell/e-shell-window-actions.c:931
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:379
+#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:801
 msgid "Copy the selection"
 msgstr "Ерекшелеуді көшіріп алу"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "Қ_иып алу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/dialogs/comp-editor.c:1265 ../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:1322
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1409
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "Ерекшелеуді қиып алу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../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:945
+#: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr ""
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:978 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "Кірі_стіру"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/dialogs/comp-editor.c:1286 ../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:1334
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1421
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "Алмасу буферінен кірістіру"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:441 ../mail/e-mail-reader.c:2262
+#: ../calendar/gui/dialogs/comp-editor.c:1291
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
 #: ../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:1270 ../mail/e-mail-reader.c:2269
+#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
 #: ../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
@@ -2983,158 +3062,158 @@ msgstr "Бас_паға шығару..."
 msgid "Pre_view..."
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 #: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:387
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Барлығын _таңдау"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/dialogs/comp-editor.c:1321 ../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:1043
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1015
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1148
 msgid "_Insert"
 msgstr "_Кірістіру"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Опциялар"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1057 ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "Тү_рі"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:380
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:382 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
 msgid "Attach a file"
 msgstr "Файлды қосып жіберу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "_Санаттар"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "Уақыт _белдеуі"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:2596
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../calendar/gui/dialogs/comp-editor.c:3512
+#: ../calendar/gui/dialogs/comp-editor.c:4525
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../calendar/gui/dialogs/comp-editor.c:4487
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr ""
 
@@ -3144,7 +3223,7 @@ msgid "Validation error: %s"
 msgstr ""
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1940
+#: ../calendar/gui/e-cal-ops.c:1968
 msgid "Destination is read only"
 msgstr ""
 
@@ -3259,7 +3338,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3178
+#: ../calendar/gui/dialogs/event-page.c:3198
 msgid "This event has reminders"
 msgstr ""
 
@@ -3286,60 +3365,57 @@ msgstr ""
 msgid "End date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1525
+#: ../calendar/gui/dialogs/event-page.c:1543
 msgid "Start time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/event-page.c:1551
 msgid "End time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1697
+#: ../calendar/gui/dialogs/event-page.c:1715
 #: ../calendar/gui/dialogs/memo-page.c:771
 #: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/event-page.c:1750
 #: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1938
+#: ../calendar/gui/dialogs/event-page.c:1956
 msgid "_Delegatees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1940
+#: ../calendar/gui/dialogs/event-page.c:1958
 msgid "Atte_ndees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../calendar/gui/dialogs/event-page.c:3478
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../calendar/gui/dialogs/event-page.c:3484
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3470
+#: ../calendar/gui/dialogs/event-page.c:3490
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3511
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3498
+#: ../calendar/gui/dialogs/event-page.c:3518
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Бос"
@@ -3382,8 +3458,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:514
-#: ../e-util/e-html-editor-link-dialog.c:367
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "Ан_ықтамасы:"
 
@@ -3406,7 +3482,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:555
 msgid "Atte_ndees..."
 msgstr ""
 
@@ -3491,7 +3567,7 @@ msgstr ""
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../calendar/gui/dialogs/memo-page.c:1168
 #: ../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
@@ -3566,17 +3642,17 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "on"
 msgstr ""
 
@@ -3584,7 +3660,7 @@ msgstr ""
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "first"
 msgstr "бірінші"
 
@@ -3593,7 +3669,7 @@ msgstr "бірінші"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "second"
 msgstr "секунд"
 
@@ -3601,7 +3677,7 @@ msgstr "секунд"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "third"
 msgstr ""
 
@@ -3609,7 +3685,7 @@ msgstr ""
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fourth"
 msgstr ""
 
@@ -3617,7 +3693,7 @@ msgstr ""
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "fifth"
 msgstr ""
 
@@ -3625,13 +3701,13 @@ msgstr ""
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1185
 msgid "last"
 msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 msgid "Other Date"
 msgstr ""
 
@@ -3639,7 +3715,7 @@ msgstr ""
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1215
 msgid "1st to 10th"
 msgstr ""
 
@@ -3647,7 +3723,7 @@ msgstr ""
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1221
 msgid "11th to 20th"
 msgstr ""
 
@@ -3655,41 +3731,41 @@ msgstr ""
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1227
 msgid "21st to 31st"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Дүйсенбі"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Сейсенбі"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Сәрсенбі"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1257
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Бейсенбі"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1258
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Жұма"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1259
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Сенбі"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../calendar/gui/dialogs/recurrence-page.c:1260
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Жексенбі"
@@ -3697,31 +3773,31 @@ msgstr "Жексенбі"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1391
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "Күн/Уақыт"
 
@@ -3848,7 +3924,7 @@ 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:1643 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/e-cal-model.c:1856 ../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:312
 msgid "Normal"
@@ -3909,7 +3985,7 @@ msgstr "Аяқталған"
 #: ../calendar/gui/e-cal-model-tasks.c:316
 #: ../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
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
 msgid "Canceled"
 msgstr "Бас тартылған"
 
@@ -3999,7 +4075,6 @@ msgstr ""
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] ""
-msgstr[1] ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
@@ -4148,8 +4223,8 @@ msgid "Due Date:"
 msgstr ""
 
 #: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1519
-#: ../modules/itip-formatter/itip-view.c:1636
+#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Қалып-күйі:"
 
@@ -4166,17 +4241,17 @@ msgstr "Сипаттамасы:"
 msgid "Web Page:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-data-model.c:1608
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-data-model.c:1612
+#: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-data-model.c:1616
+#: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr ""
@@ -4190,7 +4265,7 @@ msgid "Start date"
 msgstr "Бастапқы күн"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../calendar/gui/e-meeting-list-view.c:670
 #: ../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
@@ -4202,7 +4277,7 @@ msgstr "Түрі"
 msgid "Completion date"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
 msgid "Complete"
 msgstr "Аяқталды"
 
@@ -4224,8 +4299,8 @@ 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:3088
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-cal-model.c:3845
+#: ../calendar/gui/e-meeting-list-view.c:713
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
 #: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
@@ -4246,51 +4321,51 @@ msgstr "Жасалған"
 msgid "Last modified"
 msgstr "Соңғы рет өзгертілген"
 
-#: ../calendar/gui/e-calendar-view.c:411
+#: ../calendar/gui/e-calendar-view.c:459
 msgid "Cut selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:417
+#: ../calendar/gui/e-calendar-view.c:465
 msgid "Copy selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:423
+#: ../calendar/gui/e-calendar-view.c:471
 msgid "Paste events from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:477
 msgid "Delete selected events"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:810
+#: ../calendar/gui/e-calendar-view.c:859
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
 msgid "Default calendar not found"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
 msgid "Default memo list not found"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
 msgid "Default task list not found"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:918
+#: ../calendar/gui/e-calendar-view.c:969
 msgid "No suitable component found"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:988
+#: ../calendar/gui/e-calendar-view.c:1039
 msgid "Pasting iCalendar data"
 msgstr ""
 
 #. 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:1791 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:796
+#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr ""
@@ -4298,29 +4373,29 @@ msgstr ""
 #. 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:1795 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:800
+#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr ""
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1811
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1862
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../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:1851
+#: ../calendar/gui/e-calendar-view.c:1902
 #, c-format
 msgid "Time: %s %s"
 msgstr ""
 
-#: ../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
+#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2298
 msgid "%d %b %Y"
 msgstr ""
 
@@ -4329,13 +4404,13 @@ msgstr ""
 #. 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-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2308
 msgid "%A %d %b %Y"
 msgstr ""
 
@@ -4345,15 +4420,15 @@ msgstr ""
 #. * %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-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:2262
-#: ../calendar/gui/e-calendar-view.c:2268
-#: ../calendar/gui/e-calendar-view.c:2271
+#: ../calendar/gui/e-calendar-view.c:2315
+#: ../calendar/gui/e-calendar-view.c:2321
+#: ../calendar/gui/e-calendar-view.c:2324
 msgid "%a %d %b %Y"
 msgstr ""
 
@@ -4366,99 +4441,99 @@ msgstr "Басталу күні"
 msgid "End Date"
 msgstr "Аяқталу күні"
 
-#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:319 ../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:3607
-#: ../modules/itip-formatter/itip-view.c:6197
+#: ../modules/itip-formatter/itip-view.c:3604
+#: ../modules/itip-formatter/itip-view.c:6218
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
-#: ../calendar/gui/e-cal-ops.c:1209
+#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
+#: ../calendar/gui/e-cal-ops.c:1232
 #: ../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
+#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
+#: ../calendar/gui/e-cal-ops.c:1349
 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
+#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
+#: ../calendar/gui/e-cal-ops.c:1353
 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
+#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
+#: ../calendar/gui/e-cal-ops.c:1357
 msgid "Creating a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1645
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1647
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../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:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Жоқ"
 
-#: ../calendar/gui/e-cal-model.c:3029
+#: ../calendar/gui/e-cal-model.c:3786
 #: ../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:6185
+#: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "Қабылданған"
 
-#: ../calendar/gui/e-cal-model.c:3030
+#: ../calendar/gui/e-cal-model.c:3787
 #: ../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:6191
+#: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:3031
+#: ../calendar/gui/e-cal-model.c:3788
 #: ../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
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:3032
+#: ../calendar/gui/e-cal-model.c:3789
 #: ../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:6194
+#: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:3033
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-cal-model-calendar.c:151
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Бос"
 
-#: ../calendar/gui/e-cal-model-calendar.c:126
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Бос емес"
 
@@ -4475,163 +4550,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Жоқ"
 
-#: ../calendar/gui/e-cal-ops.c:283
+#: ../calendar/gui/e-cal-ops.c:287
 msgid "Modifying an event"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:291
 msgid "Modifying a memo"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:295
 msgid "Modifying a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:387
+#: ../calendar/gui/e-cal-ops.c:394
 msgid "Removing an event"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:391
+#: ../calendar/gui/e-cal-ops.c:398
 msgid "Removing a memo"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:402
 msgid "Removing a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:484
+#: ../calendar/gui/e-cal-ops.c:493
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:488
+#: ../calendar/gui/e-cal-ops.c:497
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:492
+#: ../calendar/gui/e-cal-ops.c:501
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:692
+#: ../calendar/gui/e-cal-ops.c:704
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:707
+#: ../calendar/gui/e-cal-ops.c:719
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:722
+#: ../calendar/gui/e-cal-ops.c:734
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:820
+#: ../calendar/gui/e-cal-ops.c:833
 msgid "Updating an event"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:824
+#: ../calendar/gui/e-cal-ops.c:837
 msgid "Updating a memo"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:828
+#: ../calendar/gui/e-cal-ops.c:841
 msgid "Updating a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:933
+#: ../calendar/gui/e-cal-ops.c:949
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:937
+#: ../calendar/gui/e-cal-ops.c:953
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:941
+#: ../calendar/gui/e-cal-ops.c:957
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:962
+#: ../calendar/gui/e-cal-ops.c:983
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:966
+#: ../calendar/gui/e-cal-ops.c:987
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:970
+#: ../calendar/gui/e-cal-ops.c:991
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:1068
+#: ../calendar/gui/e-cal-ops.c:1091
 msgid "Purging events"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:1072
+#: ../calendar/gui/e-cal-ops.c:1095
 msgid "Purging memos"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:1076
+#: ../calendar/gui/e-cal-ops.c:1099
 msgid "Purging tasks"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:1178
+#: ../calendar/gui/e-cal-ops.c:1201
 msgid "Expunging completed tasks"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:2034
+#: ../calendar/gui/e-cal-ops.c:2062
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:2035
+#: ../calendar/gui/e-cal-ops.c:2063
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] ""
 
-#: ../calendar/gui/e-cal-ops.c:2042
+#: ../calendar/gui/e-cal-ops.c:2070
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] ""
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2076
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] ""
 
-#: ../calendar/gui/e-cal-ops.c:2049
+#: ../calendar/gui/e-cal-ops.c:2077
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4655,14 +4722,14 @@ msgid ""
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
+#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
+#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4674,13 +4741,13 @@ msgstr ""
 #. * 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:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:3019 ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr ""
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3574
+#: ../calendar/gui/e-day-view.c:3744
 #, c-format
 msgid "Week %d"
 msgstr ""
@@ -4691,27 +4758,27 @@ msgstr ""
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:802
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr ""
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:846
+#: ../modules/calendar/e-calendar-preferences.c:308
+#: ../modules/calendar/e-calendar-preferences.c:360
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Жоқ"
 
-#: ../calendar/gui/e-day-view-time-item.c:878
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:391
 msgid "Select..."
 msgstr "Таңдау..."
 
@@ -4785,11 +4852,11 @@ msgstr ""
 msgid "Needs Action"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:699
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr ""
@@ -4798,90 +4865,90 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1924
+#: ../calendar/gui/e-meeting-store.c:1896
 #: ../plugins/publish-calendar/publish-calendar.c:351
 #: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Парольді енгізіңіз"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:636
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:694
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
 "Location: %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr ""
@@ -4911,45 +4978,45 @@ msgid "Language"
 msgstr "Тіл"
 
 #: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-cal-shell-content.c:1599
 #: ../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:457 ../calendar/gui/e-task-table.c:759
+#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr ""
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr ""
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr ""
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-memo-table.c:702
+#: ../calendar/gui/e-memo-table.c:701
 #: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr ""
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr ""
 
@@ -4970,35 +5037,35 @@ msgstr "%d%%"
 #: ../calendar/importers/icalendar-importer.c:78
 #: ../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-cal-shell-content.c:1559
 #: ../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:999
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-task-table.c:1017
+#: ../calendar/gui/e-task-table.c:1016
 #: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr ""
 
@@ -5131,15 +5198,15 @@ msgstr ""
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../calendar/gui/itip-utils.c:1918
 msgid "Sending an event"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../calendar/gui/itip-utils.c:1922
 msgid "Sending a memo"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../calendar/gui/itip-utils.c:1926
 msgid "Sending a task"
 msgstr ""
 
@@ -6464,7 +6531,7 @@ msgid "Asia/Kashgar"
 msgstr "Азия/Кашгар"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Азия/Катманду"
 
 #: ../calendar/zones.h:243
@@ -7119,181 +7186,176 @@ 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:389
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Ағымдағы файлды жабу"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1208
+#: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Баптаулар"
 
-#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Қалайша с_ақтау..."
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:448
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Баспа а_лдында қарау"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:482
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:488
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:490
+#: ../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:496
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:498
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#| msgid "Unicode"
 msgid "Unicode smileys"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:578
+#: ../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:584
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:547
 msgid "_From Override Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:549
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:671
+#: ../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
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid "_Name:"
 msgstr "_Аты:"
 
@@ -7311,36 +7373,36 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:793
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:817
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:822
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:826
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:834
-#: ../mail/e-mail-config-identity-page.c:505
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:504
 msgid "Si_gnature:"
 msgstr ""
 
@@ -7352,24 +7414,24 @@ msgstr ""
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:872
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:881
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
+#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
 msgid "Compose Message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4568
+#: ../composer/e-msg-composer.c:4710
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
@@ -7493,7 +7555,7 @@ msgstr ""
 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:163
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
 msgid "The reported error was &quot;{0}&quot;."
 msgstr ""
 
@@ -7530,6 +7592,25 @@ msgid ""
 "sending the message, if it was done by an accident, or send the message."
 msgstr ""
 
+#: ../composer/mail-composer.error.xml.h:39
+#| msgid "Are you sure you want to delete this contact?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr ""
+
+#: ../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
+msgid "_Don't lose formatting"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:42
+msgid "Lose _formatting"
+msgstr ""
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr ""
@@ -7538,13 +7619,13 @@ msgstr ""
 msgid "Calendar event notifications"
 msgstr ""
 
-#: ../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:1092
 #: ../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:81
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
 msgid "Groupware Suite"
 msgstr ""
 
@@ -7696,6 +7777,10 @@ msgstr ""
 msgid "Whether to show notes in the editor"
 msgstr ""
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr ""
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr ""
@@ -7812,488 +7897,582 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "The second timezone for a Day View"
+msgid "Workday start time for Monday"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
 msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
 msgid "Number of units for determining a default reminder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid "Default reminder units"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Time the last reminder ran, in time_t"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Programs that are allowed to be run by reminders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show display reminders in notification tray"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Show reminders for completed tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "Уақыт белдеуі"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a default reminder for appointments"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Tuesday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Wednesday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Thursday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Friday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Saturday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) Work days"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -8643,221 +8822,240 @@ msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Save file format for drag-and-drop operation"
+msgid ""
+"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Can be either 'mbox' or 'pdf'."
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Show image animations"
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
+"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer's toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Show image animations"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable magic space bar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Citation highlight color"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Citation highlight color."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Default charset in which to display messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Default charset in which to display messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show Animations"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show all message headers"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show all the headers when viewing a messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "List of headers to show when viewing a message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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 "
 "when viewing a message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show photo of the sender"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Search gravatar.com for photo of the sender"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Mark as Seen always after specified timeout"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Timeout for marking messages as seen"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Sender email-address column in the message list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:96
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable Unmatched search folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Height 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 "Height of the message-list pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Width of the message-list pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Width of the message-list pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "Жайма стилі"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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 "
@@ -8865,86 +9063,96 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Variable width font"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The variable width font for mail display."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "The terminal font for mail display."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Use custom fonts"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Use custom fonts for displaying mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default value for thread expand state"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
 "restart."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -8952,138 +9160,138 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Log filter actions"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default forward style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Default reply style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when emptying the trash"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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 "
 "the search results."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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 "
@@ -9091,11 +9299,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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 "
@@ -9103,152 +9311,174 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying privately to list messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when replying to many recipients"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+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:175
+msgid "Prompt when sending to many To and CC recipients"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"'composer-many-to-cc-recips-num' defines the threshold."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Last time Empty Trash was run"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Level beyond which the message should be logged."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
 "format and local time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Empty Junk folders on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Last time Empty Junk was run"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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 "
 "to the other available plugins."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 "
@@ -9256,96 +9486,96 @@ msgid ""
 "autocompletion."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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 "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
 "checking speed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "UID string of the default account."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Save directory"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Directory for saving mail component files."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Composer load/attach directory"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Directory for loading/attaching files to composer."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Check for new messages on start"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Check for new messages in all active accounts"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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 "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Server synchronization interval"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Allow expunge in virtual folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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 "
@@ -9353,63 +9583,74 @@ msgid ""
 "for deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) Default forward style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) Default reply style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9674,7 +9915,7 @@ msgstr ""
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:324
 msgid "Start in offline mode"
 msgstr ""
 
@@ -9784,16 +10025,15 @@ msgid ""
 "arguments."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../em-format/e-mail-formatter-attachment.c:424
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../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"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr ""
 
@@ -9839,8 +10079,6 @@ msgstr ""
 #: ../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:1301
-#: ../modules/cal-config-google/e-google-chooser.c:1303
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Аты"
@@ -9850,19 +10088,19 @@ msgstr "Аты"
 msgid "Size"
 msgstr "Өлшемі"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-formatter-quote-headers.c:180
 #: ../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
+#: ../smime/gui/certificate-manager.c:1632
 msgid "Subject"
 msgstr "Тақырыбы"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1166
+#: ../modules/mail/em-mailer-prefs.c:1484
 msgid "Mailer"
 msgstr ""
 
@@ -9877,18 +10115,18 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:361
+#: ../em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-actions.c:1526
 msgid "Plain Text"
 msgstr "Ашық мәтін"
 
@@ -9990,7 +10228,7 @@ msgid ""
 msgstr ""
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr ""
 
@@ -10023,7 +10261,6 @@ msgid "GPG signed"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-utils.c:570
-#| msgid "Encrypt"
 msgid "GPG encrypted"
 msgstr ""
 
@@ -10032,12 +10269,11 @@ msgid "S/MIME signed"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-utils.c:582
-#| msgid "MIME Type:"
 msgid "S/MIME encrypted"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:736
+#: ../mail/e-mail-config-security-page.c:748
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
@@ -10115,8 +10351,8 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
+#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Күні"
@@ -10186,12 +10422,12 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1779
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
 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 ""
 
@@ -10199,11 +10435,11 @@ msgstr ""
 msgid "Failed to create a thread: "
 msgstr ""
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Таңбашалар көрінісі"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Тізім көрінісі"
 
@@ -10211,58 +10447,58 @@ msgstr "Тізім көрінісі"
 #. * 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:1197
+#: ../e-util/e-attachment.c:1223
 msgid "Attached message"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
 msgid "Operation was cancelled"
 msgstr "Әрекеттен бас тартылды"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+#: ../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 ""
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../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:2353 ../e-util/e-attachment.c:3402
+#: ../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:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2761
+#: ../e-util/e-attachment.c:2809
 #, c-format
 msgid "Could not open '%s'"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr ""
@@ -10305,7 +10541,7 @@ msgstr "Сақталуда"
 msgid "Hide Attachment _Bar"
 msgstr ""
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr ""
 
@@ -10338,61 +10574,78 @@ msgstr ""
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:451
 #: ../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:461
 msgid "A_dd Attachment..."
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:417
+#: ../e-util/e-attachment-view.c:468
 #: ../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:1580
-#: ../modules/mail/e-mail-shell-view-actions.c:1651
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "Қас_иеттері"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "Жа_сыру"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:785
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:515
+msgid "Zoom the image to its natural size"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:520
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:522
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:880
 #, c-format
 msgid "Open With \"%s\""
 msgstr "\"%s\" көмегімен ашу"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:883
 #, c-format
 msgid "Open this attachment in %s"
 msgstr ""
@@ -10410,7 +10663,7 @@ msgid "Copy book content locally for offline operation"
 msgstr ""
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../e-util/e-buffer-tagger.c:412
 msgid "Ctrl-click to open a link"
 msgstr ""
 
@@ -10435,19 +10688,19 @@ 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
+#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1325
+#: ../e-util/e-calendar-item.c:1324
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1362
+#: ../e-util/e-calendar-item.c:1361
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr ""
@@ -10468,15 +10721,15 @@ msgstr ""
 msgid "Color:"
 msgstr "Түс:"
 
-#: ../e-util/e-cal-source-config.c:405
+#: ../e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
 msgstr ""
 
-#: ../e-util/e-cal-source-config.c:409
+#: ../e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 
-#: ../e-util/e-cal-source-config.c:413
+#: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
 msgstr ""
 
@@ -10543,33 +10796,34 @@ msgstr ""
 msgid "popup list"
 msgstr ""
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+#: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2033
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../e-util/e-cell-date-edit.c:303
 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
+#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
 #: ../modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../modules/itip-formatter/itip-view.c:223
+#: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Бүгін"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "Бос"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "ОК"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -10667,7 +10921,7 @@ msgstr ""
 msgid "Other..."
 msgstr "Басқалар..."
 
-#: ../e-util/e-client-cache.c:1266
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
@@ -10838,63 +11092,63 @@ msgstr "ақ"
 
 #: ../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:3858
-#: ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
+#: ../mail/mail-config.ui.h:72
 msgid "Default"
 msgstr "Стандартты"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Күн және уақыт"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:629
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Уақыт"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "Бү_гін"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:719
 msgid "_None"
 msgstr "_Жоқ"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
 msgid "Tomorrow"
 msgstr "Ертең"
 
@@ -11096,14 +11350,12 @@ msgstr ""
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:68
 #, c-format
@@ -11116,7 +11368,6 @@ msgstr[0] ""
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:70
 #, c-format
@@ -11129,7 +11380,6 @@ msgstr[0] ""
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:72
 #, c-format
@@ -11142,7 +11392,6 @@ msgstr[0] ""
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:74
 #, c-format
@@ -11155,7 +11404,6 @@ msgstr[0] ""
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:76
 #, c-format
@@ -11168,7 +11416,6 @@ msgstr[0] ""
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:78
 #, c-format
@@ -11181,7 +11428,6 @@ msgstr[0] ""
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
@@ -11229,12 +11475,12 @@ msgstr ""
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:63
 #: ../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
+#: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Бос"
 
@@ -11263,667 +11509,667 @@ msgid "A_dd Condition"
 msgstr ""
 
 #: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:229
+#: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:57
+#: ../e-util/e-html-editor-actions.c:58
 msgid "Failed to insert HTML file."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:94
+#: ../e-util/e-html-editor-actions.c:95
 msgid "Failed to insert text file."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:482
+#: ../e-util/e-html-editor-actions.c:591
 msgid "Insert HTML File"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:488
+#: ../e-util/e-html-editor-actions.c:597
 msgid "HTML file"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:515
+#: ../e-util/e-html-editor-actions.c:624
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Суретті кірістіру"
 
-#: ../e-util/e-html-editor-actions.c:576
+#: ../e-util/e-html-editor-actions.c:686
 msgid "Insert text file"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:582
+#: ../e-util/e-html-editor-actions.c:692
 msgid "Text file"
 msgstr "Мәтіндік файл"
 
-#: ../e-util/e-html-editor-actions.c:966
+#: ../e-util/e-html-editor-actions.c:1078
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:973
+#: ../e-util/e-html-editor-actions.c:1085
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:980
+#: ../e-util/e-html-editor-actions.c:1092
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:987
+#: ../e-util/e-html-editor-actions.c:1099
 msgid "Redo the last undone action"
 msgstr "Соңғы әрекетті қайталау"
 
-#: ../e-util/e-html-editor-actions.c:1001
+#: ../e-util/e-html-editor-actions.c:1113
 msgid "Undo the last action"
 msgstr "Соңғы әрекетті болдырмау"
 
-#: ../e-util/e-html-editor-actions.c:1022
+#: ../e-util/e-html-editor-actions.c:1134
 msgid "For_mat"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1029
+#: ../e-util/e-html-editor-actions.c:1141
 msgid "_Paragraph Style"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1043
-#: ../e-util/e-html-editor-image-dialog.c:591
+#: ../e-util/e-html-editor-actions.c:1155
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "_Туралануы"
 
-#: ../e-util/e-html-editor-actions.c:1050
+#: ../e-util/e-html-editor-actions.c:1162
 msgid "Current _Languages"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1067
+#: ../e-util/e-html-editor-actions.c:1179
 msgid "_Increase Indent"
 msgstr "Шегінуді үл_кейту"
 
-#: ../e-util/e-html-editor-actions.c:1069
+#: ../e-util/e-html-editor-actions.c:1181
 msgid "Increase Indent"
 msgstr "Шегіністі ұлғайту"
 
-#: ../e-util/e-html-editor-actions.c:1074
+#: ../e-util/e-html-editor-actions.c:1186
 msgid "_HTML File..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1081
+#: ../e-util/e-html-editor-actions.c:1193
 msgid "Te_xt File..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1088
+#: ../e-util/e-html-editor-actions.c:1200
 msgid "Paste _Quotation"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1095
+#: ../e-util/e-html-editor-actions.c:1207
 msgid "_Find..."
 msgstr "_Табу..."
 
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../e-util/e-html-editor-actions.c:1209
 msgid "Search for text"
 msgstr "Мәтінді іздеу"
 
-#: ../e-util/e-html-editor-actions.c:1102
+#: ../e-util/e-html-editor-actions.c:1214
 msgid "Find A_gain"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1109
+#: ../e-util/e-html-editor-actions.c:1221
 msgid "Re_place..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../e-util/e-html-editor-actions.c:1223
 msgid "Search for and replace text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1116
+#: ../e-util/e-html-editor-actions.c:1228
 msgid "Check _Spelling..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1123
+#: ../e-util/e-html-editor-actions.c:1235
 msgid "_Decrease Indent"
 msgstr "Шегінуді кі_шірейту"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1237
 msgid "Decrease Indent"
 msgstr "Шегіністі азайту"
 
-#: ../e-util/e-html-editor-actions.c:1130
+#: ../e-util/e-html-editor-actions.c:1242
 msgid "_Wrap Lines"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1137
+#: ../e-util/e-html-editor-actions.c:1249
 msgid "Open Inspector"
 msgstr ""
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1147
+#: ../e-util/e-html-editor-actions.c:1259
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Ортасынан"
 
-#: ../e-util/e-html-editor-actions.c:1149
+#: ../e-util/e-html-editor-actions.c:1261
 msgid "Center Alignment"
 msgstr ""
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1154
+#: ../e-util/e-html-editor-actions.c:1266
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Сол жақтан"
 
-#: ../e-util/e-html-editor-actions.c:1156
+#: ../e-util/e-html-editor-actions.c:1268
 msgid "Left Alignment"
 msgstr ""
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1161
+#: ../e-util/e-html-editor-actions.c:1273
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Оң жақ"
 
-#: ../e-util/e-html-editor-actions.c:1163
+#: ../e-util/e-html-editor-actions.c:1275
 msgid "Right Alignment"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1171
+#: ../e-util/e-html-editor-actions.c:1283
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-actions.c:1285
 msgid "HTML editing mode"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1178
+#: ../e-util/e-html-editor-actions.c:1290
 msgid "Plain _Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1180
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Plain text editing mode"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1188
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "_Normal"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1195
+#: ../e-util/e-html-editor-actions.c:1307
 msgid "Header _1"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1202
+#: ../e-util/e-html-editor-actions.c:1314
 msgid "Header _2"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:1321
 msgid "Header _3"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1216
+#: ../e-util/e-html-editor-actions.c:1328
 msgid "Header _4"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1335
 msgid "Header _5"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1230
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "Header _6"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1349
 msgid "_Preformatted"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1244
+#: ../e-util/e-html-editor-actions.c:1356
 msgid "A_ddress"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1251
+#: ../e-util/e-html-editor-actions.c:1363
 msgid "_Blockquote"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1258
+#: ../e-util/e-html-editor-actions.c:1370
 msgid "_Bulleted List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1265
+#: ../e-util/e-html-editor-actions.c:1377
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1272
+#: ../e-util/e-html-editor-actions.c:1384
 msgid "Numbered _List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1279
+#: ../e-util/e-html-editor-actions.c:1391
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1295
-#: ../e-util/e-html-editor-actions.c:1333
+#: ../e-util/e-html-editor-actions.c:1407
+#: ../e-util/e-html-editor-actions.c:1445
 msgid "_Image..."
 msgstr ""
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1298
+#: ../e-util/e-html-editor-actions.c:1410
 msgid "Insert Image"
 msgstr "Суретті кірістіру"
 
-#: ../e-util/e-html-editor-actions.c:1303
-#: ../e-util/e-html-editor-actions.c:1340
+#: ../e-util/e-html-editor-actions.c:1415
+#: ../e-util/e-html-editor-actions.c:1452
 msgid "_Link..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1305
+#: ../e-util/e-html-editor-actions.c:1417
 msgid "Insert Link"
 msgstr "Сілтемені кірістіру"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1311
-#: ../e-util/e-html-editor-actions.c:1355
+#: ../e-util/e-html-editor-actions.c:1423
+#: ../e-util/e-html-editor-actions.c:1467
 msgid "_Rule..."
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1426
 msgid "Insert Rule"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1319
-#: ../e-util/e-html-editor-actions.c:1362
+#: ../e-util/e-html-editor-actions.c:1431
+#: ../e-util/e-html-editor-actions.c:1474
 msgid "_Table..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1433
 msgid "Insert Table"
 msgstr "Кестені кірістіру"
 
-#: ../e-util/e-html-editor-actions.c:1326
+#: ../e-util/e-html-editor-actions.c:1438
 msgid "_Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1347
+#: ../e-util/e-html-editor-actions.c:1459
 msgid "Pa_ge..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1371
+#: ../e-util/e-html-editor-actions.c:1483
 msgid "Font _Size"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1378
+#: ../e-util/e-html-editor-actions.c:1490
 msgid "_Font Style"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1385
+#: ../e-util/e-html-editor-actions.c:1497
 msgid "Paste As _Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1508
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Жуан"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1510
 msgid "Bold"
 msgstr "Жуан"
 
-#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-actions.c:1516
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "Кө_лбеу"
 
-#: ../e-util/e-html-editor-actions.c:1406
+#: ../e-util/e-html-editor-actions.c:1518
 msgid "Italic"
 msgstr "Көлбеу"
 
-#: ../e-util/e-html-editor-actions.c:1412
+#: ../e-util/e-html-editor-actions.c:1524
 msgid "_Plain Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-actions.c:1532
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "С_ызылған"
 
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1534
 msgid "Strikethrough"
 msgstr "Сызып тастау"
 
-#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-actions.c:1540
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "Асты сы_зылған"
 
-#: ../e-util/e-html-editor-actions.c:1430
+#: ../e-util/e-html-editor-actions.c:1542
 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:1440
+#: ../e-util/e-html-editor-actions.c:1552
 msgid "-2"
 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:1448
+#: ../e-util/e-html-editor-actions.c:1560
 msgid "-1"
 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:1456
+#: ../e-util/e-html-editor-actions.c:1568
 msgid "+0"
 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:1464
+#: ../e-util/e-html-editor-actions.c:1576
 msgid "+1"
 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:1472
+#: ../e-util/e-html-editor-actions.c:1584
 msgid "+2"
 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:1480
+#: ../e-util/e-html-editor-actions.c:1592
 msgid "+3"
 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:1488
+#: ../e-util/e-html-editor-actions.c:1600
 msgid "+4"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1507
+#: ../e-util/e-html-editor-actions.c:1619
 msgid "Cell Contents"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1514
+#: ../e-util/e-html-editor-actions.c:1626
 msgid "Column"
 msgstr "Баған"
 
-#: ../e-util/e-html-editor-actions.c:1521
+#: ../e-util/e-html-editor-actions.c:1633
 msgid "Row"
 msgstr "Жол"
 
-#: ../e-util/e-html-editor-actions.c:1528
-#: ../e-util/e-html-editor-actions.c:1613
+#: ../e-util/e-html-editor-actions.c:1640
+#: ../e-util/e-html-editor-actions.c:1725
 msgid "Table"
 msgstr "Кесте"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1538
+#: ../e-util/e-html-editor-actions.c:1650
 msgid "Table Delete"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1545 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr ""
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1553
+#: ../e-util/e-html-editor-actions.c:1665
 msgid "Table Insert"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1672
 msgid "Properties"
 msgstr "Қасиеттері"
 
-#: ../e-util/e-html-editor-actions.c:1578
+#: ../e-util/e-html-editor-actions.c:1690
 msgid "Column After"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1585
+#: ../e-util/e-html-editor-actions.c:1697
 msgid "Column Before"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1704
 msgid "Insert _Link"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1599
+#: ../e-util/e-html-editor-actions.c:1711
 msgid "Row Above"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1606
+#: ../e-util/e-html-editor-actions.c:1718
 msgid "Row Below"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1620
+#: ../e-util/e-html-editor-actions.c:1732
 msgid "Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1627
+#: ../e-util/e-html-editor-actions.c:1739
 msgid "Image..."
 msgstr "Сурет..."
 
-#: ../e-util/e-html-editor-actions.c:1634
+#: ../e-util/e-html-editor-actions.c:1746
 msgid "Link..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1641
+#: ../e-util/e-html-editor-actions.c:1753
 msgid "Page..."
 msgstr "Бет..."
 
-#: ../e-util/e-html-editor-actions.c:1648
+#: ../e-util/e-html-editor-actions.c:1760
 msgid "Paragraph..."
 msgstr "Абзац..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1656
+#: ../e-util/e-html-editor-actions.c:1768
 msgid "Rule..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1663
+#: ../e-util/e-html-editor-actions.c:1775
 msgid "Table..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1670
+#: ../e-util/e-html-editor-actions.c:1782
 msgid "Text..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1677
+#: ../e-util/e-html-editor-actions.c:1789
 msgid "Remove Link"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1694
+#: ../e-util/e-html-editor-actions.c:1806
 msgid "Add Word to Dictionary"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1701
+#: ../e-util/e-html-editor-actions.c:1813
 msgid "Ignore Misspelled Word"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1708
+#: ../e-util/e-html-editor-actions.c:1820
 msgid "Add Word To"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1717
+#: ../e-util/e-html-editor-actions.c:1829
 msgid "More Suggestions"
 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:1825
+#: ../e-util/e-html-editor-actions.c:1937
 #, c-format
 msgid "%s Dictionary"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1912
+#: ../e-util/e-html-editor-actions.c:2024
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1913
+#: ../e-util/e-html-editor-actions.c:2025
 msgid "Insert Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1981
+#: ../e-util/e-html-editor-actions.c:2093
 msgid "Re_place"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1984
+#: ../e-util/e-html-editor-actions.c:2096
 msgid "_Image"
 msgstr "_Сурет"
 
-#: ../e-util/e-html-editor-actions.c:1987
+#: ../e-util/e-html-editor-actions.c:2099
 msgid "_Link"
 msgstr "_Сілтеме"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1991
+#: ../e-util/e-html-editor-actions.c:2103
 msgid "_Rule"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1994
-#: ../e-util/e-html-editor-cell-dialog.c:668
+#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "Кес_те"
 
-#: ../e-util/e-html-editor.c:672
+#: ../e-util/e-html-editor.c:704
 msgid "Paragraph Style"
 msgstr "Абзац стилі"
 
-#: ../e-util/e-html-editor.c:686
+#: ../e-util/e-html-editor.c:718
 msgid "Editing Mode"
 msgstr ""
 
-#: ../e-util/e-html-editor.c:698
+#: ../e-util/e-html-editor.c:730
 msgid "Font Color"
 msgstr "Қаріп түсі"
 
-#: ../e-util/e-html-editor.c:716
+#: ../e-util/e-html-editor.c:748
 msgid "Font Size"
 msgstr "Қаріп өлшемі"
 
-#: ../e-util/e-html-editor-cell-dialog.c:628
+#: ../e-util/e-html-editor-cell-dialog.c:698
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:642
+#: ../e-util/e-html-editor-cell-dialog.c:712
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:655
+#: ../e-util/e-html-editor-cell-dialog.c:725
 msgid "_Row"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
+#: ../e-util/e-html-editor-cell-dialog.c:751
 msgid "Col_umn"
 msgstr "_Баған"
 
-#: ../e-util/e-html-editor-cell-dialog.c:691
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:704
-#: ../e-util/e-html-editor-hrule-dialog.c:365
-#: ../e-util/e-html-editor-table-dialog.c:850
+#: ../e-util/e-html-editor-cell-dialog.c:774
+#: ../e-util/e-html-editor-hrule-dialog.c:413
+#: ../e-util/e-html-editor-table-dialog.c:900
 msgid "Left"
 msgstr "Солға"
 
-#: ../e-util/e-html-editor-cell-dialog.c:705
-#: ../e-util/e-html-editor-hrule-dialog.c:367
-#: ../e-util/e-html-editor-table-dialog.c:851
+#: ../e-util/e-html-editor-cell-dialog.c:775
+#: ../e-util/e-html-editor-hrule-dialog.c:415
+#: ../e-util/e-html-editor-table-dialog.c:901
 msgid "Center"
 msgstr "Ортасында"
 
-#: ../e-util/e-html-editor-cell-dialog.c:706
-#: ../e-util/e-html-editor-hrule-dialog.c:369
-#: ../e-util/e-html-editor-table-dialog.c:852
+#: ../e-util/e-html-editor-cell-dialog.c:776
+#: ../e-util/e-html-editor-hrule-dialog.c:417
+#: ../e-util/e-html-editor-table-dialog.c:902
 msgid "Right"
 msgstr "Оңға"
 
-#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-cell-dialog.c:784
 msgid "_Horizontal:"
 msgstr "_Горизонталды:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:722
-#: ../e-util/e-html-editor-image-dialog.c:581
+#: ../e-util/e-html-editor-cell-dialog.c:792
+#: ../e-util/e-html-editor-image-dialog.c:625
 msgid "Top"
 msgstr "Жоғарыдан"
 
-#: ../e-util/e-html-editor-cell-dialog.c:723
-#: ../e-util/e-html-editor-image-dialog.c:582
+#: ../e-util/e-html-editor-cell-dialog.c:793
+#: ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
 msgstr "Ортасы"
 
-#: ../e-util/e-html-editor-cell-dialog.c:724
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-cell-dialog.c:794
+#: ../e-util/e-html-editor-image-dialog.c:627
 msgid "Bottom"
 msgstr "Төменнен"
 
-#: ../e-util/e-html-editor-cell-dialog.c:732
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Vertical:"
 msgstr "_Вертикалды:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:738
+#: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
 msgstr ""
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:746
+#: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:760
-#: ../e-util/e-html-editor-image-dialog.c:521
-#: ../e-util/e-html-editor-table-dialog.c:762
+#: ../e-util/e-html-editor-cell-dialog.c:830
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr ""
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:771
+#: ../e-util/e-html-editor-cell-dialog.c:841
 msgid "_Width"
 msgstr "_Ені"
 
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../e-util/e-html-editor-cell-dialog.c:880
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-cell-dialog.c:894
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:831
-#: ../e-util/e-html-editor-table-dialog.c:866
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:844
-#: ../e-util/e-html-editor-table-dialog.c:879
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
 msgid "Transparent"
 msgstr "Мөлдір емес"
 
-#: ../e-util/e-html-editor-cell-dialog.c:852
+#: ../e-util/e-html-editor-cell-dialog.c:922
 msgid "C_olor:"
 msgstr "Тү_сі:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:860
-#: ../e-util/e-html-editor-image-dialog.c:483
-#: ../e-util/e-html-editor-table-dialog.c:895
+#: ../e-util/e-html-editor-cell-dialog.c:930
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:865
-#: ../e-util/e-html-editor-image-dialog.c:489
-#: ../e-util/e-html-editor-table-dialog.c:900
+#: ../e-util/e-html-editor-cell-dialog.c:935
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "Суреттер"
 
-#: ../e-util/e-html-editor-cell-dialog.c:878
+#: ../e-util/e-html-editor-cell-dialog.c:948
 msgid "_Image:"
 msgstr "Суре_т:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:885
-#: ../e-util/e-html-editor-page-dialog.c:516
-#: ../e-util/e-html-editor-table-dialog.c:920
+#: ../e-util/e-html-editor-cell-dialog.c:955
+#: ../e-util/e-html-editor-page-dialog.c:660
+#: ../e-util/e-html-editor-table-dialog.c:970
 msgid "_Remove image"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:905
+#: ../e-util/e-html-editor-cell-dialog.c:975
 msgid "Cell Properties"
 msgstr ""
 
@@ -11934,7 +12180,7 @@ msgid "No match found"
 msgstr ""
 
 #: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:232
+#: ../e-util/e-html-editor-replace-dialog.c:247
 msgid "Search _backwards"
 msgstr "К_ері іздеу"
 
@@ -11950,155 +12196,160 @@ msgstr ""
 msgid "Find"
 msgstr "Іздеу"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:300
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "<b>Size</b>"
 msgstr ""
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:320
-#: ../e-util/e-html-editor-image-dialog.c:539
-#: ../e-util/e-html-editor-table-dialog.c:773
+#: ../e-util/e-html-editor-hrule-dialog.c:368
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "_Ені:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:345
+#: ../e-util/e-html-editor-hrule-dialog.c:393
 msgid "_Size:"
 msgstr "Ө_лшемі:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:352
+#: ../e-util/e-html-editor-hrule-dialog.c:400
 msgid "<b>Style</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:377
-#: ../e-util/e-html-editor-table-dialog.c:859
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
 msgid "_Alignment:"
 msgstr "_Туралануы:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:383
+#: ../e-util/e-html-editor-hrule-dialog.c:431
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:400
+#: ../e-util/e-html-editor-hrule-dialog.c:448
 msgid "Rule properties"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../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:716
+#: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:500
+#: ../e-util/e-html-editor-image-dialog.c:544
 msgid "_Source:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:563
+#: ../e-util/e-html-editor-image-dialog.c:607
 msgid "_Height:"
 msgstr "_Биіктігі:"
 
-#: ../e-util/e-html-editor-image-dialog.c:604
+#: ../e-util/e-html-editor-image-dialog.c:648
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:620
+#: ../e-util/e-html-editor-image-dialog.c:664
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:636
-#: ../e-util/e-html-editor-table-dialog.c:840
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:646
+#: ../e-util/e-html-editor-image-dialog.c:690
 msgid "<b>Link</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:664
-#: ../e-util/e-html-editor-link-dialog.c:345
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_Сілтеме:"
 
-#: ../e-util/e-html-editor-image-dialog.c:669
-#: ../e-util/e-html-editor-link-dialog.c:350
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:686
+#: ../e-util/e-html-editor-image-dialog.c:730
 msgid "Image Properties"
 msgstr "Сурет қасиеттері"
 
-#: ../e-util/e-html-editor-link-dialog.c:374
+#: ../e-util/e-html-editor-link-dialog.c:429
 msgid "_Remove Link"
 msgstr ""
 
-#: ../e-util/e-html-editor-link-dialog.c:399
+#: ../e-util/e-html-editor-link-dialog.c:454
 msgid "Link Properties"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:69
+#: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:78
+#: ../e-util/e-html-editor-page-dialog.c:81
 msgid "Blue Ink"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:87
+#: ../e-util/e-html-editor-page-dialog.c:90
 msgid "Paper"
 msgstr "Қағаз"
 
-#: ../e-util/e-html-editor-page-dialog.c:96
+#: ../e-util/e-html-editor-page-dialog.c:99
 msgid "Ribbon"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:105
+#: ../e-util/e-html-editor-page-dialog.c:108
 msgid "Midnight"
 msgstr "Түн ортасы"
 
-#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../e-util/e-html-editor-page-dialog.c:126 ../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:132
+#: ../e-util/e-html-editor-page-dialog.c:135
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../e-util/e-html-editor-page-dialog.c:544
 msgid "<b>Colors</b>"
 msgstr "<b>Түстер</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:434
+#: ../e-util/e-html-editor-page-dialog.c:563
 msgid "_Text:"
 msgstr "_Мәтін:"
 
-#: ../e-util/e-html-editor-page-dialog.c:449
+#: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:464
+#: ../e-util/e-html-editor-page-dialog.c:593
+msgid "_Visited Link:"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:608
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../e-util/e-html-editor-page-dialog.c:472
+#: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:494
+#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "_Template:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:502
+#: ../e-util/e-html-editor-page-dialog.c:646
 #: ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Файлды таңдаңыз"
 
-#: ../e-util/e-html-editor-page-dialog.c:509
+#: ../e-util/e-html-editor-page-dialog.c:653
 msgid "_Custom:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:536
+#: ../e-util/e-html-editor-page-dialog.c:680
 msgid "Page Properties"
 msgstr ""
 
@@ -12114,121 +12365,121 @@ msgstr ""
 msgid "Paragraph Properties"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:148
+#: ../e-util/e-html-editor-replace-dialog.c:163
 #, c-format
-msgid "%d occurence replaced"
-msgid_plural "%d occurences replaced"
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
 msgstr[0] ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:212
+#: ../e-util/e-html-editor-replace-dialog.c:227
 msgid "R_eplace:"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:224
+#: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
 msgstr "_Немен:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:236
+#: ../e-util/e-html-editor-replace-dialog.c:251
 msgid "_Case sensitive"
 msgstr "Регистрді _ескеру"
 
-#: ../e-util/e-html-editor-replace-dialog.c:240
+#: ../e-util/e-html-editor-replace-dialog.c:255
 msgid "Wra_p search"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:250
+#: ../e-util/e-html-editor-replace-dialog.c:265
 msgid "_Skip"
 msgstr "А_ттап кету"
 
-#: ../e-util/e-html-editor-replace-dialog.c:258
+#: ../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:266
+#: ../e-util/e-html-editor-replace-dialog.c:281
 msgid "Replace _All"
 msgstr "Барл_ығын алмастыру"
 
-#: ../e-util/e-html-editor-replace-dialog.c:286
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Алмастыру"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
 #, c-format
 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:520
 msgid "<b>Suggestions</b>"
 msgstr ""
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
 msgid "Replace"
 msgstr "Алмастыру"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#: ../e-util/e-html-editor-spell-check-dialog.c:564
 msgid "Replace All"
 msgstr "Барлығын алмастыру"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554
-#: ../mail/mail.error.xml.h:109
+#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../mail/mail.error.xml.h:112
 msgid "Ignore"
 msgstr "Елемеу"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
 msgid "Skip"
 msgstr "Аттап кету"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
 msgid "Back"
 msgstr "Артқа"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
 msgid "<b>Dictionary</b>"
 msgstr ""
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#: ../e-util/e-html-editor-spell-check-dialog.c:620
 msgid "Add word"
 msgstr ""
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618
-#: ../mail/mail-config.ui.h:37
+#: ../e-util/e-html-editor-spell-check-dialog.c:637
+#: ../mail/mail-config.ui.h:38
 msgid "Spell Checking"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:738
+#: ../e-util/e-html-editor-table-dialog.c:788
 msgid "_Rows:"
 msgstr "Жо_лдар:"
 
-#: ../e-util/e-html-editor-table-dialog.c:755
+#: ../e-util/e-html-editor-table-dialog.c:805
 msgid "C_olumns:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:806
+#: ../e-util/e-html-editor-table-dialog.c:856
 msgid "_Spacing:"
 msgstr "Ш_егіну:"
 
-#: ../e-util/e-html-editor-table-dialog.c:823
+#: ../e-util/e-html-editor-table-dialog.c:873
 msgid "_Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:887
+#: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Түсі:"
 
-#: ../e-util/e-html-editor-table-dialog.c:913
+#: ../e-util/e-html-editor-table-dialog.c:963
 msgid "Image:"
 msgstr "Сурет:"
 
-#: ../e-util/e-html-editor-table-dialog.c:940
+#: ../e-util/e-html-editor-table-dialog.c:990
 msgid "Table Properties"
 msgstr ""
 
@@ -12240,28 +12491,14 @@ msgstr "Өл_шемі:"
 msgid "Text Properties"
 msgstr ""
 
-#: ../e-util/e-html-editor-view.c:3635
+#: ../e-util/e-html-editor-view.c:5458
 msgid "Changed property"
 msgstr ""
 
-#: ../e-util/e-html-editor-view.c:3636
+#: ../e-util/e-html-editor-view.c:5459
 msgid "Whether editor changed"
 msgstr ""
 
-#: ../e-util/e-html-editor-view.c:7493
-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:7497
-msgid "_Don't lose formatting"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:7498
-msgid "_Lose formatting"
-msgstr ""
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -12368,15 +12605,15 @@ msgstr "Жабу"
 msgid "_Save and Close"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:531
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:564
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:600
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Атаусыз"
 
@@ -12417,34 +12654,39 @@ msgid ""
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:295
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2348
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2351
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2354
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2357
+#: ../e-util/e-misc-utils.c:2396
 #, c-format
 msgid "Opening address book '%s'"
 msgstr ""
 
+#: ../e-util/e-misc-utils.c:3138
+#: ../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 ""
@@ -12479,7 +12721,7 @@ msgid "Search"
 msgstr "Іздеу"
 
 #: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr ""
 
@@ -12494,30 +12736,30 @@ 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:3183
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr ""
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3199
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr ""
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3210
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr ""
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3228
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "%s тү_зету"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ө_шіру"
@@ -12615,6 +12857,10 @@ msgstr "Автоматты түрде"
 msgid "Configuration _URL:"
 msgstr "_Баптау URL-ы:"
 
+#: ../e-util/e-proxy-editor.c:560
+msgid "No proxy"
+msgstr ""
+
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr ""
@@ -12662,51 +12908,51 @@ msgstr ""
 msgid "Matches: %u"
 msgstr "Сәйкестіктер: %u"
 
-#: ../e-util/e-search-bar.c:567
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:575
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "Та_бу:"
 
-#: ../e-util/e-search-bar.c:587
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:611
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "А_лдыңғы"
 
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Осы сөздердің мәтіннен алдыңғы табылуын іздеу"
 
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Келесі"
 
-#: ../e-util/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Осы сөздердің мәтіннен келесі табылуын іздеу"
 
-#: ../e-util/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "_Регистрді ескеру"
 
-#: ../e-util/e-search-bar.c:663
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Парақтың басына жеттік, соңынан бастап жалғастырамыз"
 
-#: ../e-util/e-search-bar.c:685
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Парақтың басына жеттік, соңынан бастап жалғастырамыз"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
 #: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163
-#: ../smime/gui/certificate-manager.c:1669
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "Пошта"
 
@@ -12875,11 +13121,11 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr ""
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Мақсатты таңдау"
 
@@ -12899,26 +13145,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:379
+#: ../e-util/e-spell-entry.c:457
 msgid "(no suggestions)"
 msgstr "(ұсыныстар жоқ)"
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:481
 msgid "More..."
 msgstr "Қосымша..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:566
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr ""
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:615
 msgid "Ignore All"
 msgstr "Барлығын елемеу"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:647
 msgid "Spelling Suggestions"
 msgstr ""
 
@@ -12949,7 +13195,7 @@ msgstr ""
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr ""
 
@@ -13013,7 +13259,7 @@ msgstr ""
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr ""
 
-#: ../e-util/e-table-click-to-add.c:684
+#: ../e-util/e-table-click-to-add.c:689
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
@@ -13064,8 +13310,6 @@ msgid "Choose the order of information to appear in the message list."
 msgstr ""
 
 #: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:367
 msgid "_Apply"
 msgstr "Іске _асыру"
 
@@ -13208,7 +13452,7 @@ msgstr ""
 msgid "_Custom"
 msgstr "Таң_дауыңызша"
 
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Барлығын таңдау"
 
@@ -13264,99 +13508,108 @@ msgid "Flags"
 msgstr ""
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:722
+#: ../mail/e-mail-config-identity-page.c:721
 msgid "Identity"
 msgstr "Идентификация"
 
-#: ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr ""
 
-#: ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view.c:336
 msgid "_Copy Email Address"
 msgstr "Эл. пошта а_дресін көшіру"
 
-#: ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:343
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr ""
+
+#: ../e-util/e-web-view.c:345
+msgid "Copy the raw email address to the clipboard"
+msgstr ""
+
+#: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
 msgstr "Сурет_ті көшіру"
 
-#: ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:367
 msgid "Save _Image..."
 msgstr ""
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
 msgstr ""
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1004
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to call %s"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1006
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1017
+#: ../e-util/e-web-view.c:1082
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1019
+#: ../e-util/e-web-view.c:1084
 msgid "Go to the beginning of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1023
+#: ../e-util/e-web-view.c:1088
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: ../e-util/e-web-view.c:2941
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:3129
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
 msgstr "Суретті сақтау"
 
-#: ../e-util/e-web-view.c:3165
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr ""
 
-#: ../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 ""
 
@@ -13388,7 +13641,7 @@ msgstr ""
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
 msgid "Missing name."
 msgstr ""
 
@@ -13432,7 +13685,7 @@ msgstr ""
 msgid "a time relative to the current time"
 msgstr ""
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
 msgid "seconds"
 msgstr "секунд"
 
@@ -13487,7 +13740,7 @@ msgid ""
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../e-util/gal-a11y-e-cell.c:130
 msgid "Table Cell"
 msgstr ""
 
@@ -13497,7 +13750,7 @@ msgid "popup a child"
 msgstr ""
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:617
+#: ../e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr ""
 
@@ -13594,93 +13847,91 @@ msgstr ""
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:113
+#: ../libemail-engine/e-mail-folder-utils.c:115
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../libemail-engine/e-mail-folder-utils.c:684
+#: ../libemail-engine/e-mail-folder-utils.c:935
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
 #, c-format
 msgid "Removing folder '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1328
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 msgid "File has been removed."
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
 msgid "Removing attachments"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../libemail-engine/e-mail-folder-utils.c:1555
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr ""
 
 #. 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
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Inbox"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 msgid "Drafts"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Outbox"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 msgid "Sent"
 msgstr "Жіберілген"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 #: ../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 "Үлгілер"
 
@@ -13706,45 +13957,45 @@ msgstr ""
 msgid "Waiting for '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:629
-#: ../libemail-engine/mail-ops.c:718
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
 #, c-format
 msgid "Posting message to '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:666
-#: ../libemail-engine/mail-ops.c:754
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:696
-#: ../libemail-engine/e-mail-session-utils.c:731
-#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#: ../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
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:720
-#: ../libemail-engine/mail-ops.c:802
+#: ../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 ""
 
-#: ../libemail-engine/e-mail-session-utils.c:750
-#: ../libemail-engine/mail-ops.c:830
+#: ../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 ""
 
-#: ../libemail-engine/e-mail-session-utils.c:952
-#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
 msgid "Sending message"
 msgstr ""
 
@@ -13781,7 +14032,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:748
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -13790,57 +14041,56 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1041
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1049
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1163
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1411
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1487
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1579
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr ""
@@ -13890,7 +14140,6 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
 msgid "Open _Online Accounts"
@@ -13913,9 +14162,9 @@ msgid "De_fault"
 msgstr ""
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1234
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Іске қосулы"
 
@@ -13931,12 +14180,12 @@ msgstr ""
 msgid "Missing domain in email address"
 msgstr ""
 
-#: ../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
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "Бұл терезені жабу"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr ""
 
@@ -13958,7 +14207,7 @@ msgstr ""
 msgid "_Revise Details"
 msgstr ""
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr ""
 
@@ -14004,7 +14253,7 @@ msgid "Archi_ve Folder:"
 msgstr ""
 
 #: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1079
+#: ../modules/mail/em-mailer-prefs.c:1397
 msgid "Choose a folder to archive messages to."
 msgstr ""
 
@@ -14076,43 +14325,43 @@ msgstr ""
 msgid "Account Information"
 msgstr "Тіркелгі ақпараты"
 
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-summary-page.c:352
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:447
+#: ../mail/e-mail-config-identity-page.c:446
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:556
+#: ../mail/e-mail-config-identity-page.c:555
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 
@@ -14145,10 +14394,10 @@ msgid "%s - %s"
 msgstr "%s - %s"
 
 #: ../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
+#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:113
+#: ../modules/calendar/e-calendar-preferences.c:625
 #: ../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 "Жалпы"
@@ -14170,22 +14419,22 @@ msgid "Si_gning algorithm:"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
 msgid "SHA384"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
 msgid "SHA512"
 msgstr ""
 
@@ -14194,49 +14443,53 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:466
-msgid "Always encrypt to _myself when sending encrypted messages"
+msgid "Always enc_rypt outgoing messages when using this account"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:478
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:535
-#: ../mail/e-mail-config-security-page.c:641
+#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:653
 msgid "Select"
 msgstr "Таңдау"
 
-#: ../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
+#: ../mail/e-mail-config-security-page.c:556
+#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "Та_зарту"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:594
+#: ../mail/e-mail-config-security-page.c:606
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:659
+#: ../mail/e-mail-config-security-page.c:671
 msgid "Always encrypt outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:679
+#: ../mail/e-mail-config-security-page.c:691
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr ""
 
@@ -14261,45 +14514,45 @@ msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Жеке ақпарат"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Жіберу"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../mail/e-mail-config-summary-page.c:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../mail/e-mail-config-summary-page.c:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Пайдаланушы аты:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Қауіпсіздік:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr ""
 
@@ -14319,27 +14572,27 @@ msgstr "Қош келдіңіз"
 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 ""
 
@@ -14361,44 +14614,42 @@ 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:226
+#: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Өшірілген"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Draft"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Жалауша бар"
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:231
-#| msgid "Attachments"
+#: ../mail/e-mail-free-form-exp.c:241
 msgctxt "ffe"
 msgid "Attachment"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:479
-#| msgid "now"
+#: ../mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr ""
@@ -14436,7 +14687,7 @@ msgid "_Later"
 msgstr ""
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr ""
 
@@ -14482,667 +14733,690 @@ msgstr ""
 msgid "Header Value"
 msgstr ""
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
 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:346 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Бумаға жылжыту"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:147
 msgid "_Move"
 msgstr "Жы_лжыту"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Көшіру"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1452
 msgid "_Do not ask me again."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1901
 msgid "_Archive..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1903
 msgid "Move selected messages to the Archive folder for the account"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1980
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
 msgid "_Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
-#| msgid "Ignore"
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
 msgid "_Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2050
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
 msgid "Do not _Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2085
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2092
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "_Жаңа терезеде ашу"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
 #: ../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:2299
+#: ../mail/e-mail-reader.c:2232
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
 msgid "Reply to _List"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2239
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2244
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "Қалы_пты өлшемі"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "Үлке_йту"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "Ө_ту"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "_Масштаб"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3020
+#: ../mail/e-mail-reader.c:3047
 msgid "Retrieving message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4028
+#: ../mail/e-mail-reader.c:4078
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "А_лға"
 
-#: ../mail/e-mail-reader.c:4029
+#: ../mail/e-mail-reader.c:4079
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4048
+#: ../mail/e-mail-reader.c:4098
 msgid "Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4049
+#: ../mail/e-mail-reader.c:4099
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4115 ../mail/filtertypes.xml.in.h:65
+#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Өшіру"
 
-#: ../mail/e-mail-reader.c:4127
+#: ../mail/e-mail-reader.c:4177
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Келесі"
 
-#: ../mail/e-mail-reader.c:4131
+#: ../mail/e-mail-reader.c:4181
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: ../mail/e-mail-reader.c:4140 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Жауап беру"
 
+#: ../mail/e-mail-reader.c:5240
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5242
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5259
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5316
+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
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1806
-#: ../modules/cal-config-google/e-google-chooser.c:1843
-#: ../plugins/face/face.c:170 ../shell/e-shell.c:861 ../shell/e-shell.c:882
+#: ../mail/e-mail-reader-utils.c:572
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
+#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:972 ../shell/e-shell.c:994
 #: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Белгісіз қате"
 
-#: ../mail/e-mail-reader-utils.c:1043
+#: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1169
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1051
+#: ../mail/e-mail-reader-utils.c:1173
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1055
+#: ../mail/e-mail-reader-utils.c:1177
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1290
+#: ../mail/e-mail-reader-utils.c:1417
 msgid "Printing"
 msgstr "Баспаға шығару"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1525
+#: ../mail/e-mail-reader-utils.c:1654
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15151,29 +15425,27 @@ msgid_plural ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../mail/e-mail-reader-utils.c:2355
+#: ../mail/e-mail-reader-utils.c:2485
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] ""
-msgstr[1] ""
 
 #. Translators: This is part of a suggested file name
 #. * used when saving a message or multiple messages to
 #. * 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:2376
+#: ../mail/e-mail-reader-utils.c:2506
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Хабарлама"
 
-#: ../mail/e-mail-reader-utils.c:2749
+#: ../mail/e-mail-reader-utils.c:2879
 msgid "Parsing message"
 msgstr ""
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr ""
 
@@ -15195,30 +15467,30 @@ msgstr ""
 #. * 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:1507
+#: ../mail/em-composer-utils.c:1603
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1609
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1518
+#: ../mail/em-composer-utils.c:1614
 msgid "-----Original Message-----"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2668
+#: ../mail/em-composer-utils.c:2827
 msgid "an unknown sender"
 msgstr ""
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3107
+#: ../mail/em-composer-utils.c:3265
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:3112
+#: ../mail/em-composer-utils.c:3270
 msgid "Choose folders to post the message to."
 msgstr ""
 
@@ -15235,35 +15507,87 @@ msgstr "Онда"
 msgid "Add Ac_tion"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr ""
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:286
+#: ../mail/em-folder-properties.c:287
 msgid "_Send Account Override:"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+#| msgid "days"
+msgctxt "autoarchive"
+msgid "days"
+msgstr "күн"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "апта"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+msgctxt "autoarchive"
+msgid "months"
+msgstr "ай"
+
+#: ../mail/em-folder-properties.c:526
+msgid "Move old messages to the default archive _folder"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:537
+msgid "_Move old messages to:"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:541
+msgid "AutoArchive folder"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:541
+msgid "Select folder to use for AutoArchive"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:547
+#| msgid "All Messages"
+msgid "_Delete old messages"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:606
+msgid "AutoArchive"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr ""
 
@@ -15279,47 +15603,47 @@ msgstr "Жаңа буманы жасау"
 msgid "Folder names cannot contain '/'"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:1668
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2249
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
+#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
 msgid "Loading..."
 msgstr "Жүктеу..."
 
@@ -15343,79 +15667,93 @@ msgstr ""
 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:1686
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1026
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ""
+
+#: ../mail/em-subscription-editor.c:1343
+#: ../modules/mail/e-mail-shell-view-private.c:1036
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d барлығы"
+
+#: ../mail/em-subscription-editor.c:1749
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
 msgid "_Account:"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
 msgid "Clear Search"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
 msgid "Sho_w items that contain:"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
 msgid "Subscribe to the selected folder"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
 msgid "Su_bscribe"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../mail/em-subscription-editor.c:1911
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
 msgid "Collapse all folders"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
 msgid "C_ollapse All"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
 msgid "Expand all folders"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
 msgid "E_xpand All"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
-#: ../modules/mail/e-mail-shell-view-actions.c:1658
+#: ../mail/em-subscription-editor.c:1974
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "Жаңар_ту"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
 msgid "Stop the current operation"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1941
+#: ../mail/em-subscription-editor.c:1986
 #: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "Т_оқтату"
@@ -15424,22 +15762,26 @@ msgstr "Т_оқтату"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
 #, c-format
 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?"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr ""
 
-#: ../mail/em-utils.c:983
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
+#: ../mail/em-utils.c:1680
+#| msgid "All Messages"
+msgid "Deleting old messages"
+msgstr ""
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr ""
@@ -15622,7 +15964,7 @@ msgstr "Маңызды"
 msgid "Read"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
 #: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr ""
@@ -15644,129 +15986,126 @@ msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
+#| 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 set"
+#| msgid "Completed"
+msgid "is not Completed"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr "орнатылмаған"
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
+msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
 #: ../mail/vfoldertypes.xml.in.h:52
-msgid "Mailing list"
+msgid "Regex Match"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
 #: ../mail/vfoldertypes.xml.in.h:53
-msgid "Regex Match"
-msgstr ""
-
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Header"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Location"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
 #: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Өшірілген"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Қайта бағытталған:"
 
@@ -15774,11 +16113,11 @@ msgstr "Қайта бағытталған:"
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr ""
 
@@ -15813,7 +16152,7 @@ msgid "From"
 msgstr "Кімнен"
 
 #: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:171
+#: ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
@@ -15823,7 +16162,6 @@ msgstr ""
 
 #: ../mail/importers/kmail-importer.c:263
 #, c-format
-#| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] ""
@@ -15837,27 +16175,27 @@ msgid "Import mail and contacts from KMail."
 msgstr ""
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Trash"
 msgstr "Қоқыс шелегі"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:61
+#: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
 msgstr ""
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:570
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -15866,11 +16204,11 @@ msgstr ""
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr ""
 
@@ -15913,7 +16251,6 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../mail/mail-config.ui.h:1
 msgid "Set custom junk header"
@@ -15941,190 +16278,195 @@ msgstr ""
 msgid "For_mat messages in HTML"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Use Unicode characters for smile_ys"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "_Languages"
 msgstr "Ті_лдер"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 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:42
+#: ../mail/mail-config.ui.h:43
 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:44
+#: ../mail/mail-config.ui.h:45
+msgid "Sending a message to many _To and CC recipients"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:47
 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:46
+#: ../mail/mail-config.ui.h:49
 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:48
+#: ../mail/mail-config.ui.h:51
 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:50
+#: ../mail/mail-config.ui.h:53
 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:52
+#: ../mail/mail-config.ui.h:55
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:56
 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:57
+#: ../mail/mail-config.ui.h:60
 msgid "Use for Folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "A_dd"
 msgstr "Қ_осу"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
 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:62
+#: ../mail/mail-config.ui.h:65
 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:64 ../modules/mail/em-composer-prefs.c:836
+#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Тіркелгі"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Send account overrides"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 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 "
@@ -16132,205 +16474,221 @@ msgid ""
 "parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "Send Account"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 msgid "Start up"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Check for new _messages on start"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new messa_ges in all active accounts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
 msgid "Message Display"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Fix_ed Width Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Түсті таңдаңыз"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "color"
 msgstr "түс"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "Default character e_ncoding:"
 msgstr "Бас_тапқы кодтауы:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
 msgid "Apply the same _view settings to all folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "F_all back to threading messages by subject"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "Delete Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "Empty _trash folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "Archive Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "On This Computer A_rchive folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:101
 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
+#: ../mail/mail-config.ui.h:103
 msgid "_Show animated images"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102
-msgid "Loading Images"
+#: ../mail/mail-config.ui.h:105
+msgid "Loading Remote Content"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:103
-msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:106
+msgid "_Never load remote content from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:104
-msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:107
+msgid "_Load remote content only in messages from contacts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:105
-msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:108
+msgid "_Always load remote content from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:109
+msgid "Add"
+msgstr "Қосу"
+
+#: ../mail/mail-config.ui.h:110
+msgid "Remove"
+msgstr "Өшіру"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:112
+msgid "Allow for senders:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:113
 msgid "HTML Messages"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Белгілер"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:115
 msgid "Sender Photograph"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:116
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:117
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
 msgid "Displayed Message Headers"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:119
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:113
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Check incoming _messages for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "_Delete junk messages"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Junk Test Options"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:126
 msgid "_Lookup in local address book only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:127
 msgid "Check cu_stom headers for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:129
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:130
 msgid "TLS encryption"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:131
 msgid "SSL encryption"
 msgstr ""
 
@@ -16473,120 +16831,134 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with invalid address?"
+#| msgid "Are you sure you want to delete this contact?"
+msgid "Are you sure you want to send a message with {0} To and CC recipients?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:17
 msgid ""
+"You are trying to send a message to {0} recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:19
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:22
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 msgid "Send private reply?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 msgid "Reply _Privately"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 msgid "Send reply to all recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 msgid "Use default drafts folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../mail/mail.error.xml.h:42
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "Қ_оқыс шелегін тазарту"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -16595,236 +16967,235 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid "Really delete folder \"{0}\"?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "These messages are not copies."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot open source folder. Error: {2}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open target folder. Error: {2}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot create folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open folder. Error: {1}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot save changes to account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Do _Not Disable"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:93
 msgid "_Disable"
 msgstr "Сө_ндіру"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "You must specify a folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
 msgid "You must name this Search Folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "No folder selected."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -16832,19 +17203,19 @@ msgid ""
 "quit."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid "_Overwrite"
 msgstr "Ү_стінен жазу"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -16855,185 +17226,206 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "_Exit Evolution"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "_Migrate Now"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "Please wait."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "Do _Not Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "Do you want to mark all messages as read?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "Also mark messages in subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "In Current Folder and _Subfolders"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "In Current _Folder Only"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Yes, Always"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "_No, Never"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "Copy folder in folder tree."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
-msgstr "Әрқ_ашан"
+#: ../mail/mail.error.xml.h:142
+msgid "Do _not copy"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#: ../mail/mail.error.xml.h:143
+#| msgid "_Always"
+msgid "_Always copy"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
+#| msgid "Never"
+msgid "N_ever copy"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:145
 msgid "Move folder in folder tree."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
+#| msgid "Do _Not Delete"
+msgid "Do _not move"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:149
+#| msgid "_Always"
+msgid "_Always move"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:150
+#| msgid "_Remove"
+msgid "N_ever move"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:152
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Mail Deletion Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "\"Check Junk\" Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Junk\" Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "\"Report Not Junk\" Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:158
 msgid "Remove duplicate messages?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "No duplicate messages found."
 msgstr ""
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:165
 msgid "Unable to retrieve message."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "Message is not available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:168
 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 "
@@ -17042,116 +17434,142 @@ msgid ""
 "available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to open folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to find duplicate messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to retrieve messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to mark messages as read."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to remove attachments from messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to save messages to disk."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:177
 msgid "Hidden file is attached."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:178
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:179
 msgid "Printing failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:180
 msgid "The printer replied &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:181
 msgid "Could not perform this operation on {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:182
 msgid "You must be working online to complete this operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:183
 msgid "Message from &quot;{0}&quot; account:"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:187
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:188
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:189
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:191
+#| msgid "Completed"
+msgid "{0}, Completed on {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:193
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:195
+msgid "Overdue: {0} by {1}"
+msgstr ""
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:645
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
 msgid "Updating..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
 msgid "Waiting..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1220
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1434
+#: ../mail/mail-send-recv.c:1452
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1436
+#: ../mail/mail-send-recv.c:1454
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1438
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr ""
@@ -17208,13 +17626,13 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6043
+#: ../mail/message-list.c:459 ../mail/message-list.c:6034
 msgid "Generating message list"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Бүгін %l:%M %p"
 
@@ -17234,20 +17652,20 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: ../mail/message-list.c:2967
+#: ../mail/message-list.c:2957
 msgid "Select all visible messages"
 msgstr ""
 
-#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3622 ../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:4985
+#: ../mail/message-list.c:4978
 msgid "Follow-up"
 msgstr ""
 
-#: ../mail/message-list.c:5980
+#: ../mail/message-list.c:5971
 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 "
@@ -17255,7 +17673,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5988
+#: ../mail/message-list.c:5979
 msgid "There are no messages in this folder."
 msgstr ""
 
@@ -17291,59 +17709,59 @@ msgstr ""
 msgid "Any header"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 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:1234
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr ""
 
@@ -17402,10 +17820,6 @@ msgstr ""
 msgid "Create a new address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Сертификаттар"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr ""
@@ -17475,7 +17889,7 @@ msgstr ""
 #: ../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:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Атын өзгерту..."
 
@@ -17556,7 +17970,7 @@ msgstr "Әр_екеттер"
 #: ../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:1830
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "А_лдын-ала қарау"
 
@@ -17583,7 +17997,7 @@ msgstr ""
 #: ../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:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_Classic View"
 msgstr ""
 
@@ -17594,7 +18008,7 @@ msgstr ""
 #: ../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:1967
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Vertical View"
 msgstr ""
 
@@ -17613,7 +18027,7 @@ msgstr ""
 #: ../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:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr ""
@@ -17690,35 +18104,40 @@ msgstr ""
 msgid "Restore from Backup"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
 msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr ""
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "Re_start Evolution after restore"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 
@@ -17785,41 +18204,41 @@ msgstr ""
 msgid "Reloading registry service"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:868
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:873
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:946
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:968
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -17828,7 +18247,7 @@ msgid "Invalid Evolution backup file"
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
+msgid "File '{0}' is not a valid Evolution backup file."
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -17870,28 +18289,28 @@ msgstr ""
 msgid "The selected folder is not writable."
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:161
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:179
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:228
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:373
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:382
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:540
+#: ../modules/bogofilter/evolution-bogofilter.c:539
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr ""
@@ -17900,67 +18319,67 @@ msgstr ""
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../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 ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../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:195
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Анонимды"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../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:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../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 "
@@ -17968,36 +18387,36 @@ msgid ""
 msgstr ""
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../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:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../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:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../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 "
@@ -18005,28 +18424,28 @@ msgid ""
 "the entries one level beneath your search base."
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Жүктелуде"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../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:220
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
@@ -18035,70 +18454,38 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
-#: ../modules/cal-config-google/e-google-chooser.c:424
-#: ../modules/cal-config-google/e-google-chooser.c:433
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP қатесі: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
-#: ../modules/cal-config-google/e-google-chooser.c:462
-msgid "Could not parse response"
-msgstr "Жауапты талдау мүмкін емес"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-#: ../modules/cal-config-google/e-google-chooser.c:471
-msgid "Empty response"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
-#: ../modules/cal-config-google/e-google-chooser.c:479
-msgid "Unexpected reply from server"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099
-#: ../modules/cal-config-google/e-google-chooser.c:1101
-msgid "Could not locate user's calendars"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
-msgid "Path"
-msgstr "Орналасу"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:348
+#: ../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:351
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:351
+#: ../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:354
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:354
+#: ../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:234
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "Эл. пошта:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr ""
 
@@ -18110,27 +18497,27 @@ msgstr ""
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr ""
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 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 ""
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -18140,29 +18527,29 @@ msgstr ""
 #. *
 #. * 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Бірліктер:"
 
@@ -18222,57 +18609,75 @@ msgstr ""
 msgid "New Task List"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
 msgid "Calendar Selector"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
 msgid "Memo List Selector"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
 msgid "Task List Selector"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:520
 msgid "Selected Calendars for Alarms"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.c:656
+#: ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.c:1057
 msgid "Ti_me and date:"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "_Date only:"
 msgstr ""
 
@@ -18390,7 +18795,6 @@ msgid "Day _ends:"
 msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#| msgid "Options"
 msgid "View Options"
 msgstr ""
 
@@ -18450,44 +18854,48 @@ msgstr ""
 msgid "Display reminders in _notification area only"
 msgstr ""
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Display reminders for completed _tasks"
+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:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 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:68
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
 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:70
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
 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:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Default _snooze time (in minutes)"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Select the calendars for reminder notification"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Default Free/Busy Server"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Үлгі:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "Publishing Information"
 msgstr ""
 
@@ -18899,14 +19307,12 @@ msgstr ""
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../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"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
@@ -19077,7 +19483,6 @@ msgstr ""
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
 #: ../modules/calendar/e-task-shell-view-private.c:539
@@ -19242,663 +19647,663 @@ msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/itip-formatter/itip-view.c:226
 msgid "Today %H:%M"
 msgstr "Бүгін, %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today %H:%M:%S"
 msgstr "Бұгін, %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %l:%M:%S %p"
 msgstr "Бүгін, %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:256
+#: ../modules/itip-formatter/itip-view.c:254
 msgid "Tomorrow %H:%M"
 msgstr "Ертең, %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow %H:%M:%S"
 msgstr "Ертең, %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %l:%M %p"
 msgstr "Ертең, %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Ертең, %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../modules/itip-formatter/itip-view.c:286
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:291
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../modules/itip-formatter/itip-view.c:295
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:306
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:315
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. 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
+#: ../modules/itip-formatter/itip-view.c:319
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %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
+#: ../modules/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %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
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:340
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:343
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:349
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %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
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:358
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:396
-#: ../modules/itip-formatter/itip-view.c:397
-#: ../modules/itip-formatter/itip-view.c:486
-#: ../modules/itip-formatter/itip-view.c:487
-#: ../modules/itip-formatter/itip-view.c:576
+#: ../modules/itip-formatter/itip-view.c:394
+#: ../modules/itip-formatter/itip-view.c:395
+#: ../modules/itip-formatter/itip-view.c:484
+#: ../modules/itip-formatter/itip-view.c:485
+#: ../modules/itip-formatter/itip-view.c:574
 msgid "An unknown person"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:399
+#: ../modules/itip-formatter/itip-view.c:489
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Received on behalf of %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:416
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:430
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:436
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:454
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s has published the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:544
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has published the following memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:598
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:676
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "Толық күн:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:682
-#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Start time:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:691
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:1516
 msgid "End time:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "Лицензияны қабылдамау"
 
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1053
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1056
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1059
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1062
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1065
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1068
-#: ../smime/gui/certificate-manager.c:1664
+#: ../modules/itip-formatter/itip-view.c:1066
+#: ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "_Жаңарту"
 
-#: ../modules/itip-formatter/itip-view.c:1520
-#: ../modules/itip-formatter/itip-view.c:1568
-#: ../modules/itip-formatter/itip-view.c:1639
+#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1566
+#: ../modules/itip-formatter/itip-view.c:1637
 msgid "Comment:"
 msgstr "Түсіндірме:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr ""
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1571
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr ""
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1576
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1577
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "Т_апсырмалар:"
 
-#: ../modules/itip-formatter/itip-view.c:1914
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3220
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "Сақ_тау"
 
-#: ../modules/itip-formatter/itip-view.c:3682
-#: ../modules/itip-formatter/itip-view.c:5131
+#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:5151
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3862
+#: ../modules/itip-formatter/itip-view.c:3859
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3891
+#: ../modules/itip-formatter/itip-view.c:3889
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4004
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4012
+#: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4017
+#: ../modules/itip-formatter/itip-view.c:4037
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4022
+#: ../modules/itip-formatter/itip-view.c:4042
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4367
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4372
+#: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4767
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4782
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4799
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4820
-#: ../modules/itip-formatter/itip-view.c:5278
-#: ../modules/itip-formatter/itip-view.c:5384
+#: ../modules/itip-formatter/itip-view.c:4840
+#: ../modules/itip-formatter/itip-view.c:5298
+#: ../modules/itip-formatter/itip-view.c:5404
 msgid "Saving changes to the calendar. Please wait..."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5054
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5075
+#: ../modules/itip-formatter/itip-view.c:5095
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5167
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "The meeting is invalid and cannot be updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5243
+#: ../modules/itip-formatter/itip-view.c:5263
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5315
-#: ../modules/itip-formatter/itip-view.c:5354
+#: ../modules/itip-formatter/itip-view.c:5335
+#: ../modules/itip-formatter/itip-view.c:5374
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5422
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5427
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5438
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5443
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5448
+#: ../modules/itip-formatter/itip-view.c:5468
 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:5513
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "calendar.ics"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5518
+#: ../modules/itip-formatter/itip-view.c:5538
 msgid "Save Calendar"
 msgstr "Күнтізбені сақтау"
 
-#: ../modules/itip-formatter/itip-view.c:5567
-#: ../modules/itip-formatter/itip-view.c:5580
+#: ../modules/itip-formatter/itip-view.c:5587
+#: ../modules/itip-formatter/itip-view.c:5600
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5568
-#: ../modules/itip-formatter/itip-view.c:5581
+#: ../modules/itip-formatter/itip-view.c:5588
+#: ../modules/itip-formatter/itip-view.c:5601
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5623
-#: ../modules/itip-formatter/itip-view.c:5653
-#: ../modules/itip-formatter/itip-view.c:5754
+#: ../modules/itip-formatter/itip-view.c:5643
+#: ../modules/itip-formatter/itip-view.c:5673
+#: ../modules/itip-formatter/itip-view.c:5774
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5624
-#: ../modules/itip-formatter/itip-view.c:5654
-#: ../modules/itip-formatter/itip-view.c:5755
+#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5674
+#: ../modules/itip-formatter/itip-view.c:5775
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5670
+#: ../modules/itip-formatter/itip-view.c:5690
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6172
+#: ../modules/itip-formatter/itip-view.c:6193
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Бос"
 
-#: ../modules/itip-formatter/itip-view.c:6188
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6348
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6351
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6354
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr ""
 
@@ -19915,45 +20320,19 @@ msgstr ""
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr ""
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr ""
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Ca_lendar to this account"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:267
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
 msgid "Add Google Con_tacts to this account"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:275
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
 msgid "You may need to enable IMAP access"
 msgstr ""
 
@@ -20075,365 +20454,382 @@ msgstr ""
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-backend.c:350
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:352
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:360
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:362
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:367
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:369
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:684
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:693
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:702
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:712
+#: ../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:1004
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Бос"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:706
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#| msgid "Move to Folder"
+msgid "Go to Folder"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "_Select"
+msgstr "_Таңдау"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr ""
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Жаңа..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1679
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1693
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Қ_оқыс шелегін тазарту"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1700
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#| msgid "Move to Folder"
+msgid "Go to _Folder"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+msgid "Opens a dialog to select a folder to go to"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "_Жоқ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
-#: ../modules/mail/e-mail-shell-view-actions.c:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1786
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1788
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "Ж_азуы"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1849
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "_Жаңа бума..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1916
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1918
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1926
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1934
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1940
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1942
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1962
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1969
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1977
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Барлық хабарламалар"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1984
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Маңызды хабарламалар"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Соңғы 5 күн хабарламалары"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Салынымдары бар хабарламалар"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Белгісі жоқ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2019
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Оқылған хабарламалар"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2026
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Оқылмаған хабарламалар"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "Барлық тіркелгілер"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr "Ағымдағы тіркелгі"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "Ағымдағы бума"
 
@@ -20445,90 +20841,79 @@ msgstr ""
 msgid "Account Search"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../modules/mail/e-mail-shell-view-private.c:954
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d таңдалған, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:995
-#: ../modules/mail/e-mail-shell-view-private.c:1012
+#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../modules/mail/e-mail-shell-view-private.c:980
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d өшірілген"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1021
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../modules/mail/e-mail-shell-view-private.c:989
+#: ../modules/mail/e-mail-shell-view-private.c:995
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1002
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d жіберілген"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1031
 #, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1061
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d барлығы"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../modules/mail/e-mail-shell-view-private.c:1549
 msgid "Send / Receive"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:394
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:854
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Бума"
 
-#: ../modules/mail/em-composer-prefs.c:890
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1163
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Keep in Outbox"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1164
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send immediately"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1165
-#| msgid "15 minutes"
+#: ../modules/mail/em-composer-prefs.c:1207
 msgid "Send after 5 minutes"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1238
+#: ../modules/mail/em-composer-prefs.c:1280
 msgid "Language(s)"
 msgstr "Тіл(дер)"
 
@@ -20552,20 +20937,20 @@ msgstr "Айына бір рет"
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Жоғарғы колонтитул"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:424
 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:1236
+#: ../modules/mail/em-mailer-prefs.c:1554
 msgid "_Date header:"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr ""
 
@@ -20634,20 +21019,20 @@ msgstr ""
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Шолу"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "Плагин"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "П_лагиндер"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr ""
 
@@ -21039,7 +21424,6 @@ msgstr ""
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
@@ -21053,11 +21437,11 @@ msgstr ""
 msgid "Evolution Web Inspector"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Кілттік сөздер"
@@ -21236,8 +21620,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:469
-#: ../plugins/external-editor/external-editor.c:471
+#: ../plugins/external-editor/external-editor.c:484
+#: ../plugins/external-editor/external-editor.c:486
 msgid "Compose in External Editor"
 msgstr ""
 
@@ -21279,23 +21663,27 @@ msgid ""
 "closed as long as the editor is active."
 msgstr ""
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr ""
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Сурет файлдары"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+msgid "Change Face Image"
+msgstr ""
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr ""
 
@@ -21316,15 +21704,28 @@ msgid "Invalid Image Size"
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
+msgid "Incorrect Face Image Byte Size"
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+"doesn't exceed 723 bytes."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
@@ -21451,64 +21852,63 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] ""
-msgstr[1] ""
 
 #. 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:411
 #, c-format
 msgid "From: %s"
 msgstr ""
 
 #. 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:425
 #, c-format
 msgid "Subject: %s"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr ""
 
 #. 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:483
 #, c-format
 msgid "Show %s"
 msgstr "%s көрсету"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr ""
 
@@ -21574,7 +21974,6 @@ msgid_plural ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
@@ -21585,7 +21984,6 @@ msgid_plural ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
@@ -21596,7 +21994,6 @@ msgid_plural ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
@@ -21749,23 +22146,18 @@ msgstr ""
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr ""
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr ""
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr ""
 
@@ -21846,7 +22238,7 @@ msgid "_Username:"
 msgstr "_Пайдаланушы аты:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:772
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Пароль:"
 
@@ -21858,7 +22250,7 @@ msgstr "Парольді есте сақ_тау"
 msgid "Publishing Location"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-fb.c:84
 #: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
@@ -21951,7 +22343,7 @@ msgstr ""
 msgid "Comma separated values (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
 msgid "iCalendar (.ics)"
 msgstr ""
 
@@ -22007,38 +22399,55 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../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:335
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr ""
 
-#: ../shell/e-shell.c:388
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr ""
 
-#: ../shell/e-shell.c:495
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr ""
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:909
+#: ../shell/e-shell.c:1024
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
+#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+msgid "New _Window"
+msgstr "Жаңа _терезе"
+
+#: ../shell/e-shell.c:1214
+#| msgid "_Preferences"
+msgid "Quick _Reference"
+msgstr ""
+
+#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+msgid "_About"
+msgstr "Осы тур_алы"
+
+#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+msgid "_Quit"
+msgstr "_Шығу"
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr ""
@@ -22051,332 +22460,320 @@ msgstr ""
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:930
+#: ../shell/e-shell-searchbar.c:926
 msgid "Sho_w:"
 msgstr ""
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr ""
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1023
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr ""
 
-#: ../shell/e-shell-utils.c:174
+#: ../shell/e-shell-utils.c:176
 msgid "vCard (.vcf)"
 msgstr ""
 
-#: ../shell/e-shell-utils.c:198
+#: ../shell/e-shell-utils.c:200
 msgid "All Files (*)"
 msgstr "Барлық файлдар (*)"
 
-#: ../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:72
+#: ../shell/e-shell-utils.c:409
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst gmail com>"
 
-#: ../shell/e-shell-window-actions.c:83
+#: ../shell/e-shell-utils.c:420
 msgid "Evolution Website"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:339
+#: ../shell/e-shell-view.c:292
+msgid "Saving user interface state"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:277
 msgid "Categories Editor"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:715
+#: ../shell/e-shell-window-actions.c:585
 msgid "Bug Buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:586
 msgid "Bug Buddy could not be run."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:894
-msgid "_About"
-msgstr "Осы тур_алы"
-
-#: ../shell/e-shell-window-actions.c:896
+#: ../shell/e-shell-window-actions.c:766
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
+#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
 msgid "_Close Window"
 msgstr "Те_резені жабу"
 
-#: ../shell/e-shell-window-actions.c:922
+#: ../shell/e-shell-window-actions.c:792
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#: ../shell/e-shell-window-actions.c:924
+#: ../shell/e-shell-window-actions.c:794
 msgid "Open the Evolution User Guide"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:950
+#: ../shell/e-shell-window-actions.c:820
 msgid "I_mport..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:952
+#: ../shell/e-shell-window-actions.c:822
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:957
-msgid "New _Window"
-msgstr "Жаңа _терезе"
-
-#: ../shell/e-shell-window-actions.c:959
+#: ../shell/e-shell-window-actions.c:829
 msgid "Create a new window displaying this view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:971
+#: ../shell/e-shell-window-actions.c:841
 msgid "Available Cate_gories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:973
+#: ../shell/e-shell-window-actions.c:843
 msgid "Manage available categories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:985
+#: ../shell/e-shell-window-actions.c:855
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:987
+#: ../shell/e-shell-window-actions.c:857
 msgid "Show Evolution's shortcut keys"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:992
-msgid "_Quit"
-msgstr "_Шығу"
-
-#: ../shell/e-shell-window-actions.c:994
+#: ../shell/e-shell-window-actions.c:864
 msgid "Exit the program"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:999
+#: ../shell/e-shell-window-actions.c:869
 msgid "_Advanced Search..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1001
+#: ../shell/e-shell-window-actions.c:871
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1008
+#: ../shell/e-shell-window-actions.c:878
 msgid "Clear the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1013
+#: ../shell/e-shell-window-actions.c:883
 msgid "_Edit Saved Searches..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1015
+#: ../shell/e-shell-window-actions.c:885
 msgid "Manage your saved searches"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1022
+#: ../shell/e-shell-window-actions.c:892
 msgid "Click here to change the search type"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1027
+#: ../shell/e-shell-window-actions.c:897
 msgid "_Find Now"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1029
+#: ../shell/e-shell-window-actions.c:899
 msgid "Execute the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1034
+#: ../shell/e-shell-window-actions.c:904
 msgid "_Save Search..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1036
+#: ../shell/e-shell-window-actions.c:906
 msgid "Save the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1048
+#: ../shell/e-shell-window-actions.c:918
 msgid "Submit _Bug Report..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1050
+#: ../shell/e-shell-window-actions.c:920
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1055
+#: ../shell/e-shell-window-actions.c:925
 msgid "_Work Offline"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1057
+#: ../shell/e-shell-window-actions.c:927
 msgid "Put Evolution into offline mode"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1062
+#: ../shell/e-shell-window-actions.c:932
 msgid "_Work Online"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1064
+#: ../shell/e-shell-window-actions.c:934
 msgid "Put Evolution into online mode"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1092
+#: ../shell/e-shell-window-actions.c:962
 msgid "Lay_out"
 msgstr ""
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../shell/e-shell-window-actions.c:1100
+#: ../shell/e-shell-window-actions.c:970
 msgid "_New"
 msgstr "_Жаңа"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../shell/e-shell-window-actions.c:977
 msgid "_Search"
 msgstr "І_здеу"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:998
 msgid "_Window"
 msgstr "_Терезе"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1027
 msgid "Show Side _Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Show the side bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1035
 msgid "Show _Buttons"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Show the switcher buttons"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1043
 msgid "Show _Status Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1045
 msgid "Show the status bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Show _Tool Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1053
 msgid "Show the tool bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1075
 msgid "_Icons Only"
 msgstr "Тек т_аңбашалар"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1077
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1082
 msgid "_Text Only"
 msgstr "Тек мә_тін"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1084
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1089
 msgid "Icons _and Text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1091
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1096
 msgid "Tool_bar Style"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1098
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1106
 msgid "Delete Current View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Save current custom view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1122
 msgid "C_urrent View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1132
 msgid "Custom View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1134
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1142
 msgid "Page Set_up..."
 msgstr "Парақ ба_птаулары..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1144
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1507
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1630
 #, c-format
 msgid "Select view: %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1647
 #, c-format
 msgid "Delete view: %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Execute these search parameters"
 msgstr ""
 
 #. 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
+#: ../shell/e-shell-window.c:555
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Жаңа"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:199
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -22396,75 +22793,75 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:207
+#: ../shell/main.c:223
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: ../shell/main.c:213
+#: ../shell/main.c:229
 msgid "Do not tell me again"
 msgstr ""
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:302
+#: ../shell/main.c:318
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:306
+#: ../shell/main.c:322
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:310
+#: ../shell/main.c:326
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:312
+#: ../shell/main.c:328
 msgid "Ignore network availability"
 msgstr ""
 
-#: ../shell/main.c:315
+#: ../shell/main.c:331
 msgid "Forcibly shut down Evolution"
 msgstr ""
 
-#: ../shell/main.c:318
+#: ../shell/main.c:334
 msgid "Disable loading of any plugins."
 msgstr ""
 
-#: ../shell/main.c:320
+#: ../shell/main.c:336
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:324
+#: ../shell/main.c:340
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:326
+#: ../shell/main.c:342
 msgid "Request a running Evolution process to quit"
 msgstr ""
 
-#: ../shell/main.c:403
+#: ../shell/main.c:419
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr ""
 
-#: ../shell/main.c:457 ../shell/main.c:462
+#: ../shell/main.c:473 ../shell/main.c:478
 msgid "- The Evolution PIM and Email Client"
 msgstr ""
 
-#: ../shell/main.c:520
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:526
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -22530,7 +22927,7 @@ msgid "Failed to invoke authenticate for '{0}'"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:17
-msgid "Failed to connect to '{0}'"
+msgid "Failed to connect '{0}'"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:18
@@ -22538,21 +22935,61 @@ msgid "_Reconnect"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:19
-msgid "Failed to prompt for credentials for '{0}'"
+msgid "Failed to connect address book '{0}'"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:20
-msgid "Failed to finish trust prompt for '{0}'"
+msgid "Failed to connect calendar '{0}'"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:21
-msgid "SSL certificate for '{0}' is not trusted."
+msgid "Failed to connect mail account '{0}'"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:22
+msgid "Failed to connect memo list '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:23
+msgid "Failed to connect task list '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:24
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:26
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr ""
 
+#: ../shell/shell.error.xml.h:29
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:33
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr ""
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -22636,7 +23073,7 @@ msgstr ""
 msgid "Email Address"
 msgstr "Электронды пошта"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../smime/gui/certificate-manager.c:652
 msgid "Select a file to backup your key and certificate..."
 msgstr ""
 
@@ -22645,52 +23082,47 @@ msgstr ""
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:662
+#: ../smime/gui/certificate-manager.c:664
 #, 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:728
+#: ../smime/gui/certificate-manager.c:730
 msgid "Backup Certificate"
 msgstr ""
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
+#: ../smime/gui/certificate-manager.c:744
 msgid "_File name:"
 msgstr "_Файл аты:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:747
+#: ../smime/gui/certificate-manager.c:749
 msgid "Please select a file..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../smime/gui/certificate-manager.c:763
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:767
+#: ../smime/gui/certificate-manager.c:769
 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
+#: ../smime/gui/certificate-manager.c:788
 msgid "_Repeat Password:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../smime/gui/certificate-manager.c:807
 msgid "Passwords do not match"
 msgstr "Парольдер өзара сәйкес келмейді"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:813
+#: ../smime/gui/certificate-manager.c:815
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -22698,144 +23130,134 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../smime/gui/certificate-manager.c:860
 msgid "No file name provided"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../smime/gui/certificate-manager.c:864
 msgid "Failed to backup key and certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ешқашан"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
-msgid "Marginal"
+msgid "Marginally"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
-msgid "Ultimate"
+msgid "Ultimately"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
-msgid "Temporary"
+msgid "Temporarily"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1333
-#| msgid "Certificates"
+#: ../smime/gui/certificate-manager.c:1335
 msgid "Change certificate trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../smime/gui/certificate-manager.c:1347
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../smime/gui/certificate-manager.c:1372
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
+msgid "_Never trust this certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "Ешқаша_н"
+msgid "_Temporarily trusted (this session only)"
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
 msgctxt "CamelTrust"
-msgid "_Marginal"
+msgid "_Marginally trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1373
-#| msgid "_Full name"
+#: ../smime/gui/certificate-manager.c:1375
 msgctxt "CamelTrust"
-msgid "_Fully"
+msgid "_Fully trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
 msgctxt "CamelTrust"
-msgid "_Ultimate"
+msgid "_Ultimately trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1378
-#| msgid ""
-#| "Before trusting this CA for any purpose, you should examine its "
-#| "certificate and its policy and procedures (if available)."
+#: ../smime/gui/certificate-manager.c:1380
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1393
-#| msgid "Certificate"
+#: ../smime/gui/certificate-manager.c:1395
 msgid "_Display certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1598
-#| msgid "You have certificates on file that identify these people:"
+#: ../smime/gui/certificate-manager.c:1600
 msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../smime/gui/certificate-manager.c:1631
 msgid "Host name"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1631
-#| msgid "Issued By"
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Issuer"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1632
-#| msgid "SHA1 Fingerprint"
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Fingerprint"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1654
-#| msgid "_Edit %s"
+#: ../smime/gui/certificate-manager.c:1656
 msgid "_Edit Trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr ""
 
@@ -22941,8 +23363,9 @@ msgstr ""
 "сертификатын тексеруіңіз керек (мүмкін болса)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Сертификат"
+#| msgid "Certificate"
+msgid "C_ertificate:"
+msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
@@ -23086,5 +23509,24 @@ msgstr ""
 msgid "With _Status"
 msgstr ""
 
+#~ msgid "is not set"
+#~ msgstr "орнатылмаған"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP қатесі: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Жауапты талдау мүмкін емес"
+
+#~ msgid "Path"
+#~ msgstr "Орналасу"
+
+#~ msgid "Template:"
+#~ msgstr "Үлгі:"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "Ешқаша_н"
+
 #~ msgid "_PostScript"
 #~ msgstr "_PostScript"


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