[evolution] Updated Galician translations



commit 9a5366d34580450ce44c031d24c74d4132e09468
Author: Fran Dieguez <fran openhost es>
Date:   Wed Aug 19 10:14:21 2015 +0200

    Updated Galician translations

 po/gl.po | 5737 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 3142 insertions(+), 2595 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 6c5ef89..03cd901 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,14 +13,13 @@
 # Fran Diéguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro regueiro gmail com>, 2012.
 # Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015.
-#: ../shell/main.c:506
+#: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evoluti";
-"on&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-03-03 18:08+0000\n"
-"PO-Revision-Date: 2015-03-03 23:57+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-19 10:01+0200\n"
+"PO-Revision-Date: 2015-08-19 10:14+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -98,8 +97,8 @@ msgstr "Desexa eliminar a axenda de enderezos «{0}»?"
 msgid "This address book will be removed permanently."
 msgstr "Esta axenda de enderezos retirarase permanentemente."
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "_Non eliminar"
 
@@ -210,8 +209,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
@@ -251,7 +250,7 @@ msgstr ""
 "engadila de todas as formas?"
 
 #: ../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 "Produciuse un erro ao eliminar o contacto"
 
@@ -288,9 +287,9 @@ msgstr ""
 "enderezos distinta."
 
 #: ../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 "Editor de contactos"
 
@@ -357,7 +356,7 @@ msgstr "Páxi_na web:"
 #: ../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 "_Calendario:"
 
@@ -374,7 +373,7 @@ msgid "Home Page:"
 msgstr "Páxina web:"
 
 #: ../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 "_Calendario:"
 
@@ -446,18 +445,15 @@ msgstr "_Aniversario:"
 
 #: ../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 "Aniversario"
 
-#. 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 "Aniversario"
 
@@ -513,7 +509,7 @@ msgstr "Traballo"
 #: ../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 "Outros"
 
@@ -526,188 +522,288 @@ msgid "Notes"
 msgstr "Notas"
 
 #: ../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 "Engadir _PGP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr "Engadir _X.509"
+
+#: ../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 "_Retirar"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "Cargar P_GP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr "_Cargar X.509"
+
+#: ../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:135
+#: ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "_Gardar"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "Certificados"
+
+#: ../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
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../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 "Opcións"
 
 #. 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:481 ../e-util/e-html-editor-actions.c:574
+#: ../e-util/e-html-editor-actions.c:616 ../e-util/e-html-editor-actions.c:711
 #: ../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:3129
+#: ../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:886
-#: ../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-utils.c:134 ../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 "_Cancelar"
 
-#: ../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:3130
-#: ../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 "_Gardar"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
 msgid "Show Telephone"
 msgstr "Mostrar teléfono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Show SIP Address"
 msgstr "Mostrar enderezo SIP"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
 msgid "Show Instant Messaging"
 msgstr "Mostrar mensaxaría instantánea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Show Web Addresses"
 msgstr "Mostrar enderezos web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Show Job section"
 msgstr "Mostrar a sección de traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Show Miscellaneous"
 msgstr "Mostrar varios"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Show Home Mailing Address"
 msgstr "Mostrar enderezo de correo particular"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "Show Work Mailing Address"
 msgstr "Mostrar enderezo de correo do traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Show Other Mailing Address"
 msgstr "Mostrar outro enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "Show Notes"
 msgstr "Mostrar notas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
-#: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:993
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+msgid "Show Certificates"
+msgstr "Mostrar certificados"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../e-util/e-html-editor-actions.c:1134
 msgid "_Undo"
 msgstr "_Desfacer"
 
-#: ../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 "Desfacer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:979
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1120
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: ../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 "Refacer"
 
-#: ../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 "Produciuse un erro ao engadir o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao retirar o contacto"
 
-#: ../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 "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
-msgstr "Escolla unha imaxe para este contacto"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+msgid "X.509 certificates"
+msgstr "Certificados X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr "Chaves PGP"
+
+#: ../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 "Todos os ficheiros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open PGP key"
+msgstr "Abrir chave PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open X.509 certificate"
+msgstr "Abir certificado 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:482 ../e-util/e-html-editor-actions.c:575
-#: ../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:617 ../e-util/e-html-editor-actions.c:712
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../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 "O ficheiro escollido non é un ficheiro local."
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, c-format
+msgid "Failed to load certificate: %s"
+msgstr "Produciuse un fallo ao cargar o certificado: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr "Gardar chave PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save X.509 certificate"
+msgstr "Gardar certificado X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+msgid "Failed to save certificate: %s"
+msgstr "Produciuse un fallo ao gardar o certificado: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "Escolla unha imaxe para este contacto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../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"
@@ -715,47 +811,47 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../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 "«%s» ten un formato incorrecto"
 
-#: ../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 "«%s» non pode ser unha data no futuro"
 
-#: ../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 "%s«%s» ten un formato incorrecto"
 
-#: ../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 "%s«%s» está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
-#: ../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
@@ -764,7 +860,7 @@ msgstr "Contacto incorrecto."
 #: ../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 "_Aceptar"
@@ -889,23 +985,6 @@ msgstr "Engadir un enderezo de correo-e á lista"
 msgid "Remove an email address from the List"
 msgstr "Retirar un enderezo de correo-e da lista"
 
-#: ../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 "_Retirar"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Insertar un enderezo de correo-e desde a axenda de enderezos"
@@ -985,22 +1064,22 @@ msgid "Copy _Email Address"
 msgstr "Copiar o _enderezo de correo"
 
 #: ../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 "Copiar o enderezo de correo ao portapapeis"
 
 #: ../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 "Enviar unha men_saxe nova a…"
 
 #: ../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 "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:997
+#: ../e-util/e-web-view.c:1064
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1097,7 +1176,7 @@ msgstr "Videoconferencia"
 #: ../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 "Calendario"
@@ -1353,73 +1432,72 @@ msgstr "Produciuse un erro ao obter a vista da axenda"
 msgid "Search Interrupted"
 msgstr "Busca interrumpida"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../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 "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos visíbeis"
 
-#: ../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 "Está seguro de que desexa eliminar estas listas de contactos?"
 
-#: ../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 "Está seguro de que desexa eliminar esta lista de contactos?"
 
-#: ../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 "Está seguro de que desexa eliminar esta lista de contactos (%s)?"
 
-#: ../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 "Está seguro de que desexa eliminar estes contactos?"
 
-#: ../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 "Está seguro de que desexa eliminar este contacto?"
 
-#: ../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 "Está seguro de que desexa eliminar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805
-#: ../mail/e-mail-account-manager.c:736
+#: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:943
-#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "E_liminar"
 
 #. 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"
@@ -1434,11 +1512,11 @@ msgstr[1] ""
 "Ao abrir %d contactos, abrirá tamén %d novas xanelas.\n"
 "Está seguro de que desexa visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1549,7 +1627,7 @@ msgid "Title"
 msgstr "Título"
 
 #: ../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 "Función"
@@ -1612,19 +1690,19 @@ msgstr "_Ampliar"
 
 #. 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 "_Reducir"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1972
+#: ../e-util/e-html-editor-actions.c:2113
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1634,7 +1712,7 @@ msgstr ""
 "\n"
 "Buscando os contactos…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1648,7 +1726,7 @@ msgstr ""
 "\n"
 "ou premer aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1662,7 +1740,7 @@ msgstr ""
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1672,7 +1750,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1917,17 +1995,18 @@ msgstr[1] "horas"
 #. * (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] "día"
 msgstr[1] "días"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Hora de inicio"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 msgid "Appointments"
 msgstr "Citas"
 
@@ -1941,15 +2020,15 @@ msgstr "_Función de repetición"
 
 #: ../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:1002
+#: ../e-util/e-html-editor-actions.c:1143
 #: ../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
@@ -1966,11 +2045,11 @@ msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../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 "Localización:"
 
@@ -2007,49 +2086,48 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../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 "Non hai un resumo dispoñíbel."
 
-#: ../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 "Non hai unha descrición dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñíbel."
 
-#: ../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 "Recordatorios de Evolution"
 
-#: ../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] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1974
+#: ../calendar/alarm-notify/alarm-queue.c:2032
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../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 "_Non"
 
-#: ../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 "_Si"
 
-#: ../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 "
@@ -2066,7 +2144,7 @@ msgstr ""
 "\n"
 "Está seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1995
+#: ../calendar/alarm-notify/alarm-queue.c:2053
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2124,8 +2202,7 @@ msgstr "_Non enviar"
 msgid "_Send Notice"
 msgstr "_Enviar a notificación"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que desexa eliminar esta reunión?"
@@ -2145,8 +2222,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a tarefa."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que desexa eliminar esta tarefa?"
@@ -2258,8 +2334,7 @@ msgstr "Modificou esta reunión pero aínda non a gardou."
 msgid "_Save Changes"
 msgstr "_Gardar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
@@ -2298,8 +2373,8 @@ msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles responder."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:13
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -2706,8 +2781,7 @@ msgstr "Produciuse un fallo ao actualizar a lista de recordatorios «{0}»"
 msgid "Failed to make an occurrence movable"
 msgstr "Produciuse un fallo ao crear unha ocorrencia movíbel"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
@@ -2756,24 +2830,24 @@ msgstr "non é"
 
 #. 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 "Público"
 
 #. 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 "Privado"
 
 #. 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 "Confidencial"
 
@@ -2788,9 +2862,9 @@ msgstr "Organizador"
 msgid "Attendee"
 msgstr "Participante"
 
-#: ../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
+#: ../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:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
@@ -2804,25 +2878,24 @@ msgstr "Categoría"
 #: ../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 "Anexos"
 
 #: ../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 "Existe"
 
 #: ../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 "Non existe"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/dialogs/event-editor.c:309
 #: ../calendar/gui/dialogs/event-editor.c:330
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
@@ -2923,7 +2996,7 @@ msgstr "Repetir"
 msgid "_Repeat the reminder"
 msgstr "_Repetir o recordatorio"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence:
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "veces adicionais cada"
@@ -3018,138 +3091,138 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr "Non foi posíbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr "Non foi posíbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Editar a cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr "Desexa gardar o elemento orixinal?"
 
-#: ../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 "Non foi posíbel sincronizar co servidor"
 
 #. == 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
+#: ../smime/gui/certificate-manager.c:2066
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:958 ../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:1099 ../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:929
 msgid "_Copy"
 msgstr "_Copiar…"
 
-#: ../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:1326 ../mail/e-mail-browser.c:135
+#: ../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:931
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:965 ../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:1106 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../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:1320
-#: ../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:938
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: ../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
 msgid "Delete the selection"
 msgstr "Eliminar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr "Ver a axuda"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:972 ../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:1113 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../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:1332
-#: ../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:966
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../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 "_Imprimir…"
 
-#: ../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
@@ -3157,160 +3230,160 @@ msgstr "_Imprimir…"
 msgid "Pre_view..."
 msgstr "Previsuliazar…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
-#: ../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 "Gardar e pechar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:986 ../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:1127 ../e-util/e-web-view.c:387
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../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:1043
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1009
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1150
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1030
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1171
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../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 "_Opcións"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1051 ../mail/e-mail-browser.c:177
+#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../e-util/e-html-editor-actions.c:1192 ../mail/e-mail-browser.c:178
 #: ../shell/e-shell-window-actions.c:1121
-#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vista"
 
-#: ../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 "_Anexo…"
 
-#: ../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 "Anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr "Alterna a vista das categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a vista do fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr "Campo da _función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a vista do campo da función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a vista do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a vista do campo de estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr "Campo do _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a vista do campo de tipo de participante"
 
-#: ../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 "Anexar"
 
-#: ../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 ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../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 "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr "Non é posíbel usar a versión actual!"
 
@@ -3320,7 +3393,7 @@ msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
 #: ../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 "O destino é só de lectura"
 
@@ -3440,7 +3513,7 @@ msgstr ""
 "organizador"
 
 #: ../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 "Esta actividade ten recordatorios"
 
@@ -3467,89 +3540,89 @@ msgstr "A data de inicio é incorrecta"
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1525
+#: ../calendar/gui/dialogs/event-page.c:1543
 msgid "Start time is wrong"
 msgstr "A hora de inicio é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/event-page.c:1551
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../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 "Requírese un organizador."
 
-#: ../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 "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1938
+#: ../calendar/gui/dialogs/event-page.c:1956
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:1940
+#: ../calendar/gui/dialogs/event-page.c:1958
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../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] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../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] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../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] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3511
 msgid "Custom"
 msgstr "Personalizar"
 
 #. 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 "Ningunha"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 msgctxt "eventpage"
 msgid "for"
 msgstr "durante"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:4
 msgctxt "eventpage"
 msgid "until"
 msgstr "até"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "15 minutos antes da cita"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 hora antes da cita"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgctxt "eventpage"
 msgid "1 day before appointment"
@@ -3563,8 +3636,8 @@ msgstr "_Localización:"
 #: ../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 "_Descrición:"
 
@@ -3587,7 +3660,7 @@ msgstr "Descrición da actividade"
 
 #: ../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 "Participa_ntes…"
 
@@ -3676,7 +3749,7 @@ msgstr ""
 "Non é posíbel editar a nota na súa totalidade porque vostede non é o "
 "organizador"
 
-#: ../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
@@ -3751,18 +3824,18 @@ msgstr "Todas as instancias"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén repeticións que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr "A data da repetición non é correcta"
 
-#: ../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 ""
 "A hora de finalización da repetición era anterior á do inicio da actividade"
 
 #. 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 "en"
 
@@ -3770,7 +3843,7 @@ msgstr "en"
 #. * (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 "primeiro"
 
@@ -3779,7 +3852,7 @@ msgstr "primeiro"
 #. * (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 "segundo"
 
@@ -3787,7 +3860,7 @@ msgstr "segundo"
 #. * (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 "terceiro"
 
@@ -3795,7 +3868,7 @@ msgstr "terceiro"
 #. * (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 "cuarto"
 
@@ -3803,7 +3876,7 @@ msgstr "cuarto"
 #. * (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 "quinto"
 
@@ -3811,13 +3884,13 @@ msgstr "quinto"
 #. * (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 "último"
 
 #. 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 "Outra data"
 
@@ -3825,7 +3898,7 @@ msgstr "Outra data"
 #. * 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 "Do 1 ao 10"
 
@@ -3833,7 +3906,7 @@ msgstr "Do 1 ao 10"
 #. * 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 "do 11 ao 20"
 
@@ -3841,41 +3914,41 @@ msgstr "do 11 ao 20"
 #. * 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 "Do 21 ao 31"
 
-#: ../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 "Luns"
 
-#: ../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 "Martes"
 
-#: ../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 "Mércores"
 
-#: ../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 "Xoves"
 
-#: ../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 "Venres"
 
-#: ../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 "Sábado"
 
-#: ../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 "Domingo"
@@ -3883,71 +3956,71 @@ msgstr "Domingo"
 #. 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 "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr "aparicións"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr "Engadir unha excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr "Non foi posíbel obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr "Modificar a excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr "Non foi posíbel obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "Data e hora"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "día(s)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "semana(s)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "mes(es)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgctxt "recurrpage"
 msgid "for"
 msgstr "durante"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
 msgid "until"
 msgstr "até"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
 msgid "forever"
@@ -4040,7 +4113,7 @@ msgstr "Alta"
 #. 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"
@@ -4055,9 +4128,8 @@ msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Sen definir"
 
@@ -4090,8 +4162,7 @@ msgstr "En progreso"
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
 #: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
 #: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Completada"
 
@@ -4101,7 +4172,7 @@ msgstr "Completada"
 #: ../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 "Cancelada"
 
@@ -4342,8 +4413,8 @@ msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #: ../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 "Estado:"
 
@@ -4360,17 +4431,17 @@ msgstr "Descrición:"
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
-#: ../calendar/gui/e-cal-data-model.c:1608
+#: ../calendar/gui/e-cal-data-model.c:1625
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr "Crear unha vista para o calendario «%s»"
 
-#: ../calendar/gui/e-cal-data-model.c:1612
+#: ../calendar/gui/e-cal-data-model.c:1629
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr "Creando vistas para a lista de tarefas «%s»"
 
-#: ../calendar/gui/e-cal-data-model.c:1616
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr "Creando unha vista para a lista de recordatorios «%s»"
@@ -4384,7 +4455,7 @@ msgid "Start date"
 msgstr "Data de inicio"
 
 #: ../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
@@ -4396,7 +4467,7 @@ msgstr "Tipo"
 msgid "Completion date"
 msgstr "Data de conclusión"
 
-#: ../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 "Completado"
 
@@ -4410,16 +4481,14 @@ msgid "% Complete"
 msgstr "% completado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Prioridade"
 
 #. 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
@@ -4440,51 +4509,51 @@ msgstr "Creado"
 msgid "Last modified"
 msgstr "Última modificación"
 
-#: ../calendar/gui/e-calendar-view.c:411
+#: ../calendar/gui/e-calendar-view.c:459
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:417
+#: ../calendar/gui/e-calendar-view.c:465
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:423
+#: ../calendar/gui/e-calendar-view.c:471
 msgid "Paste events from the clipboard"
 msgstr "Pegar as actividades desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:477
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:810
+#: ../calendar/gui/e-calendar-view.c:859
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "O código pegado non contén datos iCalendar válidos"
 
-#: ../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 "Calendario por omisión non atopado"
 
-#: ../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 "Lista de recordatorios por omisión non atopada"
 
-#: ../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 "Lista de tarefas por omisión non atopada"
 
-#: ../calendar/gui/e-calendar-view.c:918
+#: ../calendar/gui/e-calendar-view.c:969
 msgid "No suitable component found"
 msgstr "Non se atopou un compoñente non axeitado"
 
-#: ../calendar/gui/e-calendar-view.c:988
+#: ../calendar/gui/e-calendar-view.c:1039
 msgid "Pasting iCalendar data"
 msgstr "Pegando datos iCalendar"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c: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 "Organizador: %s <%s>"
@@ -4492,29 +4561,29 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c: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 "Organizador: %s"
 
 #. 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 "Localización: %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 "Hora: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2228
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/e-calendar-view.c:2242
-#: ../calendar/gui/e-calendar-view.c:2245
+#: ../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 "%d de %b de %Y"
 
@@ -4523,13 +4592,13 @@ msgstr "%d de %b de %Y"
 #. 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 "%d de %b"
 
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2308
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -4539,15 +4608,15 @@ msgstr "%A, %d de %b de %Y"
 #. * %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 "%a, %d de %b"
 
-#: ../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 "%a, %d de %b de %Y"
 
@@ -4560,99 +4629,95 @@ msgstr "Data de inicio"
 msgid "End Date"
 msgstr "Data de finalización"
 
-#: ../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 "Descoñecido"
 
-#: ../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 "A orixe con UID «%s» non se atopou"
 
-#: ../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 "Creando un evento"
 
-#: ../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 "Creando un recordatorio"
 
-#: ../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 "Creando unha tarefa"
 
-#: ../calendar/gui/e-cal-model.c:1645
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1647
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../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 "Si"
 
-#: ../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 "Non"
 
-#: ../calendar/gui/e-cal-model.c:3029
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../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 "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3030
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../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 "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3031
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../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 "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3032
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../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 "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3033
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr "Necesita unha acción"
 
-#: ../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 "Libre"
 
-#: ../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 "Ocupado"
 
@@ -4672,175 +4737,167 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-cal-ops.c:283
+#: ../calendar/gui/e-cal-ops.c:287
 msgid "Modifying an event"
 msgstr "Modificando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:291
 msgid "Modifying a memo"
 msgstr "Modificando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:295
 msgid "Modifying a task"
 msgstr "Modificando unha lista de tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:387
+#: ../calendar/gui/e-cal-ops.c:394
 msgid "Removing an event"
 msgstr "Eliminando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:391
+#: ../calendar/gui/e-cal-ops.c:398
 msgid "Removing a memo"
 msgstr "Eliminando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:402
 msgid "Removing a task"
 msgstr "Eliminando unha tarefa"
 
-#: ../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] "Eliminando un evento"
 msgstr[1] "Eliminando %d eventos"
 
-#: ../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] "Eliminando un recordatorio"
 msgstr[1] "Eliminando %d recordatorios"
 
-#: ../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] "Eliminando unha tarefa"
 msgstr[1] "Eliminando %d tarefas"
 
-#: ../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] "Pegando un evento"
 msgstr[1] "Eliminando %d eventos"
 
-#: ../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] "Pegando un recordatorio"
 msgstr[1] "Pegando %d recordatorios"
 
-#: ../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] "Pegando unha tarefa"
 msgstr[1] "Pegando %d tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:820
+#: ../calendar/gui/e-cal-ops.c:833
 msgid "Updating an event"
 msgstr "Actualizando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:824
+#: ../calendar/gui/e-cal-ops.c:837
 msgid "Updating a memo"
 msgstr "Actualizando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:828
+#: ../calendar/gui/e-cal-ops.c:841
 msgid "Updating a task"
 msgstr "Actualizando unha tarefa"
 
-#: ../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 "Obtendo os eventos a eliminar no calendario «%s»"
 
-#: ../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 "Obtendo os recordatorios a eliminar na lista de recordatorios «%s»"
 
-#: ../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 "Obtendo as tarefas a eliminar na lista de tarefas «%s»"
 
-#: ../calendar/gui/e-cal-ops.c:962
+#: ../calendar/gui/e-cal-ops.c:983
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "Eliminando eventos no calendario «%s»"
 
-#: ../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 "Eliminando recordatorios na lista de recordatorios «%s»"
 
-#: ../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 "Eliminando tarefas na lista de tarefas «%s»"
 
-#: ../calendar/gui/e-cal-ops.c:1068
+#: ../calendar/gui/e-cal-ops.c:1091
 msgid "Purging events"
 msgstr "Eliminando eventos"
 
-#: ../calendar/gui/e-cal-ops.c:1072
+#: ../calendar/gui/e-cal-ops.c:1095
 msgid "Purging memos"
 msgstr "Eliminando recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:1076
+#: ../calendar/gui/e-cal-ops.c:1099
 msgid "Purging tasks"
 msgstr "Eliminando tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:1178
+#: ../calendar/gui/e-cal-ops.c:1201
 msgid "Expunging completed tasks"
 msgstr "Compactando tarefas completadas"
 
-#: ../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] "Movendo un evento"
 msgstr[1] "Movendo %d eventos"
 
-#: ../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] "Copiando un evento"
 msgstr[1] "Copiando %d eventos"
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2069
 #, c-format
-#| msgid "Moving an memo"
-#| msgid_plural "Moving %d memos"
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Movendo un recordatorio"
 msgstr[1] "Movendo %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2042
+#: ../calendar/gui/e-cal-ops.c:2070
 #, c-format
-#| msgid "Copying an memo"
-#| msgid_plural "Copying %d memos"
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copiando un recordatorio"
 msgstr[1] "Copiando %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2076
 #, c-format
-#| msgid "Moving an task"
-#| msgid_plural "Moving %d tasks"
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Movendo unha tarefa"
 msgstr[1] "Movendo %d tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:2049
+#: ../calendar/gui/e-cal-ops.c:2077
 #, c-format
-#| msgid "Copying an task"
-#| msgid_plural "Copying %d tasks"
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
 msgstr[0] "Copiando unha tarefa"
@@ -4866,14 +4923,14 @@ msgstr ""
 "%s"
 
 #. 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 "am"
 
 #. 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"
@@ -4885,13 +4942,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c: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 "%A %d de %B"
 
 #. 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 "Semana %d"
@@ -4902,27 +4959,27 @@ msgstr "Semana %d"
 #. * 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 "divisións de %02i minutos"
 
-#: ../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 "Mostrar o fuso horario secundario"
 
 #. 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 "Ningunha"
 
-#: ../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 "Seleccionar…"
 
@@ -4996,11 +5053,11 @@ msgstr "Non-participante"
 msgid "Needs Action"
 msgstr "Necesita unha acción"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../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 "RSVP"
@@ -5009,85 +5066,85 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "En progreso"
 
-#: ../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 ""
 "Introducir o contrasinal para acceder á información de dispoñibilidade no "
 "servidor %s como usuario %s"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razón do fallo: %s"
 
-#: ../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 "Introduza o contrasinal"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Ausente da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr "Act_ualizar a dispoñibilidade"
 
-#: ../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 "Seleccionar _automaticamente"
 
-#: ../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 "Tod_as as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "Persoas necesa_rias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Pers_oas necesarias e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5096,7 +5153,7 @@ msgstr ""
 "Resumo: %s\n"
 "Localización: %s"
 
-#: ../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 "Resumo: %s"
@@ -5126,45 +5183,45 @@ msgid "Language"
 msgstr "Idioma"
 
 #: ../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 "Notas"
 
-#: ../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 "* Sen resumo *"
 
 #. 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 "Inicio: "
 
 #. 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 "Vencemento: "
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr "Pegar as notas desde o portapapeis"
 
-#: ../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 "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as notas visíbeis"
 
@@ -5185,35 +5242,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 "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:999
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../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 "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visíbeis"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Seleccionar un fuso horario"
 
@@ -5349,15 +5406,15 @@ msgstr "Non foi posíbel reservar un recurso, erro:"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../calendar/gui/itip-utils.c:1918
 msgid "Sending an event"
 msgstr "Enviando un evento"
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../calendar/gui/itip-utils.c:1922
 msgid "Sending a memo"
 msgstr "Enviando un recordatorio"
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../calendar/gui/itip-utils.c:1926
 msgid "Sending a task"
 msgstr "Enviando unha tarefa"
 
@@ -6684,7 +6741,7 @@ msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Asia/Katmandú"
 
 #: ../calendar/zones.h:243
@@ -7341,180 +7398,175 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../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 "_Non mostrar esta mensaxe outra vez"
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Gardar como…"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../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:980
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Gardar _como…"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual con un nome diferente"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../composer/e-composer-actions.c:448
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "_Vista previa de impresión"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:482
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:488
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "_Galería de imaxes"
 
-#: ../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 "Mostrar unha colección de imaxes que poida arrastrar a unha mensaxe"
 
-#: ../composer/e-composer-actions.c:496
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "_Priorizar a mensaxe"
 
-#: ../composer/e-composer-actions.c:498
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar a confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "Asi_nar con S/MIME"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Unicode smileys"
 msgstr "Sorrisos Unicode"
 
-#: ../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 "Usar caracteres Unicode para os sorrisos."
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a vista do campo «CCO»"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna a vista do campo «CC»"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:547
 msgid "_From Override Field"
 msgstr "Sobrescribir campo _De"
 
-#: ../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 "Troca se o campo «De» cambia para mostrar o nome ou o enderezo"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna a vista do campo «Responder a»"
 
-#: ../composer/e-composer-actions.c:671
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Gardar o borrador"
 
 #: ../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 "_Nome:"
 
@@ -7534,36 +7586,36 @@ msgstr ""
 "Introducir os enderezos que recibirán unha copia da mensaxe sen aparecerer "
 "na lista de destinatarios"
 
-#: ../composer/e-composer-header-table.c:793
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:817
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:822
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:826
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../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 "Si_natura:"
 
@@ -7575,7 +7627,7 @@ msgstr "Premer aquí para ir á axenda de enderezos"
 msgid "Click here to select folders to post to"
 msgstr "Premer aquí para seleccionar os cartafoles de destino"
 
-#: ../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"
@@ -7583,7 +7635,7 @@ msgstr ""
 "Non é posíbel asinar a mensaxe saínte: non hai un certificado de sinatura "
 "estabelecido para esta conta"
 
-#: ../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 "
@@ -7592,11 +7644,11 @@ msgstr ""
 "Non é posíbel cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
+#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2363
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4573
+#: ../composer/e-msg-composer.c:4706
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contén un corpo de mensaxe sen texto, polo que non é posíbel editar."
@@ -7732,7 +7784,7 @@ msgstr "O erro devolto foi «{0}». É moi posíbel que non se gardase a mensaxe
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Produciuse un erro ao enviar. Que desexa facer?"
 
-#: ../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 "O informe de erro foi «{0}»."
 
@@ -7776,6 +7828,26 @@ msgstr ""
 "envío do mensaxe, no caso de que fora premido por accidente, ou enviar o "
 "mensaxe."
 
+#: ../composer/mail-composer.error.xml.h:39
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Está seguro de que desexa cambiar o modo de composición?"
+
+#: ../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 ""
+"Desactivar o modo HTML causará que o texto perda todo o formatado. Desexa "
+"continuar?"
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr "_Non perder o formatado"
+
+#: ../composer/mail-composer.error.xml.h:42
+msgid "Lose _formatting"
+msgstr "_Perder formatado"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alarmas do Evolution"
@@ -7784,7 +7856,7 @@ msgstr "Notificador de alarmas do Evolution"
 msgid "Calendar event notifications"
 msgstr "Notificacións de actividades do calendario"
 
-#: ../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:1054
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7961,6 +8033,10 @@ msgstr "Indica se se mostra o campo de información varia no editor"
 msgid "Whether to show notes in the editor"
 msgstr "Indica se se mostra os notas no editor"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Indica se se mostra a lapela de certificados no editor"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Converter as mensaxes de correo a Unicode"
@@ -8092,10 +8168,90 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto de inicio da xornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "Hora de inicio da xornada laboral para o Luns"
+
+#: ../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 ""
+"Hora do inicio da xornada laboral, en formato de vinte e catro horas HHHH, "
+"0000 a 2359, ou -1 para usar day-start-hour e day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "Hora de finalización da xornada laboral para o Luns"
+
+#: ../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 ""
+"Hora do fin da xornada laboral, en formato de vinte e catro horas HHHH, 0000 "
+"a 2359, ou -1 para usar day-start-hour e day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "Hora de inicio da xornada laboral para o Martes"
+
+#: ../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 ""
+"Hora do fin da xornada laboral, en formato de vinte e catro horas HHHH, 0000 "
+"a 2359, ou -1 para usar day-start-hour e day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "Hora de finalización da xornada laboral para o Mércores"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "Hora de inicio da xornada laboral para o Mércores"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "Hora de finalización da xornada laboral para o Mércores"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "Hora de inicio da xornada laboral para o Xoves"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "Hora de finalización da xornada laboral para o Xoves"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "Hora de inicio da xornada laboral para o Venres"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "Hora de finalización da xornada laboral para o Venres"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "Hora de inicio da xornada laboral para o Sábado"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "Hora de finalización da xornada laboral para o Sábado"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "Hora de inicio da xornada laboral para o Domingo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "Hora de finalización da xornada laboral para o Domingo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "O fuso horario secundario para unha vista diaria"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../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"
@@ -8103,21 +8259,21 @@ msgstr ""
 "Mostra os fusos horarios secundarios nunha vista diaria se está "
 "estabelecido. O valor é semellante ao usado na chave «timezone»"
 
-#: ../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 "Fusos horarios secundarios usados recentemente nunha vista diaria"
 
-#: ../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 ""
 "Lista dos fusos horarios secundarios usados recentemente na Vista diaria"
 
-#: ../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 ""
 "O número máximo de fusos horarios usados recentemente que hai que recordar"
 
-#: ../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"
@@ -8125,112 +8281,124 @@ msgstr ""
 "O número máximo de fusos horarios usados recentemente para recordar nunha "
 "lista 'day-second-zones'"
 
-#: ../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 "Valor predeterminado para o aviso"
 
-#: ../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 "Número de unidades para determinar un aviso predeterminado"
 
-#: ../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 "Unidades predeterminadas para o aviso"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../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 "Unidades para un aviso predeterminado:  «minutos», «horas» ou «días»"
 
-#: ../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 "Valor predeterminado para o pospoñer o recordatorio, en minutos"
+
+#: ../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 ""
+"Intervalo predeterminado para postpoñer o recordatorio, en minutos, que "
+"rechear no diálogo de notificación do recordatorio"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar o campo categorías no editor de actividades/reunións/tarefas"
 
-#: ../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 ""
 "Indica se se mostra o campo de categorías no editor de actividades/reunións"
 
-#: ../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 "Mostrar o campo «Función» no editor de actividades/tarefas/reunións"
 
-#: ../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 ""
 "Indica se se mostra o campo de función no editor de actividades/tarefas/"
 "reunións"
 
-#: ../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 "Mostrar o campo RSVP no editor de actividades/tarefas/reunións"
 
-#: ../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 ""
 "Indica se se mostra o campo RSVP no editor de actividades/tarefas/reunións"
 
-#: ../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 "Mostrar o campo de estado no editor de actividades/tarefas/reunións"
 
-#: ../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 ""
 "Indica se se mostra o campo de estado no editor de actividades/tarefas/"
 "reunións"
 
-#: ../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 "Mostrar o campo do fuso horario no editor de actividades/reunións"
 
-#: ../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 ""
 "Indica se se mostra o campo de fuso horario no editor de actividades/reunións"
 
-#: ../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 "Mostrar o campo de tipo no editor de actividades/tarefas/reunións"
 
-#: ../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 ""
 "Indica se se mostra o campo de tipo no editor de actividades/tarefas/reunións"
 
-#: ../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 "Ocultar as tarefas rematadas"
 
-#: ../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 "Indica se se ocultan as tarefas rematadas na vista de tarefas"
 
-#: ../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 "Ocultar as unidades da tarefa"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../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 ""
 "Unidades para determinar cando ocultar as tarefas: «minutos», «horas» ou "
 "«días»"
 
-#: ../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 "Ocultar o valor da tarefa"
 
-#: ../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 "Número de unidades para determinar cando ocultar as tarefas"
 
-#: ../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 "Posición do panel horizontal"
 
-#: ../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"
@@ -8238,57 +8406,57 @@ msgstr ""
 "Posición do panel horizontal, entre o navegador de datas do calendario e a "
 "lista de tarefas cando non está na vista mensual, en píxeles"
 
-#: ../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 "Hora do último recordatorio"
 
-#: ../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 "A hora na que se executou o último recordatorio, en time_t"
 
-#: ../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 "Cor da liña de Marcus Bains - Vista de día"
 
-#: ../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 "Cor para debuxar a liña de Marcus Bains na vista diaria"
 
-#: ../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 "Cor da liña de Marcus Bains - Barra de tempo"
 
-#: ../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 ""
 "Cor para debuxar a liña de Marcus Bains na barra de tempo (baleiro para a "
 "predeterminada)"
 
-#: ../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 "Liña de Marcus Bains"
 
-#: ../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 ""
 "Indica se se debuxa a liña Marcus Bains (liña na hora actual) no calendario"
 
-#: ../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 "Posición do panel de vista previa de notas (horizontal)"
 
-#: ../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 ""
 "Posición do panel de vista previa de tarefas cando está orientado "
 "horizontalmente"
 
-#: ../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 "Estilo da disposición das notas"
 
-#: ../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 "
@@ -8299,20 +8467,20 @@ msgstr ""
 "previa embaixo da lista de notas. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de notas"
 
-#: ../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 "Posición do panel de vista previa de notas (vertical)"
 
-#: ../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 ""
 "Posición do panel de vista previa de notas cando está orientado verticalmente"
 
-#: ../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 "Posición do panel horizontal da vista mensual"
 
-#: ../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"
@@ -8320,45 +8488,45 @@ msgstr ""
 "Posición do panel horizontal entre a visualización, o navegador de datas do "
 "calendario e a lista de tarefas na vista mensual, en píxeles"
 
-#: ../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 "Desprazar a Vista mensual por semana, non por mes"
 
-#: ../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 "Indica se se despraza a vista mensual por semana e non por mes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "Programas de recordatorio"
 
-#: ../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 "Programas que se poden executar desde os recordatorios"
 
-#: ../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 "Mostrar o visualizador de recordatorios na bandexa de notificación"
 
-#: ../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 ""
 "Indica se se debe usar a bandexa de notificación para mostrar os "
 "recordatorios"
 
-#: ../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 "Botón «Novo» prefirido"
 
-#: ../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 "Nome do botón «Novo» da barra de ferramentas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Calendario principal"
 
-#: ../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"
@@ -8366,11 +8534,11 @@ msgstr ""
 "UID do calendario seleccionado ou primario na barra lateral da vista de "
 "«Calendarios»"
 
-#: ../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 "Lista de notas principal"
 
-#: ../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"
@@ -8378,11 +8546,11 @@ msgstr ""
 "UID da lista de notas seleccionada ou primaria da barra lateral da vista de "
 "«Notas»"
 
-#: ../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 "Lista de tarefas principal"
 
-#: ../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"
@@ -8390,11 +8558,11 @@ msgstr ""
 "UID da lista de tarefas seleccionada ou primaria na barra lateral da vista "
 "de «Tarefas»"
 
-#: ../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 "URL do modelo de dispoñibilidade"
 
-#: ../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 "
@@ -8404,21 +8572,21 @@ msgstr ""
 "substitúese pola parte de usuario do enderezo de correo, e %d substitúese "
 "polo dominio"
 
-#: ../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 "Actividades con repetición en cursiva"
 
-#: ../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 ""
 "Mostrar en cursiva os días con actividades con repeticións no calendario "
 "inferior esquerdo"
 
-#: ../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 "Rango de busca en anos para buscas baseadas en tempo"
 
-#: ../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 "
@@ -8428,67 +8596,67 @@ msgstr ""
 "desde o día seleccionado actualmente, ao buscar outra ocorrencia; o valor "
 "predeterminado son 10 anos"
 
-#: ../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 "Mostrar as horas finais das citas nas vista semanal e mensual"
 
-#: ../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 ""
 "Indica se se mostra a hora de finalización das actividades nas vistas "
 "semanais e mensuais"
 
-#: ../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 "Mostrar o panel de vista previa de notas"
 
-#: ../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 ""
 "Se é verdadeiro, móstrase o panel de vista previa das notas na xanela "
 "principal"
 
-#: ../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 "Mostrar o panel de vista previa de tarefas"
 
-#: ../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 ""
 "Se é verdadeiro, móstrase o panel de vista previa de tarefas na xanela "
 "principal"
 
-#: ../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 ""
 "Mostrar os números das semanas na vista diaria, de semana laboral e no "
 "navegador de datas"
 
-#: ../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 ""
 "Indica se se mostran os números de semana en diferentes lugares do calendario"
 
-#: ../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 "Posición vertical do panel de etiquetas"
 
-#: ../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 "Realce das tarefas que vencen hoxe"
 
-#: ../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 ""
 "Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
 "overdue-color)"
 
-#: ../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 "Cor para as tarefas que vencen hoxe"
 
-#: ../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"
@@ -8496,15 +8664,15 @@ msgstr ""
 "Cor de fondo para as tarefas que vencen hoxe, no formato «#rrggbb». Usado "
 "xunto ao realce de tarefas que vencen hoxe."
 
-#: ../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 "Posición do panel de vista previa de tarefas (horizontal)"
 
-#: ../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 "Estilo da disposición de tarefas"
 
-#: ../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 "
@@ -8515,32 +8683,45 @@ msgstr ""
 "previa embaixo da lista de tarefas. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de tarefas"
 
-#: ../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 "Posición do panel de vista previa de tarefas (vertical)"
 
-#: ../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 ""
 "Posición do panel de vista previa de tarefas cando está orientado "
 "verticalmente"
 
-#: ../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 "Mostrar recordatorios para as tarefas completadas"
+
+#: ../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 ""
+"Indica se mostrar os recordatorios para as tarefas completadas. Se está "
+"estabelecido a falso, os recordatorios para as tarefas completadas "
+"omitiránse."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr "Realce das tarefas vencidas"
 
-#: ../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 ""
 "Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
 "color)"
 
-#: ../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 "Cor para as tarefas atrasadas"
 
-#: ../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."
@@ -8548,21 +8729,21 @@ msgstr ""
 "Cor de fondo para as tarefas fóra de prazo, no formato «#rrggbb». Usado "
 "xunto ao realzado de tarefas fóra de prazo."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../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 ""
 "Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
 "minutos"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../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\""
@@ -8571,80 +8752,80 @@ msgstr ""
 "unha localización sen traducir da base de datos de fusos horarios Olsen, p."
 "ex:«America/New York»"
 
-#: ../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 "Formato de hora de vinte e catro horas"
 
-#: ../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 ""
 "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
 "usar am/pm"
 
-#: ../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 "Avisos de aniversarios"
 
-#: ../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 "Indica se se estabelece un aviso para os aniversarios"
 
-#: ../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 "Aviso de cita predeterminado"
 
-#: ../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 "Indica se se estabelece un aviso predeterminado para as citas"
 
-#: ../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 "Usar o fuso horario do sistema"
 
-#: ../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 ""
 "Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
 "Evolution"
 
-#: ../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 "Primeiro día da semana"
 
-#: ../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 "Luns é un día de traballo"
 
-#: ../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 "Martes é un día de traballo"
 
-#: ../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 "Mércores é un día de traballo"
 
-#: ../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 "Xoves é un día de traballo"
 
-#: ../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 "Venres é un día de traballo"
 
-#: ../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 "Sábado é un día de traballo"
 
-#: ../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 "Domingo é un día de traballo"
 
-#: ../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 ""
 "(Obsolteo) O primeiro día da semana, desde o Domingo (0) ata o Sábado (6)"
 
-#: ../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."
@@ -8652,11 +8833,11 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «week-start-day-name» no lugar.  "
 
-#: ../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 "(Obsoleto) Día de traballo"
 
-#: ../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-"
@@ -9079,18 +9260,43 @@ msgstr ""
 "fornecidos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+msgstr ""
+"Número de destinatarios Para e CC aos que preguntar cando aconteza «prompt-"
+"on-many-to-cc-recips»"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+"Cando preguntar, cando o número de destinatarios de Para e CC acaden este "
+"valor."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "Indica se se mostran os botóns de Asinar e Cifrar"
+
+#: ../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 "Gardar o formato de ficheiro para a operación de arrastrar e soltar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Pode ser «mbox» ou «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../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."
@@ -9098,11 +9304,11 @@ msgstr ""
 "Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
 "animadas molestas e prefiren ver unha mensaxe estática."
 
-#: ../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 "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../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."
@@ -9110,11 +9316,11 @@ msgstr ""
 "Activar a barra de busca lateral para permitir a busca interactiva de nomes "
 "de cartafoles."
 
-#: ../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 "Activar ou desactivar a barra de espazo máxica"
 
-#: ../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."
@@ -9122,75 +9328,75 @@ msgstr ""
 "Activar esta opción para usar a barra espazadora para desprazarse pola "
 "mensaxe, na lista de mensaxes e nos cartafoles."
 
-#: ../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 ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles"
 
-#: ../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 ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles."
 
-#: ../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 "Marcar citas textuais na «Vista previa» da mensaxe"
 
-#: ../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 "Marcar citas textuais na «Vista previa» da mensaxe"
 
-#: ../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 "Cor de realce das citas"
 
-#: ../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 "Cor de realce das citas."
 
-#: ../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 "Activar/desactivar o modo de cursor"
 
-#: ../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 "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
-#: ../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 "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../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 "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../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 "Cargar automaticamente as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show Animations"
 msgstr "Mostrar as animacións"
 
-#: ../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 "Mostrar as imaxes animadas como animacións."
 
-#: ../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 "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../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 "Mostrar todas as cabeceiras ao visualizar as mensaxes."
 
-#: ../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 "Lista das cabeceiras a mostrar ao visualizar a mensaxe."
 
-#: ../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 "
@@ -9201,78 +9407,73 @@ msgstr ""
 "non se mostrarán ao visualizar a mensaxe, aínda así poden verse desde "
 "Preferencias."
 
-#: ../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 "Mostrar a fotografía do remitente"
 
-#: ../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 "Mostrar a fotografía do remitente no panel de lectura da mensaxe."
 
-#: ../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 "Buscar en gravatar.com polas fotos do remitente"
 
-#: ../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 "Permitir a busca tamén en gravatar.com pola foto do remitente."
 
-#: ../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 "Marcar como visto despois do tempo de espera indicado"
 
-#: ../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 "Marcar como visto despois do tempo de espera indicado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#, fuzzy
+msgid "Mark as Seen always after specified timeout"
+msgstr "Marcar como visto despois do tempo de espera indicado"
+
+#: ../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 "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../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 "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../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 "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../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 ""
 "Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../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 ""
-"Determina se se debe usar o mesmo tipo de letra para as liñas «De» e "
-"«Asunto» da columna «Mensaxes» na vista vertical"
-
-#: ../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 ""
-"Determina se se debe usar o mesmo tipo de letra para as liñas «De» e "
-"«Asunto» da columna «Mensaxes» na vista vertical."
-
-#: ../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 "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../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 "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../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 "Activar o cartafol de busca non coincidente"
 
-#: ../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."
@@ -9280,11 +9481,11 @@ msgstr ""
 "Activar o cartafol de busca non coincidente nos cartafoles de busca. Non fai "
 "nada se os Cartafoles de busca están desactivados."
 
-#: ../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 "Oculta a vista previa por cartafol e retira a selección"
 
-#: ../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."
@@ -9292,32 +9493,32 @@ msgstr ""
 "Esta clave só se le unha vez e restabelécese como «falso» despois de a ler. "
 "Isto deselecciona o correo da lista e retira a vista previa de ese cartafol."
 
-#: ../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 "Altura do panel da lista de mensaxes"
 
-#: ../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 "Altura do panel da lista de mensaxes."
 
-#: ../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 ""
 "Indica se as cabeceiras da mensaxe están comprimidas na interface de usuario"
 
-#: ../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 "Largura do panel da lista de mensaxes"
 
-#: ../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 "Largura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "Estilo da disposición"
 
-#: ../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 "
@@ -9329,46 +9530,46 @@ msgstr ""
 "previa embaixo da lista de mensaxes. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de mensaxes."
 
-#: ../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 "Tipo de letra de largura variábel"
 
-#: ../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 "O tipo de letra de largura variábel para mostrar o correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../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 "O tipo de letra do terminal para mostrar o correo."
 
-#: ../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 "Usar tipos de letra personalizados"
 
-#: ../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 "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../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 "Abreviar a vista de enderezos en A/CC/CCO"
 
-#: ../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 ""
 "Abrevia a vista de enderezos en A/CC/CCO co número indicado en address_count."
 
-#: ../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 "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../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."
@@ -9376,11 +9577,11 @@ msgstr ""
 "Isto define o número de enderezos que se mostra na vista da lista de "
 "mensaxes predeterminada, para os restantes mostrarase «…»."
 
-#: ../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 "Listar o fíos de mensaxes por asunto"
 
-#: ../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."
@@ -9388,11 +9589,11 @@ msgstr ""
 "Indica se debe retroceder no agrupamento polo asunto cando as mensaxes non "
 "conteñen cabeceiras «En resposta a» ou «Referencias»."
 
-#: ../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 "Valor predeterminado para o estado despregado do fío"
 
-#: ../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."
@@ -9400,11 +9601,11 @@ msgstr ""
 "Esta opción indica se os fíos deben estar despregadas ou pregadas por "
 "omisión. É necesario reiniciar o Evolution."
 
-#: ../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 "Indica se ordenar os fíos pola última mensaxe que aparece"
 
-#: ../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 "
@@ -9413,11 +9614,24 @@ msgstr ""
 "Esta opción indica se os fíos deben clasificarse pola última mensaxe de cada "
 "fío en vez de pola data das mensaxes. É necesario reiniciar o Evolution."
 
-#: ../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
+#, fuzzy
+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 ""
+"Esta opción indica se os fíos deben clasificarse pola última mensaxe de cada "
+"fío en vez de pola data das mensaxes. É necesario reiniciar o Evolution."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenar contas alfabeticamente nun árbore de cartafoles"
 
-#: ../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 "
@@ -9429,27 +9643,27 @@ msgstr ""
 "coa excepción de Neste equipo y Cartafoles de busca, pola contra os "
 "cartafoles ordénanse pola orde dada polo usuario"
 
-#: ../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 "Rexistrar as accións de filtrado"
 
-#: ../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 "Rexistrar as accións de filtrado no ficheiro indicado."
 
-#: ../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 "Ficheiro de rexistro para as accións de filtrado"
 
-#: ../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 "Ficheiro de rexistro para as accións de filtrado."
 
-#: ../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 "Limpar a caixa de saída despois do filtrado"
 
-#: ../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 "
@@ -9460,57 +9674,57 @@ msgstr ""
 "filtrado «Reencamiñar a» e aproximadamente un minuto despois da invocación "
 "da última acción."
 
-#: ../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 "Estilo de reencamiñamento predeterminado"
 
-#: ../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 "Estilo de resposta predeterminado"
 
-#: ../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 "Preguntar ao enviar usando unha tecla rápida (Ctrl+Intro)"
 
-#: ../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 ""
 "Avisar ao usuario cando tente enviar unha mensaxe con unha tecla rápida."
 
-#: ../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 "Avisar cando o «Asunto» estea baleiro"
 
-#: ../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 "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../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 "Avisar ao baleirar o lixo"
 
-#: ../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 "Avisar ao usuario cando tente baleirar o lixo."
 
-#: ../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 "Avisar cando o usuario expurgue"
 
-#: ../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 "Avisar ao usuario cando tente expurgar un cartafol."
 
-#: ../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 ""
 "Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
 "correo."
 
-#: ../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"
@@ -9518,32 +9732,32 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que está tentando enviar unha "
 "mensaxe a destinatarios non insertados como enderezos de correo"
 
-#: ../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 "Avisar cando o usuario encha só o campo Cco"
 
-#: ../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 ""
 "Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos «Para» "
 "ou «CC»."
 
-#: ../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 "Avisar cando o usuario tente enviar HTML non desexado"
 
-#: ../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 ""
 "Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
-#: ../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 "Avisar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
 
-#: ../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."
@@ -9551,19 +9765,19 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, pedir a "
 "confirmación."
 
-#: ../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 "Avisar cando se marquen varias mensaxes"
 
-#: ../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 "Activar ou desactivar a confirmación cando se marcan varias mensaxes."
 
-#: ../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 "Avisar ao eliminar mensaxes no cartafol de busca"
 
-#: ../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 "
@@ -9573,13 +9787,13 @@ msgstr ""
 "cartafol de busca elimínanse as mensaxes permanentemente, non só dos "
 "resultados da busca."
 
-#: ../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 ""
 "Pregunta se se deben copiar cartafoles arrastrando e soltando no árbore de "
 "cartafoles"
 
-#: ../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 "
@@ -9591,13 +9805,13 @@ msgstr ""
 "permitir mover cartafoles arrastrando e soltando no árbore de cartafoles ou  "
 "«ask» (preguntar) ou calquera outro valor, par preguntarlle ao usuario."
 
-#: ../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 ""
 "Pregunta se se deben mover cartafoles arrastrando e soltando no árbore de "
 "cartafoles"
 
-#: ../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 "
@@ -9609,11 +9823,11 @@ msgstr ""
 "permitir mover cartafoles arrastrando e soltando no árbore de cartafoles ou "
 "«ask» (preguntar) ou calquera outro valor, para preguntar ao usuario."
 
-#: ../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 "Avisar cando se responda de forma privada a correos dunha lista"
 
-#: ../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."
@@ -9621,11 +9835,11 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que está enviando unha resposta "
 "privada a un correo que chegou a través dunha lista de correo."
 
-#: ../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 "Avisar cando a lista de correo secuestre as respostas privadas"
 
-#: ../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 "
@@ -9636,11 +9850,11 @@ msgstr ""
 "a lista estabelece unha cabeceira «Responder a:» que redirecciona a súa "
 "resposta de novo á lista."
 
-#: ../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 "Avisar ao responder a moitos destinatarios"
 
-#: ../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."
@@ -9648,7 +9862,32 @@ msgstr ""
 "Activa/desactiva as mensaxes que avisan de que está enviando unha resposta a "
 "moitas persoas."
 
-#: ../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
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"Activa/desactiva as preguntas que avisan de que está tentando enviar unha "
+"mensaxe a destinatarios non insertados como enderezos de correo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "Confirmar o envío cando haxa moitos destinatarios Para e CC"
+
+#: ../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."
@@ -9656,43 +9895,43 @@ msgstr ""
 "Normativa para pechar automaticamente a xanela do explorador da mensaxe ao "
 "reenviar ou responder á mensaxe mostrada."
 
-#: ../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 "Baleirar os cartafoles de lixo ao saír"
 
-#: ../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 "Baleirar todos os cartafoles de lixo ao saír do Evolution."
 
-#: ../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 "Número mínimo de días antes de baleirar o lixo ao saír"
 
-#: ../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 "Tempo mínimo antes de baleirar o lixo ao saír, en días."
 
-#: ../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 "A última vez que se baleirou o lixo"
 
-#: ../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 ""
 "A última vez que se baleirou o lixo, en días desde o 1 de xaneiro de 1970 "
 "(Epoch)."
 
-#: ../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 ""
 "Tempo (en segundos) durante o que se mostrará o erro na barra de estado."
 
-#: ../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 "Nivel a partir do que se debería rexistrar a mensaxe."
 
-#: ../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."
@@ -9700,11 +9939,11 @@ msgstr ""
 "Isto pode ter tres valores posíbeis: «0» para erros; «1» para avisos; «2» "
 "para mensaxes de depuración."
 
-#: ../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 "Mostrar o valor orixinal da cabeceira «Data»."
 
-#: ../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 "
@@ -9714,11 +9953,11 @@ msgstr ""
 "distinto). Doutro xeito mostrar o valor da cabeceira «Data» no formato "
 "preferido polo usuario e o fuso de hora local."
 
-#: ../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 "Lista de etiquetas coas cores asociadas"
 
-#: ../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."
@@ -9727,46 +9966,46 @@ msgstr ""
 "lista contén cadeas que conteñen nome:cor, onde a cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../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 "Comprobar se o correo entrante é correo lixo"
 
-#: ../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 "Realizar a proba do correo lixo no correo entrante."
 
-#: ../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 "Baleirar os cartafoles do correo lixo ao saír"
 
-#: ../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 "Baleirar todos os cartafoles do correo lixo ao saír do Evolution."
 
-#: ../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 "Número mínimo de días antes de baleirar o correo lixo ao saír"
 
-#: ../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 "Tempo mínimo antes de baleirar o correo lixo ao saír, en días."
 
-#: ../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 "A última vez que se baleirou o correo lixo"
 
-#: ../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 ""
 "A última vez que se baleirou o correo lixo, en días desde o 1 de xaneiro de "
 "1970 (Epoch)."
 
-#: ../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 "O engadido predeterminado para o tratamento do correo lixo"
 
-#: ../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 "
@@ -9776,13 +10015,13 @@ msgstr ""
 "engadidos activados. Se o engadido predeterminado listado está desactivado "
 "non se usarán os outros engadidos dispoñíbeis."
 
-#: ../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 ""
 "Determina se hai que buscar o enderezo de correo do remitente na axenda de "
 "enderezos"
 
-#: ../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 "
@@ -9795,7 +10034,7 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) están marcadas para o completado "
 "automático."
 
-#: ../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"
@@ -9803,7 +10042,7 @@ msgstr ""
 "Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
 "enderezos local"
 
-#: ../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 "
@@ -9814,13 +10053,13 @@ msgstr ""
 "para excluír os correos enviados por contactos coñecidos desde o filtro de "
 "correo lixo."
 
-#: ../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 ""
 "Determina se se deben usar as cabeceiras personalizadas para a detección de "
 "correo lixo"
 
-#: ../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 "
@@ -9830,11 +10069,11 @@ msgstr ""
 "correo lixo. Se esta opción está activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de detección do correo lixo."
 
-#: ../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 "Cabeceiras personalizadas para usar mentres se comproba o correo lixo."
 
-#: ../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\"."
@@ -9842,31 +10081,31 @@ msgstr ""
 "Cabeceiras personalizadas para usar mentres se comproba o correo lixo. A "
 "lista de elementos son cadeas no formato «headername=value»."
 
-#: ../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 "Cadea UID para a conta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../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 "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../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 "Cartafol para cargar/anexar do editor de mensaxes"
 
-#: ../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 "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
 
-#: ../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 "Comprobar se hai mensaxes novas ao iniciar"
 
-#: ../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."
@@ -9874,11 +10113,11 @@ msgstr ""
 "Indica se se debe comprobar se hai novas mensaxes ao iniciar Evolution. "
 "Inclúe tamén o envío de mensaxes desde a caixa de saída."
 
-#: ../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 "Comprobar se hai mensaxes novas nas contas activas"
 
-#: ../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 "
@@ -9889,11 +10128,11 @@ msgstr ""
 "X minutos» ao iniciar Evolution. Esta opción úsase conxuntamente coa opción "
 "«send_recv_on_start»."
 
-#: ../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 "Intervalo de sincronización do servidor"
 
-#: ../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."
@@ -9901,11 +10140,11 @@ msgstr ""
 "Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
-#: ../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 "Permite purgar cartafoles virtuais"
 
-#: ../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 "
@@ -9918,11 +10157,22 @@ msgstr ""
 "cartafol virtual, non só para os mensaxes eliminados que pertenzan ao "
 "cartafol virtual."
 
-#: ../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 "Un cartafol de arquivo para os Cartafoles neste computador"
 
-#: ../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."
@@ -9930,11 +10180,11 @@ msgstr ""
 "Un cartafol Arquivo para usar en Mensaxes|Arquivar… característica activada "
 "cando está no cartafol \"Neste computador\"."
 
-#: ../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 "(Obsoleto) Estilo de reencamiñamento predeterminado"
 
-#: ../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."
@@ -9942,11 +10192,11 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «forward-style-name» no lugar.  "
 
-#: ../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 "(Obsoleto) Estilo de resposta predeterminado"
 
-#: ../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."
@@ -9954,12 +10204,12 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «reply-style-name» no lugar.  "
 
-#: ../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 ""
 "(Obsoleto) Lista de cabeceiras personalizadas e o seu estado de activación."
 
-#: ../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."
@@ -9967,11 +10217,11 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «show-headers» no lugar.  "
 
-#: ../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 "(Obsoleto) Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../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."
@@ -9979,7 +10229,7 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «image-loading-policy» no lugar.  "
 
-#: ../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"
@@ -9987,7 +10237,7 @@ msgstr ""
 "(Obsoleto) Pregunta se se pecha a xanela da mensaxe cando o usuario "
 "reencamiña ou responde á mensaxe mostrada"
 
-#: ../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."
@@ -10298,7 +10548,7 @@ msgstr "Cartafol inicial do seleccionador de ficheiros"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diálogos GtkFileChooser."
 
-#: ../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 "Iniciar en modo sen conexión"
 
@@ -10422,7 +10672,7 @@ msgstr ""
 "tempo de compilación, normalmente /usr/bin/sa-learn. A orde non debería "
 "conter calquera outros argumentos."
 
-#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../em-format/e-mail-formatter-attachment.c:411
 #: ../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
@@ -10431,7 +10681,7 @@ msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:412
 msgid "Display as attachment"
 msgstr "Mostrar como anexo"
 
@@ -10477,8 +10727,6 @@ msgstr "Formatar parte como mensaxe RFC822"
 #: ../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 "Nome"
@@ -10488,19 +10736,18 @@ msgstr "Nome"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../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
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
 msgid "Subject"
 msgstr "Titular"
 
 #. 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 "Aplicativo de correo"
 
@@ -10515,18 +10762,18 @@ msgid "Display part as enriched text"
 msgstr "Mostrar parte como texto enriquecido"
 
 #: ../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 "Formatar parte como HTML"
 
 #: ../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:1408
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Plain Text"
 msgstr "Texto plano"
 
@@ -10647,7 +10894,7 @@ msgstr ""
 "tempo razoábel."
 
 #: ../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 "_Visualizar o certificado"
 
@@ -10692,7 +10939,7 @@ msgid "S/MIME encrypted"
 msgstr "Cifrado con S/MIME"
 
 #: ../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"
@@ -10770,8 +11017,8 @@ msgstr "O formato da sinatura non é compatíbel"
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../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 "Data"
@@ -10841,12 +11088,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
 #: ../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 "Cancelar"
 
 #. 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 "Pechar esta mensaxe (Escape)"
 
@@ -10854,11 +11101,11 @@ msgstr "Pechar esta mensaxe (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Produciuse un fallo ao crear un fío:"
 
-#: ../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 "Vista de iconas"
 
-#: ../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 "Vista de lista"
 
@@ -10867,58 +11114,58 @@ msgstr "Vista de lista"
 #. * 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 "Mensaxe anexada"
 
-#: ../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 "A operación foi cancelada"
 
 #. 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 "attachment.dat"
 
-#: ../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 "Xa se está en proceso unha operación de carga"
 
-#: ../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 "Xa se está en proceso unha operación de gardado"
 
-#: ../e-util/e-attachment.c:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posíbel cargar «%s»"
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posíbel cargar o anexo"
 
-#: ../e-util/e-attachment.c:2761
+#: ../e-util/e-attachment.c:2809
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posíbel abrir «%s»"
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posíbel abrir o anexo"
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr "Non se cargaron os contidos do anexo"
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posíbel gardar «%s»"
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posíbel gardar o anexo"
@@ -10961,7 +11208,7 @@ msgstr "Gardando"
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../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 "Mostrar a _barra de anexos"
 
@@ -10995,61 +11242,79 @@ msgstr "_Só gardar os ficheiros extraídos"
 msgid "Save extracted files and the original _archive"
 msgstr "Gardar os ficheiros extraídos e o _arquivo orixinal"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "Abrir con outro aplicativo…"
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "_Gardar como"
 
-#: ../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 "Gardar _como"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "Enga_dir un anexo…"
 
-#: ../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 "_Propiedades"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "O_cultar todo"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "_Ver inserido"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "_Ver todo inserido"
 
-#: ../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
+#, fuzzy
+msgid "Zoom the image to its natural size"
+msgstr "Restabelecer o texto ao seu tamaño orixinal"
+
+#: ../e-util/e-attachment-view.c:520
+#, fuzzy
+msgid "_Zoom to window"
+msgstr "Pechar esta xanela"
+
+#: ../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 "Abrir con «%s»"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:883
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este anexo en %s"
@@ -11068,7 +11333,7 @@ msgstr ""
 "Copiar o contido da axenda de enderezos localmente para operar sen conexión"
 
 #. 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 "Ctrl+clic para abrir unha ligazón"
 
@@ -11093,19 +11358,19 @@ msgid "Month Calendar"
 msgstr "Calendario mensual"
 
 #. 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 "%B de %Y"
@@ -11126,18 +11391,18 @@ msgstr "Marcar como a lista de notas predefinida"
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../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 ""
 "Copiar localmente os contidos do calendario para unha operación sen conexión"
 
-#: ../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 ""
 "Copiar localmente os contidos da lista de tarefas para unha operación sen "
 "conexión"
 
-#: ../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 ""
 "Copiar localmente os contidos da lista de notas para unha operación sen "
@@ -11206,33 +11471,34 @@ msgstr "Xa existe unha categoría «%s» na configuración. Use outro nome"
 msgid "popup list"
 msgstr "lista emerxente"
 
-#: ../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 "Agora"
 
 #. 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 "Hoxe"
 
 #. 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 "Ningún"
 
-#: ../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 "Aceptar"
 
-#: ../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 "O tempo ten que ter o formato: %s"
@@ -11331,7 +11597,7 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outro…"
 
-#: ../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 ""
@@ -11503,63 +11769,62 @@ msgstr "branco"
 
 #: ../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 "predeterminado"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación despregábel para seleccionar a hora"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Hora"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "_Hoxe"
 
 #. 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 "_Ningunha"
 
 #. 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 "Ningunha"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
 #. 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 "Mañá"
 
@@ -11913,12 +12178,12 @@ msgstr "Encontrar os elementos que cumpran as seguintes condicións"
 #. * 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 "Ningunha"
 
@@ -11947,667 +12212,667 @@ msgid "A_dd Condition"
 msgstr "Enga_dir unha condición"
 
 #: ../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 "Entrante"
 
-#: ../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 "Saínte"
 
-#: ../e-util/e-html-editor-actions.c:57
+#: ../e-util/e-html-editor-actions.c:58
 msgid "Failed to insert HTML file."
 msgstr "Produciuse un fallo ao inserir o ficheiro HTML."
 
-#: ../e-util/e-html-editor-actions.c:94
+#: ../e-util/e-html-editor-actions.c:95
 msgid "Failed to insert text file."
 msgstr "Produciuse un fallo ao inserir o ficheiro de texto."
 
-#: ../e-util/e-html-editor-actions.c:479
+#: ../e-util/e-html-editor-actions.c:614
 msgid "Insert HTML File"
 msgstr "Inserir ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:485
+#: ../e-util/e-html-editor-actions.c:620
 msgid "HTML file"
 msgstr "Ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:512
+#: ../e-util/e-html-editor-actions.c:647
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../e-util/e-html-editor-actions.c:572
+#: ../e-util/e-html-editor-actions.c:709
 msgid "Insert text file"
 msgstr "Inserir ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:578
+#: ../e-util/e-html-editor-actions.c:715
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:960
+#: ../e-util/e-html-editor-actions.c:1101
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../e-util/e-html-editor-actions.c:967
+#: ../e-util/e-html-editor-actions.c:1108
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar o texto seleccionado ao portapapeis"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:974
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "Paste text from the clipboard"
 msgstr "Pegar texto desde o portapapeis"
 
-#: ../e-util/e-html-editor-actions.c:981
+#: ../e-util/e-html-editor-actions.c:1122
 msgid "Redo the last undone action"
 msgstr "Refacer a última acción desfeita"
 
-#: ../e-util/e-html-editor-actions.c:995
+#: ../e-util/e-html-editor-actions.c:1136
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: ../e-util/e-html-editor-actions.c:1016
+#: ../e-util/e-html-editor-actions.c:1157
 msgid "For_mat"
 msgstr "For_mato"
 
-#: ../e-util/e-html-editor-actions.c:1023
+#: ../e-util/e-html-editor-actions.c:1164
 msgid "_Paragraph Style"
 msgstr "Estilo do _parágrafo"
 
-#: ../e-util/e-html-editor-actions.c:1037
-#: ../e-util/e-html-editor-image-dialog.c:591
+#: ../e-util/e-html-editor-actions.c:1178
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "A_liñamento"
 
-#: ../e-util/e-html-editor-actions.c:1044
+#: ../e-util/e-html-editor-actions.c:1185
 msgid "Current _Languages"
 msgstr "_Idiomas dispoñíbeis"
 
-#: ../e-util/e-html-editor-actions.c:1061
+#: ../e-util/e-html-editor-actions.c:1202
 msgid "_Increase Indent"
 msgstr "_Aumentar sangría"
 
-#: ../e-util/e-html-editor-actions.c:1063
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Increase Indent"
 msgstr "Aumentar sangría"
 
-#: ../e-util/e-html-editor-actions.c:1068
+#: ../e-util/e-html-editor-actions.c:1209
 msgid "_HTML File..."
 msgstr "Ficheiro _HTML…"
 
-#: ../e-util/e-html-editor-actions.c:1075
+#: ../e-util/e-html-editor-actions.c:1216
 msgid "Te_xt File..."
 msgstr "Ficheiro de te_xto…"
 
-#: ../e-util/e-html-editor-actions.c:1082
+#: ../e-util/e-html-editor-actions.c:1223
 msgid "Paste _Quotation"
 msgstr "Pegar _citas"
 
-#: ../e-util/e-html-editor-actions.c:1089
+#: ../e-util/e-html-editor-actions.c:1230
 msgid "_Find..."
 msgstr "_Buscar…"
 
-#: ../e-util/e-html-editor-actions.c:1091
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Search for text"
 msgstr "Busca de texto"
 
-#: ../e-util/e-html-editor-actions.c:1096
+#: ../e-util/e-html-editor-actions.c:1237
 msgid "Find A_gain"
 msgstr "Buscar de _novo"
 
-#: ../e-util/e-html-editor-actions.c:1103
+#: ../e-util/e-html-editor-actions.c:1244
 msgid "Re_place..."
 msgstr "S_ubstituír…"
 
-#: ../e-util/e-html-editor-actions.c:1105
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Search for and replace text"
 msgstr "Buscar e substituír un texto"
 
-#: ../e-util/e-html-editor-actions.c:1110
+#: ../e-util/e-html-editor-actions.c:1251
 msgid "Check _Spelling..."
 msgstr "Comprobar _ortografía…"
 
-#: ../e-util/e-html-editor-actions.c:1117
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "_Decrease Indent"
 msgstr "_Diminuír sangría"
 
-#: ../e-util/e-html-editor-actions.c:1119
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "Decrease Indent"
 msgstr "Diminuír sangría"
 
-#: ../e-util/e-html-editor-actions.c:1124
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "_Wrap Lines"
 msgstr "_Axustar liñas"
 
-#: ../e-util/e-html-editor-actions.c:1131
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Open Inspector"
 msgstr "Abrir inspector"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1282
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Centrado"
 
-#: ../e-util/e-html-editor-actions.c:1143
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Center Alignment"
 msgstr "Aliñamento centrado"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1148
+#: ../e-util/e-html-editor-actions.c:1289
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Esquerda"
 
-#: ../e-util/e-html-editor-actions.c:1150
+#: ../e-util/e-html-editor-actions.c:1291
 msgid "Left Alignment"
 msgstr "Aliñamento á esquerda"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1155
+#: ../e-util/e-html-editor-actions.c:1296
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Dereita"
 
-#: ../e-util/e-html-editor-actions.c:1157
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "Right Alignment"
 msgstr "Aliñamento á dereita"
 
-#: ../e-util/e-html-editor-actions.c:1165
+#: ../e-util/e-html-editor-actions.c:1306
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1167
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "HTML editing mode"
 msgstr "Modo de edición HTML"
 
-#: ../e-util/e-html-editor-actions.c:1172
+#: ../e-util/e-html-editor-actions.c:1313
 msgid "Plain _Text"
 msgstr "_Texto plano"
 
-#: ../e-util/e-html-editor-actions.c:1174
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Plain text editing mode"
 msgstr "Modo de edición de texto plano"
 
-#: ../e-util/e-html-editor-actions.c:1182
+#: ../e-util/e-html-editor-actions.c:1323
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1330
 msgid "Header _1"
 msgstr "Cabeceira _1"
 
-#: ../e-util/e-html-editor-actions.c:1196
+#: ../e-util/e-html-editor-actions.c:1337
 msgid "Header _2"
 msgstr "Cabeceira _2"
 
-#: ../e-util/e-html-editor-actions.c:1203
+#: ../e-util/e-html-editor-actions.c:1344
 msgid "Header _3"
 msgstr "Cabeceira _3"
 
-#: ../e-util/e-html-editor-actions.c:1210
+#: ../e-util/e-html-editor-actions.c:1351
 msgid "Header _4"
 msgstr "Cabeceira _4"
 
-#: ../e-util/e-html-editor-actions.c:1217
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "Header _5"
 msgstr "Cabeceira _5"
 
-#: ../e-util/e-html-editor-actions.c:1224
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Header _6"
 msgstr "Cabeceira _6"
 
-#: ../e-util/e-html-editor-actions.c:1231
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Preformatted"
 msgstr "_Preformatado"
 
-#: ../e-util/e-html-editor-actions.c:1238
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "A_ddress"
 msgstr "En_derezo"
 
-#: ../e-util/e-html-editor-actions.c:1245
+#: ../e-util/e-html-editor-actions.c:1386
 msgid "_Blockquote"
 msgstr "_Bloque"
 
-#: ../e-util/e-html-editor-actions.c:1252
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "_Bulleted List"
 msgstr "Lista con _viñetas"
 
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "_Roman Numeral List"
 msgstr "Lista de numerais _romanos"
 
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Numbered _List"
 msgstr "_Lista numerada"
 
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "_Alphabetical List"
 msgstr "Lista _alfabética"
 
-#: ../e-util/e-html-editor-actions.c:1289
-#: ../e-util/e-html-editor-actions.c:1327
+#: ../e-util/e-html-editor-actions.c:1430
+#: ../e-util/e-html-editor-actions.c:1468
 msgid "_Image..."
 msgstr "_Imaxe…"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1433
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../e-util/e-html-editor-actions.c:1297
-#: ../e-util/e-html-editor-actions.c:1334
+#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1475
 msgid "_Link..."
 msgstr "_Ligar…"
 
-#: ../e-util/e-html-editor-actions.c:1299
+#: ../e-util/e-html-editor-actions.c:1440
 msgid "Insert Link"
 msgstr "Inserir ligazón"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1305
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1446
+#: ../e-util/e-html-editor-actions.c:1490
 msgid "_Rule..."
 msgstr "_Regra…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "Insert Rule"
 msgstr "Inserir regra"
 
-#: ../e-util/e-html-editor-actions.c:1313
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1454
+#: ../e-util/e-html-editor-actions.c:1497
 msgid "_Table..."
 msgstr "_Táboa…"
 
-#: ../e-util/e-html-editor-actions.c:1315
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Insert Table"
 msgstr "Inserir táboa"
 
-#: ../e-util/e-html-editor-actions.c:1320
+#: ../e-util/e-html-editor-actions.c:1461
 msgid "_Cell..."
 msgstr "_Cela…"
 
-#: ../e-util/e-html-editor-actions.c:1341
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "Pa_ge..."
 msgstr "Pá_xina…"
 
-#: ../e-util/e-html-editor-actions.c:1365
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Font _Size"
 msgstr "_Tamaño de tipo de letra"
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "_Font Style"
 msgstr "Estilo do _tipo de letra"
 
-#: ../e-util/e-html-editor-actions.c:1379
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paste As _Text"
 msgstr "Pegar como _texto"
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1531
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Negra"
 
-#: ../e-util/e-html-editor-actions.c:1392
+#: ../e-util/e-html-editor-actions.c:1533
 msgid "Bold"
 msgstr "Negra"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1539
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Cursiva"
 
-#: ../e-util/e-html-editor-actions.c:1400
+#: ../e-util/e-html-editor-actions.c:1541
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../e-util/e-html-editor-actions.c:1406
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "_Plain Text"
 msgstr "Texto _plano"
 
-#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-actions.c:1555
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Riscado"
 
-#: ../e-util/e-html-editor-actions.c:1416
+#: ../e-util/e-html-editor-actions.c:1557
 msgid "Strikethrough"
 msgstr "Riscado"
 
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1563
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Subliñado"
 
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../e-util/e-html-editor-actions.c:1565
 msgid "Underline"
 msgstr "Subliñado"
 
 #. 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:1434
+#: ../e-util/e-html-editor-actions.c:1575
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1442
+#: ../e-util/e-html-editor-actions.c:1583
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1450
+#: ../e-util/e-html-editor-actions.c:1591
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1458
+#: ../e-util/e-html-editor-actions.c:1599
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1466
+#: ../e-util/e-html-editor-actions.c:1607
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1615
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1482
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1501
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Cell Contents"
 msgstr "Contidos da cela"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1649
 msgid "Column"
 msgstr "Columna"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../e-util/e-html-editor-actions.c:1656
 msgid "Row"
 msgstr "Fila"
 
-#: ../e-util/e-html-editor-actions.c:1522
-#: ../e-util/e-html-editor-actions.c:1607
+#: ../e-util/e-html-editor-actions.c:1663
+#: ../e-util/e-html-editor-actions.c:1748
 msgid "Table"
 msgstr "Táboa"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1673
 msgid "Table Delete"
 msgstr "Eliminar táboa"
 
-#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1680 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1547
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Table Insert"
 msgstr "Inserir táboa"
 
-#: ../e-util/e-html-editor-actions.c:1554
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../e-util/e-html-editor-actions.c:1572
+#: ../e-util/e-html-editor-actions.c:1713
 msgid "Column After"
 msgstr "Columna posterior"
 
-#: ../e-util/e-html-editor-actions.c:1579
+#: ../e-util/e-html-editor-actions.c:1720
 msgid "Column Before"
 msgstr "Columna anterior"
 
-#: ../e-util/e-html-editor-actions.c:1586
+#: ../e-util/e-html-editor-actions.c:1727
 msgid "Insert _Link"
 msgstr "Inserir _ligazón"
 
-#: ../e-util/e-html-editor-actions.c:1593
+#: ../e-util/e-html-editor-actions.c:1734
 msgid "Row Above"
 msgstr "Fila superior"
 
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1741
 msgid "Row Below"
 msgstr "Fila inferior"
 
-#: ../e-util/e-html-editor-actions.c:1614
+#: ../e-util/e-html-editor-actions.c:1755
 msgid "Cell..."
 msgstr "Cela…"
 
-#: ../e-util/e-html-editor-actions.c:1621
+#: ../e-util/e-html-editor-actions.c:1762
 msgid "Image..."
 msgstr "Imaxe…"
 
-#: ../e-util/e-html-editor-actions.c:1628
+#: ../e-util/e-html-editor-actions.c:1769
 msgid "Link..."
 msgstr "Ligazón…"
 
-#: ../e-util/e-html-editor-actions.c:1635
+#: ../e-util/e-html-editor-actions.c:1776
 msgid "Page..."
 msgstr "Páxina…"
 
-#: ../e-util/e-html-editor-actions.c:1642
+#: ../e-util/e-html-editor-actions.c:1783
 msgid "Paragraph..."
 msgstr "Parágrafo…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1791
 msgid "Rule..."
 msgstr "Regra…"
 
-#: ../e-util/e-html-editor-actions.c:1657
+#: ../e-util/e-html-editor-actions.c:1798
 msgid "Table..."
 msgstr "Táboa…"
 
-#: ../e-util/e-html-editor-actions.c:1664
+#: ../e-util/e-html-editor-actions.c:1805
 msgid "Text..."
 msgstr "Texto…"
 
-#: ../e-util/e-html-editor-actions.c:1671
+#: ../e-util/e-html-editor-actions.c:1812
 msgid "Remove Link"
 msgstr "Eliminar ligazón"
 
-#: ../e-util/e-html-editor-actions.c:1688
+#: ../e-util/e-html-editor-actions.c:1829
 msgid "Add Word to Dictionary"
 msgstr "Engadir palabra ao dicionario"
 
-#: ../e-util/e-html-editor-actions.c:1695
+#: ../e-util/e-html-editor-actions.c:1836
 msgid "Ignore Misspelled Word"
 msgstr "Ignorar palabra mal escrita"
 
-#: ../e-util/e-html-editor-actions.c:1702
+#: ../e-util/e-html-editor-actions.c:1843
 msgid "Add Word To"
 msgstr "Engadir palabra a"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1852
 msgid "More Suggestions"
 msgstr "Máis suxestións"
 
 #. 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:1819
+#: ../e-util/e-html-editor-actions.c:1960
 #, c-format
 msgid "%s Dictionary"
 msgstr "Dicionario %s"
 
-#: ../e-util/e-html-editor-actions.c:1906
+#: ../e-util/e-html-editor-actions.c:2047
 msgid "_Emoticon"
 msgstr "_Emoticona"
 
-#: ../e-util/e-html-editor-actions.c:1907
+#: ../e-util/e-html-editor-actions.c:2048
 msgid "Insert Emoticon"
 msgstr "Inserir emoticona"
 
-#: ../e-util/e-html-editor-actions.c:1975
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "Re_place"
 msgstr "Susb_tituir"
 
-#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Image"
 msgstr "_Imaxe"
 
-#: ../e-util/e-html-editor-actions.c:1981
+#: ../e-util/e-html-editor-actions.c:2122
 msgid "_Link"
 msgstr "_Ligazón"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1985
+#: ../e-util/e-html-editor-actions.c:2126
 msgid "_Rule"
 msgstr "_Regra"
 
-#: ../e-util/e-html-editor-actions.c:1988
-#: ../e-util/e-html-editor-cell-dialog.c:658
+#: ../e-util/e-html-editor-actions.c:2129
+#: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Táboa"
 
-#: ../e-util/e-html-editor.c:670
+#: ../e-util/e-html-editor.c:681
 msgid "Paragraph Style"
 msgstr "Estilo do parágrafo"
 
-#: ../e-util/e-html-editor.c:684
+#: ../e-util/e-html-editor.c:695
 msgid "Editing Mode"
 msgstr "Editar modo"
 
-#: ../e-util/e-html-editor.c:696
+#: ../e-util/e-html-editor.c:707
 msgid "Font Color"
 msgstr "Cor do tipo de letra"
 
-#: ../e-util/e-html-editor.c:714
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Tamaño do tipo de letra"
 
-#: ../e-util/e-html-editor-cell-dialog.c:618
+#: ../e-util/e-html-editor-cell-dialog.c:698
 msgid "<b>Scope</b>"
 msgstr "<b>Ámbito</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:632
+#: ../e-util/e-html-editor-cell-dialog.c:712
 msgid "C_ell"
 msgstr "C_ela"
 
-#: ../e-util/e-html-editor-cell-dialog.c:645
+#: ../e-util/e-html-editor-cell-dialog.c:725
 msgid "_Row"
 msgstr "_Fila"
 
-#: ../e-util/e-html-editor-cell-dialog.c:671
+#: ../e-util/e-html-editor-cell-dialog.c:751
 msgid "Col_umn"
 msgstr "Col_umna"
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Aliñamento e comportamento</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:694
-#: ../e-util/e-html-editor-hrule-dialog.c:394
-#: ../e-util/e-html-editor-table-dialog.c:819
+#: ../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 "Esquerda"
 
-#: ../e-util/e-html-editor-cell-dialog.c:695
-#: ../e-util/e-html-editor-hrule-dialog.c:396
-#: ../e-util/e-html-editor-table-dialog.c:820
+#: ../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 "Centrado"
 
-#: ../e-util/e-html-editor-cell-dialog.c:696
-#: ../e-util/e-html-editor-hrule-dialog.c:398
-#: ../e-util/e-html-editor-table-dialog.c:821
+#: ../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 "Dereita"
 
-#: ../e-util/e-html-editor-cell-dialog.c:704
+#: ../e-util/e-html-editor-cell-dialog.c:784
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
-#: ../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 "Arriba"
 
-#: ../e-util/e-html-editor-cell-dialog.c:713
-#: ../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 "Medio"
 
-#: ../e-util/e-html-editor-cell-dialog.c:714
-#: ../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 "Abaixo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:722
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:728
+#: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
 msgstr "_Axustar texto"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:736
+#: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
 msgstr "Estilo da _cabeceira"
 
-#: ../e-util/e-html-editor-cell-dialog.c:750
-#: ../e-util/e-html-editor-image-dialog.c:521
-#: ../e-util/e-html-editor-table-dialog.c:731
+#: ../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 "<b>Disposición</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:841
 msgid "_Width"
 msgstr "_Ancho"
 
-#: ../e-util/e-html-editor-cell-dialog.c:800
+#: ../e-util/e-html-editor-cell-dialog.c:880
 msgid "Row S_pan:"
 msgstr "Tamaño da _fila:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:814
+#: ../e-util/e-html-editor-cell-dialog.c:894
 msgid "Co_lumn Span:"
 msgstr "Tamaño da co_lumna:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:821
-#: ../e-util/e-html-editor-table-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
 msgstr "<b>Fondo</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:834
-#: ../e-util/e-html-editor-table-dialog.c:848
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
 msgid "Transparent"
 msgstr "Transparente"
 
-#: ../e-util/e-html-editor-cell-dialog.c:842
+#: ../e-util/e-html-editor-cell-dialog.c:922
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:850
-#: ../e-util/e-html-editor-image-dialog.c:483
-#: ../e-util/e-html-editor-table-dialog.c:864
+#: ../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 "Escoller cor de fondo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:855
-#: ../e-util/e-html-editor-image-dialog.c:489
-#: ../e-util/e-html-editor-table-dialog.c:869
+#: ../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 "Imaxes"
 
-#: ../e-util/e-html-editor-cell-dialog.c:868
+#: ../e-util/e-html-editor-cell-dialog.c:948
 msgid "_Image:"
 msgstr "_Imaxe:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:875
-#: ../e-util/e-html-editor-page-dialog.c:516
-#: ../e-util/e-html-editor-table-dialog.c:889
+#: ../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 "_Quitar imaxe"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-cell-dialog.c:975
 msgid "Cell Properties"
 msgstr "Propiedades da cela"
 
@@ -12618,7 +12883,7 @@ msgid "No match found"
 msgstr "Non se atopou unha coincidencia"
 
 #: ../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 "Buscar cara _atrás"
 
@@ -12634,155 +12899,160 @@ msgstr "_Axustar busca"
 msgid "Find"
 msgstr "Buscar"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:329
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "<b>Size</b>"
 msgstr "<b>Tamaño</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:349
-#: ../e-util/e-html-editor-image-dialog.c:539
-#: ../e-util/e-html-editor-table-dialog.c:742
+#: ../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 "_Ancho:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:374
+#: ../e-util/e-html-editor-hrule-dialog.c:393
 msgid "_Size:"
 msgstr "_Tamaño:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:381
+#: ../e-util/e-html-editor-hrule-dialog.c:400
 msgid "<b>Style</b>"
 msgstr "<b>Tamaño</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:406
-#: ../e-util/e-html-editor-table-dialog.c:828
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
 msgid "_Alignment:"
 msgstr "A_liñamento:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:412
+#: ../e-util/e-html-editor-hrule-dialog.c:431
 msgid "S_haded"
 msgstr "So_mbreado"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:429
+#: ../e-util/e-html-editor-hrule-dialog.c:448
 msgid "Rule properties"
 msgstr "Propiedades da regra"
 
-#: ../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:685
+#: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>Xeral</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:500
+#: ../e-util/e-html-editor-image-dialog.c:544
 msgid "_Source:"
 msgstr "_Fonte:"
 
-#: ../e-util/e-html-editor-image-dialog.c:563
+#: ../e-util/e-html-editor-image-dialog.c:607
 msgid "_Height:"
 msgstr "_Alto:"
 
-#: ../e-util/e-html-editor-image-dialog.c:604
+#: ../e-util/e-html-editor-image-dialog.c:648
 msgid "_X-Padding:"
 msgstr "Recheo-_X:"
 
-#: ../e-util/e-html-editor-image-dialog.c:620
+#: ../e-util/e-html-editor-image-dialog.c:664
 msgid "_Y-Padding:"
 msgstr "Recheo-_Y:"
 
-#: ../e-util/e-html-editor-image-dialog.c:636
-#: ../e-util/e-html-editor-table-dialog.c:809
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "_Borde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:646
+#: ../e-util/e-html-editor-image-dialog.c:690
 msgid "<b>Link</b>"
 msgstr "<b>Ligazón</b>"
 
-#: ../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 "_URL:"
 
-#: ../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 "_Probar URL…"
 
-#: ../e-util/e-html-editor-image-dialog.c:686
+#: ../e-util/e-html-editor-image-dialog.c:730
 msgid "Image Properties"
 msgstr "Propiedades da imaxe"
 
-#: ../e-util/e-html-editor-link-dialog.c:374
+#: ../e-util/e-html-editor-link-dialog.c:429
 msgid "_Remove Link"
 msgstr "_Retirar ligazón"
 
-#: ../e-util/e-html-editor-link-dialog.c:399
+#: ../e-util/e-html-editor-link-dialog.c:454
 msgid "Link Properties"
 msgstr "Propiedades da ligazón"
 
-#: ../e-util/e-html-editor-page-dialog.c:69
+#: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
 msgstr "Papel perforado"
 
-#: ../e-util/e-html-editor-page-dialog.c:78
+#: ../e-util/e-html-editor-page-dialog.c:81
 msgid "Blue Ink"
 msgstr "Tinta azul"
 
-#: ../e-util/e-html-editor-page-dialog.c:87
+#: ../e-util/e-html-editor-page-dialog.c:90
 msgid "Paper"
 msgstr "Papel"
 
-#: ../e-util/e-html-editor-page-dialog.c:96
+#: ../e-util/e-html-editor-page-dialog.c:99
 msgid "Ribbon"
 msgstr "Ribete"
 
-#: ../e-util/e-html-editor-page-dialog.c:105
+#: ../e-util/e-html-editor-page-dialog.c:108
 msgid "Midnight"
 msgstr "Medianoite"
 
-#: ../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 "Borrador"
 
-#: ../e-util/e-html-editor-page-dialog.c:132
+#: ../e-util/e-html-editor-page-dialog.c:135
 msgid "Graph Paper"
 msgstr "Papel de gráficos"
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../e-util/e-html-editor-page-dialog.c:544
 msgid "<b>Colors</b>"
 msgstr "<b>Cores</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:434
+#: ../e-util/e-html-editor-page-dialog.c:563
 msgid "_Text:"
 msgstr "_Texto:"
 
-#: ../e-util/e-html-editor-page-dialog.c:449
+#: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
 msgstr "_Ligazón:"
 
-#: ../e-util/e-html-editor-page-dialog.c:464
+#: ../e-util/e-html-editor-page-dialog.c:593
+#, fuzzy
+msgid "_Visited Link:"
+msgstr "_Ligazón:"
+
+#: ../e-util/e-html-editor-page-dialog.c:608
 msgid "_Background:"
 msgstr "_Fondo:"
 
-#: ../e-util/e-html-editor-page-dialog.c:472
+#: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr "<b>Imaxe de fondo</b>"
 
-#: ../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 "_Modelo:"
 
-#: ../e-util/e-html-editor-page-dialog.c:502
-#: ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../e-util/e-html-editor-page-dialog.c:509
+#: ../e-util/e-html-editor-page-dialog.c:653
 msgid "_Custom:"
 msgstr "_Personalizar:"
 
-#: ../e-util/e-html-editor-page-dialog.c:536
+#: ../e-util/e-html-editor-page-dialog.c:680
 msgid "Page Properties"
 msgstr "Propiedades da páxina"
 
@@ -12798,123 +13068,121 @@ msgstr "<b>Aliñamento</b>"
 msgid "Paragraph Properties"
 msgstr "Propiedades do parágrafo"
 
-#: ../e-util/e-html-editor-replace-dialog.c:148
-#, c-format
-msgid "%d occurence replaced"
-msgid_plural "%d occurences replaced"
+#: ../e-util/e-html-editor-replace-dialog.c:163
+#, fuzzy, c-format
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
 msgstr[0] "%d aparición substituída"
 msgstr[1] "%d aparicións substituídas"
 
-#: ../e-util/e-html-editor-replace-dialog.c:212
+#: ../e-util/e-html-editor-replace-dialog.c:227
 msgid "R_eplace:"
 msgstr "S_ubstituír:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:224
+#: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
 msgstr "_Con:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:236
+#: ../e-util/e-html-editor-replace-dialog.c:251
 msgid "_Case sensitive"
 msgstr "_Coincidir con maiúsculas e minúsculas"
 
-#: ../e-util/e-html-editor-replace-dialog.c:240
+#: ../e-util/e-html-editor-replace-dialog.c:255
 msgid "Wra_p search"
 msgstr "_Axustar busca"
 
-#: ../e-util/e-html-editor-replace-dialog.c:250
+#: ../e-util/e-html-editor-replace-dialog.c:265
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../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 "Subs_tituír"
 
-#: ../e-util/e-html-editor-replace-dialog.c:266
+#: ../e-util/e-html-editor-replace-dialog.c:281
 msgid "Replace _All"
 msgstr "Substituír _todos"
 
-#: ../e-util/e-html-editor-replace-dialog.c:286
-#| msgid "Replace"
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Substituír"
 
-#: ../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 "<b>Suxestións para '%s'</b>"
 
-#: ../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 "<b>Suxestións</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
 msgid "Replace"
 msgstr "Substituír"
 
 #. 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 "Substituír todo"
 
 #. 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 "Ignorar"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
 msgid "Skip"
 msgstr "Omitir"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
 msgid "Back"
 msgstr "Atrás"
 
-#: ../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 "<b>Dicionario</b>"
 
 #. 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 "Engadir palabra"
 
-#: ../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 "Comprobación ortográfica"
 
-#: ../e-util/e-html-editor-table-dialog.c:707
+#: ../e-util/e-html-editor-table-dialog.c:788
 msgid "_Rows:"
 msgstr "_Filas:"
 
-#: ../e-util/e-html-editor-table-dialog.c:724
+#: ../e-util/e-html-editor-table-dialog.c:805
 msgid "C_olumns:"
 msgstr "C_olumna:"
 
-#: ../e-util/e-html-editor-table-dialog.c:775
+#: ../e-util/e-html-editor-table-dialog.c:856
 msgid "_Spacing:"
 msgstr "E_spaciado:"
 
-#: ../e-util/e-html-editor-table-dialog.c:792
+#: ../e-util/e-html-editor-table-dialog.c:873
 msgid "_Padding:"
 msgstr "_Recheo:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Cor:"
 
-#: ../e-util/e-html-editor-table-dialog.c:882
+#: ../e-util/e-html-editor-table-dialog.c:963
 msgid "Image:"
 msgstr "Imaxe:"
 
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-table-dialog.c:990
 msgid "Table Properties"
 msgstr "Propiedades da táboa"
 
@@ -12926,30 +13194,14 @@ msgstr "Ta_maño:"
 msgid "Text Properties"
 msgstr "Propiedades do texto"
 
-#: ../e-util/e-html-editor-view.c:3455
+#: ../e-util/e-html-editor-view.c:5344
 msgid "Changed property"
 msgstr "Propiedade cambiada"
 
-#: ../e-util/e-html-editor-view.c:3456
+#: ../e-util/e-html-editor-view.c:5345
 msgid "Whether editor changed"
 msgstr "Indica se o editor cambiou"
 
-#: ../e-util/e-html-editor-view.c:7317
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-"Desactivar o modo HTML causará que o texto perda todo o formatado. Desexa "
-"continuar?"
-
-#: ../e-util/e-html-editor-view.c:7321
-msgid "_Don't lose formatting"
-msgstr "_Non perder o formatado"
-
-#: ../e-util/e-html-editor-view.c:7322
-msgid "_Lose formatting"
-msgstr "_Perder formatado"
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -13063,15 +13315,15 @@ msgstr "Pechar"
 msgid "_Save and Close"
 msgstr "G_ardar e pechar"
 
-#: ../e-util/e-mail-signature-editor.c:531
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../e-util/e-mail-signature-editor.c:564
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../e-util/e-mail-signature-editor.c:600
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Sen nome"
 
@@ -13118,34 +13370,39 @@ msgstr ""
 "horario. Os usuarios de teclado deben seleccionar o fuso horario na caixa de "
 "combinación despregábel de embaixo."
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "Non foi posíbel abrir a ligazón."
 
-#: ../e-util/e-misc-utils.c:295
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "Non foi posíbel mostrar a axuda do Evolution."
 
-#: ../e-util/e-misc-utils.c:2348
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Abrindo o calendario «%s»"
 
-#: ../e-util/e-misc-utils.c:2351
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Abrindo a lista de notas «%s»"
 
-#: ../e-util/e-misc-utils.c:2354
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Abrindo as tarefas «%s»"
 
-#: ../e-util/e-misc-utils.c:2357
+#: ../e-util/e-misc-utils.c:2396
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Abrindo a axenda de enderezos «%s»"
 
+#: ../e-util/e-misc-utils.c:3138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Non mostrar esta mensaxe outra vez"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Mostrar os contactos"
@@ -13179,8 +13436,7 @@ msgstr "Co_ntactos"
 msgid "Search"
 msgstr "Buscar"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
@@ -13195,30 +13451,30 @@ msgid "Select Contacts from Address Book"
 msgstr "Seleccionar contactos desde a axenda de enderezos"
 
 #. 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 "E_xpandir %s en liña"
 
 #. 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 "Cop_iar %s"
 
 #. 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 "Co_rtar %s"
 
 #. 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 "_Editar %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "E_liminar %s"
@@ -13325,6 +13581,11 @@ msgstr "Automático"
 msgid "Configuration _URL:"
 msgstr "_URL de configuración:"
 
+#: ../e-util/e-proxy-editor.c:560
+#, fuzzy
+msgid "No proxy"
+msgstr "Sen pro_xy para:"
+
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Usar unha configuración directa, non é preciso un proxy."
@@ -13374,51 +13635,50 @@ msgstr "Editar a  regra"
 msgid "Matches: %u"
 msgstr "Coincide con: %u"
 
-#: ../e-util/e-search-bar.c:567
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "Pechar esta barra de busca"
 
-#: ../e-util/e-search-bar.c:575
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../e-util/e-search-bar.c:587
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "Limpar a busca"
 
-#: ../e-util/e-search-bar.c:611
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar a anterior aparición na frase"
 
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../e-util/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte aparición na frase"
 
-#: ../e-util/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "_Coincidir maiúsculas e minúsculas"
 
-#: ../e-util/e-search-bar.c:663
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Alcanzouse o final da páxina, continúase desde o inicio"
 
-#: ../e-util/e-search-bar.c:685
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Alcanzouse o inicio da páxina, continúase desde o final"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
-#: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163
-#: ../smime/gui/certificate-manager.c:1669
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
+#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "Correo"
 
@@ -13587,11 +13847,11 @@ msgstr "Desestabelecer _confianza para o certificado SSL"
 msgid "User"
 msgstr "Usuario"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Destino:"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Seleccionar destino"
 
@@ -13611,26 +13871,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:410
 msgid "(no suggestions)"
 msgstr "(non hai suxestións)"
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:434
 msgid "More..."
 msgstr "Máis…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:519
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Engadir \"%s\" ao Dicionario"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:568
 msgid "Ignore All"
 msgstr "Ignorar todo"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:600
 msgid "Spelling Suggestions"
 msgstr "Suxestións de ortografía"
 
@@ -13660,7 +13920,7 @@ msgstr "Non é posíbel abrir o ficheiro «{0}»."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Produciuse un erro ao retirar a fonte de datos «{0}»."
 
-#: ../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 "O informe de erro foi &quot;{1}&quot;."
 
@@ -13746,7 +14006,7 @@ msgstr ""
 "A infraestrutura de lista de tarefas que serve &quot;{0}&quot; atopou un "
 "erro."
 
-#: ../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"
@@ -13797,8 +14057,6 @@ msgid "Choose the order of information to appear in the message list."
 msgstr "Seleccione a orde da información que aparece na lista de mensaxes."
 
 #: ../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 "_Aplicar"
 
@@ -13945,7 +14203,7 @@ msgstr "O_rdenar por"
 msgid "_Custom"
 msgstr "_Personalizar"
 
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Seleccionar todo"
 
@@ -14004,99 +14262,109 @@ msgid "Flags"
 msgstr "Bandeiras"
 
 #: ../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 "Identidade"
 
-#: ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr "_Copiar a localización da ligazón"
 
-#: ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazón no portapapeis"
 
-#: ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazón no navegador web"
 
-#: ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view.c:336
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:343
+#, fuzzy
+msgid "Copy _Raw Email Address"
+msgstr "Copiar o _enderezo de correo"
+
+#: ../e-util/e-web-view.c:345
+#, fuzzy
+msgid "Copy the raw email address to the clipboard"
+msgstr "Copiar o enderezo de correo ao portapapeis"
+
+#: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
 msgstr "_Copiar imaxe"
 
-#: ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:367
 msgid "Save _Image..."
 msgstr "Gardar _imaxe…"
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
 msgstr "Gardar a imaxe a un ficheiro"
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1338
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../e-util/e-web-view.c:1004
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../e-util/e-web-view.c:1015
+#: ../e-util/e-web-view.c:1082
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Ir á sección %s do mensaxe"
 
-#: ../e-util/e-web-view.c:1017
+#: ../e-util/e-web-view.c:1084
 msgid "Go to the beginning of the message"
 msgstr "Ir ao inicio da mensaxe"
 
-#: ../e-util/e-web-view.c:1021
+#: ../e-util/e-web-view.c:1088
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../e-util/e-web-view.c:2939
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr "Copiar imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../e-util/e-web-view.c:3163
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Gardando imaxe en «%s»"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Desfacer «Insertar texto»"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Refacer «Insertar texto»"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Desfacer «Eliminar texto»"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Refacer «Eliminar texto»"
 
@@ -14128,7 +14396,7 @@ msgstr "Expresión regular incorrecta «{0}»."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Non foi posíbel compilar a expresión regular «{1}»."
 
-#: ../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 "Falta o nome."
 
@@ -14172,7 +14440,7 @@ msgstr "o instante que indique"
 msgid "a time relative to the current time"
 msgstr "unha hora relativa á hora actual"
 
-#: ../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 "segundos"
 
@@ -14180,8 +14448,7 @@ msgstr "segundos"
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "meses"
 
@@ -14233,7 +14500,7 @@ msgstr ""
 "A data da mensaxe compararase co\n"
 "instante relativo no que se produce o filtrado."
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../e-util/gal-a11y-e-cell.c:130
 msgid "Table Cell"
 msgstr "Cela da táboa"
 
@@ -14243,7 +14510,7 @@ msgid "popup a child"
 msgstr "mostrar un fillo"
 
 #. 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 "comezar a usar esta cela"
 
@@ -14349,93 +14616,93 @@ msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 "Esta opción usará un token de acceso OAuth 2.0 para conectarse ao servidor"
 
-#: ../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 "Gardando a mensaxe no cartafol «%s»"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr "Mensaxes reencamiñadas"
 
-#: ../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] "Descargando %d mensaxe"
 msgstr[1] "Descargando %d mensaxes"
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr "Buscando mensaxes duplicadas"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Retirando o cartafol «%s»"
 
-#: ../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 "Retirouse o ficheiro «%s»."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 msgid "File has been removed."
 msgstr "Retirouse o ficheiro."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
 msgid "Removing attachments"
 msgstr "Retirando os anexos"
 
-#: ../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] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol «%s» non é válido"
 
 #. 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:1081
+#: ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. 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:1079
 msgid "Drafts"
 msgstr "Borradores"
 
 #. 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:1083
 msgid "Outbox"
 msgstr "Caixa de saída"
 
 #. 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:1085
 msgid "Sent"
 msgstr "Enviados"
 
 #. 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:1087
 #: ../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 "Modelos"
 
@@ -14463,31 +14730,31 @@ msgstr ""
 msgid "Waiting for '%s'"
 msgstr "Agardando por «%s»"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr "Non hai un servizo de transporte de correo dispoñíbel"
 
-#: ../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 "Enviando un mensaxe a «%s»"
 
-#: ../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 "Produciuse un erro ao aplicar os filtros ao correo saínte: %s"
 
-#: ../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 "Almacenando o mensaxe enviado a «%s»"
 
-#: ../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"
@@ -14496,14 +14763,14 @@ msgstr ""
 "Produciuse un erro ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local «Enviados»."
 
-#: ../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 "Produciuse un erro ao anexar ao cartafol local «Enviados»: %s"
 
-#: ../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 "Enviando a mensaxe"
 
@@ -14544,7 +14811,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Obtendo o correo de «%s»"
 
-#: ../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 "
@@ -14557,57 +14824,57 @@ msgstr ""
 "Comprobe os seus filtros en Editar->Filtros de mensaxes.\n"
 "O erro orixinal foi: %s"
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../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] "Produciuse un erro ao enviar unha mensaxe"
 msgstr[1] "Produciuse un erro ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:1049
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1163
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol «%s»"
 
-#: ../libemail-engine/mail-ops.c:1411
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1487
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de «%s»"
 
-#: ../libemail-engine/mail-ops.c:1579
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Procesando os cambios do cartafol en «%s»"
@@ -14685,9 +14952,9 @@ msgid "De_fault"
 msgstr "Prede_finido"
 
 #: ../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 "Activado"
 
@@ -14703,12 +14970,12 @@ msgstr "Non se forneceu ningún enderezo de correo"
 msgid "Missing domain in email address"
 msgstr "Falta o dominio no enderezo de correo"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:903
 #: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
@@ -14730,7 +14997,7 @@ msgstr "Asistente de contas do Evolution"
 msgid "_Revise Details"
 msgstr "_Revisar detalles"
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "Comprobar tipos admitidos"
 
@@ -14782,7 +15049,7 @@ msgid "Archi_ve Folder:"
 msgstr "Cartafol Arqui_vo:"
 
 #: ../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 "Escolla un cartafol onde arquivar mensaxes."
 
@@ -14857,45 +15124,46 @@ msgstr ""
 msgid "Account Information"
 msgstr "Información da conta"
 
-#: ../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
+#, fuzzy
 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 ""
 "Escriba o nome polo que quere identificar esta conta.\n"
 "Por exemplo: «Traballo» ou «Persoal»"
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr "Información solicitada"
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../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 "Información opcional"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr "Engadir unha sinatura _nova…"
 
-#: ../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 ""
 "_Buscar a información do servidor de correo baseado no enderezo de correo "
@@ -14929,11 +15197,11 @@ msgctxt "PGPKeyDescription"
 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/e-mail-config-security-page.c:340 ../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 "Xeral"
@@ -14956,22 +15224,22 @@ msgid "Si_gning algorithm:"
 msgstr "Algoritmo da si_natura:"
 
 #: ../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 "SHA384"
 
 #: ../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 "SHA512"
 
@@ -14980,49 +15248,54 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Asinar sem_pre as mensaxes saíntes cando se use esta conta"
 
 #: ../mail/e-mail-config-security-page.c:466
+#, fuzzy
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../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 "Seleccionar"
 
-#: ../mail/e-mail-config-security-page.c:544
-#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../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:1006
 msgid "_Clear"
 msgstr "Limpa_r"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo da sinatura:"
 
-#: ../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 "Asinar sempre as mensaxes saíntes ao usar esta conta"
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr "Certificado de cifrado:"
 
-#: ../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 "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: ../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 "Cifrar sempre para min mesmo ao enviar correo cifrado"
 
@@ -15049,45 +15322,45 @@ msgstr ""
 "Este é un resumo da configuración que se empregarán para acceder ao seu "
 "correo."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Detalles persoais"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr "Nome completo"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr "Enderezo de correo"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr "Tipo de servidor:"
 
-#: ../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 "Servidor:"
 
-#: ../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 "Nome do usuario:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
@@ -15110,27 +15383,27 @@ msgstr "Benvido/a"
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "Eng_adir á axenda de enderezos…"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "A es_te enderezo"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "Enviar _resposta a…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Enviar unha mensaxe de resposta a este enderezo"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
@@ -15152,42 +15425,42 @@ msgstr "_Nome do cartafol:"
 
 #. 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 "Respondida"
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Borrador"
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Marcada"
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/e-mail-free-form-exp.c:231
+#: ../mail/e-mail-free-form-exp.c:241
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/e-mail-free-form-exp.c:479
+#: ../mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "non"
 
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "falso"
@@ -15225,7 +15498,7 @@ msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../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 "Engadir unha etiqueta"
 
@@ -15273,668 +15546,691 @@ msgstr "Nome da cabeceira:"
 msgid "Header Value"
 msgstr "Valor da cabecera"
 
-#: ../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 "Cabeceiras"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "Páxina %d de %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 "Mover ao cartafol"
 
-#: ../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 "Copiar ao cartafol"
 
-#: ../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 "_Mover"
 
-#: ../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 "C_opiar"
 
-#: ../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 "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un erro ao obter a mensaxe:"
 
-#: ../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 "Recuperando a mensaxe «%s»"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1901
 msgid "_Archive..."
 msgstr "_Arquivo…"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1903
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Mover os mensaxes seleccionados ao cartafol Arquivo para a conta"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Crear unha regra de filtrado segundo a _rolda de correo…"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Crear unha regra de filtrado segundo os _destinatarios…"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Crear unha regra de filtrado segundo o re_mitente…"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Crear unha regra de filtrado segundo o _asunto…"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe…"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Retirar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../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 ""
 "Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr "Seguimento…"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../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 "Reencamiñar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr "Reencamiñar como un _anexo"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../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 "Reencamiñar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr "Reencamiñar _inserida"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../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 "Reencamiñar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr "Reencamiñar _citada"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../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 "_Ignorar subfío"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Marcar novos correos na subconversa como lida automaticamente"
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
 msgid "_Ignore Thread"
 msgstr "_Ignorar fío"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2050
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Marcar os novos correos nesta conversa como lidas automaticamente"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr "_Non é correo lixo"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../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 "Non _ignorar sub-conversa"
 
-#: ../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 "Non marcar novos correos nunha subconversa como lidos automaticamente"
 
-#: ../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 "Non _ignorar conversa"
 
-#: ../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 "Non marcar novos correos nesta conversa como lidos automaticamente"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova…"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol…"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr "Seguin_te fío"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr "Mostrar o fío anterior"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr "Retirar os anexos"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr "Retirar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../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 "Responder a t_odos"
 
-#: ../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 ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../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 "Responder á _lista"
 
-#: ../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 "Responder á rolda de correo remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2311
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr "Gardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr "Cre_ar"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr "Reencamiñar c_omo…"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Crear un cartafol de busca segundo a ro_lda de correo…"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Crear un cartafol de busca segundo os des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Crear un cartafol de busca segundo o _remitente…"
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Crear un cartafol de busca segundo o as_unto…"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento…"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:3020
+#: ../mail/e-mail-reader.c:3047
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:4028
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4078 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Reencamiñar"
 
-#: ../mail/e-mail-reader.c:4029
+#: ../mail/e-mail-reader.c:4079
 msgid "Forward the selected message to someone"
 msgstr "Reencamiñar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:4048
+#: ../mail/e-mail-reader.c:4098
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:4049
+#: ../mail/e-mail-reader.c:4099
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder á lista de correo ou a todos os destinatarios"
 
-#: ../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 "Eliminar"
 
-#: ../mail/e-mail-reader.c:4127
+#: ../mail/e-mail-reader.c:4177
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:4131
+#: ../mail/e-mail-reader.c:4181
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../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 "Responder"
 
+#: ../mail/e-mail-reader.c:5249
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5251
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5268
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5325
+#, fuzzy
+msgid "Load remote content"
+msgstr "Contido da cabeceira"
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
-#: ../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 "Actualizando o cartafol «%s»"
+
+#: ../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 "Erro descoñecido"
 
-#: ../mail/e-mail-reader-utils.c:1043
+#: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
 msgstr "Marcar conversa para ignorala"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1169
 msgid "Unmarking thread from being ignored"
 msgstr "Desmarcando conversa para ignorala"
 
-#: ../mail/e-mail-reader-utils.c:1051
+#: ../mail/e-mail-reader-utils.c:1173
 msgid "Marking subthread to be ignored"
 msgstr "Marcando sub-conversa para ignorala"
 
-#: ../mail/e-mail-reader-utils.c:1055
+#: ../mail/e-mail-reader-utils.c:1177
 msgid "Unmarking subthread from being ignored"
 msgstr "Desmarcando sub-conversa para ignorala"
 
-#: ../mail/e-mail-reader-utils.c:1290
+#: ../mail/e-mail-reader-utils.c:1417
 msgid "Printing"
 msgstr "Imprimindo"
 
 #. 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 "
@@ -15949,7 +16245,7 @@ msgstr[1] ""
 "O cartafol «%s» contén %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:2355
+#: ../mail/e-mail-reader-utils.c:2485
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -15960,17 +16256,17 @@ msgstr[1] "Gardar mensaxes"
 #. * 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] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:2749
+#: ../mail/e-mail-reader-utils.c:2879
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr "O mensaxe non ten contido de texto."
 
@@ -15992,7 +16288,7 @@ msgstr "Non foi posíbel atopar os datos para o UID «%s»"
 #. * 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:"
@@ -16000,24 +16296,24 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1609
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiñada --------"
 
-#: ../mail/em-composer-utils.c:1518
+#: ../mail/em-composer-utils.c:1614
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2668
+#: ../mail/em-composer-utils.c:2827
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3074
+#: ../mail/em-composer-utils.c:3265
 msgid "Posting destination"
 msgstr "Destino da publicación"
 
-#: ../mail/em-composer-utils.c:3079
+#: ../mail/em-composer-utils.c:3270
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -16034,35 +16330,97 @@ msgstr "Entón"
 msgid "Add Ac_tion"
 msgstr "Engadir unha a_cción"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxes sen ler:"
 msgstr[1] "Mensaxes sen ler:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Cota de uso (%s):"
 
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr "Cota de uso"
 
 #. 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 "_Enviar sobrescritura de conta:"
 
-#: ../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
+#, fuzzy
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "Cartafol das _mensaxes enviadas:"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+#, fuzzy
+msgctxt "autoarchive"
+msgid "days"
+msgstr "días"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+#, fuzzy
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "semanas"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+#, fuzzy
+msgctxt "autoarchive"
+msgid "months"
+msgstr "meses"
+
+#: ../mail/em-folder-properties.c:526
+#, fuzzy
+msgid "Move old messages to the default archive _folder"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
+
+#: ../mail/em-folder-properties.c:537
+#, fuzzy
+msgid "_Move old messages to:"
+msgstr "Movendo as mensaxes a «%s»"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+msgid "AutoArchive folder"
+msgstr "Cartafol Arqui_vo:"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+msgid "Select folder to use for AutoArchive"
+msgstr "Seleccionar un cartafol ao que importar"
+
+#: ../mail/em-folder-properties.c:547
+#, fuzzy
+msgid "_Delete old messages"
+msgstr "_Eliminar o correo lixo"
+
+#: ../mail/em-folder-properties.c:606
+#, fuzzy
+msgid "AutoArchive"
+msgstr "_Arquivo…"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
@@ -16078,47 +16436,47 @@ msgstr "Crear un novo cartafol"
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter «/»"
 
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1668
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../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 "Movendo o cartafol %s"
 
-#: ../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 "Copiando o cartafol %s"
 
-#: ../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 "Movendo as mensaxes ao cartafol %s"
 
-#: ../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 "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2249
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non é posíbel soltar as mensaxe(s) no almacenamento do nivel superior"
 
 #. 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 "SEN COINCIDENCIAS"
 
-#: ../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 "Cargando…"
 
@@ -16142,79 +16500,95 @@ msgstr "Su_bscribirse aos mostrados"
 msgid "Subscribe To _All"
 msgstr "Subscribirse a _todos"
 
-#: ../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 "Cancelar a s_ubscrición"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "Des_ubscribirse dos ocultos"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Desubscribirse de _todo"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1058
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d sen ler, "
+msgstr[1] "%d sen ler, "
+
+#: ../mail/em-subscription-editor.c:1343
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d en total"
+msgstr[1] "%d en total"
+
+#: ../mail/em-subscription-editor.c:1749
 msgid "Folder Subscriptions"
 msgstr "Subscricións de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
 msgid "Clear Search"
 msgstr "Limpar a busca"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
 msgid "Sho_w items that contain:"
 msgstr "Most_rar os elementos que conteñan:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
 msgid "Subscribe to the selected folder"
 msgstr "Subscribir o cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
 msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
-#: ../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 "Cancelar a subscrición ao cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
 msgid "Collapse all folders"
 msgstr "Pregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
 msgid "C_ollapse All"
 msgstr "Pregar t_odo"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
 msgid "Expand all folders"
 msgstr "Despregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
 msgid "E_xpand All"
 msgstr "Despre_gar todo"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ../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 "_Actualizar"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
 msgid "Stop the current operation"
 msgstr "Deter a operación actual"
 
-#: ../mail/em-subscription-editor.c:1941
+#: ../mail/em-subscription-editor.c:1986
 #: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Deter"
@@ -16223,22 +16597,27 @@ msgstr "_Deter"
 #. * 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] "Está seguro de que desexa abrir %d mensaxe á vez?"
 msgstr[1] "Está seguro de que desexa abrir %d mensaxes á vez?"
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:983
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
 
+#: ../mail/em-utils.c:1680
+#, fuzzy
+msgid "Deleting old messages"
+msgstr "_Eliminar o correo lixo"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
@@ -16421,7 +16800,7 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Ler"
 
-#: ../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 "Correo lixo"
@@ -16443,129 +16822,126 @@ msgstr "non está marcado"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr "Completado o"
+#, fuzzy
+msgid "is Completed"
+msgstr "% completado"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr "está estabelecido"
-
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr "non está estabelecido"
+#, fuzzy
+msgid "is not Completed"
+msgstr "% completado"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
 msgid "Mailing list"
 msgstr "Rolda de correo"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
 msgid "Regex Match"
 msgstr "Coincidir coa expresión regular"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Message Header"
 msgstr "Cabeceira da mensaxe"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr "Conta de orixe"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr "non retorna"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr "Proba de correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr "A mensaxe é un correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr "A mensaxe non é un correo lixo"
 
-#: ../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 "Localización da mensaxe"
 
-#: ../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 "Coincidir todo"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr "Estabelecer a etiqueta"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr "Asignar unha cor"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr "Quitar cor"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr "Asignar unha puntuación"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr "Axustar a puntuación"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr "Estabelecer o estado"
 
-#: ../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 "Eliminada"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr "Son de aviso"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr "Reproducir un son"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Reencamiñar a"
 
@@ -16573,11 +16949,11 @@ msgstr "Reencamiñar a"
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Importador Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
@@ -16611,8 +16987,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:171
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
@@ -16636,27 +17011,27 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importar correo e contactos desde KMail."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../modules/mail/e-mail-shell-view-private.c:1089
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Importando a caixa de correo"
 
-#: ../mail/importers/mail-importer.c:61
+#: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
 msgstr "Importar correo e contactos desde KMail"
 
 #. 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 "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:570
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
@@ -16665,11 +17040,11 @@ msgstr "Examinando %s"
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -16747,110 +17122,110 @@ msgstr "Comportamento predeterminado:"
 msgid "For_mat messages in HTML"
 msgstr "For_matar as mensaxes en HTML"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Use Unicode characters for smile_ys"
 msgstr "Usar caracteres Unicode para os sorr_isos"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre a confirmación de lec_tura"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro á forma de _Outlook/GMail\""
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr "Enviar mensaxes mediante o cartafol Saí_da"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr "Numero de caracteres para o _axuste de palabra:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Codificación de car_acteres:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Respostas e reencamiñamentos"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "Estilo do _reencamiñamento:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escribir ao final da respos_ta"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norar «Responder a:» para as listas de correo"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "A resposta ao gr_upo vai unicamente á lista de correo, se é posíbel"
 
-#: ../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 ""
 "_Firmar mensaxes digitalmente cando a mensaxe orixinal estea firmada (PGP ou "
 "S/MIME)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "En liña (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Non citar"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr "Táboa de idiomas"
 
-#: ../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."
@@ -16858,11 +17233,11 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografía men_tres escribe"
 
-#: ../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:"
@@ -16871,75 +17246,81 @@ msgstr ""
 "antes de realizar as seguintes accións marcadas:"
 
 #. 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 "Enviar unha m_ensaxe co asunto baleiro"
 
 #. 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 "Enviar unha mensaxe só con destinatarios _Bcc definidos"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
+#, fuzzy
+msgid "Sending a message to many _To and CC recipients"
+msgstr "Enviar unha mensaxe só con destinatarios _Bcc definidos"
+
+#. 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 "Enviar unha resposta _privada á mensaxes da lista de correo"
 
 #. 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 "Enviar unha resposta a un grande _número de destinatarios"
 
 #. 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 ""
 "Per_mitir que unha lista de correo redirixa as respostas privadas de novo á "
 "lista"
 
 #. 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 ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
 #. 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 "Enviando un mensaxe usando unha _tecla rápida (Ctrl+Intro)"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:56
 msgid "Confirmations"
 msgstr "Confirmacións"
 
 #. 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 "Usar para os cartafoles"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "A_dd"
 msgstr "Enga_dir"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
 msgid "Re_move"
 msgstr "E_liminar"
 
 #. 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 "Usar para os destinatarios"
 
 #. 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 "Conta"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Send account overrides"
 msgstr "Enviar sobrescritura de conta"
 
-#: ../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 "
@@ -16951,209 +17332,231 @@ msgstr ""
 "normal. A lista de destinatarios pode conter enderezos ou nomes parciais. As "
 "partes do nome e enderezos poden compararse de forma separada."
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "A sobrescrita de _cartafol ten precedencia sobre a sobrescrita de "
 "destinatario"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "Send Account"
 msgstr "Conta de envío"
 
-#: ../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 "a"
 
-#: ../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 "b"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Check for new _messages on start"
 msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprobar se hai mensa_xes novas nas contas activas"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
 msgid "Message Display"
 msgstr "Vista das mensaxes"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variábel para HTML"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Fix_ed Width Font:"
 msgstr "Tipo de l_etra de largura fixa:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../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 "Seleccionar unha cor"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "Default character e_ncoding:"
 msgstr "Codificació_n de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar as mesmas opcións de _vista para todos os cartafoles"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "F_all back to threading messages by subject"
 msgstr "Volver agrupar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "Delete Mail"
 msgstr "Eliminar o correo"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "Empty _trash folders"
 msgstr "Baleirar os cartafoles do _lixo"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "Archive Mail"
 msgstr "Arquivar correo"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "On This Computer A_rchive folder:"
 msgstr "Cartafol Ar_quivo Neste computador:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:101
 msgid "Archive folder to use for On This Computer messages"
 msgstr "O cartafol Arquivo a usar para os mensaxes Neste computador"
 
 #. 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 "Mo_strar as imaxes animadas"
 
-#: ../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 "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
 
-#: ../mail/mail-config.ui.h:102
-msgid "Loading Images"
-msgstr "Cargando as imaxes"
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+msgid "Loading Remote Content"
+msgstr "Cargando a lista de notas"
 
-#: ../mail/mail-config.ui.h:103
-msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:106
+#, fuzzy
+msgid "_Never load remote content from the Internet"
 msgstr "_Non cargar nunca as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:104
-msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "_Load remote content only in messages from contacts"
 msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:105
-msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+msgid "_Always load remote content from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:109
+msgid "Add"
+msgstr "Engadir"
+
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Remove"
+msgstr "_Retirar"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:112
+#, fuzzy
+msgid "Allow for senders:"
+msgstr "Todos os cartafoles locais"
+
+#: ../mail/mail-config.ui.h:113
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../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 "Etiquetas"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:115
 msgid "Sender Photograph"
 msgstr "Fotografía do remitente"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:116
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografía do remitente na vista previa das mensaxes"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:117
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Buscar en gra_vatar.com a fotografía do emisor"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:119
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../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 "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "_Delete junk messages"
 msgstr "_Eliminar o correo lixo"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
 msgid "Junk Test Options"
 msgstr "Opcións de proba de spam"
 
-#: ../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 ""
 "Non ma_rcar as mensaxes como correo lixo se o remitente está na miña axenda "
 "de enderezos"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:126
 msgid "_Lookup in local address book only"
 msgstr "Buscar só nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:127
 msgid "Check cu_stom headers for junk"
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../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 "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:130
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:131
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -17320,11 +17723,26 @@ msgstr ""
 "un destinatario «Para:» ou «CC:»."
 
 #: ../mail/mail.error.xml.h:16
+#, fuzzy
+msgid "Are you sure you want to send a message with {0} To and CC recipients?"
+msgstr ""
+"Está seguro de que desexa enviar unha mensaxe só con destinatarios Cco?"
+
+#: ../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 ""
 "Está seguro de que desexa enviar unha mensaxe con un enderezo incorrecto?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:20
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -17333,12 +17751,12 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../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 ""
 "Está seguro de que desexa enviar unha mensaxe con enderezos incorrectos?"
 
-#: ../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}"
@@ -17347,11 +17765,11 @@ msgstr ""
 "electrónico correctos:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 msgid "Send private reply?"
 msgstr "Desexa enviar unha resposta privada?"
 
-#: ../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 "
@@ -17361,11 +17779,11 @@ msgstr ""
 "mediante unha lista de correo, pero a lista está tentando redireccionar a "
 "súa resposta de novo á lista. Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 msgid "Reply _Privately"
 msgstr "Responder de forma _privada"
 
-#: ../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 "
@@ -17375,11 +17793,11 @@ msgstr ""
 "correo, pero está respondendo de forma privada ao remitente, non á lista. "
 "Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 msgid "Send reply to all recipients?"
 msgstr "Desexa enviar unha resposta a todos os destinatarios?"
 
-#: ../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?"
@@ -17387,13 +17805,13 @@ msgstr ""
 "Está respondendo a un correo electrónico que se enviou a moitos "
 "destinatarios. Está seguro que desexa responder a TODOS eles?"
 
-#: ../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 ""
 "Non é posíbel enviar esta mensaxe porque non indicou ningún destinatario"
 
-#: ../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."
@@ -17401,11 +17819,11 @@ msgstr ""
 "Introduza un enderezo de correo correcto no campo «Para:». Pode buscar "
 "enderezos de correo premendo no botón «Para:» ao lado da caixa da entrada."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 msgid "Use default drafts folder?"
 msgstr "Desexa usar o cartafol de borradores predeterminado?"
 
-#: ../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?"
@@ -17413,11 +17831,11 @@ msgstr ""
 "Non é posíbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Usar o pre_definido"
 
-#: ../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}\"?"
@@ -17425,15 +17843,15 @@ msgstr ""
 "Está seguro de que desexa retirar permanentemente todas as mensaxes "
 "eliminadas do cartafol «{0}»?"
 
-#: ../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 "Se continúa non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../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?"
@@ -17441,24 +17859,23 @@ msgstr ""
 "Está seguro de que desexa retirar permanentemente todas as mensaxes "
 "eliminadas de todos os cartafoles?"
 
-#: ../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 "_Baleirar o lixo"
 
-#: ../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 "Abrir demasiadas mensaxes á vez pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Abrir as mensaxes"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes sen enviar. Desexa saír de todas formas?"
 
-#: ../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."
@@ -17469,55 +17886,55 @@ 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 "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operación."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definicións dos filtros."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non é posíbel gardar no cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non é posíbel gardar no ficheiro «{0}»."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non é posíbel crear o cartafol de gardado porque «{1}»"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Non é posíbel crear o cartafol de gardado temporal."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe pero non é posíbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe pero non é un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol do sistema «{0}»."
 
-#: ../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."
@@ -17525,25 +17942,25 @@ msgstr ""
 "O Evolution precisa os cartafoles do sistema para funcionar correctamente e "
 "non é posíbel renomealos, movelos ou eliminalos."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao expurgar o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao actualizar o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Non é posíbel renomear ou mover o cartafol do sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "Está seguro de que desexa eliminar o cartafol «{0}» e todos os seus "
 "subcartafoles?"
 
-#: ../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."
@@ -17551,20 +17968,20 @@ msgstr ""
 "Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
 "eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid "Really delete folder \"{0}\"?"
 msgstr "Desexa confirmar o borrado do cartafol «{0}»?"
 
-#: ../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 "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "These messages are not copies."
 msgstr "Estes mensaxes non son copias."
 
-#: ../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 "
@@ -17575,63 +17992,63 @@ msgstr ""
 "fisicamente.\n"
 "Está seguro de que desexa facer isto?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel renomear «{0}» como «{1}»."
 
-#: ../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 "Xa existe un cartafol co nome «{1}». Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel mover o cartafol «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Non é posíbel cartafol orixinal. Erro: «{2}»"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Non é posíbel abrir o cartafol destino. Erro: «{2}»"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel copiar o cartafol «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot create folder \"{0}\"."
 msgstr "Non é posíbel crear o cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open folder. Error: {1}"
 msgstr "Non é posíbel abrir o cartafol. Erro: «{1}»."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot save changes to account."
 msgstr "Non é posíbel gardar as modificacións na conta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account?"
 msgstr "Está seguro de que desexa eliminar esta conta?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se continúa, a información da conta eliminarase permanentemente."
 
-#: ../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 "Está seguro de que desexa eliminar esta conta e todos os seus proxies?"
 
-#: ../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."
@@ -17639,31 +18056,30 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy eliminarase permanentemente."
 
-#: ../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 ""
 "Está seguro de que desexa desactivar esta conta e eliminar todos os seus "
 "proxies?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se continúa, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:93
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Non é posíbel editar o cartafol de busca «{0}» porque non existe."
 
-#: ../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."
@@ -17672,39 +18088,39 @@ msgstr ""
 "se é necesario, vaia ao editor de cartafoles de busca para engadilo "
 "explicitamente."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non é posíbel engadir o cartafol de busca «{0}»."
 
-#: ../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 "Xa existe un cartafol co nome «{0}». Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "You must specify a folder."
 msgstr "Debe indicar un cartafol."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "No folder selected."
 msgstr "Non se seleccionou ningún cartafol."
 
-#: ../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 "
@@ -17714,11 +18130,11 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo «{0}»."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -17730,19 +18146,19 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
 "contidos ou saír."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr "_Anexar"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Evolution's local mail format has changed."
 msgstr "O formato de correo electrónico local de Evolution cambiou."
 
-#: ../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 "
@@ -17761,19 +18177,19 @@ msgstr ""
 "Se escolle a migración comprobe con anterioridade que haxa suficiente espazo "
 "libre no seu disco."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "_Exit Evolution"
 msgstr "_Saír do Evolution"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "_Migrate Now"
 msgstr "_Migrar agora"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Non é posíbel ler o ficheiro da licenza."
 
-#: ../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."
@@ -17781,28 +18197,28 @@ msgstr ""
 "Non é posíbel ler o ficheiro de licenza «{0}» debido a un problema de "
 "instalación. Non poderá usar este provedor até que acepte a súa licenza."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase solicitando do servidor unha lista de mecanismos de autenticación "
 "compatíbeis."
 
-#: ../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 ""
 "Produciuse un erro ao solicitar a lista de mecanismos de autenticación "
 "admitidos polo servidor."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../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?"
@@ -17810,27 +18226,27 @@ msgstr ""
 "Desexa sincronizar localmente os cartafoles que están marcados para o uso "
 "sen conexión?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "Do _Not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "Do you want to mark all messages as read?"
 msgstr "Desexa marcar todas as mensaxes como lidas?"
 
-#: ../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 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "Also mark messages in subfolders?"
 msgstr "Desexa marcar tamén as mensaxes nos subcartafoles?"
 
-#: ../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?"
@@ -17838,51 +18254,73 @@ msgstr ""
 "Desexa marcar unicamente as mensaxes do cartafol actual como lidas ou tamén "
 "as dos subcartafoles?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "In Current Folder and _Subfolders"
 msgstr "No cartafol actual e nos _subcartafoles"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "In Current _Folder Only"
 msgstr "Só no carta_fol actual"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Debería Evolution pechar esta xanela ao responder ou reencamiñar?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Yes, Always"
 msgstr "_Si, sempre"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "_No, Never"
 msgstr "_Non, nunca"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "Copy folder in folder tree."
 msgstr "Copiar cartafol no árbore de cartafois."
 
-#: ../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 "Ten certeza que quere copiar o cartafol «{0}» a «{1}»?"
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
+#: ../mail/mail.error.xml.h:142
+#, fuzzy
+msgid "Do _not copy"
+msgstr "_Non enviar"
+
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+msgid "_Always copy"
 msgstr "_Sempre"
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#: ../mail/mail.error.xml.h:144
+#, fuzzy
+msgid "N_ever copy"
 msgstr "N_unca"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:145
 msgid "Move folder in folder tree."
 msgstr "Mover cartafol no árbore de cartafois."
 
-#: ../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 "Está seguro de que desexa mover o cartafol «{0}» a «{1}»?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
+#, fuzzy
+msgid "Do _not move"
+msgstr "_Non enviar"
+
+#: ../mail/mail.error.xml.h:149
+#, fuzzy
+msgid "_Always move"
+msgstr "_Sempre"
+
+#: ../mail/mail.error.xml.h:150
+#, fuzzy
+msgid "N_ever move"
+msgstr "N_unca"
+
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -17890,68 +18328,68 @@ msgstr ""
 "Non é posíbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:152
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou faga o envío usando outra conta."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminación do correo"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "\"Check Junk\" Failed"
 msgstr "Produciuse un fallo na comprobación do correo lixo"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do correo lixo"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "\"Report Not Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do que non é correo lixo"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:158
 msgid "Remove duplicate messages?"
 msgstr "Desexa retirar as mensaxes duplicadas?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "No duplicate messages found."
 msgstr "Non se atoparon mensaxes duplicadas."
 
 #. 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 "O cartafol «{0}» non contén ningunha mensaxe duplicada."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Produciuse un fallo ao conectarse á conta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Produciuse un erro ao desconectar a conta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao desuscribirse do cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:165
 msgid "Unable to retrieve message."
 msgstr "Non foi posíbel obter a mensaxe."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "Message is not available in offline mode."
 msgstr "A mensaxe non está dispoñíbel en modo desconectado."
 
-#: ../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 "
@@ -17966,40 +18404,40 @@ msgstr ""
 "asegurarse de que todos os mensaxes do cartafol estarán dispoñíbeis en modo "
 "desconectado."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to open folder."
 msgstr "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un erro ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un erro ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to mark messages as read."
 msgstr "Produciuse un erro ao marcar as mensaxes como lidas."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un erro ao retirar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 "Produciuse un erro ao descargar as mensaxes para traballar sen conexión"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un erro ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:177
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../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."
@@ -18007,82 +18445,108 @@ msgstr ""
 "O anexo co nome {0} é un ficheiro oculto e pode conter datos sensíbeis. "
 "Revíseo antes de envialo."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:179
 msgid "Printing failed."
 msgstr "Produciuse un fallo ao imprimir."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:180
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "A impresora respondeu &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:181
 msgid "Could not perform this operation on {0}."
 msgstr "Non é posíbel realizar esta operación en {0}."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:182
 msgid "You must be working online to complete this operation."
 msgstr "Debe estar traballando en liña para completar esta operación."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:183
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Mensaxe desde a conta &quot;{0}&quot;:"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao marcar a conversa para ignorala no cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Produciuse un fallo ao desmarcar o fío como ignorada no cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao marcar a sub-conversa como ignorada nun cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:187
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao desmarcar a subconversa como ignorada no cartafol "
 "«{0}»"
 
+#: ../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
+#, fuzzy
+msgid "{0}, Completed on {1}"
+msgstr "Completado o"
+
+#. 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 "Cancelando…"
 
-#: ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:645
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../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 "Actualizando…"
 
-#: ../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 "Agardando…"
 
-#: ../mail/mail-send-recv.c:1220
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Comprobando se hai correo novo en «%s»"
 
-#: ../mail/mail-send-recv.c:1434
+#: ../mail/mail-send-recv.c:1452
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Eliminando lixo e purgando lixo en «%s»"
 
-#: ../mail/mail-send-recv.c:1436
+#: ../mail/mail-send-recv.c:1454
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Eliminar lixo en «%s»"
 
-#: ../mail/mail-send-recv.c:1438
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Purgando o lixo en «%s»"
@@ -18139,13 +18603,13 @@ msgstr "Superior"
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../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 "Xerando a lista de mensaxes"
 
 #. 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 "Hoxe ás %l:%M %p"
 
@@ -18168,20 +18632,20 @@ msgstr "O %b %d ás %l:%M %p"
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2967
+#: ../mail/message-list.c:2957
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../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 "Mensaxes"
 
 #. 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 "Seguimento"
 
-#: ../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 "
@@ -18193,7 +18657,7 @@ msgstr ""
 "despregábel de enriba ou executando unha nova busca limpándoa no elemento de "
 "menú Buscar->Limpar ou cambiando a consulta enriba."
 
-#: ../mail/message-list.c:5988
+#: ../mail/message-list.c:5979
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -18229,59 +18693,59 @@ msgstr "Asunto - Recortado"
 msgid "Any header"
 msgstr "Calquera cabeceira"
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../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 "Os destinatarios conteñen"
 
-#: ../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 "A mensaxe contén"
 
-#: ../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 "O asunto contén"
 
-#: ../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 "O remitente contén"
 
-#: ../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 "O corpo contén"
 
-#: ../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 "Expresión libre de forma"
 
 #. 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 "Columna da _táboa:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Formatado de enderezos"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "_Formatar enderezos segundo o estándar do país de destino"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Completado automático"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
@@ -18340,10 +18804,6 @@ msgstr "_Axenda de enderezos"
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Certificados"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
@@ -18414,7 +18874,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 "_Renomear…"
 
@@ -18495,7 +18955,7 @@ msgstr "_Accións"
 #: ../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 "Vista _previa"
 
@@ -18522,7 +18982,7 @@ msgstr "Mostrar mapas na xanela de vista previa de contactos"
 #: ../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 "Vista _clásica"
 
@@ -18533,7 +18993,7 @@ msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 #: ../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 "Vista _vertical"
 
@@ -18552,7 +19012,7 @@ msgstr "Sen coincidencias"
 #: ../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 "Busca avanzada"
@@ -18633,37 +19093,42 @@ msgstr "Seleccionar un ficheiro de respaldo a restaurar"
 msgid "Restore from Backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../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 "Seleccionar o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr "_Reiniciar Evolution despois restaurar"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccionar o nome do ficheiro da copia de seguranza do Evolution para "
 "restaurar"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "Re_start Evolution after restore"
-msgstr "_Reiniciar Evolution despois restaurar"
+#: ../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 "Fa_cer unha copia de seguranza dos datos do Evolution…"
 
-#: ../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 "Facer unha copia de seguranza dos datos e os axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr "R_estabelecer os datos do Evolution…"
 
-#: ../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 "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
@@ -18689,7 +19154,7 @@ msgstr "Con interface gráfica de usuario"
 
 #. FIXME Will the versioned setting always work?
 #: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
@@ -18708,65 +19173,65 @@ msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:665
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:481
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:488
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Extraendo os ficheiros desde a copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Cargando os axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Retirando os ficheiros temporais da copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Recargando o servizo de rexistro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:853
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Respaldo de Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:854
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:858
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Restabelecemento do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:859
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:928
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:929
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:931
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:932
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:954
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto podería levar algún tempo dependendo da cantidade de datos da súa conta."
@@ -18776,8 +19241,9 @@ msgid "Invalid Evolution backup file"
 msgstr "Ficheiro de respaldo de Evolution non válido"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Seleccione un ficheiro de respaldo válido que restaurar."
+#, fuzzy
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "Ficheiro de respaldo de Evolution non válido"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -18826,29 +19292,29 @@ msgstr "Permisos insuficientes"
 msgid "The selected folder is not writable."
 msgstr "O cartafol seleccionado non é escribíbel."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:161
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Produciuse un erro ao iniciar Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:179
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 "Produciuse un erro ao enviar o fluxo do contido dos correos a Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:228
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter colgouse ou fallou ao procesar unha mensaxe de correo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:373
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Opcións do Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:382
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:540
+#: ../modules/bogofilter/evolution-bogofilter.c:539
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
@@ -18857,67 +19323,67 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Filtro de spam usando Bogofilter"
 
-#: ../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 "Porto LDAP estándar"
 
-#: ../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 "LDAP sobre SSL (obsoleto)"
 
-#: ../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 "Catálogo global de Microsoft"
 
-#: ../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 "Catálogo global de Microsoft sobre SSL"
 
 #. 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 "Conecando a LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recomendado)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Cifrado:"
 
-#: ../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 "Autenticación"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Anonimamente"
 
-#: ../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 "Usando enderezo de correo"
 
-#: ../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 "Empregar o nome distintivo (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Método:"
 
-#: ../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 "
@@ -18928,36 +19394,36 @@ msgstr ""
 "anónimo ao servidor LDAP."
 
 #. 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 "Usando LDAP"
 
-#: ../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 "Buscando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "Base de busca:"
 
-#: ../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 "Buscar bases de busca posíbeis"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "Un nivel"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Subárbore"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Ámbito da busca:"
 
-#: ../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 "
@@ -18970,28 +19436,28 @@ msgstr ""
 "busca «Un nivel» só incluirá as entradas un nivel por embaixo da súa base de "
 "busca."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Filtro de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Límite:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "contactos"
 
-#: ../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 "Examinar até chegar ao final"
 
 #: ../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:"
@@ -19000,70 +19466,38 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 
-#: ../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 "Erro 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 "Non foi posíbel analizar a resposta"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-#: ../modules/cal-config-google/e-google-chooser.c:471
-msgid "Empty response"
-msgstr "Resposta baleira"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
-#: ../modules/cal-config-google/e-google-chooser.c:479
-msgid "Unexpected reply from server"
-msgstr "Resposta non agardada do servidor"
-
-#: ../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 "Non foi posíbel atopar ningún calendario do usuario."
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
-msgid "Path"
-msgstr "Ruta"
-
-#: ../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 "Elixir un calendario"
 
-#: ../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 "Elixir unha lista de notas"
 
-#: ../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 "Elixir unha lista de tarefas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Buscar calendarios"
 
-#: ../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 "Buscar lista de notas"
 
-#: ../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 "Buscar listas de tarefas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: ../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 "O servidor xestiona os convites a reunións"
 
@@ -19075,27 +19509,27 @@ msgstr "Seleccione a axenda de enderezos a usar."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Usar no cartafol Cumpreanos e aniversarios"
 
-#: ../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 "Calendario do usuario por omisión"
 
-#: ../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 "Usar un ficheiro iCalendar existente (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "Ficheiro iCalendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Seleccione un ficheiro iCalendar"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: ../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 "Permitir a Evolution actualizar o ficheiro"
 
@@ -19105,31 +19539,29 @@ msgstr "Permitir a Evolution actualizar o ficheiro"
 #. *
 #. * 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
-#| msgid "Fahrenheit (ےF)"
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
-#| msgid "Centigrade (ےC)"
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "Centigrade (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Unidades:"
 
@@ -19189,57 +19621,75 @@ msgstr "Lista de notas nova"
 msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
-#: ../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 "Copiando un evento no calendario «%s»"
 
-#: ../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 "Movendo un evento nun calendario «%s»"
 
-#: ../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 "Copiando un recordatorio na lista de recordatorios «%s»"
 
-#: ../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 "Movendo un recordatorio na lista de recordatorios «%s»"
 
-#: ../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 "Copiando unha tarefa na lista de tarefas «%s»"
 
-#: ../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 "Movendo unha tarefa na lista de tarefas «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
 msgid "Calendar Selector"
 msgstr "Selector de calendario"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
 msgid "Task List Selector"
 msgstr "Selector de lista de tarefas"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:520
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr "Convites a reunións"
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr "E_liminar a mensaxe despois da acción"
+
+#: ../modules/calendar/e-calendar-preferences.c:656
+#: ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr "Busca de conflitos"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Seleccionar os calendarios nos que buscar conflitos entre reunións"
+
+#: ../modules/calendar/e-calendar-preferences.c:1057
 msgid "Ti_me and date:"
 msgstr "_Hora e data:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "_Date only:"
 msgstr "Só a _data:"
 
@@ -19418,46 +19868,51 @@ msgstr "_Ocultar as tarefas terminadas despois de"
 msgid "Display reminders in _notification area only"
 msgstr "Mostrar os recordatorios só na área de _notificación"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#, fuzzy
+msgid "Display reminders for completed _tasks"
+msgstr "Eliminar as tarefas terminadas"
+
 #. 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 "M_ostrar un aviso"
 
 #. 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 "antes de cada cita"
 
 #. 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 "Most_rar un aviso"
 
 #. 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 "antes de cada aniversario"
 
-#: ../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 "Seleccionar os calendarios para a notificación de recordatorios"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Default Free/Busy Server"
 msgstr "Servidor predeterminado de dispoñibilidade"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Modelo:"
-
-#: ../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 ""
 "%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
 "electrónico."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "Publishing Information"
 msgstr "Información de publicación"
 
@@ -20220,194 +20675,194 @@ msgstr "Formatar parte como convite"
 
 #. 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 "Hoxe ás %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 "Hoxe ás %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 "Hoxe ás %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 "Mañá ás %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 "Mañá ás %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 "Mañá ás %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 "Mañá ás %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, %e de %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:321
+#: ../modules/itip-formatter/itip-view.c:319
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../modules/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %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, %e de %B %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, %e de %B de %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, %e de %B de %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, %e de %B de %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, %e de %B de %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, %e de %B de %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 "Unha persoa descoñecida"
 
-#: ../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 "Responda de parte de %s"
 
-#: ../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 "Recibido de parte de %s"
 
-#: ../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 "%s publicou a seguinte información da reunión a través de %s:"
 
-#: ../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 "%s publicou a seguinte información da reunión:"
 
-#: ../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 "%s delegoulle a reunión seguinte:"
 
-#: ../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 "%s solicita a súa presenza na seguinte reunión a través de %s:"
 
-#: ../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 "%s solicita a súa presenza na seguinte reunión:"
 
-#: ../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 "%s desexa apuntarse a unha reunión existente a través de %s:"
 
-#: ../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 "%s desexa apuntarse a unha reunión existente:"
 
-#: ../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 "
@@ -20416,87 +20871,87 @@ msgstr ""
 "%s desexa recibir a última información sobre a próxima reunión a través de "
 "%s:"
 
-#: ../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 "%s desexa recibir a última información da seguinte reunión:"
 
-#: ../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 "%s enviou a seguinte resposta á reunión a través de %s :"
 
-#: ../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 "%s enviou a seguinte resposta á reunión:"
 
-#: ../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 "%s cancelou a seguinte reunión a través de %s:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s cancelou a seguinte reunión:"
 
-#: ../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 "%s propuxo as seguintes modificacións para a reunión a través de %s."
 
-#: ../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 "%s propuxo os seguintes cambios para a reunión:"
 
-#: ../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 "%s rexeitou as seguintes modificacións para a reunión a través de %s:"
 
-#: ../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 "%s rexeitou os seguintes cambios para a reunión:"
 
-#: ../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 "%s publicou a seguinte tarefa a través de %s:"
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s publicou a seguinte tarefa:"
 
-#: ../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 "%s solicita a asignación de %s para a seguinte tarefa:"
 
-#: ../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 "%s asignoulle unha tarefa a través de %s:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s asignoulle unha tarefa:"
 
-#: ../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 "%s desexa apuntarse a unha tarefa existente a través de %s:"
 
-#: ../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 "%s desexa apuntarse a unha tarefa existente:"
 
-#: ../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 "
@@ -20505,342 +20960,342 @@ msgstr ""
 "%s desexa recibir a última información para a seguinte tarefa asignada a "
 "través de %s :"
 
-#: ../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 ""
 "%s desexa recibir a última información para a seguinte tarefa asignada:"
 
-#: ../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 "%s enviou a seguinte resposta para a tarefa asignada a través de %s :"
 
-#: ../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 "%s enviou a seguinte resposta á tarefa asignada:"
 
-#: ../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 "%s cancelou a seguinte tarefa asignada a través de %s :"
 
-#: ../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 "%s cancelou a seguinte tarefa asignada:"
 
-#: ../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 ""
 "%s propuxo as seguintes modificacións na asignación de tarefas a través de "
 "%s :"
 
-#: ../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 "%s propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../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 "%s rexeitou a seguinte tarefa asignada a través de %s:"
 
-#: ../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 "%s rexeitou a seguinte tarefa asignada:"
 
-#: ../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 "%s publicou a seguinte nota a través de %s:"
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s publicou a seguinte nota:"
 
-#: ../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 "%s desexa apuntarse a unha nota existente a través de %s:"
 
-#: ../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 "%s desexa apuntarse a unha nota existente:"
 
-#: ../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 "%s cancelou a seguinte nota compartida a través de %s:"
 
-#: ../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 "%s cancelou a seguinte nota compartida:"
 
-#: ../modules/itip-formatter/itip-view.c:676
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "Todo o día:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr "Día de inicio:"
 
-#: ../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 "Hora de inicio:"
 
-#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr "Día de finalización:"
 
-#: ../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 "Hora de finalización:"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr "_Abrir calendario"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../modules/itip-formatter/itip-view.c:1053
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../modules/itip-formatter/itip-view.c:1056
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr "A_ceptar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1059
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr "Ace_ptar"
 
-#: ../modules/itip-formatter/itip-view.c:1062
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr "Enviar _información"
 
-#: ../modules/itip-formatter/itip-view.c:1065
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../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 "_Actualizar"
 
-#: ../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 "Comentario:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr "Responder ao remitente"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1571
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr "Enviar _actualizacións aos participantes"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../modules/itip-formatter/itip-view.c:1576
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr "_Conservar o meu recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1577
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr "_Herdar recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../modules/itip-formatter/itip-view.c:1914
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr "_Notas:"
 
-#: ../modules/itip-formatter/itip-view.c:3220
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "Gar_dar"
 
-#: ../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 "Actualizouse o estado de participante"
 
-#: ../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 "Unha cita no calendario «%s» entra en conflito con esta reunión"
 
-#: ../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 "Localizouse a cita no calendario «%s»"
 
-#: ../modules/itip-formatter/itip-view.c:4004
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr "Non é posíbel atopar ningún calendario"
 
-#: ../modules/itip-formatter/itip-view.c:4012
+#: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non é posíbel atopar esta reunión en ningún calendario"
 
-#: ../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 "Non é posíbel atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../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 "Non é posíbel atopar esta nota en ningunha lista de notas"
 
-#: ../modules/itip-formatter/itip-view.c:4367
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4372
+#: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../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 "Non é posíbel enviar o elemento ao calendario «%s». %s"
 
-#: ../modules/itip-formatter/itip-view.c:4782
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario «%s» como aceptado"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario «%s» como provisional"
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario «%s» como rexeitado"
 
-#: ../modules/itip-formatter/itip-view.c:4799
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario «%s» como cancelado"
 
-#: ../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 "Gardando os cambios no calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr "Non é posíbel analizar o elemento"
 
-#: ../modules/itip-formatter/itip-view.c:5054
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador retirou o delegado %s "
 
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificación de cancelación ao delegado"
 
-#: ../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 "Non foi posíbel enviar unha notificación de cancelación ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posíbel actualizar o participante. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5167
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reunión no é válida e non pode actualizarse"
 
-#: ../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 ""
 "Non foi posíbel actualizar o estado de participante debido a que o estado "
 "non é válido"
 
-#: ../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 ""
 "Non foi posíbel actualizar o estado de participante porque xa non existe o "
 "elemento"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr "Enviouse a información da reunión"
 
-#: ../modules/itip-formatter/itip-view.c:5422
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr "Enviouse a información da tarefa"
 
-#: ../modules/itip-formatter/itip-view.c:5427
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr "Enviouse a información da nota"
 
-#: ../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 "Non é posíbel enviar a información da reunión, a reunión non existe"
 
-#: ../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 "Non é posíbel enviar a información da tarefa, a tarefa non existe"
 
-#: ../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 "Non é posíbel enviar a información da nota, a nota non existe"
 
 #. 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 "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5518
+#: ../modules/itip-formatter/itip-view.c:5538
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../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 "O calendario anexado non é válido"
 
-#: ../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."
@@ -20848,15 +21303,15 @@ msgstr ""
 "A mensaxe di que contén un calendario pero o calendario non é un iCalendar "
 "correcto."
 
-#: ../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 "O elemento do calendario non é válido"
 
-#: ../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"
@@ -20864,11 +21319,11 @@ msgstr ""
 "A mensaxe contén un calendario pero o calendario non contén actividades, "
 "tarefas nin información de dispoñibilidade"
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contén múltiples elementos"
 
-#: ../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"
@@ -20876,24 +21331,24 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:6172
+#: ../modules/itip-formatter/itip-view.c:6193
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/itip-formatter/itip-view.c:6188
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../modules/itip-formatter/itip-view.c:6348
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6351
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6354
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
@@ -20912,45 +21367,19 @@ msgstr "Esta xuntanza foi delegada"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "«{0}» delegou a reunión. Desexa engadir o delegado «{1}»?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "Convites a reunións"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "E_liminar a mensaxe despois da acción"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "Busca de conflitos"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Seleccionar os calendarios nos que buscar conflitos entre reunións"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Formatador iTip"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Mostrar as partes MIME do texto/calendario nas mensaxes de correo."
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr "Características de Google"
 
-#: ../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 "Engadir un ca_lendario de Google a esta conta"
 
-#: ../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 "Engadir un con_tacto de Google a esta conta"
 
-#: ../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 "Pode que deba activar o acceso IMAP"
 
@@ -21076,369 +21505,389 @@ msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../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] "%d mensaxe anexada"
 msgstr[1] "%d mensaxes anexadas"
 
-#: ../modules/mail/e-mail-shell-backend.c:350
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:352
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Escribir unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:360
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Conta de _correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:362
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Crear unha nova conta de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:367
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:369
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Crear un novo cartafol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:684
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:693
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:702
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:712
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
 #. 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 "Ningún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:706
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Marcando mensaxes como lidas…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#, fuzzy
+msgid "Go to Folder"
+msgstr "Mover ao cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#, fuzzy
+msgid "_Select"
+msgstr "Seleccionar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../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 ""
 "Retirar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../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 "Modificar as propiedades desta conta"
 
-#: ../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 "Actualizar a lista de cartafoles para esta conta"
 
-#: ../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 "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../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 ""
 "Descargar as mensaxes das contas e cartafoles marcados para uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol a…"
 
-#: ../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 "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Retirar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../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 "Retirar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../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 "Ma_rcar todas as mensaxes como lidas"
 
-#: ../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 "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a…"
 
-#: ../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 "Mover o cartafol seleccionado a outro cartafol"
 
 #. 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 "_Novo…"
 
-#: ../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 "Crear un cartafol novo para gardar o correo"
 
-#: ../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 "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../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 "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fío desta mensaxe"
 
-#: ../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 "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1679
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fío sec_undario desta mensaxe"
 
-#: ../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 "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1693
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../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 ""
 "Retirar permanentemente todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1700
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#, fuzzy
+msgid "Go to _Folder"
+msgstr "Mover ao cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#, fuzzy
+msgid "Opens a dialog to select a folder to go to"
+msgstr "Premer aquí para seleccionar os cartafoles de destino"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "Nin_gún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscricións"
 
-#: ../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 ""
 "Subscribir ou eliminar as subscricións a cartafoles en servidores remotos"
 
-#: ../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 "Enviar / _Recibir"
 
-#: ../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 "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../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 "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../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 "Enviar os elementos da cola de todas as contas"
 
-#: ../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 "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1786
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Pregar todos os _fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1788
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Pregar todos os fíos de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "D_espregar todos os fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas do fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../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 "Crear ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Subscricións…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../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 "C_rear un cartafol de busca a partir da busca…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../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 "Crear ou editar as definicións dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "Cartafol _novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1916
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1918
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../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 "Mostrar as mensaxes eliminadas riscándoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1934
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1940
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr "Cartafol non _coincidente activado"
 
-#: ../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 "Conmuta cando se activa o cartafol de busca non coincidente"
 
-#: ../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 "Mostrar a vista previa da mensaxe embaixo da lista de mensaxes"
 
-#: ../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 "Mostrar a vista previa da mensaxe a carón da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1977
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1984
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2019
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2026
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
@@ -21494,49 +21943,42 @@ msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
+#: ../modules/mail/e-mail-shell-view-private.c:1063
+#, fuzzy, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1061
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d en total"
-msgstr[1] "%d en total"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../modules/mail/e-mail-shell-view-private.c:1581
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/em-composer-prefs.c:394
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr "Seleccione un cartafol a engadir"
 
-#: ../modules/mail/em-composer-prefs.c:854
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Cartafol"
 
-#: ../modules/mail/em-composer-prefs.c:890
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../modules/mail/em-composer-prefs.c:1163
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Keep in Outbox"
 msgstr "Manter en Saída"
 
-#: ../modules/mail/em-composer-prefs.c:1164
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send immediately"
 msgstr "Enviar inmediatamente"
 
-#: ../modules/mail/em-composer-prefs.c:1165
+#: ../modules/mail/em-composer-prefs.c:1207
 msgid "Send after 5 minutes"
 msgstr "Despois de 5 minutos"
 
-#: ../modules/mail/em-composer-prefs.c:1238
+#: ../modules/mail/em-composer-prefs.c:1280
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -21560,20 +22002,20 @@ msgstr "Unha vez ao mes"
 msgid "Immediately, on folder leave"
 msgstr "Inmediatamente, ao deixar o cartafol"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:424
 msgid "Contains Value"
 msgstr "Contén o valor"
 
 #. 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 "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -21646,20 +22088,20 @@ msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Nota: algunhas modificacións non serán efectivas até que reinicie o programa"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Visión xeral"
 
-#: ../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 "Engadido"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "_Engadidos"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Activar e desactivar os engadidos"
 
@@ -22076,11 +22518,11 @@ msgstr "Formatar parte como contacto da axenda de enderezos"
 msgid "Evolution Web Inspector"
 msgstr "Inspector web de Evolution"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Palabras chave"
@@ -22272,8 +22714,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Iniciar _automaticamente cando se edite un novo correo"
 
-#: ../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 "Escribir no editor externo"
 
@@ -22322,23 +22764,28 @@ msgstr ""
 "Aínda está en execución o editor externo. Non é posíbel pechar a xanela do "
 "editor de correo mentres o editor estea activo."
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Seleccionar unha imaxe facial"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Ficheiros de imaxe"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "_Inserir a imaxe predeterminada da cara"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Cargar unha imaxe nova da _cara"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+#, fuzzy
+msgid "Change Face Image"
+msgstr "Escoller cor de fondo"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "I_ncluír a cara"
 
@@ -22359,15 +22806,29 @@ msgid "Invalid Image Size"
 msgstr "O tamaño da imaxe non é válido"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Seleccione unha imaxe dun tamaño de 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 "Incorrect Face Image Byte Size"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+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 "Non é unha imaxe"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+#, fuzzy
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr ""
 "O ficheiro que seleccionou non semella ser unha imaxe .png correcta. Erro: "
 "{0}"
@@ -22517,8 +22978,8 @@ msgstr ""
 "\n"
 "Cabeceira: {0}"
 
-#: ../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."
@@ -22527,54 +22988,54 @@ msgstr[1] "Recibiu %d mensaxes novas."
 
 #. 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 "De: %s:"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr "Novo correo en Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "Re_producir un son cando chegue correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "Usar un _tema sonoro"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "Reproducir o _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar as mensaxes novas só na caixa de _entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "Mostrar _notificacións cando chegue correo novo"
 
@@ -22835,23 +23296,18 @@ msgstr "Rematouse con éxito a publicación en %s"
 msgid "Mount of %s failed:"
 msgstr "Produciuse un erro ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "A_ctivar"
-
-#: ../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 "Está seguro de que desexa retirar esta localización?"
 
 #. 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 "Non foi posíbel crear o fío para publicar."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a información do calendario"
 
@@ -22932,7 +23388,7 @@ msgid "_Username:"
 msgstr "_Nome do usuario:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:772
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
@@ -22944,7 +23400,7 @@ msgstr "_Lembrar o contrasinal"
 msgid "Publishing Location"
 msgstr "Localización da publicación"
 
-#: ../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'"
@@ -23096,35 +23552,35 @@ msgstr ""
 "$ORIG[subject], $ORIG[from], $ORIG[to] ou $ORIG[body], que se substituirán "
 "cos valores do correo electrónico ao que está respondendo."
 
-#: ../plugins/templates/templates.c:1199
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Sen título"
 
-#: ../plugins/templates/templates.c:1308
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Gardar como un _modelo"
 
-#: ../plugins/templates/templates.c:1310
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexión…"
 
-#: ../shell/e-shell.c:388
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr "Preparando a conexión…"
 
-#: ../shell/e-shell.c:495
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr "Preparando a saída"
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr "Preparando a saída…"
 
-#: ../shell/e-shell.c:909
+#: ../shell/e-shell.c:1024
 msgid "Credentials are required to connect to the destination host."
 msgstr "Requírense credenciais para conectarse ao equipo de destino."
 
@@ -23140,19 +23596,19 @@ msgstr "Gardar a busca"
 #. * 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 "Mos_trar:"
 
 #. 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 "Bus_car:"
 
 #. 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 "e_n"
 
@@ -23174,13 +23630,13 @@ msgstr "Gardando o estado da interface do usuario"
 #: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
+"Fran Diéguez <frandieguez gnome org>, 2009-.2015\n"
 "Leandro Regueiro <leandro regueiro gmail com>, 2012.\n"
-"Fran Diéguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.\n"
 "Antón Méixome <meixome certima net>, 2010.\n"
 "Antón Méixome <meixome mancomun org>, 2009.\n"
 "Suso Baleato <suso baleato xunta es>, 2009;\n"
-"Mancomún - Centro de Referencia e Servizos de Software Libre <g11n mancomun "
-"org>, 2009.\n"
+"Mancomún - Centro de Referencia e Servizos de Software Libre "
+"<g11n mancomun org>, 2009.\n"
 "Ignacio Casal Quinteiro <icq svn gnome org>, 2007, 2008.\n"
 "Ignacio Casal Quinteiro <nacho resa gmail com>, 2005, 2006.\n"
 "Manuel A. Fernández Montecelo <manuel sindominio net>, 2001, 2005.\n"
@@ -23472,19 +23928,19 @@ msgstr "Executar estes parámetros de busca"
 
 #. 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 "Novo"
 
 #. 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"
@@ -23520,7 +23976,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro\n"
 "traballo, e agardamos con ansias as súas colaboracións!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:223
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -23528,13 +23984,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:229
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
 #. 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'"
@@ -23542,39 +23998,39 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoñente indicado. As opción dispoñíbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:322
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría indicada á xanela principal"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:326
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:328
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoñibilidade da rede"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:331
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:334
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:320
+#: ../shell/main.c:336
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:324
+#: ../shell/main.c:340
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:326
+#: ../shell/main.c:342
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saída dun proceso de execución do Evolution"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:419
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -23583,11 +24039,11 @@ msgstr ""
 "Non é posíbel iniciar Evolution. Outra instancia de Evolution probabelmente "
 "xa estea en execución e non responda. Erro do sistema: %s"
 
-#: ../shell/main.c:457 ../shell/main.c:462
+#: ../shell/main.c:473 ../shell/main.c:478
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:520
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -23596,7 +24052,7 @@ msgstr ""
 "%s: non é posíbel usar á vez --online e --offline.\n"
 "  Use «%s --help» para máis información.\n"
 
-#: ../shell/main.c:526
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -23674,7 +24130,8 @@ msgid "Failed to invoke authenticate for '{0}'"
 msgstr "Produciuse un fallo ao invocar a autenticación para «{0}»"
 
 #: ../shell/shell.error.xml.h:17
-msgid "Failed to connect to '{0}'"
+#, fuzzy
+msgid "Failed to connect '{0}'"
 msgstr "Produciuse un fallo ao conectarse a «{0}»"
 
 #: ../shell/shell.error.xml.h:18
@@ -23682,21 +24139,71 @@ msgid "_Reconnect"
 msgstr "_Reconectar"
 
 #: ../shell/shell.error.xml.h:19
+#, fuzzy
+msgid "Failed to connect address book '{0}'"
+msgstr "Produciuse un fallo ao actualizar a axenda de enderezos '{0}'"
+
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+msgid "Failed to connect calendar '{0}'"
+msgstr "Produciuse un fallo ao abrir o calendario «{0}»"
+
+#: ../shell/shell.error.xml.h:21
+#, fuzzy
+msgid "Failed to connect mail account '{0}'"
+msgstr "Produciuse un fallo ao conectarse a «{0}»"
+
+#: ../shell/shell.error.xml.h:22
+#, fuzzy
+msgid "Failed to connect memo list '{0}'"
+msgstr "Produciuse un fallo ao abrir a lista de recordatorios «{0}»"
+
+#: ../shell/shell.error.xml.h:23
+#, fuzzy
+msgid "Failed to connect task list '{0}'"
+msgstr "Produciuse un fallo ao abrir a lista de tarefas «{0}»"
+
+#: ../shell/shell.error.xml.h:24
 msgid "Failed to prompt for credentials for '{0}'"
 msgstr "Produciuse un fallo ao solicitar as credenciais para «{0}»"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:25
 msgid "Failed to finish trust prompt for '{0}'"
 msgstr "Produciuse un fallo ao rematar a solicitude de confianza para «{0}»"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:26
 msgid "SSL certificate for '{0}' is not trusted."
 msgstr "O certificado SSL para «{0}» non é confiábel."
 
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "Razón: {1}"
 
+#: ../shell/shell.error.xml.h:29
+#, fuzzy
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
+#: ../shell/shell.error.xml.h:30
+#, fuzzy
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
+#: ../shell/shell.error.xml.h:31
+#, fuzzy
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
+#: ../shell/shell.error.xml.h:32
+#, fuzzy
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
+#: ../shell/shell.error.xml.h:33
+#, fuzzy
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23708,72 +24215,60 @@ msgstr ""
 "\n"
 "Editar os axustes de confianza:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Expedido á organi_zación:"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Expedido á unidade organizativa (OU)"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Número de serie"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Emitido por"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Expedido pola organi_zación:"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Expedido pola unidade organizativa (UO)"
 
-#: ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Emitido"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:94
-#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "Impresión dixital SHA1"
 
-#: ../smime/gui/certificate-manager.c:95
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Impresión dixital MD5"
@@ -23783,7 +24278,7 @@ msgstr "Impresión dixital MD5"
 msgid "Email Address"
 msgstr "Enderezo de correo"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../smime/gui/certificate-manager.c:652
 msgid "Select a file to backup your key and certificate..."
 msgstr "Seleccione un ficheiro para respaldar a súa chave e certificado…"
 
@@ -23792,36 +24287,31 @@ msgstr "Seleccione un ficheiro para respaldar a súa chave e certificado…"
 #. * 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 "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:676
-#: ../smime/gui/certificate-manager.c:965
-msgid "All files"
-msgstr "Todos os ficheiros"
-
-#: ../smime/gui/certificate-manager.c:728
+#: ../smime/gui/certificate-manager.c:730
 msgid "Backup Certificate"
 msgstr "Respaldar certificado"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
+#: ../smime/gui/certificate-manager.c:744
 msgid "_File name:"
 msgstr "Nome do _ficheiro:"
 
 #. 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 "Seleccione un ficheiro…"
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../smime/gui/certificate-manager.c:763
 msgid "_Include certificate chain in the backup"
 msgstr "_Incluír a cadea de certificados no respaldo"
 
 #. 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"
@@ -23831,16 +24321,16 @@ msgstr ""
 "de respaldo que está apunto de crear.\n"
 "Debe estabelecer este contrasinal para proceder co respaldo."
 
-#: ../smime/gui/certificate-manager.c:786
+#: ../smime/gui/certificate-manager.c:788
 msgid "_Repeat Password:"
 msgstr "_Repetir o contrasinal:"
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../smime/gui/certificate-manager.c:807
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
 #. 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 "
@@ -23852,92 +24342,96 @@ msgstr ""
 "restaurar este respaldo máis tarde.\n"
 "Por favor gárdeo nun lugar seguro."
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../smime/gui/certificate-manager.c:860
 msgid "No file name provided"
 msgstr "Non se forneceu un nome de ficheiro"
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../smime/gui/certificate-manager.c:864
 msgid "Failed to backup key and certificate"
 msgstr "Produciuse un erro ao respaldar a chave e o certificado"
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "Seleccionar un certificado para importar…"
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
 msgstr "Produciuse un erro ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Preguntar ao usala"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nunca"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
-msgid "Marginal"
+msgid "Marginally"
 msgstr "Marginal"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Completa"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
-msgid "Ultimate"
+msgid "Ultimately"
 msgstr "Absoluta"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
-msgid "Temporary"
+msgid "Temporarily"
 msgstr "Temporal"
 
-#: ../smime/gui/certificate-manager.c:1333
+#: ../smime/gui/certificate-manager.c:1335
 msgid "Change certificate trust"
 msgstr "Cambiar confianza do certificado"
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../smime/gui/certificate-manager.c:1347
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Cambiar confianza para este equipo «%s»:"
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Preguntar ao usalo"
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../smime/gui/certificate-manager.c:1372
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
-msgstr "_Temporal (só para esta sesión)"
+msgid "_Never trust this certificate"
+msgstr "_Nunca confiar neste certificado"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "_Nunca"
+msgid "_Temporarily trusted (this session only)"
+msgstr "Confianza _Temporal (só para esta sesión)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
+#, fuzzy
 msgctxt "CamelTrust"
-msgid "_Marginal"
-msgstr "_Marginal"
+msgid "_Marginally trusted"
+msgstr "Confianza _marxinal"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
+#, fuzzy
 msgctxt "CamelTrust"
-msgid "_Fully"
-msgstr "_Completa"
+msgid "_Fully trusted"
+msgstr "Confianza _completa"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
+#, fuzzy
 msgctxt "CamelTrust"
-msgid "_Ultimate"
-msgstr "_Absoluta"
+msgid "_Ultimately trusted"
+msgstr "Confianza _Absoluta"
 
-#: ../smime/gui/certificate-manager.c:1378
+#: ../smime/gui/certificate-manager.c:1380
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -23945,44 +24439,44 @@ msgstr ""
 "Antes de confiar neste sitio, debería examinar o seu certificado e as súas "
 "directrices e procedementos (se están dispoñíbeis)."
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../smime/gui/certificate-manager.c:1395
 msgid "_Display certificate"
 msgstr "_Mostrar certificado"
 
-#: ../smime/gui/certificate-manager.c:1598
+#: ../smime/gui/certificate-manager.c:1600
 msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 "Ten os certificados no ficheiro que identifican estes servidores de correo:"
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../smime/gui/certificate-manager.c:1631
 msgid "Host name"
 msgstr "Nome do equipo"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/gui/certificate-manager.c:1632
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Fingerprint"
 msgstr "Pegada dixital"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Trust"
 msgstr "Confiar"
 
-#: ../smime/gui/certificate-manager.c:1654
+#: ../smime/gui/certificate-manager.c:1656
 msgid "_Edit Trust"
 msgstr "_Editar a confianza"
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificados de correo"
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificados dunha EA"
 
@@ -24094,8 +24588,9 @@ msgstr ""
 "certificado e as súas directrices e procedementos (se están dispoñíbeis)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Certificado"
+#, fuzzy
+msgid "C_ertificate:"
+msgstr "C_ertificado:"
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
@@ -24240,6 +24735,76 @@ msgstr "Con _data de vencemento"
 msgid "With _Status"
 msgstr "Con e_stado"
 
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr ""
+#~ "Determina se se debe usar o mesmo tipo de letra para as liñas «De» e "
+#~ "«Asunto» da columna «Mensaxes» na vista vertical"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr ""
+#~ "Determina se se debe usar o mesmo tipo de letra para as liñas «De» e "
+#~ "«Asunto» da columna «Mensaxes» na vista vertical."
+
+#~ msgid "Completed On"
+#~ msgstr "Completado o"
+
+#~ msgid "is set"
+#~ msgstr "está estabelecido"
+
+#~ msgid "is not set"
+#~ msgstr "non está estabelecido"
+
+#~ msgid "Loading Images"
+#~ msgstr "Cargando as imaxes"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Seleccione un ficheiro de respaldo válido que restaurar."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "Erro HTTP: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Non foi posíbel analizar a resposta"
+
+#~ msgid "Empty response"
+#~ msgstr "Resposta baleira"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Resposta non agardada do servidor"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Non foi posíbel atopar ningún calendario do usuario."
+
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
+#~ msgid "Template:"
+#~ msgstr "Modelo:"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Formatador iTip"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "Mostrar as partes MIME do texto/calendario nas mensaxes de correo."
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Seleccione unha imaxe dun tamaño de 48 * 48"
+
+#~ msgid "E_nable"
+#~ msgstr "A_ctivar"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "_Nunca"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Fully"
+#~ msgstr "_Completa"
+
 #~ msgid "Unknown background operation"
 #~ msgstr "Operación en segundo plano descoñecida"
 
@@ -24360,9 +24925,6 @@ msgstr "Con e_stado"
 #~ msgid "Certificate details"
 #~ msgstr "Información do certificado"
 
-#~ msgid "Add"
-#~ msgstr "Engadir"
-
 #~ msgid "Edit"
 #~ msgstr "Editar"
 
@@ -24402,9 +24964,6 @@ msgstr "Con e_stado"
 #~ msgid "_Secure HTTP Proxy:"
 #~ msgstr "Proxy HTTP _segura:"
 
-#~ msgid "No _Proxy for:"
-#~ msgstr "Sen pro_xy para:"
-
 #~ msgid "Use Authe_ntication"
 #~ msgstr "Usar aute_nticación"
 
@@ -24934,9 +25493,6 @@ msgstr "Con e_stado"
 #~ msgid "Loading calendars"
 #~ msgstr "Cargando os calendarios"
 
-#~ msgid "Loading memo list"
-#~ msgstr "Cargando a lista de notas"
-
 #~ msgid "The Evolution tasks have quit unexpectedly."
 #~ msgstr "As tarefas do Evolution saíron inesperadamente."
 
@@ -25132,9 +25688,6 @@ msgstr "Con e_stado"
 #~ msgid "Proxy _Logout"
 #~ msgstr "_Saír da sesión proxy"
 
-#~ msgid "File is not a valid .desktop file"
-#~ msgstr "O ficheiro non é un ficheiro .desktop correcto"
-
 #~ msgid "Unrecognized desktop file Version '%s'"
 #~ msgstr "Non se recoñece a versión de ficheiro desktop «%s»"
 
@@ -25460,9 +26013,6 @@ msgstr "Con e_stado"
 #~ msgid "Unsubscribing from folder '%s'"
 #~ msgstr "Eliminando a subscrición do cartafol «%s»"
 
-#~ msgid "Refreshing folder '%s'"
-#~ msgstr "Actualizando o cartafol «%s»"
-
 #~ msgid "Expunging folder '%s'"
 #~ msgstr "Expurgando o cartafol «%s»"
 
@@ -26341,9 +26891,6 @@ msgstr "Con e_stado"
 #~ msgid "Cannot proccess non-text mime/part"
 #~ msgstr "Non é posíbel procesar a parte MIME que non é texto"
 
-#~ msgid "Completed on"
-#~ msgstr "Completado o"
-
 #~ msgid "Overdue:"
 #~ msgstr "Atrasada:"
 



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